mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

can detangle the sdext graphic resource now

Browse Source 
Change-Id: I2992b859bbebfa4bfae3ea5bfe76e8aa62193f69
This commit is contained in:
Caolán McNamara
2017-04-27 11:22:39 +01:00
parent 6fc5a80009
commit 34bdbcecf1
5 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
postprocess/CustomTarget_images.mk
View File

@@ -64,6 +64,7 @@ $(packimages_DIR)/sourceimagelist.ilst : \
$(SRCDIR)/reportdesign/inc/bitmaps.hlst \
$(SRCDIR)/sc/inc/bitmaps.hlst \
$(SRCDIR)/sd/inc/bitmaps.hlst \
$(SRCDIR)/sdext/inc/bitmaps.hlst \
$(SRCDIR)/sfx2/inc/bitmaps.hlst \
$(SRCDIR)/svtools/inc/bitmaps.hlst \
$(SRCDIR)/svx/inc/bitmaps.hlst \

4
sd/inc/bitmaps.hlst
View File

@@ -177,10 +177,6 @@
#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL "sd/res/presenterscreen-ScrollbarThumbBottomNormal.png"
#define BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED "sd/res/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.
#define BMP_PRESENTATION_MINIMIZER "sd/res/minimize_presi_80.png"
#define BMP_EMBEDDED "sd/res/nv08.png"
#define BMP_LINK "sd/res/nv09.png"
#define BMP_HYPERLINK "sd/res/nv010.png"

5
sdext/Library_PresentationMinimizer.mk
View File

@@ -24,6 +24,11 @@ $(eval $(call gb_Library_use_api,PresentationMinimizer,\
udkapi \
))
$(eval $(call gb_Library_set_include,PresentationMinimizer,\
$$(INCLUDE) \
-I$(SRCDIR)/sdext/inc \
))
$(eval $(call gb_Library_use_libraries,PresentationMinimizer,\
cppu \
cppuhelper \

17
sdext/inc/bitmaps.hlst Normal file
View File

@@ -0,0 +1,17 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_SDEXT_INC_BITMAPS_HRC
#define INCLUDED_SDEXT_INC_BITMAPS_HRC
#define BMP_PRESENTATION_MINIMIZER "sd/res/minimize_presi_80.png"
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

7
sdext/source/minimizer/optimizerdialog.cxx
View File

@@ -30,7 +30,7 @@
#include <sal/macros.h>
#include <osl/time.h>
#include <tools/urlobj.hxx>
#include "bitmaps.hlst"
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::ui;
@@ -112,10 +112,7 @@ void OptimizerDialog::InitRoadmap()
InsertRoadmapItem( 3, getString( STR_OLE_OBJECTS ), ITEM_ID_OLE_OPTIMIZATION );
InsertRoadmapItem( 4, getString( STR_SUMMARY ), ITEM_ID_SUMMARY );
// 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" );
OUString sURL("private:graphicrepository/" + OUString(BMP_PRESENTATION_MINIMIZER));
xPropertySet->setPropertyValue( "ImageURL", Any( sURL ) );
xPropertySet->setPropertyValue( "Activated", Any( true ) );