[Libreoffice-commits] .: sw/source

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Sat Nov 6 08:13:14 PDT 2010


 sw/source/ui/app/app.src |  105 +++++++++++++-------------
 sw/source/ui/inc/app.hrc |  188 ++++++++++++++++++-----------------------------
 2 files changed, 127 insertions(+), 166 deletions(-)

New commits:
commit 3eae353a0fca3b97090ee0b01e5627ac3a919ced
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Fri Nov 5 19:25:39 2010 -0700

    High-Contrast Cleanup Phase #1

diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 0d20e73..acad200 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,7 +62,7 @@ String STR_PAGE_COUNT_MACRO
     IdList = { 							\
         FN_FORMULA_CALC 				;\
         FN_FORMULA_CANCEL 				;\
-         FN_FORMULA_APPLY  				;\
+        FN_FORMULA_APPLY  				;\
         };								\
     IdCount = { 						\
         3;                              \
@@ -74,6 +74,7 @@ ImageList RID_DEFAULTIMAGELIST_SC
     MaskColor = IMAGE_MASK_COLOR ;
     IMAGELIST_AND_COUNT
 };
+
 ImageList RID_DEFAULTIMAGELIST_LC
 {
     Prefix = "lc";
@@ -81,19 +82,6 @@ ImageList RID_DEFAULTIMAGELIST_LC
     IMAGELIST_AND_COUNT
 };
 
-ImageList RID_DEFAULTIMAGELIST_SCH
-{
-    Prefix = "sch";
-    MaskColor = IMAGE_MASK_COLOR ;
-    IMAGELIST_AND_COUNT
-};
-ImageList RID_DEFAULTIMAGELIST_LCH
-{
-    Prefix = "lch";
-    MaskColor = IMAGE_MASK_COLOR ;
-    IMAGELIST_AND_COUNT
-};
-
 // Vorlagen
 #define STYLE_IMAGE_LISTEF \
     MaskColor = IMAGE_MASK_COLOR ; \
@@ -111,65 +99,65 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
         {
             Text [ en-US ] = "Paragraph Styles" ;
             StyleFamily = SFX_STYLE_FAMILY_PARA ;
-        FilterList [ en-US ] =
-        {
-         < "All Styles" ; SFXSTYLEBIT_ALL ; > ;
-            < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
-            < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
-            < "Automatic" ; SFXSTYLEBIT_AUTO ; > ;
-            < "Text Styles" ; SWSTYLEBIT_TEXT ; > ;
-            < "Chapter Styles" ; SWSTYLEBIT_CHAPTER ; > ;
-            < "List Styles" ; SWSTYLEBIT_LIST ; > ;
-            < "Index Styles" ; SWSTYLEBIT_IDX ; > ;
-            < "Special Styles" ; SWSTYLEBIT_EXTRA ; > ;
-            < "HTML Styles" ; SWSTYLEBIT_HTML ; > ;
-            < "Conditional Styles" ; SWSTYLEBIT_CONDCOLL ; > ;
+            FilterList [ en-US ] =
+            {
+                < "All Styles"          ; SFXSTYLEBIT_ALL       ; > ;
+                < "Applied Styles"      ; SFXSTYLEBIT_USED      ; > ;
+                < "Custom Styles"       ; SFXSTYLEBIT_USERDEF   ; > ;
+                < "Automatic"           ; SFXSTYLEBIT_AUTO      ; > ;
+                < "Text Styles"         ; SWSTYLEBIT_TEXT       ; > ;
+                < "Chapter Styles"      ; SWSTYLEBIT_CHAPTER    ; > ;
+                < "List Styles"         ; SWSTYLEBIT_LIST       ; > ;
+                < "Index Styles"        ; SWSTYLEBIT_IDX        ; > ;
+                < "Special Styles"      ; SWSTYLEBIT_EXTRA      ; > ;
+                < "HTML Styles"         ; SWSTYLEBIT_HTML       ; > ;
+                < "Conditional Styles"  ; SWSTYLEBIT_CONDCOLL   ; > ;
+            };
         };
-    };
         SfxStyleFamilyItem
         {
             Text [ en-US ] = "Character Styles" ;
             StyleFamily = SFX_STYLE_FAMILY_CHAR ;
             FilterList [ en-US ] =
             {
-                < "All" ; SFXSTYLEBIT_ALL ; > ;
-                < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
-                < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
+                < "All"             ; SFXSTYLEBIT_ALL       ; > ;
+                < "Applied Styles"  ; SFXSTYLEBIT_USED      ; > ;
+                < "Custom Styles"   ; SFXSTYLEBIT_USERDEF   ; > ;
             };
-    };
+        };
         SfxStyleFamilyItem
         {
             Text [ en-US ] = "Frame Styles" ;
             StyleFamily = SFX_STYLE_FAMILY_FRAME ;
             FilterList [ en-US ] =
             {
-                < "All" ; SFXSTYLEBIT_ALL ; > ;
-                < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
-                < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
+                < "All"             ; SFXSTYLEBIT_ALL       ; > ;
+                < "Applied Styles"  ; SFXSTYLEBIT_USED      ; > ;
+                < "Custom Styles"   ; SFXSTYLEBIT_USERDEF   ; > ;
             };
-    };
+        };
         SfxStyleFamilyItem
         {
             Text [ en-US ] = "Page Styles" ;
             StyleFamily = SFX_STYLE_FAMILY_PAGE ;
             FilterList [ en-US ] =
             {
-                < "All" ; SFXSTYLEBIT_ALL ; > ;
-                < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
-                < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
+                < "All"             ; SFXSTYLEBIT_ALL       ; > ;
+                < "Applied Styles"  ; SFXSTYLEBIT_USED      ; > ;
+                < "Custom Styles"   ; SFXSTYLEBIT_USERDEF   ; > ;
             };
-    };
+        };
         SfxStyleFamilyItem
         {
             StyleFamily = SFX_STYLE_FAMILY_PSEUDO ;
             FilterList [ en-US ] =
             {
-                < "All" ; SFXSTYLEBIT_ALL ; > ;
-                < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
-                < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
+                < "All"             ; SFXSTYLEBIT_ALL       ; > ;
+                < "Applied Styles"  ; SFXSTYLEBIT_USED      ; > ;
+                < "Custom Styles"   ; SFXSTYLEBIT_USERDEF   ; > ;
             };
             Text [ en-US ] = "List Styles" ;
-    };
+        };
     };
 
     ImageList 1	// == BMP_COLOR_NORMAL + 1
@@ -177,18 +165,21 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
         Prefix = "sf";
         STYLE_IMAGE_LISTEF
     };
+
     ImageList 2	// == BMP_COLOR_HIGHCONTRAST + 1
     {
         Prefix = "sfh";
         STYLE_IMAGE_LISTEF
     };
+
 };
 
 
 
- // Default Bitmap fuer Toolbox
+// Default Bitmap fuer Toolbox
 BITMAP BMP_FEHLT { FILE = "x.bmp" ; };
- // Bitmap fuer die NumerierungsVorlagen im Organizer
+
+// Bitmap fuer die NumerierungsVorlagen im Organizer
 Bitmap BMP_STYLES_FAMILY_NUM { File = "styfamnu.bmp" ; };
 Bitmap BMP_STYLES_FAMILY_NUM_HC { File = "styfamnu_h.bmp" ; };
 
@@ -223,18 +214,17 @@ String STR_CANTCREATE
 {
     Text [ en-US ] = "Can't create document.";
 };
+
 String STR_DLLNOTFOUND
 {
     Text [ en-US ] = "Filter not found." ;
 };
 
-
 String STR_UNBENANNT
 {
     Text [ en-US ] = "Untitled" ;
 };
 
-
 String STR_LOAD_GLOBAL_DOC
 {
     Text [ en-US ] = "Name and Path of Master Document" ;
@@ -251,6 +241,7 @@ InfoBox MSG_ERROR_SEND_MAIL
     DEFBUTTON = WB_DEF_OK ;
     Message [ en-US ] = "Error sending mail." ;
 };
+
 InfoBox MSG_ERROR_PASSWD
 {
     BUTTONS = WB_OK ;
@@ -424,14 +415,17 @@ String STR_FRAME_DEFNAME
 {
     Text [ en-US ] = "Frame" ;
 };
+
 String STR_REGION_DEFNAME
 {
     Text [ en-US ] = "Section" ;
 };
+
 String STR_NUMRULE_DEFNAME
 {
     Text [ en-US ] = "Numbering" ;
 };
+
 String STR_EMPTYPAGE
 {
     Text [ en-US ] = "blank page" ;
@@ -456,6 +450,7 @@ QueryBox MSG_SAVEAS_HTML_QUERY
     DEFBUTTON = WB_DEF_NO ;
     Message [ en-US ] = "The source code can only be displayed if the document is saved in HTML format.\nWould you like to save the document as HTML?";
 };
+
 String STR_ABSTRACT_TITLE
 {
     Text [ en-US ] = "Abstract: " ;
@@ -478,25 +473,29 @@ String STR_FDLG_OUTLINE_LEVEL
 
 String STR_FDLG_STYLE
 {
-    Text [ en-US ] = "Style: "; 
+    Text [ en-US ] = "Style: ";
 };
 
 String STR_PAGEOFFSET
 {
     Text [ en-US ] = "Page number: " ;
 };
+
 String STR_PAGEBREAK
 {
     Text [ en-US ] = "Break before new page" ;
 };
+
 String STR_WESTERN_FONT
 {
     Text [ en-US ] = "Western text: ";
 };
+
 String STR_CJK_FONT
 {
     Text [ en-US ] = "Asian text: ";
 };
+
 String STR_REDLINE_UNKNOWN_AUTHOR
 {
     Text [ en-US ] = "Unknown Author";
@@ -508,6 +507,7 @@ WarningBox MSG_DISABLE_UNDO_QUESTION
     DEFBUTTON = WB_DEF_YES ;
     Message [ en-US ] = "This action deletes the list of actions that can be undone. Previous changes made to the document are still valid, but cannot be undone. Do you want to continue formatting?";
 };
+
 QueryBox MSG_PRINT_AS_MERGE
 {
     HelpId = HID_PRINT_AS_MERGE;
@@ -515,6 +515,7 @@ QueryBox MSG_PRINT_AS_MERGE
     DefButton = WB_DEF_YES ;
     Message [ en-US ] = "Your document contains address database fields. Do you want to print a form letter?";
 };
+
 ModalDialog DLG_MERGE_SOURCE_UNAVAILABLE
 {
     HelpId = HID_MERGE_SOURCE_UNAVAILABLE;
@@ -547,6 +548,7 @@ ModalDialog DLG_MERGE_SOURCE_UNAVAILABLE
         Size = MAP_APPFONT ( 50 , 14 ) ;
     };
 };
+
 WarningBox MSG_DATA_SOURCES_UNAVAILABLE
 {
     HelpId = HID_DATA_SOURCES_UNAVAILABLE;
@@ -558,14 +560,17 @@ String RID_MODULE_TOOLBOX
 {
     Text [ en-US ] = "Function Bar (viewing mode)" ;
 };
+
 String  STR_DONT_ASK_AGAIN
 {
     Text [ en-US ] = "~Do not show warning again" ;
 };
+
 String STR_OUTLINE_NUMBERING
 {
     Text [ en-US ] = "Outline Numbering";
 };
+
 ToolBox RID_MODULE_TOOLBOX
 {
     HelpID = HID_MODULE_TOOLBOX ;
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index 0ecc117..04cb0da 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,137 +31,93 @@
 #include "rcid.hrc"
 
 // Default Bitmap fuer ToolBox
-#define BMP_FEHLT					(RC_APP_BEGIN + 1)
+#define BMP_FEHLT					    (RC_APP_BEGIN + 1)
 
 // Document-Icon
-#define RC_DOC_ICON 				(RC_APP_BEGIN + 2)
+#define RC_DOC_ICON 				    (RC_APP_BEGIN + 2)
 
 //Soll das Clipboard fuer andere Applikationen...
-#define MSG_CLPBRD_CLEAR			(RC_APP_BEGIN + 3)
+#define MSG_CLPBRD_CLEAR			    (RC_APP_BEGIN + 3)
 
-#define STR_CANTCREATE				(RC_APP_BEGIN + 4)
-#define STR_CANTOPEN				(RC_APP_BEGIN + 5)
+#define STR_CANTCREATE				    (RC_APP_BEGIN + 4)
+#define STR_CANTOPEN				    (RC_APP_BEGIN + 5)
 
 // Messages
-#define MSG_ERROR_SEND_MAIL 		( RC_APP_BEGIN + 6)
-#define MSG_SAVE_HTML_QUERY         ( RC_APP_BEGIN + 7)
+#define MSG_ERROR_SEND_MAIL 		    ( RC_APP_BEGIN + 6)
+#define MSG_SAVE_HTML_QUERY             ( RC_APP_BEGIN + 7)
 
 //Fuer das Interface, weil der RID_APP_BEGIN jetzt Desktop ist.
-#define RID_SW_NAME					( RC_APP_BEGIN + 8)
-#define MSG_SAVEAS_HTML_QUERY       ( RC_APP_BEGIN + 9)
+#define RID_SW_NAME					    ( RC_APP_BEGIN + 8)
+#define MSG_SAVEAS_HTML_QUERY           ( RC_APP_BEGIN + 9)
 
 
-#define STR_UNBENANNT				(RC_APP_BEGIN + 13)
-#define STR_VERSION 				(RC_APP_BEGIN + 14)
-#define STR_PRINT_MERGE_MACRO		(RC_APP_BEGIN + 15)
-#define STR_PAGE_COUNT_MACRO		(RC_APP_BEGIN + 16)
+#define STR_UNBENANNT				    (RC_APP_BEGIN + 13)
+#define STR_VERSION 				    (RC_APP_BEGIN + 14)
+#define STR_PRINT_MERGE_MACRO		    (RC_APP_BEGIN + 15)
+#define STR_PAGE_COUNT_MACRO		    (RC_APP_BEGIN + 16)
 
 // Bitmap fuer die NumerierungsVorlagen im Organizer
-#define BMP_STYLES_FAMILY_NUM		(RC_APP_BEGIN + 17)
-#define BMP_STYLES_FAMILY_NUM_HC	(RC_APP_BEGIN + 18)
+#define BMP_STYLES_FAMILY_NUM		    (RC_APP_BEGIN + 17)
+#define BMP_STYLES_FAMILY_NUM_HC	    (RC_APP_BEGIN + 18)
 
 // Strings fuer Bereiche in der Konfiguration
-#define STR_GRP_FILE				(RC_APP_BEGIN + 56)
-#define STR_GRP_EDIT				(RC_APP_BEGIN + 57)
-#define STR_GRP_TRAVELLING			(RC_APP_BEGIN + 58)
-#define STR_GRP_VIEW				(RC_APP_BEGIN + 59)
-#define STR_GRP_INSERT				(RC_APP_BEGIN + 60)
-#define STR_GRP_FORMAT				(RC_APP_BEGIN + 61)
-#define STR_GRP_STYLE				(RC_APP_BEGIN + 62)
-#define STR_GRP_TEXT				(RC_APP_BEGIN + 63)
-#define STR_GRP_FRAME				(RC_APP_BEGIN + 64)
-#define STR_GRP_GRAPHIC 			(RC_APP_BEGIN + 65)
-#define STR_GRP_TABLE				(RC_APP_BEGIN + 66)
-#define STR_GRP_TOOLS				(RC_APP_BEGIN + 67)
-#define STR_GRP_NUMBERING			(RC_APP_BEGIN + 68)
-#define STR_GRP_WINDOW				(RC_APP_BEGIN + 69)
-#define STR_GRP_MISC				(RC_APP_BEGIN + 70)
-#define STR_GRP_MACRO				(RC_APP_BEGIN + 71)
-#define RES_EXT_HELP_STRING 		(RC_APP_BEGIN + 72)
-#define RES_STD_HELP_STRING 		(RC_APP_BEGIN + 73)
-#define STR_PAGEOFFSET				(RC_APP_BEGIN + 74)
-#define STR_PAGEBREAK				(RC_APP_BEGIN + 75)
-#define STR_REDLINE_UNKNOWN_AUTHOR	(RC_APP_BEGIN + 76)
-#define STR_WESTERN_FONT            (RC_APP_BEGIN + 77)
-#define STR_CJK_FONT                (RC_APP_BEGIN + 78)
-//#define MSG_INS_MERGE_FIELDS        (RC_APP_BEGIN + 79)
-#define MSG_PRINT_AS_MERGE          (RC_APP_BEGIN + 80)
-#define MSG_DATA_SOURCES_UNAVAILABLE (RC_APP_BEGIN + 82)
-#define DLG_MERGE_SOURCE_UNAVAILABLE (RC_APP_BEGIN + 83)
-#define ST_MERGE_SOURCE_UNAVAILABLE 1
-#define PB_MERGE_OK                 2
-#define PB_MERGE_CANCEL             3
-#define IMG_MERGE                   4
-#define SID_TOGGLETOOLBOX			(RC_APP_BEGIN + 89)
-
-#define STR_ENV_TITLE				(RC_APP_BEGIN + 91)
-#define STR_LAB_TITLE				(RC_APP_BEGIN + 92)
-
-#define STR_HUMAN_SWDOC_NAME 		(RC_APP_BEGIN + 93)
-
-#define RID_SW_ERRHDL               (RC_APP_BEGIN + 95)
-
-#define STR_FDLG_TEMPLATE_BUTTON    (RC_APP_BEGIN + 1)
-#define STR_FDLG_TEMPLATE_NAME		(RC_APP_BEGIN + 2)
+#define STR_GRP_FILE				    (RC_APP_BEGIN + 56)
+#define STR_GRP_EDIT				    (RC_APP_BEGIN + 57)
+#define STR_GRP_TRAVELLING			    (RC_APP_BEGIN + 58)
+#define STR_GRP_VIEW				    (RC_APP_BEGIN + 59)
+#define STR_GRP_INSERT				    (RC_APP_BEGIN + 60)
+#define STR_GRP_FORMAT				    (RC_APP_BEGIN + 61)
+#define STR_GRP_STYLE				    (RC_APP_BEGIN + 62)
+#define STR_GRP_TEXT				    (RC_APP_BEGIN + 63)
+#define STR_GRP_FRAME				    (RC_APP_BEGIN + 64)
+#define STR_GRP_GRAPHIC 			    (RC_APP_BEGIN + 65)
+#define STR_GRP_TABLE				    (RC_APP_BEGIN + 66)
+#define STR_GRP_TOOLS				    (RC_APP_BEGIN + 67)
+#define STR_GRP_NUMBERING			    (RC_APP_BEGIN + 68)
+#define STR_GRP_WINDOW				    (RC_APP_BEGIN + 69)
+#define STR_GRP_MISC				    (RC_APP_BEGIN + 70)
+#define STR_GRP_MACRO				    (RC_APP_BEGIN + 71)
+#define RES_EXT_HELP_STRING 		    (RC_APP_BEGIN + 72)
+#define RES_STD_HELP_STRING 		    (RC_APP_BEGIN + 73)
+#define STR_PAGEOFFSET				    (RC_APP_BEGIN + 74)
+#define STR_PAGEBREAK				    (RC_APP_BEGIN + 75)
+#define STR_REDLINE_UNKNOWN_AUTHOR	    (RC_APP_BEGIN + 76)
+#define STR_WESTERN_FONT                (RC_APP_BEGIN + 77)
+#define STR_CJK_FONT                    (RC_APP_BEGIN + 78)
+#define MSG_PRINT_AS_MERGE              (RC_APP_BEGIN + 80)
+#define MSG_DATA_SOURCES_UNAVAILABLE    (RC_APP_BEGIN + 82)
+#define DLG_MERGE_SOURCE_UNAVAILABLE    (RC_APP_BEGIN + 83)
+
+#define ST_MERGE_SOURCE_UNAVAILABLE     1
+#define PB_MERGE_OK                     2
+#define PB_MERGE_CANCEL                 3
+#define IMG_MERGE                       4
+
+#define SID_TOGGLETOOLBOX			    (RC_APP_BEGIN + 89)
+
+#define STR_ENV_TITLE				    (RC_APP_BEGIN + 91)
+#define STR_LAB_TITLE				    (RC_APP_BEGIN + 92)
+
+#define STR_HUMAN_SWDOC_NAME 		    (RC_APP_BEGIN + 93)
+
+#define RID_SW_ERRHDL                   (RC_APP_BEGIN + 95)
+
+#define STR_FDLG_TEMPLATE_BUTTON        (RC_APP_BEGIN + 1)
+#define STR_FDLG_TEMPLATE_NAME		    (RC_APP_BEGIN + 2)
 
 
 // Ids fuer die einzelnen PopUpMenues
-//#define MN_WIZARD                 (RC_APP_BEGIN + 9)
-//#define MN_INDEX                  (RC_APP_BEGIN + 10)
-//#define MN_FILE                   (RC_APP_BEGIN + 11)
-//#define MN_EDIT                   (RC_APP_BEGIN + 12)
-//#define MN_VIEW                   (RC_APP_BEGIN + 13)
-//#define MN_INS                        (RC_APP_BEGIN + 14)
-//#define MN_TEXT                   (RC_APP_BEGIN + 15)
-//#define MN_FORMAT                 (RC_APP_BEGIN + 16)
-#define MN_FORMAT_STYLE           (RC_APP_BEGIN + 17)
-#define MN_FORMAT_ALGN                (RC_APP_BEGIN + 18)
-#define MN_FORMAT_LINESPACE       (RC_APP_BEGIN + 19)
-//#define MN_EXTRA                  (RC_APP_BEGIN + 20)
-//#define MN_WIN                        (RC_APP_BEGIN + 21)
-//#define MN_HELP                   (RC_APP_BEGIN + 22)
-#define MN_FORMAT_FRM_HORZ            (RC_APP_BEGIN + 23)
-//#define MN_FORMAT_FRM_VERT            (RC_APP_BEGIN + 24)
-//#define MN_PICKLIST               (RC_APP_BEGIN + 25)
-//#define MN_WINLIST                    (RC_APP_BEGIN + 26)
-//#define MN_MACRO                  (RC_APP_BEGIN + 27)
-//#define MN_FORMAT_HIERARCHY       (RC_APP_BEGIN + 28)
-#define MN_CELL                   (RC_APP_BEGIN + 29)
-//#define MN_HELP_TIP               (RC_APP_BEGIN + 30)
-//#define MN_HELP_SEARCH                (RC_APP_BEGIN + 31)
-//#define MN_HELP_ACTIVE                (RC_APP_BEGIN + 32)
-//#define MN_HELP_INDEX             (RC_APP_BEGIN + 33)
-//#define MN_OBJECT                 (RC_APP_BEGIN + 34)
-//#define MN_DATABASE                   (RC_APP_BEGIN + 35)
-//#define MN_DIRSUBMENU               (RC_APP_BEGIN + 36)
-//#define MN_MAIL                       (RC_APP_BEGIN + 37)
-#define MN_WRAP                       (RC_APP_BEGIN + 38)
-#define MN_SUB_TBLROW               (RC_APP_BEGIN + 39)
-#define MN_SUB_TBLCOL               (RC_APP_BEGIN + 40)
-//#define MN_SUB_AUTOFORMAT           (RC_APP_BEGIN + 41)
-//#define MN_SUB_TOOLBAR              (RC_APP_BEGIN + 42)
-//#define MN_SUB_FIELD                (RC_APP_BEGIN + 43)
-//#define MN_SUB_GRAPHIC              (RC_APP_BEGIN + 44)
-//#define MN_SUB_TEMPLATES            (RC_APP_BEGIN + 45)
-#define MN_SUB_ARRANGE              (RC_APP_BEGIN + 46)
-
-//#define MN_SUB_UPDATE               (RC_APP_BEGIN + 48)
-//#define MN_SUB_MIRROR             (RC_APP_BEGIN + 49)
-#define MN_SUB_ALIGN                (RC_APP_BEGIN + 50)
-//#define MN_SUB_OPTIONS              (RC_APP_BEGIN + 51)
-//#define MN_SUB_SENDTO             (RC_APP_BEGIN + 52)
-//#define MN_SUB_REVISE             (RC_APP_BEGIN + 53)
-//#define MN_TEMPLATES              (RC_APP_BEGIN + 54)
-//#define MN_FILE_PORT                  (RC_APP_BEGIN + 55)
-//#define MN_EDIT_PORT                  (RC_APP_BEGIN + 56)
-//#define MN_VIEW_PORT                  (RC_APP_BEGIN + 57)
-//#define MN_INS_PORT                   (RC_APP_BEGIN + 58)
-//#define MN_FORMAT_PORT                (RC_APP_BEGIN + 59)
-//#define MN_EXTRA_PORT             (RC_APP_BEGIN + 60)
-//#define MN_WIN_PORT               (RC_APP_BEGIN + 61)
-//#define MN_HELP_PORT              (RC_APP_BEGIN + 62)
-//#define MN_SUB_TRANSLITERATE        (RC_APP_BEGIN + 63)
-//#define MN_SUB_MACRO                (RC_APP_BEGIN + 64)
+#define MN_FORMAT_STYLE                 (RC_APP_BEGIN + 17)
+#define MN_FORMAT_ALGN                  (RC_APP_BEGIN + 18)
+#define MN_FORMAT_LINESPACE             (RC_APP_BEGIN + 19)
+#define MN_FORMAT_FRM_HORZ              (RC_APP_BEGIN + 23)
+#define MN_CELL                         (RC_APP_BEGIN + 29)
+#define MN_WRAP                         (RC_APP_BEGIN + 38)
+#define MN_SUB_TBLROW                   (RC_APP_BEGIN + 39)
+#define MN_SUB_TBLCOL                   (RC_APP_BEGIN + 40)
+#define MN_SUB_ARRANGE                  (RC_APP_BEGIN + 46)
+
+#define MN_SUB_ALIGN                    (RC_APP_BEGIN + 50)
 
 #define STR_WRITER_DOCUMENT_FULLTYPE    (RC_APP_BEGIN + 100)
 #define STR_ABSTRACT_TITLE              (RC_APP_BEGIN + 102)
@@ -170,8 +126,8 @@
 #define STR_OUTLINE_NUMBERING           (RC_APP_BEGIN + 104)
 // <--
 //#outline level,zhaojianwei
-#define STR_FDLG_OUTLINE_LEVEL		(RC_APP_BEGIN + 105)
-#define STR_FDLG_STYLE				(RC_APP_BEGIN + 106)
+#define STR_FDLG_OUTLINE_LEVEL		    (RC_APP_BEGIN + 105)
+#define STR_FDLG_STYLE				    (RC_APP_BEGIN + 106)
 //<-end,zhaojianwei
 
 #define APP_ACT_END                     STR_FDLG_STYLE


More information about the Libreoffice-commits mailing list