CWS swlayoutrefactoring: resync to m91

6 files changed, 27 insertions, 36 deletions

diff --git a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx
index 3ab86b3469d7..dd3e7e2dce9b 100644
--- a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx
+++ b/sw/source/ui/inc/SwSpellDialogChildWindow.hxx
@@ -48,8 +48,8 @@ class SwSpellDialogChildWindow
     void            LockFocusNotification(bool bLock);
 
 protected:
-    virtual svx::SpellPortions GetNextWrongSentence (void);
-    virtual void ApplyChangedSentence(const svx::SpellPortions& rChanged);
+    virtual svx::SpellPortions GetNextWrongSentence(bool bRecheck);
+    virtual void ApplyChangedSentence(const svx::SpellPortions& rChanged, bool bRecheck);
     virtual void AddAutoCorrection(const String& rOld, const String& rNew, LanguageType eLanguage);
     virtual bool HasAutoCorrection();
     virtual bool HasGrammarChecking();
diff --git a/sw/source/ui/inc/ribbar.hrc b/sw/source/ui/inc/ribbar.hrc
index 45c494b6f136..c9af820ba35b 100644
--- a/sw/source/ui/inc/ribbar.hrc
+++ b/sw/source/ui/inc/ribbar.hrc
@@ -69,10 +69,7 @@
 #define MN_CALC_POPUP               (RC_RIBBAR_BEGIN + 22)
 
 #define MN_NUMNAMES_POPUP           (RC_RIBBAR_BEGIN + 23)
-#define RID_INSERT_CTRL             (RC_RIBBAR_BEGIN + 24)
-#define RID_INSERT_OBJ_CTRL         (RC_RIBBAR_BEGIN + 25)
 #define RID_INSERT_FIELD_CTRL       (RC_RIBBAR_BEGIN + 26)
-#define RID_TBL_OPT_CTRL            (RC_RIBBAR_BEGIN + 27)
 #define RID_BEZIER_WIN              (RC_RIBBAR_BEGIN + 28)
 #define RID_SCROLL_NAVI_TBX         (RC_RIBBAR_BEGIN + 29)
 #define RID_SCROLL_NAVIGATION_WIN   (RC_RIBBAR_BEGIN + 30)
diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx
index a239f13f1ec2..041b55d9c6db 100644
--- a/sw/source/ui/inc/swdtflvr.hxx
+++ b/sw/source/ui/inc/swdtflvr.hxx
@@ -91,6 +91,7 @@ class SwTransferable : public TransferableHelper
     void DeleteSelection();
 
     // helper methods for the paste
+    static SwTransferable* GetSwTransferable( const TransferableDataHelper& rData );
     static void SetSelInShell( SwWrtShell& , BOOL , const Point* );
     static BOOL _CheckForURLOrLNKFile( TransferableDataHelper& rData,
                                 String& rFileName, String* pTitle = 0 );
diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx
index 0c31a9ab977f..a0d7ebf03ca1 100644
--- a/sw/source/ui/inc/swlbox.hxx
+++ b/sw/source/ui/inc/swlbox.hxx
@@ -76,11 +76,7 @@ namespace nsSwComboBoxStyle
     const SwComboBoxStyle CBS_LOWER         = 0x02;
     const SwComboBoxStyle CBS_ALL           = 0x04;
     const SwComboBoxStyle CBS_FILENAME      = 0x08;
-#ifdef WIN
-    const SwComboBoxStyle CBS_SW_FILENAME   = CBS_FILENAME | CBS_LOWER;
-#else
     const SwComboBoxStyle CBS_SW_FILENAME   = CBS_FILENAME;
-#endif
 }
 
 class SW_DLLPUBLIC SwComboBox : public ComboBox
diff --git a/sw/source/ui/inc/swmn_tmpl.hrc b/sw/source/ui/inc/swmn_tmpl.hrc
index bf375e4ab010..0d5b3265e79a 100644
--- a/sw/source/ui/inc/swmn_tmpl.hrc
+++ b/sw/source/ui/inc/swmn_tmpl.hrc
@@ -57,7 +57,7 @@
     MenuItem\
     {\
         Identifier = FN_FORMAT_PAGE_DLG ; \
-        HelpID = FN_FORMAT_PAGE_DLG ; \
+        HelpId = CMD_FN_FORMAT_PAGE_DLG ; \
         Text [ en-US ] = "Pa~ge..." ; \
     };
 
@@ -74,7 +74,6 @@
     MenuItem\
     {\
         Identifier = MN_FORMAT_STYLE ; \
-        HelpID = MN_FORMAT_STYLE ; \
         Command = ".uno:StyleMenu" ; \
         Text [ en-US ] = "St~yle" ; \
         SubMenu = Menu\
@@ -113,13 +112,13 @@
                 MenuItem\
                 {\
                     Identifier = FN_SET_SUPER_SCRIPT ; \
-                    HelpID = FN_SET_SUPER_SCRIPT ; \
+                    HelpId = CMD_FN_SET_SUPER_SCRIPT ; \
                     Text [ en-US ] = "Superscript" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_SET_SUB_SCRIPT ; \
-                    HelpID = FN_SET_SUB_SCRIPT ; \
+                    HelpId = CMD_FN_SET_SUB_SCRIPT ; \
                     Text [ en-US ] = "Subscript" ; \
                 };\
             };\
@@ -128,7 +127,6 @@
     MenuItem\
     {\
         Identifier = MN_FORMAT_ALGN ; \
-        HelpID = MN_FORMAT_ALGN ; \
         Command = ".uno:AlignTextMenu" ; \
         Text [ en-US ] = "A~lignment" ; \
         SubMenu = Menu\
@@ -153,7 +151,7 @@
                 MenuItem\
                 {\
                     Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
-                    HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \
+                    HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \
                     RadioCheck = TRUE ; \
                     Text [ en-US ] = "Justified" ; \
                 };\
@@ -163,7 +161,6 @@
     MenuItem\
     {\
         Identifier = MN_FORMAT_LINESPACE ; \
-        HelpID = MN_FORMAT_LINESPACE ; \
         Command = ".uno:LineSpacingMenu" ; \
         Text [ en-US ] = "Line Spacing" ; \
         _MenuItemFlags = MIB_RADIOCHECK ; \
@@ -208,21 +205,21 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_EDIT_FIELD ;                                    \
-            HelpID = FN_EDIT_FIELD ;                                        \
+            HelpId = CMD_FN_EDIT_FIELD ;                                        \
             Text [ en-US ] = "Fields..." ;                             \
     };
 #define _MN_EDIT_FOOTNOTE                                                    \
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_EDIT_FOOTNOTE ;                                 \
-            HelpID = FN_EDIT_FOOTNOTE ;                                     \
+            HelpId = CMD_FN_EDIT_FOOTNOTE ;                                     \
             Text [ en-US ] = "Footnote/Endnote~..." ;                          \
         };
     #define _MN_EDIT_IDX_ENTRY_DLG                                          \
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_EDIT_IDX_ENTRY_DLG ;                            \
-            HelpID = FN_EDIT_IDX_ENTRY_DLG ;                                \
+            HelpId = CMD_FN_EDIT_IDX_ENTRY_DLG ;                                \
             Text [ en-US ] = "Inde~x Entry..." ;                       \
     };
 
@@ -230,13 +227,13 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_REDLINE_ACCEPT_DIRECT;                            \
-            HelpID = FN_REDLINE_ACCEPT_DIRECT ;                                \
+            HelpId = CMD_FN_REDLINE_ACCEPT_DIRECT ;                                \
             Text [ en-US ] = "Accept Change" ;                       \
         };\
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_REDLINE_REJECT_DIRECT ;                            \
-            HelpID = FN_REDLINE_REJECT_DIRECT ;                                \
+            HelpId = CMD_FN_REDLINE_REJECT_DIRECT ;                                \
             Text [ en-US ] = "Reject Change" ;                       \
         };                              \
     SEPARATOR ;
@@ -244,7 +241,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_EDIT_AUTH_ENTRY_DLG ;                           \
-            HelpID = FN_EDIT_AUTH_ENTRY_DLG ;                               \
+            HelpId = CMD_FN_EDIT_AUTH_ENTRY_DLG ;                               \
             Text [ en-US ] = "~Bibliography Entry...";                  \
     };                                                                  \
         SEPARATOR ;
@@ -257,19 +254,19 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
     MenuItem                                                            \
     {                                                                   \
         Identifier = FN_EDIT_HYPERLINK ;                           \
-        HelpID = FN_EDIT_HYPERLINK ;                               \
+        HelpId = CMD_FN_EDIT_HYPERLINK ;                               \
         Text [ en-US ] = "Edit Hyperlink...";                  \
     };                                                                  \
     MenuItem                                                            \
     {                                                                   \
         Identifier =  FN_COPY_HYPERLINK_LOCATION;                           \
-        HelpID =  FN_COPY_HYPERLINK_LOCATION;                               \
+        HelpId = CMD_FN_COPY_HYPERLINK_LOCATION;                               \
         Text [ en-US ] = "Copy Hyperlink ~Location";                  \
     };                                                                  \
     MenuItem                                                            \
     {                                                                   \
         Identifier = FN_REMOVE_HYPERLINK ;                           \
-        HelpID = FN_REMOVE_HYPERLINK ;                               \
+        HelpId = CMD_FN_REMOVE_HYPERLINK ;                               \
         Text [ en-US ] = "Remo~ve Hyperlink";                  \
     };
 
@@ -283,7 +280,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
     MenuItem\
     {\
         Identifier = FN_EDIT_HYPERLINK ; \
-        HelpID = FN_EDIT_HYPERLINK ; \
+        HelpId = CMD_FN_EDIT_HYPERLINK ; \
         Text [ en-US ] = "~Edit Hyperlink" ; \
     };
 
@@ -306,7 +303,7 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
     MenuItem\
     {\
         Identifier = FN_FORMAT_RESET ; \
-        HelpID = FN_FORMAT_RESET ; \
+        HelpId = CMD_FN_FORMAT_RESET ; \
         Text [ en-US ] = "~Default Formatting" ; \
     };
 
@@ -315,25 +312,25 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_NUMBER_NEWSTART;                                \
-            HelpId = FN_NUMBER_NEWSTART;                                    \
+            HelpId = CMD_FN_NUMBER_NEWSTART;                                    \
             Text[ en-US ] = "Restart Numbering";                            \
         };                                                                  \
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_NUM_CONTINUE;                                   \
-            HelpId = FN_NUM_CONTINUE;                                       \
+            HelpId = CMD_FN_NUM_CONTINUE;                                       \
             Text[ en-US ] = "Continue previous numbering";                  \
         };                                                                  \
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_NUM_BULLET_UP;                              \
-            HelpId = FN_NUM_BULLET_UP;                                  \
+            HelpId = CMD_FN_NUM_BULLET_UP;                                  \
             Text[ en-US ] = "Up One Level";                              \
         };                                                                  \
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_NUM_BULLET_DOWN;                              \
-            HelpId = FN_NUM_BULLET_DOWN;                                  \
+            HelpId = CMD_FN_NUM_BULLET_DOWN;                                  \
             Text[ en-US ] = "Down One Level";                              \
         };
 
@@ -356,19 +353,19 @@ location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_UPDATE_CUR_TOX ;                                \
-            HelpID = FN_UPDATE_CUR_TOX ;                                    \
+            HelpId = CMD_FN_UPDATE_CUR_TOX ;                                    \
             Text [ en-US ] = "~Update Index/Table";                         \
         };                                                                  \
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_EDIT_CURRENT_TOX;                               \
-            HelpID = FN_EDIT_CURRENT_TOX;                                   \
+            HelpId = CMD_FN_EDIT_CURRENT_TOX;                                   \
             Text [ en-US ] = "~Edit Index/Table";                           \
         };                                                                  \
         MenuItem                                                            \
         {                                                                   \
             Identifier = FN_REMOVE_CUR_TOX;                                 \
-            HelpID = FN_REMOVE_CUR_TOX;                                     \
+            HelpId = CMD_FN_REMOVE_CUR_TOX;                                     \
             Text [ en-US ] = "Delete Index/Table";                          \
         };                                                                  \
         SEPARATOR ;
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 9b9620c5d8f2..94b8f3cf9368 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -452,7 +452,7 @@ public:
     inline       SwEditWin &GetEditWin()        { return *pEditWin; }
     inline const SwEditWin &GetEditWin () const { return *pEditWin; }
 
-#if defined WIN || defined WNT || defined UNX
+#if defined WNT || defined UNX
     void ScannerEventHdl( const ::com::sun::star::lang::EventObject& rEventObject );
 #endif
 
@@ -581,7 +581,7 @@ public:
     BOOL            HasDrwObj(SdrObject *pSdrObj) const;
     BOOL            HasOnlyObj(SdrObject *pSdrObj, UINT32 eObjInventor) const;
     BOOL            BeginTextEdit(  SdrObject* pObj, SdrPageView* pPV=NULL,
-                                    Window* pWin=NULL, BOOL bIsNewObj=FALSE);
+                                    Window* pWin=NULL, bool bIsNewObj=false, bool bSetSelectionToStart=false );
 
     void            StateTabWin(SfxItemSet&);