Skip to content

C
core
Kaydet (Commit) ff03b807 authored tarafından Andre Fischer's avatar Andre Fischer Kaydeden (comit) Michael Meeks
Dosyalara gözat
Seçenekler

Related: #i122144# Replace more Symphony icons with standard icons 

ParaPropertyPanel

(cherry picked from commit 8808ad84)

Conflicts:
	icon-themes/galaxy/svx/res/symphony/AlignTextCenter_16x16.png
	icon-themes/galaxy/svx/res/symphony/AlignTextJustified_16x16.png
	icon-themes/galaxy/svx/res/symphony/AlignTextLeft_16x16.png
	icon-themes/galaxy/svx/res/symphony/AlignTextRight_16x16.png
	icon-themes/galaxy/svx/res/symphony/Indent_16x16.png
	icon-themes/galaxy/svx/res/symphony/Outdent_16x16.png
	icon-themes/galaxy/svx/res/symphony/para_vert01.png
	icon-themes/galaxy/svx/res/symphony/para_vert02.png
	icon-themes/galaxy/svx/res/symphony/para_vert03.png
	icon-themes/galaxy/svx/res/symphony/para_verth01.png
	icon-themes/galaxy/svx/res/symphony/para_verth02.png
	icon-themes/galaxy/svx/res/symphony/para_verth03.png
	icon-themes/galaxy/svx/res/symphony/rte_Indent_16x16.png
	icon-themes/galaxy/svx/res/symphony/rte_Outdent_16x16.png

Change-Id: Idedcbb16b99a0fa7126d4e095e13e4f3a1f3f013

Fix build breaker: declare missing member variable

(cherry picked from commit eb15aa36)

Change-Id: Ie53ff7cea8874048fe575003a0ae4ded25b6535b

Fix build breaker: remove missing images

(cherry picked from commit 2f116e91)

Change-Id: I6130c7b55b03b3962ec72f49d48084324dfdc3df
üst 28ca23af
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 101 deletions
svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
Dosyayı görüntüle @ ff03b807
......@@ -34,12 +34,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
......@@ -63,8 +57,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
......@@ -87,8 +79,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
Dosyayı görüntüle @ ff03b807
......@@ -142,21 +142,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;
......@@ -212,9 +201,7 @@ 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;
......@@ -269,7 +256,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
Dosyayı görüntüle @ ff03b807
......@@ -71,40 +71,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";
};
};
};
};
......@@ -276,20 +260,12 @@ Control RID_SIDEBAR_PARA_PANEL
Identifier = BT_TBX_INDENT_INC ;
HelpID = HID_PPROPERTYPANEL_PARA_TBI_INDENT_INC ;
Text [ en-US ] = "Increase Indent" ;
ItemBitmap = Bitmap
{
File = "symphony/Indent_16x16.png";
};
};
ToolBoxItem
{
Identifier = BT_TBX_INDENT_DEC ;
HelpID = HID_PPROPERTYPANEL_PARA_TBI_INDENT_DEC ;
Text [ en-US ] = "Decrease Indent" ;
ItemBitmap = Bitmap
{
File = "symphony/Outdent_16x16.png";
};
};
ToolBoxItem
{
......@@ -318,20 +294,12 @@ Control RID_SIDEBAR_PARA_PANEL
Identifier = BT_TBX_INDENT_PROMOTE ;
HelpID = HID_PPROPERTYPANEL_PARA_TBI_INDENTP_INC ;
Text [ en-US ] = "Increase Indent" ;
ItemBitmap = Bitmap
{
File = "symphony/Indent_16x16.png";
};
};
ToolBoxItem
{
Identifier = BT_TBX_INDENT_DEMOTE ;
HelpID = HID_PPROPERTYPANEL_PARA_TBI_INDENTP_DEC ;
Text [ en-US ] = "Decrease Indent" ;
ItemBitmap = Bitmap
{
File = "symphony/Outdent_16x16.png";
};
};
ToolBoxItem
{
......@@ -441,19 +409,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";
......@@ -506,38 +461,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";};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment