[Libreoffice-commits] core.git: sw/inc sw/source

[Vitaliy Anderson]

 sw/inc/unoprnms.hxx                |    6 ++++
 sw/source/core/unocore/unosett.cxx |   54 ++++++++++++++++++-------------------
 2 files changed, 33 insertions(+), 27 deletions(-)

New commits:
commit 167e3c6d64ec187eeb382ca61b18894f79f7b149
Author: Vitaliy Anderson <vanderson at smartru.com>
Date:   Thu Mar 30 10:14:19 2017 +0300

    sw: replace hardcoded uno names
    
    Change-Id: I4cf8a4f76744b8a6bc25cd5abdd280f98eea9499
    Reviewed-on: https://gerrit.libreoffice.org/35889
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 1be45ccf6308..24cc71cb8740 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -39,7 +39,12 @@
 #define UNO_NAME_GRAPHIC_FILTER "GraphicFilter"
 #define UNO_NAME_GRAPHIC_SIZE "GraphicSize"
 #define UNO_NAME_GRAPHIC_BITMAP "GraphicBitmap"
+#define UNO_NAME_BULLET_ID "BulletId"
+#define UNO_NAME_BULLET_CHAR "BulletChar"
+#define UNO_NAME_BULLET_REL_SIZE "BulletRelSize"
 #define UNO_NAME_BULLET_FONT "BulletFont"
+#define UNO_NAME_BULLET_FONT_NAME "BulletFontName"
+#define UNO_NAME_BULLET_COLOR "BulletColor"
 #define UNO_NAME_PARA_GRAPHIC_LOCATION "ParaBackGraphicLocation"
 #define UNO_NAME_HEADER_GRAPHIC_LOCATION "HeaderBackGraphicLocation"
 #define UNO_NAME_FOOTER_GRAPHIC_LOCATION "FooterBackGraphicLocation"
@@ -297,6 +302,7 @@
 #define UNO_NAME_ACTUAL_SIZE "ActualSize"
 #define UNO_NAME_SOURCE_NAME "SourceName"
 #define UNO_NAME_START_AT "StartAt"
+#define UNO_NAME_START_WITH "StartWith"
 #define UNO_NAME_STATISTIC_TYPE_ID "StatisticTypeId"
 #define UNO_NAME_SUB_TYPE "SubType"
 #define UNO_NAME_SURROUND "Surround"
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 1b5d3bf44c28..ef24606f4bb0 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1570,36 +1570,36 @@ void SwXNumberingRules::SetPropertiesToNumFormat(
     // the order of the names is important!
     static const char* aNumPropertyNames[] =
     {
-        "Adjust",                               //0
-        "ParentNumbering",                      //1
-        "Prefix",                               //2
-        "Suffix",                               //3
-        "CharStyleName",                        //4
-        "StartWith",                            //5
-        UNO_NAME_LEFT_MARGIN,                   //6
-        UNO_NAME_SYMBOL_TEXT_DISTANCE,          //7
-        UNO_NAME_FIRST_LINE_OFFSET,             //8
-        UNO_NAME_POSITION_AND_SPACE_MODE, //9
-        UNO_NAME_LABEL_FOLLOWED_BY,       //10
-        UNO_NAME_LISTTAB_STOP_POSITION,   //11
-        UNO_NAME_FIRST_LINE_INDENT,       //12
-        UNO_NAME_INDENT_AT,               //13
-        "NumberingType",                        //14
-        UNO_NAME_PARAGRAPH_STYLE_NAME, //15
+        UNO_NAME_ADJUST,                        // 0
+        UNO_NAME_PARENT_NUMBERING,              // 1
+        UNO_NAME_PREFIX,                        // 2
+        UNO_NAME_SUFFIX,                        // 3
+        UNO_NAME_CHAR_STYLE_NAME,               // 4
+        UNO_NAME_START_WITH,                    // 5
+        UNO_NAME_LEFT_MARGIN,                   // 6
+        UNO_NAME_SYMBOL_TEXT_DISTANCE,          // 7
+        UNO_NAME_FIRST_LINE_OFFSET,             // 8
+        UNO_NAME_POSITION_AND_SPACE_MODE,       // 9
+        UNO_NAME_LABEL_FOLLOWED_BY,             // 10
+        UNO_NAME_LISTTAB_STOP_POSITION,         // 11
+        UNO_NAME_FIRST_LINE_INDENT,             // 12
+        UNO_NAME_INDENT_AT,                     // 13
+        UNO_NAME_NUMBERING_TYPE,                // 14
+        UNO_NAME_PARAGRAPH_STYLE_NAME,          // 15
         // these are not in chapter numbering
-        "BulletId",                             //16
-        UNO_NAME_BULLET_FONT, //17
-        "BulletFontName",                       //18
-        "BulletChar",                           //19
-        UNO_NAME_GRAPHIC_URL,    //20
-        UNO_NAME_GRAPHIC_BITMAP, //21
-        UNO_NAME_GRAPHIC_SIZE,   //22
-        UNO_NAME_VERT_ORIENT,    //23
+        UNO_NAME_BULLET_ID,                     // 16
+        UNO_NAME_BULLET_FONT,                   // 17
+        UNO_NAME_BULLET_FONT_NAME,              // 18
+        UNO_NAME_BULLET_CHAR,                   // 19
+        UNO_NAME_GRAPHIC_URL,                   // 20
+        UNO_NAME_GRAPHIC_BITMAP,                // 21
+        UNO_NAME_GRAPHIC_SIZE,                  // 22
+        UNO_NAME_VERT_ORIENT,                   // 23
         // these are only in chapter numbering
-        UNO_NAME_HEADING_STYLE_NAME, //24
+        UNO_NAME_HEADING_STYLE_NAME,            // 24
         // these two are accepted but ignored for some reason
-        "BulletRelSize",                         // 25
-        "BulletColor"                            // 26
+        UNO_NAME_BULLET_REL_SIZE,               // 25
+        UNO_NAME_BULLET_COLOR                   // 26
     };
 
     enum {