diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-13 00:45:08 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-13 00:58:57 +0200 |
| commit | 40f9ae367ca71e9dadb7cd76b08616b229726d7e (patch) | |
| tree | bbd73929b4d769b96e5ee40ff2648c59d110fcd8 /framework | |
| parent | 6640bfc66dca7fdad8a038b32fa062bff34219b7 (diff) | |
Modified state icons not packaged into zip
It seems that images must be mentioned in some src file.
Unfortunately had to copy the save icon in place of the
modified icon in galaxy, to satisfy the resource compiler.
Change-Id: If3fa7a8a194a0289c79fa10987138dfb35eaeca2
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/classes/resource.hrc | 3 | ||||
| -rw-r--r-- | framework/source/classes/resource.src | 9 | ||||
| -rw-r--r-- | framework/source/uielement/popuptoolbarcontroller.cxx | 12 |
3 files changed, 17 insertions, 7 deletions
diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc index 4331a42a21cb..d1fdfeb2b0f5 100644 --- a/framework/inc/classes/resource.hrc +++ b/framework/inc/classes/resource.hrc @@ -53,6 +53,9 @@ #define STR_OPEN_REMOTE (RID_STR_START+26) #define STR_REMOTE_TITLE (RID_STR_START+27) +#define IMG_SAVEMODIFIED_SMALL (RID_IMAGE_START+0) +#define IMG_SAVEMODIFIED_LARGE (RID_IMAGE_START+1) + #define POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION (RID_MENU_START+0) #define MENUITEM_TOOLBAR_VISIBLEBUTTON 1 diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src index 66f5a2451642..9e0fee8d26ef 100644 --- a/framework/source/classes/resource.src +++ b/framework/source/classes/resource.src @@ -205,4 +205,13 @@ String STR_LANGSTATUS_HINT Text [ en-US ] = "Text Language. Right-click to set character or paragraph language" ; }; +Image IMG_SAVEMODIFIED_SMALL +{ + ImageBitmap = Bitmap{File = "savemodified_small.png";}; +}; +Image IMG_SAVEMODIFIED_LARGE +{ + ImageBitmap = Bitmap{File = "savemodified_large.png";}; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index c076652bd11d..d2c272bdd158 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <classes/resource.hrc> +#include <classes/fwkresid.hxx> + #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/processfactory.hxx> @@ -43,7 +46,6 @@ #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/frame/XSubToolbarController.hpp> #include <com/sun/star/frame/XUIControllerFactory.hpp> -#include <com/sun/star/graphic/GraphicProvider.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> #include <com/sun/star/ucb/ContentCreationException.hpp> @@ -417,12 +419,8 @@ void SaveToolbarController::updateImage() } else if ( m_xModifiable.is() && m_xModifiable->isModified() ) { - const OUString aImageURL( "private:graphicrepository/res/savemodified_" + ( bLargeIcons ? OUString( "large.png" ) : OUString( "small.png" ) ) ); - const css::uno::Reference< css::graphic::XGraphicProvider > xGraphicProvider( css::graphic::GraphicProvider::create( m_xContext ) ); - const css::uno::Reference< css::graphic::XGraphic > xGraphic( - xGraphicProvider->queryGraphic( comphelper::InitPropertySequence( { { "URL", css::uno::makeAny( aImageURL ) } } ) ), css::uno::UNO_QUERY ); - if ( xGraphic.is() ) - aImage = Image( xGraphic ); + Image aResImage( bLargeIcons ? FwkResId( IMG_SAVEMODIFIED_LARGE ) : FwkResId( IMG_SAVEMODIFIED_SMALL ) ); + aImage = aResImage; } if ( !aImage ) |