dev/null |binary python/prj/d.lst | 2 - svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 24 ++++++++++++------ svx/source/sidebar/paragraph/ParaPropertyPanel.hrc | 2 - svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 2 - svx/source/sidebar/paragraph/ParaPropertyPanel.src | 28 +++++++++------------ 6 files changed, 29 insertions(+), 29 deletions(-)
New commits: commit 4be53ae1f2e0e2f5c9e9acdd9016ff0176dd8b50 Author: Jürgen Schmidt <[email protected]> Date: Tue Jun 4 16:30:11 2013 +0000 #122010# deliver _sysconfigdata.py diff --git a/python/prj/d.lst b/python/prj/d.lst index b366161..1748f37 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -73,7 +73,7 @@ mkdir: %_DEST%\lib%_EXT%\python\python2.7\config ..\%__SRC%\misc\build\Python-2.7.5\Lib\multiprocessing\dummy\* %_DEST%\lib%_EXT%\python\multiprocessing\dummy\* ..\%__SRC%\misc\build\Python-2.7.5\Lib\unittest\* %_DEST%\lib%_EXT%\python\unittest\* ..\%__SRC%\misc\build\Python-2.7.5\Makefile %_DEST%\lib%_EXT%\python\python2.7\config\Makefile - +..\%__SRC%\misc\build\python-inst\lib\python2.7\_sysconfigdata.py %_DEST%\lib%_EXT%\python\_sysconfigdata.py ..\pyversion.mk %_DEST%\inc%_EXT%\pyversion.mk ..\%__SRC%\misc\build\Python-2.7.5\Include\* %_DEST%\inc%_EXT%\python\* commit 98cb48c452fc49531b39af66e4db54211e8ffd9b Author: Andre Fischer <[email protected]> Date: Tue Jun 4 16:26:03 2013 +0000 122446: Removed unused icons. diff --git a/default_images/svx/res/symphony/DecreaseSpace_16x16.png b/default_images/svx/res/symphony/DecreaseSpace_16x16.png deleted file mode 100644 index 3f97e69..0000000 Binary files a/default_images/svx/res/symphony/DecreaseSpace_16x16.png and /dev/null differ diff --git a/default_images/svx/res/symphony/IncreaseSpace_16x16.png b/default_images/svx/res/symphony/IncreaseSpace_16x16.png deleted file mode 100644 index f27f369..0000000 Binary files a/default_images/svx/res/symphony/IncreaseSpace_16x16.png and /dev/null differ commit 2dc77c47146c622ffbe37996c319000e55c2f697 Author: Andre Fischer <[email protected]> Date: Tue Jun 4 16:24:18 2013 +0000 122446: Use different icons in Paragraph panel for increasing or decreasing inter-pagraph spacing. diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index d912807..5beceeb 100755 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -34,8 +34,10 @@ #include <sfx2/sidebar/Theme.hxx> #include <sfx2/sidebar/ResourceDefinitions.hrc> #include <sfx2/sidebar/ControlFactory.hxx> +#include <sfx2/sidebar/Tools.hxx> #include <svx/sidebar/PopupContainer.hxx> #include <sfx2/dispatch.hxx> +//#include <sfx2/imagemgr.hxx> #include <editeng/colritem.hxx> #include <editeng/brshitem.hxx> #include <editeng/lrspitem.hxx> @@ -70,8 +72,6 @@ namespace svx {namespace sidebar { #define INDENT_DECREMENT 2 #define INDENT_STEP 706 #define UL_STEP 58 -#define UL_INCREMENT 1 -#define UL_DECREMENT 2 #define NEGATIVE_MAX_VALUE -9999 #define BEGIN_VALUE 28 @@ -491,8 +491,18 @@ void ParaPropertyPanel::InitToolBoxSpacing() maTopDist->SetAccessibleName(maTopDist->GetQuickHelpText()); maBottomDist->SetAccessibleName(maBottomDist->GetQuickHelpText()); - maTbxUL_IncDec->SetItemImage(TOOLBOX_ITEM1, maParInc); - maTbxUL_IncDec->SetItemImage(TOOLBOX_ITEM2, maParDec); + // Use a form of image loading that can handle both .uno:<command> + // and private:graphirepository... syntax. This is necessary to + // handle the workaround for accessing the images of commands + // ParaspaceIncrease and ParaspaceDecrease. + // See issue 122446 for more details. + maTbxUL_IncDec->SetItemImage( + BT_TBX_UL_INC, + sfx2::sidebar::Tools::GetImage(mpTbxUL_IncDec->GetItemCommand(BT_TBX_UL_INC), mxFrame)); + maTbxUL_IncDec->SetItemImage( + BT_TBX_UL_DEC, + sfx2::sidebar::Tools::GetImage(mpTbxUL_IncDec->GetItemCommand(BT_TBX_UL_DEC), mxFrame)); + aLink = LINK( this, ParaPropertyPanel, ClickUL_IncDec_Hdl_Impl ); maTbxUL_IncDec->SetSelectHdl(aLink); m_eULSpaceUnit = maULSpaceControl.GetCoreMetric(); @@ -984,7 +994,7 @@ IMPL_LINK(ParaPropertyPanel, ClickUL_IncDec_Hdl_Impl, ToolBox *, pControl) { switch (pControl->GetCurItemId()) { - case UL_INCREMENT: + case BT_TBX_UL_INC: { SvxULSpaceItem aMargin( SID_ATTR_PARA_ULSPACE ); @@ -1002,7 +1012,7 @@ IMPL_LINK(ParaPropertyPanel, ClickUL_IncDec_Hdl_Impl, ToolBox *, pControl) SID_ATTR_PARA_ULSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L); } break; - case UL_DECREMENT: + case BT_TBX_UL_DEC: { SvxULSpaceItem aMargin( SID_ATTR_PARA_ULSPACE ); @@ -1600,8 +1610,6 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent, maIndent2 (SVX_RES(IMG_INDENT2)), maIndent3 (SVX_RES(IMG_INDENT3)), maIndHang (SVX_RES(IMG_INDENT_HANG)), - maParInc (SVX_RES(IMG_PARA_INC)), - maParDec (SVX_RES(IMG_PARA_DEC)), maNumBImageList (SVX_RES(IL_NUM_BULLET)), maNumBImageListH (SVX_RES(ILH_NUM_BULLET)), maNumBImageListRTL (SVX_RES(IL_NUM_BULLET_RTL)), diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc index c33cb77..b5a0f73 100755 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc @@ -38,8 +38,6 @@ #define MF_AFTER_INDENT 4 #define MF_FL_INDENT 6 #define TBX_HORIZONTALALIGNMENT 5 -#define IMG_PARA_INC 13 -#define IMG_PARA_DEC 14 #define IMG_INDENT_HANG 15 #define FT_INDENT 16 #define TBX_INDENT_INC_DEC 17 diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index d12e9dc..3cee580 100755 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -147,8 +147,6 @@ private: Image maIndent3; Image maIndHang; - Image maParInc; - Image maParDec; ImageList maNumBImageList; ImageList maNumBImageListH; diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/svx/source/sidebar/paragraph/ParaPropertyPanel.src index d14ee47..1dbc2d5 100755 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src @@ -196,20 +196,24 @@ Control RID_SIDEBAR_PARA_PANEL Identifier = BT_TBX_UL_INC ; HelpID = HID_PPROPERTYPANEL_PARA_TBI_INC ; Text [ en-US ] = "Increase Spacing" ; - ItemBitmap = Bitmap - { - File = "symphony/IncreaseSpace_16x16.png"; - }; + + /** The next line should be + Command = ".uno:ParaspaceIncrease"; + The hack is necessary because the ParaspaceIncrease command is only + defined for Draw/Impress. It has to be defined in + GenericCommancs.xcu to be recognized. See issue 122446 for more details. + */ + Command = "private:graphicrepository/res/commandimagelist/sc_paraspaceincrease.png"; }; ToolBoxItem { Identifier = BT_TBX_UL_DEC ; HelpID = HID_PPROPERTYPANEL_PARA_TBI_DEC ; Text [ en-US ] = "Decrease Spacing" ; - ItemBitmap = Bitmap - { - File = "symphony/DecreaseSpace_16x16.png"; - }; + /** See above or issue 122446 why the following line is not + Command = ".uno:ParaspaceDecrease"; + */ + Command = "private:graphicrepository/res/commandimagelist/sc_paraspacedecrease.png"; }; }; }; @@ -469,14 +473,6 @@ Control RID_SIDEBAR_PARA_PANEL { ImageBitmap = Bitmap{File = "symphony/Indent_Hanging.png";}; }; - Image IMG_PARA_INC - { - ImageBitmap = Bitmap{File = "symphony/IncreaseSpace_16x16.png";}; - }; - Image IMG_PARA_DEC - { - ImageBitmap = Bitmap{File = "symphony/DecreaseSpace_16x16.png";}; - }; }; //===========================================Back color page==============================
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
