From 40f9ae367ca71e9dadb7cd76b08616b229726d7e Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Wed, 13 Jan 2016 00:45:08 +0200 Subject: 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 --- framework/inc/classes/resource.hrc | 3 +++ framework/source/classes/resource.src | 9 +++++++++ framework/source/uielement/popuptoolbarcontroller.cxx | 12 +++++------- icon-themes/galaxy/res/savemodified_large.png | Bin 0 -> 535 bytes icon-themes/galaxy/res/savemodified_small.png | Bin 0 -> 366 bytes 5 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 icon-themes/galaxy/res/savemodified_large.png create mode 100644 icon-themes/galaxy/res/savemodified_small.png 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 +#include + #include #include #include @@ -43,7 +46,6 @@ #include #include #include -#include #include #include #include @@ -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 ) diff --git a/icon-themes/galaxy/res/savemodified_large.png b/icon-themes/galaxy/res/savemodified_large.png new file mode 100644 index 000000000000..51505d7414f1 Binary files /dev/null and b/icon-themes/galaxy/res/savemodified_large.png differ diff --git a/icon-themes/galaxy/res/savemodified_small.png b/icon-themes/galaxy/res/savemodified_small.png new file mode 100644 index 000000000000..d89302377461 Binary files /dev/null and b/icon-themes/galaxy/res/savemodified_small.png differ -- cgit v1.2.3