summaryrefslogtreecommitdiff
path: root/framework/source/uielement
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2016-01-13 00:45:08 +0200
committerMaxim Monastirsky <momonasmon@gmail.com>2016-01-13 00:58:57 +0200
commit40f9ae367ca71e9dadb7cd76b08616b229726d7e (patch)
treebbd73929b4d769b96e5ee40ff2648c59d110fcd8 /framework/source/uielement
parent6640bfc66dca7fdad8a038b32fa062bff34219b7 (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/source/uielement')
-rw-r--r--framework/source/uielement/popuptoolbarcontroller.cxx12
1 files changed, 5 insertions, 7 deletions
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 )