From cc2a405915e82c4b332dd25457f76704dc536d7f Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Tue, 15 Oct 2013 17:37:59 +0200 Subject: [PATCH] fdo#61950 De-extensionize presentation minimizer: post clean Change-Id: I7d21f1d67b13fcd83792503e8c72ccf16fbda1ec Reviewed-on: https://gerrit.libreoffice.org/6247 Reviewed-by: David Ostrovsky Tested-by: David Ostrovsky --- .../res/minimize_presi_80.png} | Bin .../lc_presentationminimizer.png} | Bin .../sc_presentationminimizer.png} | Bin .../res/minimize_presi_80.png} | Bin .../data/org/openoffice/Office/Addons.xcu | 80 +++--------------- .../Office/PresentationMinimizer.xcu | 4 - .../Office/PresentationMinimizer.xcs | 3 - sd/source/ui/app/res_bmp.src | 8 ++ sd/source/ui/inc/res_bmp.hrc | 1 + sdext/source/minimizer/optimizerdialog.cxx | 9 +- 10 files changed, 25 insertions(+), 80 deletions(-) rename icon-themes/galaxy/{minimizer/minimizepresi_80.png => sd/res/minimize_presi_80.png} (100%) rename icon-themes/hicontrast/{minimizer/opt_26.png => cmd/lc_presentationminimizer.png} (100%) rename icon-themes/hicontrast/{minimizer/opt_16.png => cmd/sc_presentationminimizer.png} (100%) rename icon-themes/hicontrast/{minimizer/minimizepresi_80.png => sd/res/minimize_presi_80.png} (100%) diff --git a/icon-themes/galaxy/minimizer/minimizepresi_80.png b/icon-themes/galaxy/sd/res/minimize_presi_80.png similarity index 100% rename from icon-themes/galaxy/minimizer/minimizepresi_80.png rename to icon-themes/galaxy/sd/res/minimize_presi_80.png diff --git a/icon-themes/hicontrast/minimizer/opt_26.png b/icon-themes/hicontrast/cmd/lc_presentationminimizer.png similarity index 100% rename from icon-themes/hicontrast/minimizer/opt_26.png rename to icon-themes/hicontrast/cmd/lc_presentationminimizer.png diff --git a/icon-themes/hicontrast/minimizer/opt_16.png b/icon-themes/hicontrast/cmd/sc_presentationminimizer.png similarity index 100% rename from icon-themes/hicontrast/minimizer/opt_16.png rename to icon-themes/hicontrast/cmd/sc_presentationminimizer.png diff --git a/icon-themes/hicontrast/minimizer/minimizepresi_80.png b/icon-themes/hicontrast/sd/res/minimize_presi_80.png similarity index 100% rename from icon-themes/hicontrast/minimizer/minimizepresi_80.png rename to icon-themes/hicontrast/sd/res/minimize_presi_80.png diff --git a/officecfg/registry/data/org/openoffice/Office/Addons.xcu b/officecfg/registry/data/org/openoffice/Office/Addons.xcu index b0caea26dcaf..cecba99e6f20 100644 --- a/officecfg/registry/data/org/openoffice/Office/Addons.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Addons.xcu @@ -8,8 +8,8 @@ * --> - - + + @@ -159,47 +159,8 @@ - - - - - .uno:ToolsMenu\.uno:AVMediaPlayer - - - AddAfter - - - AddPath - - - com.sun.star.presentation.PresentationDocument - - - - - private:separator - - - - - vnd.com.sun.star.comp.PresentationMinimizer:execute - - - ~Minimize Presentation... - - - _self - - - com.sun.star.presentation.PresentationDocument - - - - - - - + vnd.sun.star.script:LibreLogo|LibreLogo.py$goforward?language=Python&location=share @@ -212,7 +173,7 @@ - + vnd.sun.star.script:LibreLogo|LibreLogo.py$gobackward?language=Python&location=share @@ -225,7 +186,7 @@ - + vnd.sun.star.script:LibreLogo|LibreLogo.py$left?language=Python&location=share @@ -238,7 +199,7 @@ - + vnd.sun.star.script:LibreLogo|LibreLogo.py$right?language=Python&location=share @@ -251,7 +212,7 @@ - + vnd.sun.star.script:LibreLogo|LibreLogo.py$run?language=Python&location=share @@ -264,7 +225,7 @@ - + vnd.sun.star.script:LibreLogo|LibreLogo.py$stop?language=Python&location=share @@ -277,7 +238,7 @@ - + vnd.sun.star.script:LibreLogo|LibreLogo.py$home?language=Python&location=share @@ -290,7 +251,7 @@ - + vnd.sun.star.script:LibreLogo|LibreLogo.py$clearscreen?language=Python&location=share @@ -303,7 +264,7 @@ - + vnd.sun.star.script:LibreLogo|LibreLogo.py$__translate__?language=Python&location=share @@ -316,25 +277,6 @@ - - - vnd.com.sun.star.comp.PresentationMinimizer:execute - - - - bitmaps/opt_16.png - - - bitmaps/opt_26.png - - - bitmaps/opt_16_h.png - - - bitmaps/opt_26_h.png - - - diff --git a/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu index 2780c7df5472..84f9fa5aaf0b 100644 --- a/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu +++ b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu @@ -18,10 +18,6 @@ --> - - bitmaps - - Presentation Minimizer diff --git a/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs b/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs index 947a15e9c274..63df4c5645a1 100644 --- a/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs @@ -123,9 +123,6 @@ - - Bitmap path. - UI strings. diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index 00f7a275ed42..7db1d017946c 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -820,4 +820,12 @@ Bitmap BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED File = "presenterscreen-ButtonPlusDisabled.png"; }; +// This definition is not used directly. +// It is only here to be shipped in images.zip. +// The bitmap itself is used from sdext/source/minimizer. +Bitmap BMP_PRESENTATION_MINIMIZER +{ + File = "minimize_presi_80.png"; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc index 46cb52a52e08..79896d165fc2 100644 --- a/sd/source/ui/inc/res_bmp.hrc +++ b/sd/source/ui/inc/res_bmp.hrc @@ -188,6 +188,7 @@ #define BMP_PRESENTERSCREEN_VIEW_BACKGROUND (RID_SD_START+590) #define BMP_PRESENTERSCREEN_ANIMATION (RID_SD_START+591) #define BMP_PRESENTERSCREEN_TRANSITION (RID_SD_START+592) +#define BMP_PRESENTATION_MINIMIZER (RID_SD_START+593) // ResourceIDs for Popup-Menus do not need a dummy string!!! diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index b104de7209e4..47605277b12f 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -104,7 +104,7 @@ void OptimizerDialog::InitRoadmap() sal_Int32 nCount = SAL_N_ELEMENTS( pNames ); Sequence< OUString > aNames( pNames, nCount ); - Sequence< Any > aValues( pValues, nCount ); + Sequence< Any > aValues( pValues, nCount ); mxRoadmapControlModel = insertControlModel( OUString( "com.sun.star.awt.UnoControlRoadmapModel" ), "rdmNavi", aNames, aValues ); @@ -118,9 +118,10 @@ void OptimizerDialog::InitRoadmap() InsertRoadmapItem( 3, sal_True, getString( STR_OLE_OBJECTS ), ITEM_ID_OLE_OPTIMIZATION ); InsertRoadmapItem( 4, sal_True, getString( STR_SUMMARY ), ITEM_ID_SUMMARY ); - OUString sBitmapPath( getPath( "BitmapPath" ) ); - OUString sBitmap( "/minimizepresi_80.png" ); - OUString sURL( sBitmapPath += sBitmap ); + // Well, that's messy, but the + // BMP_PRESENTATION_MINIMIZER from sd module cannot be used here directly + // that UNO wizard dialog should be converted to ui + OUString sURL( "private:graphicrepository/sd/res/minimize_presi_80.png" ); xPropertySet->setPropertyValue( "ImageURL", Any( sURL ) ); xPropertySet->setPropertyValue( "Activated", Any( (sal_Bool)sal_True ) );