Author: af
Date: Tue Apr 23 11:41:58 2013
New Revision: 1470903
URL: http://svn.apache.org/r1470903
Log:
122144: Use AOO icons for flipping shapes.
Removed:
openoffice/trunk/main/default_images/svx/res/symphony/FlipHorizontally_16x16.png
openoffice/trunk/main/default_images/svx/res/symphony/FlipVertically_16x16.png
Modified:
openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.hrc
openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.src
Modified:
openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx?rev=1470903&r1=1470902&r2=1470903&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
(original)
+++ openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
Tue Apr 23 11:41:58 2013
@@ -31,6 +31,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/objsh.hxx>
+#include <sfx2/imagemgr.hxx>
#include <svx/dlgutil.hxx>
#include <unotools/viewoptions.hxx>
#include <vcl/virdev.hxx>
@@ -101,8 +102,6 @@ PosSizePropertyPanel::PosSizePropertyPan
maAutoWidthControl(SID_ATTR_TRANSFORM_AUTOWIDTH, *pBindings, *this),
maAutoHeightControl(SID_ATTR_TRANSFORM_AUTOHEIGHT, *pBindings, *this),
m_aMetricCtl(SID_ATTR_METRIC, *pBindings, *this),
- maImgFlipHori(SVX_RES(IMG_HORI_FLIP)),
- maImgFlipVert(SVX_RES(IMG_VERT_FLIP)),
mxFrame(rxFrame),
maContext(),
mpBindings(pBindings),
@@ -184,8 +183,12 @@ void PosSizePropertyPanel::Initialize()
//flip:
mpFlipTbx->SetSelectHdl( LINK( this, PosSizePropertyPanel, FlipHdl) );
- mpFlipTbx->SetItemImage(FLIP_HORIZONTAL,maImgFlipHori);
- mpFlipTbx->SetItemImage(FLIP_VERTICAL,maImgFlipVert);
+ mpFlipTbx->SetItemImage(
+ FLIP_HORIZONTAL,
+ GetImage(mxFrame, A2S(".uno:FlipHorizontal"), sal_False,
Theme::IsHighContrastMode()));
+ mpFlipTbx->SetItemImage(
+ FLIP_VERTICAL,
+ GetImage(mxFrame, A2S(".uno:FlipVertical"), sal_False,
Theme::IsHighContrastMode()));
mpFlipTbx->SetQuickHelpText(FLIP_HORIZONTAL,String(SVX_RES(STR_QH_HORI_FLIP)));
//Add
mpFlipTbx->SetQuickHelpText(FLIP_VERTICAL,String(SVX_RES(STR_QH_VERT_FLIP)));
//Add
Modified:
openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.hrc
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.hrc?rev=1470903&r1=1470902&r2=1470903&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.hrc
(original)
+++ openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.hrc
Tue Apr 23 11:41:58 2013
@@ -37,8 +37,6 @@
#define DIAL_CONTROL
17
#define FLIP_HORIZONTAL
18
#define FLIP_VERTICAL
19
-#define IMG_HORI_FLIP
20
-#define IMG_VERT_FLIP
21
#define FT_FLIP
22
#define STR_QH_HORI_FLIP
23
#define STR_QH_VERT_FLIP
24
Modified:
openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.hxx?rev=1470903&r1=1470902&r2=1470903&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
(original)
+++ openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
Tue Apr 23 11:41:58 2013
@@ -125,10 +125,6 @@ private:
::sfx2::sidebar::ControllerItem maAutoHeightControl;
::sfx2::sidebar::ControllerItem m_aMetricCtl;
- // images from ressource
- Image maImgFlipHori;
- Image maImgFlipVert;
-
cssu::Reference< css::frame::XFrame > mxFrame;
::sfx2::sidebar::EnumContext maContext;
SfxBindings* mpBindings;
Modified:
openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.src?rev=1470903&r1=1470902&r2=1470903&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.src
(original)
+++ openoffice/trunk/main/svx/source/sidebar/possize/PosSizePropertyPanel.src
Tue Apr 23 11:41:58 2013
@@ -180,20 +180,12 @@ Control RID_SIDEBAR_POSSIZE_PANEL
Identifier = FLIP_VERTICAL ;
Text [ en-US ] = "Flip Vertically" ;
HelpID =
HID_PROPERTY_PANEL_POSIZE_FLIP_VERTICAL;
- ItemBitmap = Bitmap
- {
- File =
"symphony/FlipVertically_16x16.png";
- };
};
ToolBoxItem
{
Identifier = FLIP_HORIZONTAL ;
Text [ en-US ] = "Flip Horizontally" ;
HelpID =
HID_PROPERTY_PANEL_POSIZE_FLIP_HORIZONTAL;
- ItemBitmap = Bitmap
- {
- File =
"symphony/FlipHorizontally_16x16.png";
- };
};
};
};
@@ -207,15 +199,6 @@ Control RID_SIDEBAR_POSSIZE_PANEL
Text [ en-US ] = "Flip the selected object vertically.";
};
- Image IMG_HORI_FLIP
- {
- ImageBitmap = Bitmap{File =
"symphony/FlipHorizontally_16x16.png";};
- };
- Image IMG_VERT_FLIP
- {
- ImageBitmap = Bitmap{File =
"symphony/FlipVertically_16x16.png";};
- };
-
Control DIAL_CONTROL
{
Pos = MAP_APPFONT ( ROTATE_CONTROL_X , ROTATE_CONTROL_Y );
