122144: Replace more Symphony icons with AOO icons: ParaPropertyPanel.

svx/source/sidebar/paragraph/ParaPropertyPanel.hrc

@@ -38,12 +38,6 @@
 #define MF_AFTER_INDENT                              4
 #define MF_FL_INDENT                                 6
 #define TBX_HORIZONTALALIGNMENT                      5
-#define IMG_LEFT_PARA                                7
-#define IMG_CENTER_PARA                              8
-#define IMG_RIGHT_PARA                               9
-#define IMG_JUSTIFY_PARA                             10
-#define IMG_INDENT_INC                               11
-#define IMG_INDENT_DEC                               12
 #define IMG_PARA_INC                                 13
 #define IMG_PARA_DEC                                 14
 #define IMG_INDENT_HANG                              15
@@ -67,8 +61,6 @@
 #define MF_BELOW_PARASPACING                         34
 #define TBX_INDENT_PRO_DEMOTE                        35
 #define TBX_VERT_ALIGN      40
-#define IL_VERT_ALIGN       41
-#define ILH_VERT_ALIGN      42
 #define TBX_NUM_BULLET      44
 #define IL_NUM_BULLET       45
 #define ILH_NUM_BULLET      46
@@ -91,8 +83,6 @@
 #define TBI_INDENT_DEC          70
 #define TBI_UL_INC              71
 #define TBI_UL_DEC              72
-#define IMG_INDENT_INC_BD       73
-#define IMG_INDENT_DEC_BD       74
 
 //for vertical alignment
 #define IID_VERT_TOP        1

svx/source/sidebar/paragraph/ParaPropertyPanel.hxx

@@ -146,21 +146,10 @@ private:
     Image  maIndent2;
     Image  maIndent3;
 
-    Image  maLeftPara;
-    Image  maCentPara;
-    Image  maRightPara;
-    Image  maJusPara;
-
-    Image  maIndInc;
-    Image  maIndDec;
-    Image  maIndInc_BD;
-    Image  maIndDec_BD;
     Image  maIndHang;
     Image  maParInc;
     Image  maParDec;
 
-    ImageList   maVertImageList;
-    ImageList   maVertImageListH;
     ImageList   maNumBImageList;
     ImageList   maNumBImageListH;
     ImageList   maNumBImageListRTL;
@@ -216,9 +205,6 @@ private:
     ::sfx2::sidebar::ControllerItem  maBulletNumRuleIndex;
     ::sfx2::sidebar::ControllerItem  maNumNumRuleIndex;
 
-    //i122166, the icons for numbering or bullets toolbox inside toolbar and sidebar should be the same one
-    cssu::Reference<css::frame::XFrame> mxFrame;
-    //End of i122166
     ::sfx2::sidebar::EnumContext maContext;
     SfxBindings* mpBindings;
     ParaLineSpacingPopup maLineSpacePopup;
@@ -273,7 +259,6 @@ private:
     DECL_LINK(NumBTbxDDHandler, ToolBox*);
     DECL_LINK(ToolBoxBackColorDDHandler, ToolBox *);
 
-    void SetupIcons (void);
     void InitToolBoxAlign();
     void InitToolBoxVertAlign();
     void InitToolBoxIndent();

svx/source/sidebar/paragraph/ParaPropertyPanel.src

@@ -75,40 +75,24 @@ Control RID_SIDEBAR_PARA_PANEL
                 Identifier = BT_SUBSTLEFT ;
                 HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_LEFT;
                 Text [ en-US ] = "Align Left" ;
-                ItemBitmap = Bitmap
-                {
-                    File = "symphony/AlignTextLeft_16x16.png";
-                };
             };
             ToolBoxItem
             {
                 Identifier = BT_SUBSTCENTER ;
                 HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_CENTER;
                 Text [ en-US ] = "Align Center" ;
-                ItemBitmap = Bitmap
-                {
-                    File = "symphony/AlignTextCenter_16x16.png";
-                };
             };
             ToolBoxItem
             {
                 Identifier = BT_SUBSTRIGHT ;
                 HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_RIGHT;
                 Text [ en-US ] = "Align Right" ;
-                ItemBitmap = Bitmap
-                {
-                    File = "symphony/AlignTextRight_16x16.png";
-                };
             };
             ToolBoxItem
             {
                 Identifier = BT_SUBSTJUSTIFY ;
                 HelpID = HID_PPROPERTYPANEL_PARA_TBI_HALIGN_JUSTIFY;
                 Text [ en-US ] = "Align Justified" ;
-                ItemBitmap = Bitmap
-                {
-                    File = "symphony/AlignTextJustified_16x16.png";
-                };
             };
         };
     };
@@ -445,19 +429,6 @@ Control RID_SIDEBAR_PARA_PANEL
         Size = MAP_APPFONT( IMAGE_SIZE, IMAGE_SIZE );
     };
 
-    ImageList IL_VERT_ALIGN
-    {
-        Prefix = "symphony/para_vert";
-        MaskColor = STD_MASKCOLOR ;
-        SVX_PROPERTYPANEL_PARA_VERT_IDLIST
-    };
-    ImageList ILH_VERT_ALIGN
-    {
-        Prefix = "symphony/para_verth";
-        MaskColor = STD_MASKCOLOR ;
-        SVX_PROPERTYPANEL_PARA_VERT_IDLIST
-    };
-
     ImageList IL_NUM_BULLET
     {
         Prefix = "symphony/para_numbullet";
@@ -510,38 +481,6 @@ Control RID_SIDEBAR_PARA_PANEL
     {
         ImageBitmap = Bitmap{File = "symphony/Indent4.png";};
     };
-    Image IMG_LEFT_PARA
-    {
-        ImageBitmap = Bitmap{File = "symphony/AlignTextLeft_16x16.png";};
-    };
-    Image IMG_CENTER_PARA
-    {
-        ImageBitmap = Bitmap{File = "symphony/AlignTextCenter_16x16.png";};
-    };
-    Image IMG_RIGHT_PARA
-    {
-        ImageBitmap = Bitmap{File = "symphony/AlignTextRight_16x16.png";};
-    };
-    Image IMG_JUSTIFY_PARA
-    {
-        ImageBitmap = Bitmap{File = "symphony/AlignTextJustified_16x16.png";};
-    };
-    Image IMG_INDENT_INC
-    {
-        ImageBitmap = Bitmap{File = "symphony/Indent_16x16.png";};
-    };
-    Image IMG_INDENT_DEC
-    {
-        ImageBitmap = Bitmap{File = "symphony/Outdent_16x16.png";};
-    };
-    Image IMG_INDENT_INC_BD
-    {
-        ImageBitmap = Bitmap{File = "symphony/rte_Indent_16x16.png";};
-    };
-    Image IMG_INDENT_DEC_BD
-    {
-        ImageBitmap = Bitmap{File = "symphony/rte_Outdent_16x16.png";};
-    };
     Image IMG_INDENT_HANG
     {
         ImageBitmap = Bitmap{File = "symphony/Indent_Hanging.png";};