diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-19 12:02:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-25 17:02:15 +0200 |
| commit | d7559de4f70afdf64dea3bfbf462f5f188da7d05 (patch) | |
| tree | f27987aec5a5518928a8271af04bd875bb92ef58 | |
| parent | e68b6e349c31ac1376e90218013e1e7612f2b522 (diff) | |
remove bitmaps from .src files
and into includeable .hlst files, add them to
postprocess/CustomTarget_images.mk
to continue only including used bitmaps in icon-theme zips
Change-Id: I5c24c3eca93a9c4101bcdcacb0e4b2712133968e
Reviewed-on: https://gerrit.libreoffice.org/36941
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
69 files changed, 556 insertions, 1291 deletions
diff --git a/avmedia/inc/bitmaps.hlst b/avmedia/inc/bitmaps.hlst new file mode 100644 index 000000000000..24441a26f688 --- /dev/null +++ b/avmedia/inc/bitmaps.hlst @@ -0,0 +1,32 @@ +/* -*- 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_AVMEDIA_INC_BITMAPS_HRC +#define INCLUDED_AVMEDIA_INC_BITMAPS_HRC + +#define AVMEDIA_IMG_OPEN_NORMAL "avmedia/res/av02048.png" +#define AVMEDIA_IMG_PLAY_NORMAL "avmedia/res/av02049.png" +#define AVMEDIA_IMG_PAUSE_NORMAL "avmedia/res/av02050.png" +#define AVMEDIA_IMG_STOP_NORMAL "avmedia/res/av02051.png" +#define AVMEDIA_IMG_LOOP_NORMAL "avmedia/res/av02052.png" +#define AVMEDIA_IMG_INSERT_NORMAL "avmedia/res/av02053.png" +#define AVMEDIA_IMG_MUTE_NORMAL "avmedia/res/av02054.png" +#define AVMEDIA_IMG_OPEN_LARGE "avmedia/res/avl02048.png" +#define AVMEDIA_IMG_PLAY_LARGE "avmedia/res/avl02049.png" +#define AVMEDIA_IMG_PAUSE_LARGE "avmedia/res/avl02050.png" +#define AVMEDIA_IMG_STOP_LARGE "avmedia/res/avl02051.png" +#define AVMEDIA_IMG_LOOP_LARGE "avmedia/res/avl02052.png" +#define AVMEDIA_IMG_INSERT_LARGE "avmedia/res/avl02053.png" +#define AVMEDIA_IMG_MUTE_LARGE "avmedia/res/avl02054.png" +#define AVMEDIA_BMP_AUDIOLOGO "avmedia/res/avaudiologo.png" +#define AVMEDIA_BMP_EMPTYLOGO "avmedia/res/avemptylogo.png" + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx index f134d3038ef4..6e879244cd07 100644 --- a/avmedia/source/framework/MediaControlBase.cxx +++ b/avmedia/source/framework/MediaControlBase.cxx @@ -26,6 +26,7 @@ #include <svtools/miscopt.hxx> #include <tools/time.hxx> #include <vcl/lstbox.hxx> +#include "bitmaps.hlst" #include "mediacontrol.hrc" #include "helpids.hrc" #include "mediamisc.hxx" @@ -268,34 +269,67 @@ Image MediaControlBase::GetImage(sal_Int32 nImageId) { const bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge(); - switch (nImageId) + OUString sImageId; + + if (bLarge) { - default: - case AVMEDIA_TOOLBOXITEM_PLAY: - nImageId = bLarge ? AVMEDIA_IMG_PLAY_LARGE : AVMEDIA_IMG_PLAY_NORMAL; - break; - case AVMEDIA_TOOLBOXITEM_PAUSE: - nImageId = bLarge ? AVMEDIA_IMG_PAUSE_LARGE : AVMEDIA_IMG_PAUSE_NORMAL; - break; - case AVMEDIA_TOOLBOXITEM_STOP: - nImageId = bLarge ? AVMEDIA_IMG_STOP_LARGE : AVMEDIA_IMG_STOP_NORMAL; - break; - case AVMEDIA_TOOLBOXITEM_MUTE: - nImageId = bLarge ? AVMEDIA_IMG_MUTE_LARGE : AVMEDIA_IMG_MUTE_NORMAL; - break; - case AVMEDIA_TOOLBOXITEM_LOOP: - nImageId = bLarge ? AVMEDIA_IMG_LOOP_LARGE : AVMEDIA_IMG_LOOP_NORMAL; - break; - case AVMEDIA_TOOLBOXITEM_OPEN: - nImageId = bLarge ? AVMEDIA_IMG_OPEN_LARGE : AVMEDIA_IMG_OPEN_NORMAL; - break; - case AVMEDIA_TOOLBOXITEM_INSERT: - nImageId = bLarge ? AVMEDIA_IMG_INSERT_LARGE : AVMEDIA_IMG_INSERT_NORMAL; - break; + switch (nImageId) + { + default: + case AVMEDIA_TOOLBOXITEM_PLAY: + sImageId = AVMEDIA_IMG_PLAY_LARGE; + break; + case AVMEDIA_TOOLBOXITEM_PAUSE: + sImageId = AVMEDIA_IMG_PAUSE_LARGE; + break; + case AVMEDIA_TOOLBOXITEM_STOP: + sImageId = AVMEDIA_IMG_STOP_LARGE; + break; + case AVMEDIA_TOOLBOXITEM_MUTE: + sImageId = AVMEDIA_IMG_MUTE_LARGE; + break; + case AVMEDIA_TOOLBOXITEM_LOOP: + sImageId = AVMEDIA_IMG_LOOP_LARGE; + break; + case AVMEDIA_TOOLBOXITEM_OPEN: + sImageId = AVMEDIA_IMG_OPEN_LARGE; + break; + case AVMEDIA_TOOLBOXITEM_INSERT: + sImageId = AVMEDIA_IMG_INSERT_LARGE; + break; + } + } + else + { + switch (nImageId) + { + default: + case AVMEDIA_TOOLBOXITEM_PLAY: + sImageId = AVMEDIA_IMG_PLAY_NORMAL; + break; + case AVMEDIA_TOOLBOXITEM_PAUSE: + sImageId = AVMEDIA_IMG_PAUSE_NORMAL; + break; + case AVMEDIA_TOOLBOXITEM_STOP: + sImageId = AVMEDIA_IMG_STOP_NORMAL; + break; + case AVMEDIA_TOOLBOXITEM_MUTE: + sImageId = AVMEDIA_IMG_MUTE_NORMAL; + break; + case AVMEDIA_TOOLBOXITEM_LOOP: + sImageId = AVMEDIA_IMG_LOOP_NORMAL; + break; + case AVMEDIA_TOOLBOXITEM_OPEN: + sImageId = AVMEDIA_IMG_OPEN_NORMAL; + break; + case AVMEDIA_TOOLBOXITEM_INSERT: + sImageId = AVMEDIA_IMG_INSERT_NORMAL; + break; + } } - return Image(BitmapEx(AVMEDIA_RESID(nImageId))); + return Image(BitmapEx(sImageId)); } } diff --git a/avmedia/source/framework/mediacontrol.hrc b/avmedia/source/framework/mediacontrol.hrc index c221d65786a2..3086496eb214 100644 --- a/avmedia/source/framework/mediacontrol.hrc +++ b/avmedia/source/framework/mediacontrol.hrc @@ -31,22 +31,6 @@ #define AVMEDIA_STR_INSERT 1035 #define AVMEDIA_STR_MEDIAPLAYER 1036 -#define AVMEDIA_IMG_OPEN_NORMAL 2048 -#define AVMEDIA_IMG_PLAY_NORMAL 2049 -#define AVMEDIA_IMG_PAUSE_NORMAL 2050 -#define AVMEDIA_IMG_STOP_NORMAL 2051 -#define AVMEDIA_IMG_LOOP_NORMAL 2052 -#define AVMEDIA_IMG_INSERT_NORMAL 2053 -#define AVMEDIA_IMG_MUTE_NORMAL 2054 - -#define AVMEDIA_IMG_OPEN_LARGE 2148 -#define AVMEDIA_IMG_PLAY_LARGE 2149 -#define AVMEDIA_IMG_PAUSE_LARGE 2150 -#define AVMEDIA_IMG_STOP_LARGE 2151 -#define AVMEDIA_IMG_LOOP_LARGE 2152 -#define AVMEDIA_IMG_INSERT_LARGE 2153 -#define AVMEDIA_IMG_MUTE_LARGE 2154 - #define AVMEDIA_MEDIA_PATH 4076 #define AVMEDIA_MEDIA_PATH_DEFAULT 4078 diff --git a/avmedia/source/framework/mediacontrol.src b/avmedia/source/framework/mediacontrol.src index 1d3e5855c4aa..e62c43a27b4c 100644 --- a/avmedia/source/framework/mediacontrol.src +++ b/avmedia/source/framework/mediacontrol.src @@ -84,75 +84,6 @@ String AVMEDIA_STR_MEDIAPLAYER Text[en-US] = "Media Player"; }; -Bitmap AVMEDIA_IMG_OPEN_NORMAL -{ - File = "av02048.png"; -}; - -Bitmap AVMEDIA_IMG_PLAY_NORMAL -{ - File = "av02049.png"; -}; - -Bitmap AVMEDIA_IMG_PAUSE_NORMAL -{ - File = "av02050.png"; -}; - -Bitmap AVMEDIA_IMG_STOP_NORMAL -{ - File = "av02051.png"; -}; - -Bitmap AVMEDIA_IMG_LOOP_NORMAL -{ - File = "av02052.png"; -}; - -Bitmap AVMEDIA_IMG_INSERT_NORMAL -{ - File = "av02053.png"; -}; - -Bitmap AVMEDIA_IMG_MUTE_NORMAL -{ - File = "av02054.png"; -}; - -Bitmap AVMEDIA_IMG_OPEN_LARGE -{ - File = "avl02048.png"; -}; - -Bitmap AVMEDIA_IMG_PLAY_LARGE -{ - File = "avl02049.png"; -}; - -Bitmap AVMEDIA_IMG_PAUSE_LARGE -{ - File = "avl02050.png"; -}; - -Bitmap AVMEDIA_IMG_STOP_LARGE -{ - File = "avl02051.png"; -}; - -Bitmap AVMEDIA_IMG_LOOP_LARGE -{ - File = "avl02052.png"; -}; - -Bitmap AVMEDIA_IMG_INSERT_LARGE -{ - File = "avl02053.png"; -}; - -Bitmap AVMEDIA_IMG_MUTE_LARGE -{ - File = "avl02054.png"; -}; String AVMEDIA_MEDIA_PATH { Text[en-US] = "Media Path"; diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 74bb879a5233..71227b86265c 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -20,6 +20,7 @@ #include <avmedia/mediawindow.hxx> #include "mediawindow_impl.hxx" #include "mediamisc.hxx" +#include "bitmaps.hlst" #include "mediawindow.hrc" #include <tools/urlobj.hxx> #include <vcl/layout.hxx> @@ -392,7 +393,7 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL if( !aPrefSize.Width && !aPrefSize.Height ) { - const BitmapEx aBmpEx( AVMEDIA_RESID(AVMEDIA_BMP_AUDIOLOGO) ); + const BitmapEx aBmpEx(AVMEDIA_BMP_AUDIOLOGO); xGraphic.reset( new Graphic( aBmpEx ) ); } } @@ -400,7 +401,7 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL if( !xRet.is() && !xGraphic.get() ) { - const BitmapEx aBmpEx( AVMEDIA_RESID(AVMEDIA_BMP_EMPTYLOGO) ); + const BitmapEx aBmpEx(AVMEDIA_BMP_EMPTYLOGO); xGraphic.reset( new Graphic( aBmpEx ) ); } diff --git a/avmedia/source/viewer/mediawindow.hrc b/avmedia/source/viewer/mediawindow.hrc index 3288eeae83f1..b4ec26c6e357 100644 --- a/avmedia/source/viewer/mediawindow.hrc +++ b/avmedia/source/viewer/mediawindow.hrc @@ -23,7 +23,4 @@ #define AVMEDIA_STR_ALL_FILES 16387 #define AVMEDIA_STR_ERR_URL 16388 -#define AVMEDIA_BMP_AUDIOLOGO 20000 -#define AVMEDIA_BMP_EMPTYLOGO 20001 - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/viewer/mediawindow.src b/avmedia/source/viewer/mediawindow.src index db2749368a1c..9c753a6f5b57 100644 --- a/avmedia/source/viewer/mediawindow.src +++ b/avmedia/source/viewer/mediawindow.src @@ -39,16 +39,6 @@ String AVMEDIA_STR_ALL_FILES Text[en-US] = "All files"; }; -Bitmap AVMEDIA_BMP_AUDIOLOGO -{ - file = "avaudiologo.png"; -}; - -Bitmap AVMEDIA_BMP_EMPTYLOGO -{ - file = "avemptylogo.png"; -}; - String AVMEDIA_STR_ERR_URL { Text[en-US] = "The format of the selected file is not supported."; diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 518b83eaf119..172e4a3610ab 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -23,6 +23,7 @@ #include "mediawindow_impl.hxx" #include "mediaevent_impl.hxx" #include "mediamisc.hxx" +#include "bitmaps.hlst" #include "mediawindow.hrc" #include "helpids.hrc" @@ -605,14 +606,14 @@ void MediaWindowImpl::Paint(vcl::RenderContext& rRenderContext, const tools::Rec if (!mxPlayer.is()) { if (!mpEmptyBmpEx) - mpEmptyBmpEx = new BitmapEx(AVMEDIA_RESID(AVMEDIA_BMP_EMPTYLOGO)); + mpEmptyBmpEx = new BitmapEx(AVMEDIA_BMP_EMPTYLOGO); pLogo = mpEmptyBmpEx; } else if (!mxPlayerWindow.is()) { if (!mpAudioBmpEx) - mpAudioBmpEx = new BitmapEx(AVMEDIA_RESID(AVMEDIA_BMP_AUDIOLOGO)); + mpAudioBmpEx = new BitmapEx(AVMEDIA_BMP_AUDIOLOGO); pLogo = mpAudioBmpEx; } diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc index 0f9150613182..60a2f0fa903e 100644 --- a/basctl/inc/basidesh.hrc +++ b/basctl/inc/basidesh.hrc @@ -24,18 +24,6 @@ #define RID_BASICIDE_OBJECTBAR ( RID_BASICIDE_START + 0 ) -#define RID_BMP_REMOVEWATCH ( RID_BASICIDE_START + 8 ) -#define RID_BMP_INSTALLATION ( RID_BASICIDE_START + 20 ) -#define RID_BMP_DOCUMENT ( RID_BASICIDE_START + 22 ) -#define RID_BMP_MODLIB ( RID_BASICIDE_START + 24 ) -#define RID_BMP_MODLIBNOTLOADED ( RID_BASICIDE_START + 26 ) -#define RID_BMP_MODULE ( RID_BASICIDE_START + 28 ) -#define RID_BMP_MACRO ( RID_BASICIDE_START + 30 ) -#define RID_BMP_DLGLIB ( RID_BASICIDE_START + 32 ) -#define RID_BMP_DLGLIBNOTLOADED ( RID_BASICIDE_START + 34 ) -#define RID_BMP_DIALOG ( RID_BASICIDE_START + 36 ) -#define RID_BMP_LOCKED ( RID_BASICIDE_START + 41 ) - #define RID_STR_SEARCHALLMODULES ( RID_BASICIDE_START + 1 ) #define RID_STR_SEARCHFROMSTART ( RID_BASICIDE_START + 2 ) #define RID_STR_NOMODULE ( RID_BASICIDE_START + 3 ) @@ -122,10 +110,6 @@ #define RID_STR_USERFORMS ( RID_BASICIDE_START + 119 ) #define RID_STR_NORMAL_MODULES ( RID_BASICIDE_START + 120 ) #define RID_STR_CLASS_MODULES ( RID_BASICIDE_START + 121 ) -#define RID_BMP_BRKENABLED ( SID_BASICIDE_START + 122 ) -#define RID_BMP_BRKDISABLED ( SID_BASICIDE_START + 123 ) -#define RID_BMP_STEPMARKER ( SID_BASICIDE_START + 124 ) -#define RID_BMP_ERRORMARKER ( SID_BASICIDE_START + 125 ) //free slots #define RID_STR_PRINTDLG_RANGE ( RID_BASICIDE_START + 130 ) #define RID_STR_PRINTDLG_ALLPAGES ( RID_BASICIDE_START + 131 ) diff --git a/basctl/inc/bitmaps.hlst b/basctl/inc/bitmaps.hlst new file mode 100644 index 000000000000..3dd019785a67 --- /dev/null +++ b/basctl/inc/bitmaps.hlst @@ -0,0 +1,31 @@ +/* -*- 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_BASCTL_INC_BITMAPS_HRC +#define INCLUDED_BASCTL_INC_BITMAPS_HRC + +#define RID_BMP_BRKENABLED "res/im30838.png" +#define RID_BMP_BRKDISABLED "res/im30839.png" +#define RID_BMP_STEPMARKER "res/im30840.png" +#define RID_BMP_ERRORMARKER "res/im30841.png" +#define RID_BMP_LOCKED "res/lock.png" +#define RID_BMP_INSTALLATION "res/harddisk_16.png" +#define RID_BMP_DOCUMENT "res/im30826.png" +#define RID_BMP_MODLIB "res/im30820.png" +#define RID_BMP_MODLIBNOTLOADED "res/im30827.png" +#define RID_BMP_MODULE "res/im30821.png" +#define RID_BMP_MACRO "res/im30822.png" +#define RID_BMP_DLGLIB "res/dialogfolder_16.png" +#define RID_BMP_DLGLIBNOTLOADED "res/dialogfoldernot_16.png" +#define RID_BMP_DIALOG "res/im30823.png" +#define RID_BMP_REMOVEWATCH "res/baswatr.png" + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 7876a0a1ad49..bc137c171825 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -23,6 +23,7 @@ #include "helpid.hrc" #include <basidesh.hrc> +#include "bitmaps.hlst" #include "baside2.hxx" #include "brkdlg.hxx" @@ -74,9 +75,9 @@ SbxVariable* IsSbxVariable (SbxBase* pBase) return nullptr; } -Image GetImage (unsigned nId) +Image GetImage(const OUString& rId) { - return Image(BitmapEx(IDEResId(nId))); + return Image(BitmapEx(rId)); } int const nScrollLine = 12; @@ -1378,7 +1379,7 @@ void BreakPointWindow::ShowMarker(vcl::RenderContext& rRenderContext) Size const aOutSz = GetOutputSize(); long const nLineHeight = GetTextHeight(); - Image aMarker = GetImage(bErrorMarker ? RID_BMP_ERRORMARKER : RID_BMP_STEPMARKER); + Image aMarker = GetImage(bErrorMarker ? OUStringLiteral(RID_BMP_ERRORMARKER) : OUStringLiteral(RID_BMP_STEPMARKER)); Size aMarkerSz(aMarker.GetSizePixel()); aMarkerSz = rRenderContext.PixelToLogic(aMarkerSz); @@ -1568,7 +1569,7 @@ WatchWindow::WatchWindow (Layout* pParent) aRemoveWatchButton->SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) ); aRemoveWatchButton->SetPosPixel( Point( nTextLen + aXEdit->GetSizePixel().Width() + 4, 2 ) ); aRemoveWatchButton->SetHelpId(HID_BASICIDE_REMOVEWATCH); - aRemoveWatchButton->SetModeImage(Image(BitmapEx(IDEResId(RID_BMP_REMOVEWATCH)))); + aRemoveWatchButton->SetModeImage(Image(BitmapEx(RID_BMP_REMOVEWATCH))); aRemoveWatchButton->SetQuickHelpText(IDEResId(RID_STR_REMOVEWATCHTIP)); Size aSz( aRemoveWatchButton->GetModeImage().GetSizePixel() ); aSz.Width() += 6; diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src index 7d05eb495d32..0fd062d44fd5 100644 --- a/basctl/source/basicide/basidesh.src +++ b/basctl/source/basicide/basidesh.src @@ -264,81 +264,6 @@ String RID_STR_SHAREMACROSDIALOGS Text [ en-US ] = "%PRODUCTNAME Macros & Dialogs" ; }; -Bitmap RID_BMP_BRKENABLED -{ - File = "im30838.png"; -}; - -Bitmap RID_BMP_BRKDISABLED -{ - File = "im30839.png"; -}; - -Bitmap RID_BMP_STEPMARKER -{ - File = "im30840.png"; -}; - -Bitmap RID_BMP_ERRORMARKER -{ - File = "im30841.png"; -}; - -Bitmap RID_BMP_LOCKED -{ - File = "lock.png"; -}; - -Bitmap RID_BMP_INSTALLATION -{ - File = "harddisk_16.png"; -}; - -Bitmap RID_BMP_DOCUMENT -{ - File = "im30826.png"; -}; - -Bitmap RID_BMP_MODLIB -{ - File = "im30820.png"; -}; - -Bitmap RID_BMP_MODLIBNOTLOADED -{ - File = "im30827.png"; -}; - -Bitmap RID_BMP_MODULE -{ - File = "im30821.png"; -}; - -Bitmap RID_BMP_MACRO -{ - File = "im30822.png"; -}; - -Bitmap RID_BMP_DLGLIB -{ - File = "dialogfolder_16.png"; -}; - -Bitmap RID_BMP_DLGLIBNOTLOADED -{ - File = "dialogfoldernot_16.png"; -}; - -Bitmap RID_BMP_DIALOG -{ - File = "im30823.png"; -}; - -Bitmap RID_BMP_REMOVEWATCH -{ - File = "baswatr.png"; -}; - String RID_STR_REMOVEWATCHTIP { Text [ en-US ] = "Remove Watch" ; diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index 5280399b1a0e..39f026b651ac 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -21,6 +21,7 @@ #include <bastypes.hxx> #include <bastype2.hxx> #include <basidesh.hrc> +#include <bitmaps.hlst> #include <iderid.hxx> #include <o3tl/make_unique.hxx> #include <tools/urlobj.hxx> @@ -254,15 +255,15 @@ void TreeListBox::ImpCreateLibEntries( SvTreeListEntry* pDocumentRootEntry, cons } // create tree list box entry - sal_uInt16 nId; + OUString sId; if ( ( nMode & BrowseMode::Dialogs ) && !( nMode & BrowseMode::Modules ) ) - nId = bLoaded ? RID_BMP_DLGLIB : RID_BMP_DLGLIBNOTLOADED; + sId = bLoaded ? OUStringLiteral(RID_BMP_DLGLIB) : OUStringLiteral(RID_BMP_DLGLIBNOTLOADED); else - nId = bLoaded ? RID_BMP_MODLIB : RID_BMP_MODLIBNOTLOADED; + sId = bLoaded ? OUStringLiteral(RID_BMP_MODLIB) : OUStringLiteral(RID_BMP_MODLIBNOTLOADED); SvTreeListEntry* pLibRootEntry = FindEntry( pDocumentRootEntry, aLibName, OBJ_TYPE_LIBRARY ); if ( pLibRootEntry ) { - SetEntryBitmaps(pLibRootEntry, Image(BitmapEx(IDEResId(nId)))); + SetEntryBitmaps(pLibRootEntry, Image(BitmapEx(sId))); if ( IsExpanded(pLibRootEntry)) ImpCreateLibSubEntries( pLibRootEntry, rDocument, aLibName ); } @@ -270,7 +271,7 @@ void TreeListBox::ImpCreateLibEntries( SvTreeListEntry* pDocumentRootEntry, cons { AddEntry( aLibName, - Image(BitmapEx(IDEResId(nId))), + Image(BitmapEx(sId)), pDocumentRootEntry, true, o3tl::make_unique<Entry>(OBJ_TYPE_LIBRARY)); } @@ -306,7 +307,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const { pModuleEntry = AddEntry( aModName, - Image(BitmapEx(IDEResId(RID_BMP_MODULE))), + Image(BitmapEx(RID_BMP_MODULE)), pLibRootEntry, false, o3tl::make_unique<Entry>(OBJ_TYPE_MODULE)); } @@ -326,7 +327,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const { AddEntry( aName, - Image(BitmapEx(IDEResId(RID_BMP_MACRO))), + Image(BitmapEx(RID_BMP_MACRO)), pModuleEntry, false, o3tl::make_unique<Entry>( OBJ_TYPE_METHOD)); @@ -365,7 +366,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const { AddEntry( aDlgName, - Image(BitmapEx(IDEResId(RID_BMP_DIALOG))), + Image(BitmapEx(RID_BMP_DIALOG)), pLibRootEntry, false, o3tl::make_unique<Entry>(OBJ_TYPE_DIALOG)); } @@ -393,7 +394,7 @@ void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvTreeListEntry* pLibRootEntr SvTreeListEntry* pLibSubRootEntry = FindEntry( pLibRootEntry, aEntryName, eType ); if( pLibSubRootEntry ) { - SetEntryBitmaps(pLibSubRootEntry, Image(BitmapEx(IDEResId(RID_BMP_MODLIB)))); + SetEntryBitmaps(pLibSubRootEntry, Image(BitmapEx(RID_BMP_MODLIB))); if ( IsExpanded( pLibSubRootEntry ) ) ImpCreateLibSubSubEntriesInVBAMode( pLibSubRootEntry, rDocument, rLibName ); } @@ -401,7 +402,7 @@ void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvTreeListEntry* pLibRootEntr { AddEntry( aEntryName, - Image(BitmapEx(IDEResId(RID_BMP_MODLIB))), + Image(BitmapEx(RID_BMP_MODLIB)), pLibRootEntry, true, o3tl::make_unique<Entry>(eType)); } } @@ -462,7 +463,7 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvTreeListEntry* pLibSubRo { pModuleEntry = AddEntry( aEntryName, - Image(BitmapEx(IDEResId(RID_BMP_MODULE))), + Image(BitmapEx(RID_BMP_MODULE)), pLibSubRootEntry, false, o3tl::make_unique<Entry>(OBJ_TYPE_MODULE)); } @@ -482,7 +483,7 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvTreeListEntry* pLibSubRo { AddEntry( aName, - Image(BitmapEx(IDEResId(RID_BMP_MACRO))), + Image(BitmapEx(RID_BMP_MACRO)), pModuleEntry, false, o3tl::make_unique<Entry>(OBJ_TYPE_METHOD)); } @@ -770,12 +771,12 @@ void TreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& r else { // default icon - rImage = Image(BitmapEx(IDEResId(RID_BMP_DOCUMENT))); + rImage = Image(BitmapEx(RID_BMP_DOCUMENT)); } } else { - rImage = Image(BitmapEx(IDEResId(RID_BMP_INSTALLATION))); + rImage = Image(BitmapEx(RID_BMP_INSTALLATION)); } } diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx index 5447dbf585de..489cb1d1ee83 100644 --- a/basctl/source/basicide/bastype3.cxx +++ b/basctl/source/basicide/bastype3.cxx @@ -21,6 +21,7 @@ #include <basic/sbmod.hxx> #include <bastype2.hxx> #include <basidesh.hrc> +#include "bitmaps.hlst" #include <bastypes.hxx> #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/script/XLibraryContainerPassword.hpp> @@ -106,7 +107,7 @@ void TreeListBox::RequestingChildren( SvTreeListEntry* pEntry ) // exchange image const bool bDlgMode = (nMode & BrowseMode::Dialogs) && !(nMode & BrowseMode::Modules); - Image aImage(BitmapEx(IDEResId(bDlgMode ? RID_BMP_DLGLIB : RID_BMP_MODLIB))); + Image aImage(BitmapEx(bDlgMode ? OUStringLiteral(RID_BMP_DLGLIB) : OUStringLiteral(RID_BMP_MODLIB))); SetEntryBitmaps( pEntry, aImage ); } else diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 4bd2b1078ca3..5a2f06d497fa 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -21,6 +21,7 @@ #include <moduldlg.hxx> #include <basidesh.hxx> #include <basidesh.hrc> +#include <bitmaps.hlst> #include <iderdll.hxx> #include <iderdll2.hxx> #include <o3tl/make_unique.hxx> @@ -1434,7 +1435,7 @@ SvTreeListEntry* LibPage::ImpInsertLibEntry( const OUString& rLibName, sal_uLong if (bProtected) { - Image aImage(BitmapEx(IDEResId(RID_BMP_LOCKED))); + Image aImage(BitmapEx(RID_BMP_LOCKED)); m_pLibBox->SetExpandedEntryBmp(pNewEntry, aImage); m_pLibBox->SetCollapsedEntryBmp(pNewEntry, aImage); } @@ -1527,10 +1528,10 @@ void createLibImpl( vcl::Window* pWin, const ScriptDocument& rDocument, BrowseMode nMode = pBasicBox->GetMode(); bool bDlgMode = ( nMode & BrowseMode::Dialogs ) && !( nMode & BrowseMode::Modules ); - const sal_uInt16 nId = bDlgMode ? RID_BMP_DLGLIB : RID_BMP_MODLIB; + const OUString sId = bDlgMode ? OUStringLiteral(RID_BMP_DLGLIB) : OUStringLiteral(RID_BMP_MODLIB); SvTreeListEntry* pNewLibEntry = pBasicBox->AddEntry( aLibName, - Image(BitmapEx(IDEResId(nId))), + Image(BitmapEx(sId)), pRootEntry, false, o3tl::make_unique<Entry>(OBJ_TYPE_LIBRARY)); DBG_ASSERT( pNewLibEntry, "Insert entry failed!" ); @@ -1539,7 +1540,7 @@ void createLibImpl( vcl::Window* pWin, const ScriptDocument& rDocument, { SvTreeListEntry* pEntry_ = pBasicBox->AddEntry( aModName, - Image(BitmapEx(IDEResId(RID_BMP_MODULE))), + Image(BitmapEx(RID_BMP_MODULE)), pNewLibEntry, false, o3tl::make_unique<Entry>(OBJ_TYPE_MODULE)); DBG_ASSERT( pEntry_, "Insert entry failed!" ); diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 165fd0b61701..3029bfe92467 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -20,6 +20,7 @@ #include <sal/config.h> #include "basidesh.hrc" +#include "bitmaps.hlst" #include "moduldlg.hxx" #include "localizationmgr.hxx" @@ -849,7 +850,7 @@ void ObjectPage::NewDialog() { pEntry = m_pBasicBox->AddEntry( aDlgName, - Image(BitmapEx(IDEResId(RID_BMP_DIALOG))), + Image(BitmapEx(RID_BMP_DIALOG)), pLibEntry, false, o3tl::make_unique<Entry>(OBJ_TYPE_DIALOG)); DBG_ASSERT( pEntry, "Insert entry failed!" ); @@ -1020,7 +1021,7 @@ SbModule* createModImpl( vcl::Window* pWin, const ScriptDocument& rDocument, { pEntry = rBasicBox.AddEntry( aModName, - Image(BitmapEx(IDEResId(RID_BMP_MODULE))), + Image(BitmapEx(RID_BMP_MODULE)), pSubRootEntry, false, o3tl::make_unique<Entry>(OBJ_TYPE_MODULE)); DBG_ASSERT( pEntry, "Insert entry failed!" ); diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk index d1c2bed9e1f8..0685402145bb 100644 --- a/connectivity/Library_hsqldb.mk +++ b/connectivity/Library_hsqldb.mk @@ -10,6 +10,7 @@ $(eval $(call gb_Library_Library,hsqldb)) $(eval $(call gb_Library_set_include,hsqldb,\ + -I$(SRCDIR)/connectivity/inc \ -I$(SRCDIR)/connectivity/source/inc \ $$(INCLUDE) \ )) diff --git a/connectivity/inc/bitmaps.hlst b/connectivity/inc/bitmaps.hlst new file mode 100644 index 000000000000..d51533745e2e --- /dev/null +++ b/connectivity/inc/bitmaps.hlst @@ -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_CONNECTIVITY_INC_BITMAPS_HRC +#define INCLUDED_CONNECTIVITY_INC_BITMAPS_HRC + +#define LINKED_TEXT_TABLE_IMAGE_RESOURCE "dbaccess/res/linked_text_table.png" + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index 7f7032525ae5..fbb86796442f 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -20,7 +20,7 @@ #include "hsqldb/HConnection.hxx" #include "hsqldb/HTools.hxx" -#include "hsqlui.hrc" +#include "bitmaps.hlst" #include <connectivity/dbtools.hxx> @@ -323,7 +323,6 @@ namespace connectivity { namespace hsqldb // load the graphic from the global graphic repository aImageURL.append( "private:graphicrepository/" ); // the relative path within the images.zip - aImageURL.append( "database/" ); aImageURL.append( LINKED_TEXT_TABLE_IMAGE_RESOURCE ); // the name of the graphic to use OUString sImageURL( aImageURL.makeStringAndClear() ); diff --git a/connectivity/source/drivers/hsqldb/hsqlui.hrc b/connectivity/source/drivers/hsqldb/hsqlui.hrc deleted file mode 100644 index 6ca44358cc30..000000000000 --- a/connectivity/source/drivers/hsqldb/hsqlui.hrc +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef CONNECTIVITY_HSQLUI_HRC -#define CONNECTIVITY_HSQLUI_HRC - -#define LINKED_TEXT_TABLE_IMAGE_RESOURCE "linked_text_table.png" - -#endif // CONNECTIVITY_HSQLUI_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/hsqlui.ilst b/connectivity/source/drivers/hsqldb/hsqlui.ilst deleted file mode 100644 index 9590ff4d9e20..000000000000 --- a/connectivity/source/drivers/hsqldb/hsqlui.ilst +++ /dev/null @@ -1 +0,0 @@ -%MODULE%/database/linked_text_table.png diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk index f5e1a981189a..ac6db418161b 100644 --- a/cui/AllLangResTarget_cui.mk +++ b/cui/AllLangResTarget_cui.mk @@ -52,8 +52,4 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\ cui/source/tabpages/strings.src \ )) -$(eval $(call gb_SrsTarget_add_nonlocalizable_files,cui/res,\ - cui/source/tabpages/align.src \ -)) - # vim: set noet sw=4 ts=4: diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 74fbc31f0c24..813bff0eba0c 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -13,6 +13,7 @@ $(eval $(call gb_Library_set_componentfile,cui,cui/util/cui)) $(eval $(call gb_Library_set_include,cui,\ $$(INCLUDE) \ + -I$(SRCDIR)/cui/inc \ -I$(SRCDIR)/cui/source/inc \ )) diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst new file mode 100644 index 000000000000..075e05e94d10 --- /dev/null +++ b/cui/inc/bitmaps.hlst @@ -0,0 +1,69 @@ +/* -*- 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_CUI_INC_BITMAPS_HRC +#define INCLUDED_CUI_INC_BITMAPS_HRC + +#define RID_SVXBMP_CELL_NONE "svx/res/pr01.png" +#define RID_SVXBMP_CELL_ALL "svx/res/pr02.png" +#define RID_SVXBMP_CELL_LR "svx/res/pr03.png" +#define RID_SVXBMP_CELL_TB "svx/res/pr04.png" +#define RID_SVXBMP_CELL_L "svx/res/pr05.png" +#define RID_SVXBMP_CELL_DIAG "svx/res/pr06.png" +#define RID_SVXBMP_HOR_NONE "svx/res/pr07.png" +#define RID_SVXBMP_HOR_OUTER "svx/res/pr08.png" +#define RID_SVXBMP_HOR_HOR "svx/res/pr09.png" +#define RID_SVXBMP_HOR_ALL "svx/res/pr010.png" +#define RID_SVXBMP_HOR_OUTER2 "svx/res/pr011.png" +#define RID_SVXBMP_VER_NONE "svx/res/pr012.png" +#define RID_SVXBMP_VER_OUTER "svx/res/pr013.png" +#define RID_SVXBMP_VER_VER "svx/res/pr014.png" +#define RID_SVXBMP_VER_ALL "svx/res/pr015.png" +#define RID_SVXBMP_VER_OUTER2 "svx/res/pr016.png" +#define RID_SVXBMP_TABLE_NONE "svx/res/pr017.png" +#define RID_SVXBMP_TABLE_OUTER "svx/res/pr018.png" +#define RID_SVXBMP_TABLE_OUTERH "svx/res/pr019.png" +#define RID_SVXBMP_TABLE_ALL "svx/res/pr020.png" +#define RID_SVXBMP_TABLE_OUTER2 "svx/res/pr021.png" +#define RID_SVXBMP_SHADOWNONE "svx/res/sh01.png" +#define RID_SVXBMP_SHADOW_BOT_RIGHT "svx/res/sh02.png" +#define RID_SVXBMP_SHADOW_BOT_LEFT "svx/res/sh03.png" +#define RID_SVXBMP_SHADOW_TOP_RIGHT "svx/res/sh04.png" +#define RID_SVXBMP_SHADOW_TOP_LEFT "svx/res/sh05.png" + +#define RID_SVXBMP_BOTTOMLOCK "svx/res/lo01.png" +#define RID_SVXBMP_TOPLOCK "svx/res/lo02.png" +#define RID_SVXBMP_CELLLOCK "svx/res/lo03.png" + +#define RID_SVXBMP_LOCK "res/lock.png" + +#define RID_SVXBMP_THEME_NORMAL_BIG "svx/res/galnorl.png" +#define RID_SVXBMP_THEME_READONLY_BIG "svx/res/galrdol.png" +#define RID_SVXBMP_THEME_DEFAULT_BIG "svx/res/galdefl.png" + +#define RID_CUIBMP_HARDDISK "res/harddisk_16.png" +#define RID_CUIBMP_LIB "res/im30820.png" +#define RID_CUIBMP_MACRO "res/im30821.png" +#define RID_CUIBMP_DOC "res/im30826.png" +#define RID_CUIBMP_COLLAPSED "res/plus.png" +#define RID_CUIBMP_EXPANDED "res/minus.png" + +#define RID_SVXBMP_HLINETTP "res/hlinettp.png" +#define RID_SVXBMP_HLMAILTP "res/hlmailtp.png" +#define RID_SVXBMP_HLDOCTP "res/hldoctp.png" +#define RID_SVXBMP_HLDOCNTP "res/hldocntp.png" +#define RID_SVXBMP_SCRIPT "res/script.png" +#define RID_SVXBMP_ADRESSBOOK "res/adrbook.png" +#define RID_SVXBMP_FILEOPEN "res/fileopen.png" +#define RID_SVXBMP_TARGET "res/target.png" +#define RID_SVXBMP_NEWDOC "res/newdoc.png" + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 8e47238ca3ee..8ca7a614b315 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -46,6 +46,7 @@ #include <basic/basmgr.hxx> #include <tools/urlobj.hxx> #include "cuires.hrc" +#include "bitmaps.hlst" #include <sfx2/app.hxx> #include <sfx2/minfitem.hxx> #include <comphelper/documentinfo.hxx> @@ -354,17 +355,17 @@ struct SvxConfigGroupBoxResource_Impl }; SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() : - m_hdImage(BitmapEx(CUI_RES(RID_CUIBMP_HARDDISK))), - m_libImage(BitmapEx(CUI_RES(RID_CUIBMP_LIB))), - m_macImage(BitmapEx(CUI_RES(RID_CUIBMP_MACRO))), - m_docImage(BitmapEx(CUI_RES(RID_CUIBMP_DOC))), + m_hdImage(BitmapEx(RID_CUIBMP_HARDDISK)), + m_libImage(BitmapEx(RID_CUIBMP_LIB)), + m_macImage(BitmapEx(RID_CUIBMP_MACRO)), + m_docImage(BitmapEx(RID_CUIBMP_DOC)), m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)), m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)), m_sMacros(CUI_RESSTR(RID_SVXSTR_BASICMACROS)), m_sDlgMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)), m_aStrGroupStyles(CUI_RESSTR(RID_SVXSTR_GROUP_STYLES)), - m_collapsedImage(BitmapEx(CUI_RES(RID_CUIBMP_COLLAPSED))), - m_expandedImage(BitmapEx(CUI_RES(RID_CUIBMP_EXPANDED))) + m_collapsedImage(BitmapEx(RID_CUIBMP_COLLAPSED)), + m_expandedImage(BitmapEx(RID_CUIBMP_EXPANDED)) { } diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 1b3fd74c19a5..55635acd8449 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -29,6 +29,7 @@ #include <svx/fmresids.hrc> #include <svx/dialmgr.hxx> #include <cuires.hrc> +#include <bitmaps.hlst> #include <sfx2/app.hxx> #include <sfx2/msg.hxx> #include <sfx2/msgpool.hxx> @@ -202,10 +203,10 @@ SvxConfigGroupListBox::SvxConfigGroupListBox(vcl::Window* pParent, WinBits nStyl , m_bShowSlots(false) , pFunctionListBox(nullptr) , m_pImageProvider(nullptr) - , m_hdImage(BitmapEx(CUI_RES(RID_CUIBMP_HARDDISK))) - , m_libImage(BitmapEx(CUI_RES(RID_CUIBMP_LIB))) - , m_macImage(BitmapEx(CUI_RES(RID_CUIBMP_MACRO))) - , m_docImage(BitmapEx(CUI_RES(RID_CUIBMP_DOC))) + , m_hdImage(BitmapEx(RID_CUIBMP_HARDDISK)) + , m_libImage(BitmapEx(RID_CUIBMP_LIB)) + , m_macImage(BitmapEx(RID_CUIBMP_MACRO)) + , m_docImage(BitmapEx(RID_CUIBMP_DOC)) , m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)) , m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)) { diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 3754d5c12645..8c023fde7861 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -24,6 +24,7 @@ #include "hlmailtp.hxx" #include "hldoctp.hxx" #include "hldocntp.hxx" +#include "bitmaps.hlst" #include <svx/svxids.hrc> #include <vector> @@ -86,10 +87,10 @@ SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings) std::vector<Image> imgVector; OUString aStrTitle; SvxIconChoiceCtrlEntry *pEntry; - imgVector.push_back(Image(BitmapEx(CUI_RES(RID_SVXBMP_HLINETTP)))); - imgVector.push_back(Image(BitmapEx(CUI_RES(RID_SVXBMP_HLMAILTP)))); - imgVector.push_back(Image(BitmapEx(CUI_RES(RID_SVXBMP_HLDOCTP)))); - imgVector.push_back(Image(BitmapEx(CUI_RES(RID_SVXBMP_HLDOCNTP)))); + imgVector.push_back(Image(BitmapEx(RID_SVXBMP_HLINETTP))); + imgVector.push_back(Image(BitmapEx(RID_SVXBMP_HLMAILTP))); + imgVector.push_back(Image(BitmapEx(RID_SVXBMP_HLDOCTP))); + imgVector.push_back(Image(BitmapEx(RID_SVXBMP_HLDOCNTP))); for(Image &aImage : imgVector ) { diff --git a/cui/source/dialogs/cuires.src b/cui/source/dialogs/cuires.src index 4ac3bc264043..5e43e24a21e6 100644 --- a/cui/source/dialogs/cuires.src +++ b/cui/source/dialogs/cuires.src @@ -70,36 +70,6 @@ String RID_SVXSTR_EDIT_GRAPHIC Text [ en-US ] = "Link" ; }; -Bitmap RID_CUIBMP_HARDDISK -{ - File = "harddisk_16.png"; -}; - -Bitmap RID_CUIBMP_LIB -{ - File = "im30820.png"; -}; - -Bitmap RID_CUIBMP_MACRO -{ - File = "im30821.png"; -}; - -Bitmap RID_CUIBMP_DOC -{ - File = "im30826.png"; -}; - -Bitmap RID_CUIBMP_COLLAPSED -{ - File = "plus.bmp" ; -}; - -Bitmap RID_CUIBMP_EXPANDED -{ - File = "minus.bmp" ; -}; - String RID_SVXSTR_LOADACCELCONFIG { Text [ en-US ] = "Load Keyboard Configuration" ; diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src index 6c68a7c2025d..43d94175a970 100644 --- a/cui/source/dialogs/gallery.src +++ b/cui/source/dialogs/gallery.src @@ -43,19 +43,4 @@ String RID_SVXSTR_GALLERY_ID_EXISTS Text [ en-US ] = "This ID already exists..." ; }; -Bitmap RID_SVXBMP_THEME_NORMAL_BIG -{ - File = "galnorl.png" ; -}; - -Bitmap RID_SVXBMP_THEME_READONLY_BIG -{ - File = "galrdol.png" ; -}; - -Bitmap RID_SVXBMP_THEME_DEFAULT_BIG -{ - File = "galdefl.png" ; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index efe4ccc75969..34ca087432b1 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -38,6 +38,8 @@ #include <com/sun/star/ui/dialogs/FolderPicker.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> +#include "bitmaps.hlst" + using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::uno; @@ -105,7 +107,7 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDia get(m_pCbbPath, "path"); m_pCbbPath->SetSmartProtocol(INetProtocol::File); get(m_pBtCreate, "create"); - BitmapEx aBitmap(CUI_RES(RID_SVXBMP_NEWDOC)); + BitmapEx aBitmap(RID_SVXBMP_NEWDOC); aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality ); m_pBtCreate->SetModeImage(Image(aBitmap)); get(m_pLbDocTypes, "types"); diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 5d970fe6c465..1c002d1035fb 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -24,6 +24,7 @@ #include "hldoctp.hxx" #include "hlmarkwn_def.hxx" +#include "bitmaps.hlst" sal_Char const sHash[] = "#"; sal_Char const sFileScheme[] = INET_FILE_SCHEME; @@ -41,13 +42,13 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* p get(m_pCbbPath, "path"); m_pCbbPath->SetSmartProtocol(INetProtocol::File); get(m_pBtFileopen, "fileopen"); - BitmapEx aBitmap(CUI_RES(RID_SVXBMP_FILEOPEN)); + BitmapEx aBitmap(RID_SVXBMP_FILEOPEN); aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality); m_pBtFileopen->SetModeImage(Image(aBitmap)); get(m_pEdTarget, "target"); get(m_pFtFullURL, "url"); get(m_pBtBrowse, "browse"); - aBitmap = BitmapEx(CUI_RES(RID_SVXBMP_TARGET)); + aBitmap = BitmapEx(RID_SVXBMP_TARGET); aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality ); m_pBtBrowse->SetModeImage(Image(aBitmap)); diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 3b617bd6205e..1edb472dd525 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -28,6 +28,7 @@ #include <unotools/moduleoptions.hxx> #include "hlmailtp.hxx" +#include "bitmaps.hlst" using namespace ::com::sun::star; @@ -44,7 +45,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* get(m_pCbbReceiver, "receiver"); m_pCbbReceiver->SetSmartProtocol(INetProtocol::Mailto); get(m_pBtAdrBook, "adressbook"); - BitmapEx aBitmap(CUI_RES(RID_SVXBMP_ADRESSBOOK)); + BitmapEx aBitmap(RID_SVXBMP_ADRESSBOOK); aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality ); m_pBtAdrBook->SetModeImage(Image(aBitmap)); get(m_pFtSubject, "subject_label"); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index f8370ef242e5..e85226c9c1e1 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -32,6 +32,7 @@ #include "macroass.hxx" #include <svx/svxdlg.hxx> #include <cuires.hrc> +#include <bitmaps.hlst> #include <vcl/builderfactory.hxx> using namespace ::ucbhelper; @@ -173,7 +174,7 @@ void SvxHyperlinkTabPageBase::InitStdControls () get(mpEdIndication, "indication"); get(mpEdText, "name"); get(mpBtScript, "script"); - BitmapEx aBitmap(CUI_RES(RID_SVXBMP_SCRIPT)); + BitmapEx aBitmap(RID_SVXBMP_SCRIPT); aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality ); mpBtScript->SetModeImage(Image(aBitmap)); diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src index 0641d7c21dba..ff3bd695ada8 100644 --- a/cui/source/dialogs/hyperdlg.src +++ b/cui/source/dialogs/hyperdlg.src @@ -94,49 +94,4 @@ String RID_SVXSTR_HYPERDLG_QUERYOVERWRITE Text [ en-US ] = "The file already exists. Overwrite?" ; }; -Bitmap RID_SVXBMP_HLINETTP -{ - File = "hlinettp.png"; -}; - -Bitmap RID_SVXBMP_HLMAILTP -{ - File = "hlmailtp.png"; -}; - -Bitmap RID_SVXBMP_HLDOCTP -{ - File = "hldoctp.png"; -}; - -Bitmap RID_SVXBMP_HLDOCNTP -{ - File = "hldocntp.png"; -}; - -Bitmap RID_SVXBMP_SCRIPT -{ - File = "script.png"; -}; - -Bitmap RID_SVXBMP_ADRESSBOOK -{ - File = "adrbook.png"; -}; - -Bitmap RID_SVXBMP_FILEOPEN -{ - File = "fileopen.png"; -}; - -Bitmap RID_SVXBMP_TARGET -{ - File = "target.png"; -}; - -Bitmap RID_SVXBMP_NEWDOC -{ - File = "newdoc.png"; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index ffe0f300e6ab..438c87b50957 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -28,6 +28,7 @@ #include <osl/mutex.hxx> #include <cuires.hrc> +#include <bitmaps.hlst> #include "scriptdlg.hxx" #include <dialmgr.hxx> #include "selector.hxx" @@ -77,10 +78,10 @@ void ShowErrorDialog( const Any& aException ) SFTreeListBox::SFTreeListBox(vcl::Window* pParent) : SvTreeListBox(pParent) - , m_hdImage(BitmapEx(CUI_RES(RID_CUIBMP_HARDDISK))) - , m_libImage(BitmapEx(CUI_RES(RID_CUIBMP_LIB))) - , m_macImage(BitmapEx(CUI_RES(RID_CUIBMP_MACRO))) - , m_docImage(BitmapEx(CUI_RES(RID_CUIBMP_DOC))) + , m_hdImage(BitmapEx(RID_CUIBMP_HARDDISK)) + , m_libImage(BitmapEx(RID_CUIBMP_LIB)) + , m_macImage(BitmapEx(RID_CUIBMP_MACRO)) + , m_docImage(BitmapEx(RID_CUIBMP_DOC)) , m_sMyMacros(CUI_RESSTR(RID_SVXSTR_MYMACROS)) , m_sProdMacros(CUI_RESSTR(RID_SVXSTR_PRODMACROS)) { @@ -238,7 +239,7 @@ void SFTreeListBox::Init( const OUString& language ) Reference< browse::XBrowseNode > langEntries = getLangNodeFromRootNode( children[ n ], lang ); - insertEntry( uiName, app ? RID_CUIBMP_HARDDISK : RID_CUIBMP_DOC, + insertEntry( uiName, app ? OUStringLiteral(RID_CUIBMP_HARDDISK) : OUStringLiteral(RID_CUIBMP_DOC), nullptr, true, o3tl::make_unique< SFEntry >( OBJTYPE_SFROOT, langEntries, xDocumentModel ), factoryURL ); } @@ -335,11 +336,11 @@ bool SFTreeListBox::ExpandingHdl() } SvTreeListEntry * SFTreeListBox::insertEntry( - OUString const & rText, sal_uInt16 nBitmap, SvTreeListEntry * pParent, + OUString const & rText, OUString const & rBitmap, SvTreeListEntry * pParent, bool bChildrenOnDemand, std::unique_ptr< SFEntry > && aUserData, const OUString& factoryURL ) { SvTreeListEntry * p; - if( nBitmap == RID_CUIBMP_DOC && !factoryURL.isEmpty() ) + if (rBitmap == RID_CUIBMP_DOC && !factoryURL.isEmpty()) { Image aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL) ); p = InsertEntry( @@ -348,29 +349,29 @@ SvTreeListEntry * SFTreeListBox::insertEntry( } else { - p = insertEntry( rText, nBitmap, pParent, bChildrenOnDemand, std::move(aUserData) ); + p = insertEntry(rText, rBitmap, pParent, bChildrenOnDemand, std::move(aUserData)); } return p; } SvTreeListEntry * SFTreeListBox::insertEntry( - OUString const & rText, sal_uInt16 nBitmap, SvTreeListEntry * pParent, + OUString const & rText, const OUString &rBitmap, SvTreeListEntry * pParent, bool bChildrenOnDemand, std::unique_ptr< SFEntry > && aUserData ) { Image aImage; - if( nBitmap == RID_CUIBMP_HARDDISK ) + if (rBitmap == RID_CUIBMP_HARDDISK) { aImage = m_hdImage; } - else if( nBitmap == RID_CUIBMP_LIB ) + else if (rBitmap == RID_CUIBMP_LIB) { aImage = m_libImage; } - else if( nBitmap == RID_CUIBMP_MACRO ) + else if (rBitmap == RID_CUIBMP_MACRO) { aImage = m_macImage; } - else if( nBitmap == RID_CUIBMP_DOC ) + else if (rBitmap == RID_CUIBMP_DOC) { aImage = m_docImage; } diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 1ee2819e698b..4c75db05aa0f 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -28,13 +28,6 @@ // RID_SVX_START + 0 unused #define RID_SVXSTR_OPTIONS_RESTART (RID_SVX_START + 1) -#define RID_CUIBMP_HARDDISK (RID_SVX_START + 4) -#define RID_CUIBMP_LIB (RID_SVX_START + 5) -#define RID_CUIBMP_MACRO (RID_SVX_START + 6) -#define RID_CUIBMP_DOC (RID_SVX_START + 7) -#define RID_CUIBMP_COLLAPSED (RID_SVX_START + 8) -#define RID_CUIBMP_EXPANDED (RID_SVX_START + 9) - // Gallery #define RID_CUI_GALLERY_START (RID_SVX_START + 360) // RID_CUI_GALLERY_END (RID_SVX_START + 410) @@ -130,7 +123,6 @@ #define RID_SVXSTR_JRE_FAILED_VERSION (RID_SVX_START + 257) #define RID_SVXSTR_JAVA_START_PARAM (RID_SVX_START + 258) #define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003) -#define RID_SVXBMP_LOCK (RID_SVX_START + 118) #define RID_SVXPAGE_BASICIDE_OPTIONS (RID_SVX_START + 209) #define RID_SVXSTR_KEY_AUTOCORRECT_DIR (RID_SVX_START + 1004) //? #define RID_SVXSTR_KEY_DICTIONARY_PATH (RID_SVX_START + 1010)//? @@ -161,44 +153,6 @@ #define STR_MODIFY (RID_SVX_START + 336)//from optdict.src // hyperlink dialog -#define RID_SVXBMP_SCRIPT (RID_SVX_START + 550) -#define RID_SVXBMP_TARGET (RID_SVX_START + 551) -#define RID_SVXBMP_FILEOPEN (RID_SVX_START + 552) -#define RID_SVXBMP_NEWDOC (RID_SVX_START + 553) -#define RID_SVXBMP_ADRESSBOOK (RID_SVX_START + 555) -#define RID_SVXBMP_HLINETTP (RID_SVX_START + 556) -#define RID_SVXBMP_HLMAILTP (RID_SVX_START + 557) -#define RID_SVXBMP_HLDOCTP (RID_SVX_START + 558) -#define RID_SVXBMP_HLDOCNTP (RID_SVX_START + 559) -#define RID_SVXBMP_BOTTOMLOCK (RID_SVX_START + 560) -#define RID_SVXBMP_TOPLOCK (RID_SVX_START + 561) -#define RID_SVXBMP_CELLLOCK (RID_SVX_START + 562) -#define RID_SVXBMP_SHADOWNONE (RID_SVX_START + 563) -#define RID_SVXBMP_SHADOW_BOT_RIGHT (RID_SVX_START + 564) -#define RID_SVXBMP_SHADOW_BOT_LEFT (RID_SVX_START + 565) -#define RID_SVXBMP_SHADOW_TOP_RIGHT (RID_SVX_START + 566) -#define RID_SVXBMP_SHADOW_TOP_LEFT (RID_SVX_START + 567) -#define RID_SVXBMP_CELL_NONE (RID_SVX_START + 568) -#define RID_SVXBMP_CELL_ALL (RID_SVX_START + 569) -#define RID_SVXBMP_CELL_LR (RID_SVX_START + 570) -#define RID_SVXBMP_CELL_TB (RID_SVX_START + 571) -#define RID_SVXBMP_CELL_L (RID_SVX_START + 572) -#define RID_SVXBMP_CELL_DIAG (RID_SVX_START + 573) -#define RID_SVXBMP_HOR_NONE (RID_SVX_START + 574) -#define RID_SVXBMP_HOR_OUTER (RID_SVX_START + 575) -#define RID_SVXBMP_HOR_HOR (RID_SVX_START + 576) -#define RID_SVXBMP_HOR_ALL (RID_SVX_START + 577) -#define RID_SVXBMP_HOR_OUTER2 (RID_SVX_START + 578) -#define RID_SVXBMP_VER_NONE (RID_SVX_START + 579) -#define RID_SVXBMP_VER_OUTER (RID_SVX_START + 580) -#define RID_SVXBMP_VER_VER (RID_SVX_START + 581) -#define RID_SVXBMP_VER_ALL (RID_SVX_START + 582) -#define RID_SVXBMP_VER_OUTER2 (RID_SVX_START + 583) -#define RID_SVXBMP_TABLE_NONE (RID_SVX_START + 584) -#define RID_SVXBMP_TABLE_OUTER (RID_SVX_START + 585) -#define RID_SVXBMP_TABLE_OUTERH (RID_SVX_START + 586) -#define RID_SVXBMP_TABLE_ALL (RID_SVX_START + 587) -#define RID_SVXBMP_TABLE_OUTER2 (RID_SVX_START + 588) #define RID_SVXPAGE_HYPERLINK_INTERNET (RID_SVX_START + 228) #define RID_SVXPAGE_HYPERLINK_MAIL (RID_SVX_START + 229) #define RID_SVXPAGE_HYPERLINK_DOCUMENT (RID_SVX_START + 230) diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index e0281c5e774b..d07e44cf765e 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -73,12 +73,12 @@ public: virtual ~SFTreeListBox() override; virtual void dispose() override; - SvTreeListEntry * insertEntry(OUString const & rText, sal_uInt16 nBitmap, + SvTreeListEntry * insertEntry(OUString const & rText, OUString const & rBitmap, SvTreeListEntry * pParent, bool bChildrenOnDemand, std::unique_ptr< SFEntry > && aUserData, const OUString& factoryURL ); - SvTreeListEntry * insertEntry(OUString const & rText, sal_uInt16 nBitmap, + SvTreeListEntry * insertEntry(OUString const & rText, OUString const & rBitmap, SvTreeListEntry * pParent, bool bChildrenOnDemand, std::unique_ptr< SFEntry > && aUserData ); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index a0a4a504d389..082b74ee7b9d 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -25,6 +25,7 @@ #include <svtools/editbrowsebox.hxx> #include "svtools/treelistentry.hxx" #include <cuires.hrc> +#include <bitmaps.hlst> #include <vcl/field.hxx> #include <vcl/layout.hxx> #include <svl/eitem.hxx> @@ -392,7 +393,7 @@ void DbRegistrationOptionsPage::insertNewEntry( const OUString& _sName,const OUS SvTreeListEntry* pEntry = nullptr; if ( _bReadOnly ) { - Image aLocked(BitmapEx(CUI_RES(RID_SVXBMP_LOCK))); + Image aLocked(BitmapEx(RID_SVXBMP_LOCK)); pEntry = m_pPathBox->InsertEntry( aStr, aLocked, aLocked ); } else diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src index e769b6582a69..7362be056d51 100644 --- a/cui/source/options/dbregister.src +++ b/cui/source/options/dbregister.src @@ -29,9 +29,4 @@ String RID_SVXSTR_PATH Text [ en-US ] = "Database file" ; }; -Bitmap RID_SVXBMP_LOCK -{ - File = "lock.png"; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 49baf4c509c9..a4ee1d46facd 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -22,6 +22,7 @@ #include <editeng/svxenum.hxx> #include <svx/dialogs.hrc> #include <cuires.hrc> +#include <bitmaps.hlst> #include <svx/rotmodit.hxx> #include <svx/algitem.hxx> @@ -340,9 +341,9 @@ void AlignmentTabPage::InitVsRefEgde() // remember selection - is deleted in call to ValueSet::Clear() sal_uInt16 nSel = m_pVsRefEdge->GetSelectItemId(); - BitmapEx aBottomLock(ResId(RID_SVXBMP_BOTTOMLOCK, CUI_MGR())); - BitmapEx aTopLock(ResId(RID_SVXBMP_TOPLOCK, CUI_MGR())); - BitmapEx aCellLock(ResId(RID_SVXBMP_CELLLOCK, CUI_MGR())); + BitmapEx aBottomLock(RID_SVXBMP_BOTTOMLOCK); + BitmapEx aTopLock(RID_SVXBMP_TOPLOCK); + BitmapEx aCellLock(RID_SVXBMP_CELLLOCK); if( GetDPIScaleFactor() > 1 ) { diff --git a/cui/source/tabpages/align.src b/cui/source/tabpages/align.src deleted file mode 100644 index e9c1fcfebeb1..000000000000 --- a/cui/source/tabpages/align.src +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "cuires.hrc" - -Bitmap RID_SVXBMP_BOTTOMLOCK -{ - File = "lo01.png"; -}; - -Bitmap RID_SVXBMP_TOPLOCK -{ - File = "lo02.png"; -}; - -Bitmap RID_SVXBMP_CELLLOCK -{ - File = "lo03.png"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 0f496ec233be..a4fbb998f0a2 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -24,6 +24,7 @@ #include <svx/dialmgr.hxx> #include <cuires.hrc> +#include <bitmaps.hlst> #include "helpid.hrc" #include <svx/xtable.hxx> @@ -136,7 +137,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore get(m_pRemoveAdjcentCellBordersCB, "rmadjcellborders"); get(m_pRemoveAdjcentCellBordersFT, "rmadjcellbordersft"); - static const sal_uInt16 pnBorderImgIds[] = + static const OUStringLiteral pnBorderImgIds[] = { RID_SVXBMP_CELL_NONE, RID_SVXBMP_CELL_ALL, @@ -162,9 +163,9 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore }; for (size_t i = 0; i < SAL_N_ELEMENTS(pnBorderImgIds); ++i) - m_aBorderImgVec.push_back(BitmapEx(CUI_RES(pnBorderImgIds[i]))); + m_aBorderImgVec.push_back(BitmapEx(pnBorderImgIds[i])); - static const sal_uInt16 pnShadowImgIds[SVX_BORDER_SHADOW_COUNT] = + static const OUStringLiteral pnShadowImgIds[SVX_BORDER_SHADOW_COUNT] = { RID_SVXBMP_SHADOWNONE, RID_SVXBMP_SHADOW_BOT_RIGHT, @@ -174,7 +175,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore }; for (size_t i = 0; i < SAL_N_ELEMENTS(pnShadowImgIds); ++i) - m_aShadowImgVec.push_back(BitmapEx(CUI_RES(pnShadowImgIds[i]))); + m_aShadowImgVec.push_back(BitmapEx(pnShadowImgIds[i])); assert(m_aShadowImgVec.size() == SVX_BORDER_SHADOW_COUNT); if ( GetDPIScaleFactor() > 1 ) diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src index 9526575f3871..2dded5a4ded3 100644 --- a/cui/source/tabpages/border.src +++ b/cui/source/tabpages/border.src @@ -21,136 +21,6 @@ #include <cuires.hrc> #include <svx/dialogs.hrc> -Bitmap RID_SVXBMP_CELL_NONE -{ - File = "pr01.png"; -}; - -Bitmap RID_SVXBMP_CELL_ALL -{ - File = "pr02.png"; -}; - -Bitmap RID_SVXBMP_CELL_LR -{ - File = "pr03.png"; -}; - -Bitmap RID_SVXBMP_CELL_TB -{ - File = "pr04.png"; -}; - -Bitmap RID_SVXBMP_CELL_L -{ - File = "pr05.png"; -}; - -Bitmap RID_SVXBMP_CELL_DIAG -{ - File = "pr06.png"; -}; - -Bitmap RID_SVXBMP_HOR_NONE -{ - File = "pr07.png"; -}; - -Bitmap RID_SVXBMP_HOR_OUTER -{ - File = "pr08.png"; -}; - -Bitmap RID_SVXBMP_HOR_HOR -{ - File = "pr09.png"; -}; - -Bitmap RID_SVXBMP_HOR_ALL -{ - File = "pr010.png"; -}; - -Bitmap RID_SVXBMP_HOR_OUTER2 -{ - File = "pr011.png"; -}; - -Bitmap RID_SVXBMP_VER_NONE -{ - File = "pr012.png"; -}; - -Bitmap RID_SVXBMP_VER_OUTER -{ - File = "pr013.png"; -}; - -Bitmap RID_SVXBMP_VER_VER -{ - File = "pr014.png"; -}; - -Bitmap RID_SVXBMP_VER_ALL -{ - File = "pr015.png"; -}; - -Bitmap RID_SVXBMP_VER_OUTER2 -{ - File = "pr016.png"; -}; - -Bitmap RID_SVXBMP_TABLE_NONE -{ - File = "pr017.png"; -}; - -Bitmap RID_SVXBMP_TABLE_OUTER -{ - File = "pr018.png"; -}; - -Bitmap RID_SVXBMP_TABLE_OUTERH -{ - File = "pr019.png"; -}; - -Bitmap RID_SVXBMP_TABLE_ALL -{ - File = "pr020.png"; -}; - -Bitmap RID_SVXBMP_TABLE_OUTER2 -{ - File = "pr021.png"; -}; - -Bitmap RID_SVXBMP_SHADOWNONE -{ - File = "sh01.png"; -}; - -Bitmap RID_SVXBMP_SHADOW_BOT_RIGHT -{ - File = "sh02.png"; -}; - -Bitmap RID_SVXBMP_SHADOW_BOT_LEFT -{ - File = "sh03.png"; -}; - -Bitmap RID_SVXBMP_SHADOW_TOP_RIGHT -{ - File = "sh04.png"; -}; - -Bitmap RID_SVXBMP_SHADOW_TOP_LEFT -{ - File = "sh05.png"; -}; - String RID_SVXSTR_TABLE_PRESET_NONE { Text [ en-US ] = "Set No Borders" ; diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index 7d250e210c53..652711c99e75 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -877,12 +877,10 @@ cmd/sc_previousslide.png cmd/sc_prevrecord.png cmd/sc_nextslide.png cmd/sc_nextrecord.png cmd/sc_slidesetup.png cmd/sc_pagesetup.png -# database -# ============================================== -database/linked_text_table.png cmd/sc_dataimport.png - # dbaccess # ============================================== +dbaccess/res/linked_text_table.png cmd/sc_dataimport.png + dbaccess/res/all_left.png cmd/sc_firstrecord.png dbaccess/res/all_right.png cmd/sc_lastrecord.png dbaccess/res/db.png cmd/sc_viewdatasourcebrowser.png diff --git a/icon-themes/breeze_dark/links.txt b/icon-themes/breeze_dark/links.txt index c73f12acdaa4..c8af3adff72f 100644 --- a/icon-themes/breeze_dark/links.txt +++ b/icon-themes/breeze_dark/links.txt @@ -876,12 +876,10 @@ cmd/sc_previousslide.png cmd/sc_prevrecord.png cmd/sc_nextslide.png cmd/sc_nextrecord.png cmd/sc_slidesetup.png cmd/sc_pagesetup.png -# database -# ============================================== -database/linked_text_table.png cmd/sc_dataimport.png - # dbaccess # ============================================== +dbaccess/res/linked_text_table.png cmd/sc_dataimport.png + dbaccess/res/all_left.png cmd/sc_firstrecord.png dbaccess/res/all_right.png cmd/sc_lastrecord.png dbaccess/res/db.png cmd/sc_viewdatasourcebrowser.png diff --git a/icon-themes/breeze_svg/links.txt b/icon-themes/breeze_svg/links.txt index c73f12acdaa4..c8af3adff72f 100644 --- a/icon-themes/breeze_svg/links.txt +++ b/icon-themes/breeze_svg/links.txt @@ -876,12 +876,10 @@ cmd/sc_previousslide.png cmd/sc_prevrecord.png cmd/sc_nextslide.png cmd/sc_nextrecord.png cmd/sc_slidesetup.png cmd/sc_pagesetup.png -# database -# ============================================== -database/linked_text_table.png cmd/sc_dataimport.png - # dbaccess # ============================================== +dbaccess/res/linked_text_table.png cmd/sc_dataimport.png + dbaccess/res/all_left.png cmd/sc_firstrecord.png dbaccess/res/all_right.png cmd/sc_lastrecord.png dbaccess/res/db.png cmd/sc_viewdatasourcebrowser.png diff --git a/icon-themes/elementary/database/linked_text_table.png b/icon-themes/elementary/dbaccess/res/linked_text_table.png Binary files differindex a978d23def57..a978d23def57 100644 --- a/icon-themes/elementary/database/linked_text_table.png +++ b/icon-themes/elementary/dbaccess/res/linked_text_table.png diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt index e03b3f9705c9..247a0a39abb6 100644 --- a/icon-themes/elementary/links.txt +++ b/icon-themes/elementary/links.txt @@ -631,10 +631,6 @@ sw/res/sidebar/pageproppanel/last_custom_common.png svx/res/symphony/last_custom sw/res/sidebar/pageproppanel/last_custom_common_grey.png svx/res/symphony/last_custom_common_grey.png sw/res/styfamnu.png sw/res/sf05.png vcl/res/closedoc.png sfx2/res/closedoc.png -vcl/source/src/error.png vcl/res/errorbox.png -vcl/source/src/warningbox.png vcl/res/warningbox.png -vcl/source/src/infobox.png vcl/res/infobox.png -vcl/source/src/querybox.png vcl/res/querybox.png xmlsecurity/res/signet_11x16.png svx/res/signet_11x16.png # Mail merge diff --git a/icon-themes/galaxy/database/linked_text_table.png b/icon-themes/galaxy/dbaccess/res/linked_text_table.png Binary files differindex b60b9975457c..b60b9975457c 100644 --- a/icon-themes/galaxy/database/linked_text_table.png +++ b/icon-themes/galaxy/dbaccess/res/linked_text_table.png diff --git a/icon-themes/hicontrast/database/linked_text_table.png b/icon-themes/hicontrast/dbaccess/res/database/linked_text_table.png Binary files differindex 48e2a663698a..48e2a663698a 100644 --- a/icon-themes/hicontrast/database/linked_text_table.png +++ b/icon-themes/hicontrast/dbaccess/res/database/linked_text_table.png diff --git a/icon-themes/oxygen/database/linked_text_table.png b/icon-themes/oxygen/dbaccess/res/database/linked_text_table.png Binary files differindex b60b9975457c..b60b9975457c 100644 --- a/icon-themes/oxygen/database/linked_text_table.png +++ b/icon-themes/oxygen/dbaccess/res/database/linked_text_table.png diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt index 5009947fc08a..272425875a99 100644 --- a/icon-themes/tango/links.txt +++ b/icon-themes/tango/links.txt @@ -60,10 +60,6 @@ cmd/lc_alignvcenter.png cmd/lc_alignverticalcenter.png cmd/sc_alignvcenter.png cmd/sc_alignverticalcenter.png cmd/sc_commontaskbarvisible.png cmd/sc_autoformat.png sd/res/sc05928.png cmd/sc_autoformat.png -vcl/source/src/error.png vcl/res/errorbox.png -vcl/source/src/warningbox.png vcl/res/warningbox.png -vcl/source/src/infobox.png vcl/res/infobox.png -vcl/source/src/querybox.png vcl/res/querybox.png desktop/res/extension_16.png cmd/sc_addons.png res/sx03256.png cmd/sc_addons.png res/extension_plus_26.png cmd/lc_addons.png diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index def511bc4940..cb4c8e2fa175 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -27,11 +27,9 @@ $(packimages_DIR)/images%.zip : INDUSTRIAL_FALLBACK := $(packimages_DIR)/%.zip : \ $(packimages_DIR)/sorted.lst \ $(packimages_DIR)/commandimagelist.ilst \ - $(SRCDIR)/sfx2/source/sidebar/sidebar.ilst \ - $(SRCDIR)/vcl/source/control/throbber.ilst \ + $(packimages_DIR)/sourceimagelist.ilst \ $(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \ $(call gb_Helper_optional,HELP,$(helpimages_DIR)/screenshotimg.ilst) \ - $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_JAVA),$(SRCDIR)/connectivity/source/drivers/hsqldb/hsqlui.ilst)) \ $(call gb_Helper_get_imagelists) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) $(call gb_Helper_abbreviate_dirs, \ @@ -48,6 +46,16 @@ $(packimages_DIR)/%.zip : \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null) && \ rm -rf $${ILSTFILE}) +# turn the #defines foo "resource.png" of hlst into the final ilst format +$(packimages_DIR)/sourceimagelist.ilst : \ + $(SRCDIR)/avmedia/inc/bitmaps.hlst \ + $(SRCDIR)/basctl/inc/bitmaps.hlst \ + $(SRCDIR)/connectivity/inc/bitmaps.hlst \ + $(SRCDIR)/cui/inc/bitmaps.hlst \ + $(SRCDIR)/sfx2/inc/bitmaps.hlst \ + $(SRCDIR)/vcl/inc/bitmaps.hlst + grep res $^ | cut -d'"' -f2 | sed "s/^/%MODULE%\//" | sed "s/%MODULE%.res/%GLOBALRES%/g" > $@ + # commandimagelist.ilst and sorted.lst are phony to rebuild everything each time .PHONY : $(packimages_DIR)/commandimagelist.ilst $(packimages_DIR)/sorted.lst diff --git a/sfx2/inc/bitmaps.hlst b/sfx2/inc/bitmaps.hlst new file mode 100644 index 000000000000..ff88d467071d --- /dev/null +++ b/sfx2/inc/bitmaps.hlst @@ -0,0 +1,46 @@ +/* -*- 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_SFX2_INC_BITMAPS_HRC +#define INCLUDED_SFX2_INC_BITMAPS_HRC + +//start, sfx2/source/sidebar/Theme.cxx +#define CLOSEDOC "sfx2/res/closedoc.png" +#define GRIP "sfx2/res/grip.png" +#define OPEN_MORE "sfx2/res/symphony/open_more.png" +#define MOREBUTTON "sfx2/res/symphony/morebutton.png" +#define SIDEBAR_3D_LARGE "sfx2/res/symphony/sidebar-3d-large.png" +#define SIDEBAR_3D_SMALL "sfx2/res/symphony/sidebar-3d-small.png" +#define SIDEBAR_ANIMATION_LARGE "sfx2/res/symphony/sidebar-animation-large.png" +#define SIDEBAR_ANIMATION_SMALL "sfx2/res/symphony/sidebar-animation-small.png" +#define SIDEBAR_COLORS_LARGE "sfx2/res/symphony/sidebar-colors-large.png" +#define SIDEBAR_COLORS_SMALL "sfx2/res/symphony/sidebar-colors-small.png" +#define SIDEBAR_EYEDROPPER_LARGE "sfx2/res/symphony/sidebar-eyedropper-large.png" +#define SIDEBAR_EYEDROPPER_SMALL "sfx2/res/symphony/sidebar-eyedropper-small.png" +#define SIDEBAR_GALLERY_LARGE "sfx2/res/symphony/sidebar-gallery-large.png" +#define SIDEBAR_GALLERY_SMALL "sfx2/res/symphony/sidebar-gallery-small.png" +#define SIDEBAR_IMGANIM_LARGE "sfx2/res/symphony/sidebar-imganim-large.png" +#define SIDEBAR_IMGANIM_SMALL "sfx2/res/symphony/sidebar-imganim-small.png" +#define SIDEBAR_NAVIGATOR_LARGE "sfx2/res/symphony/sidebar-navigator-large.png" +#define SIDEBAR_NAVIGATOR_SMALL "sfx2/res/symphony/sidebar-navigator-small.png" +#define SIDEBAR_PROPERTY_LARGE "sfx2/res/symphony/sidebar-property-large.png" +#define SIDEBAR_PROPERTY_SMALL "sfx2/res/symphony/sidebar-property-small.png" +#define SIDEBAR_STYLE_LARGE "sfx2/res/symphony/sidebar-style-large.png" +#define SIDEBAR_STYLE_SMALL "sfx2/res/symphony/sidebar-style-small.png" +#define SIDEBAR_TEMPLATE_LARGE "sfx2/res/symphony/sidebar-template-large.png" +#define SIDEBAR_TEMPLATE_SMALL "sfx2/res/symphony/sidebar-template-small.png" +#define SIDEBAR_TRANSITION_LARGE "sfx2/res/symphony/sidebar-transition-large.png" +#define SIDEBAR_TRANSITION_SMALL "sfx2/res/symphony/sidebar-transition-small.png" +#define SIDEBAR_FUNCTIONS_LARGE "sfx2/res/symphony/sidebar-functions-large.png" +#define SIDEBAR_FUNCTIONS_SMALL "sfx2/res/symphony/sidebar-functions-small.png" +//end, sfx2/source/sidebar/Theme.cxx + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sfx2/source/sidebar/sidebar.ilst b/sfx2/source/sidebar/sidebar.ilst deleted file mode 100644 index bc112a03b0a6..000000000000 --- a/sfx2/source/sidebar/sidebar.ilst +++ /dev/null @@ -1,29 +0,0 @@ -%MODULE%/cmd/lc_decrementlevel.png -%MODULE%/sfx2/res/closedoc.png -%MODULE%/sfx2/res/grip.png -%MODULE%/sfx2/res/symphony/open_more.png -%MODULE%/sfx2/res/symphony/morebutton.png -%MODULE%/sfx2/res/symphony/sidebar-3d-large.png -%MODULE%/sfx2/res/symphony/sidebar-3d-small.png -%MODULE%/sfx2/res/symphony/sidebar-animation-large.png -%MODULE%/sfx2/res/symphony/sidebar-animation-small.png -%MODULE%/sfx2/res/symphony/sidebar-colors-large.png -%MODULE%/sfx2/res/symphony/sidebar-colors-small.png -%MODULE%/sfx2/res/symphony/sidebar-eyedropper-large.png -%MODULE%/sfx2/res/symphony/sidebar-eyedropper-small.png -%MODULE%/sfx2/res/symphony/sidebar-gallery-large.png -%MODULE%/sfx2/res/symphony/sidebar-gallery-small.png -%MODULE%/sfx2/res/symphony/sidebar-imganim-large.png -%MODULE%/sfx2/res/symphony/sidebar-imganim-small.png -%MODULE%/sfx2/res/symphony/sidebar-navigator-large.png -%MODULE%/sfx2/res/symphony/sidebar-navigator-small.png -%MODULE%/sfx2/res/symphony/sidebar-property-large.png -%MODULE%/sfx2/res/symphony/sidebar-property-small.png -%MODULE%/sfx2/res/symphony/sidebar-style-large.png -%MODULE%/sfx2/res/symphony/sidebar-style-small.png -%MODULE%/sfx2/res/symphony/sidebar-template-large.png -%MODULE%/sfx2/res/symphony/sidebar-template-small.png -%MODULE%/sfx2/res/symphony/sidebar-transition-large.png -%MODULE%/sfx2/res/symphony/sidebar-transition-small.png -%MODULE%/sfx2/res/symphony/sidebar-functions-large.png -%MODULE%/sfx2/res/symphony/sidebar-functions-small.png diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk index c76fcd00d3e9..b12b29c9b1a5 100644 --- a/vcl/AllLangResTarget_vcl.mk +++ b/vcl/AllLangResTarget_vcl.mk @@ -44,8 +44,4 @@ $(eval $(call gb_SrsTarget_add_files,vcl/source/src,\ vcl/source/edit/textundo.src \ )) -$(eval $(call gb_SrsTarget_add_nonlocalizable_files,vcl/source/src,\ - vcl/source/src/images.src \ -)) - # vim: set noet sw=4 ts=4: diff --git a/vcl/inc/bitmaps.hlst b/vcl/inc/bitmaps.hlst new file mode 100644 index 000000000000..e096f92e65fa --- /dev/null +++ b/vcl/inc/bitmaps.hlst @@ -0,0 +1,104 @@ +/* -*- 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_VCL_INC_BITMAPS_HRC +#define INCLUDED_VCL_INC_BITMAPS_HRC + +#define SV_RESID_BITMAP_CHECK1 "vcl/res/check1.png" +#define SV_RESID_BITMAP_CHECK2 "vcl/res/check2.png" +#define SV_RESID_BITMAP_CHECK3 "vcl/res/check3.png" +#define SV_RESID_BITMAP_CHECK4 "vcl/res/check4.png" +#define SV_RESID_BITMAP_CHECK5 "vcl/res/check5.png" +#define SV_RESID_BITMAP_CHECK6 "vcl/res/check6.png" +#define SV_RESID_BITMAP_CHECK7 "vcl/res/check7.png" +#define SV_RESID_BITMAP_CHECK8 "vcl/res/check8.png" +#define SV_RESID_BITMAP_CHECK9 "vcl/res/check9.png" +#define SV_RESID_BITMAP_CHECKMONO1 "vcl/res/checkmono1.png" +#define SV_RESID_BITMAP_CHECKMONO2 "vcl/res/checkmono2.png" +#define SV_RESID_BITMAP_CHECKMONO3 "vcl/res/checkmono3.png" +#define SV_RESID_BITMAP_CHECKMONO4 "vcl/res/checkmono4.png" +#define SV_RESID_BITMAP_CHECKMONO5 "vcl/res/checkmono5.png" +#define SV_RESID_BITMAP_CHECKMONO6 "vcl/res/checkmono6.png" +#define SV_RESID_BITMAP_CHECKMONO7 "vcl/res/checkmono7.png" +#define SV_RESID_BITMAP_CHECKMONO8 "vcl/res/checkmono8.png" +#define SV_RESID_BITMAP_CHECKMONO9 "vcl/res/checkmono9.png" +#define SV_RESID_BITMAP_RADIO1 "vcl/res/radio1.png" +#define SV_RESID_BITMAP_RADIO2 "vcl/res/radio2.png" +#define SV_RESID_BITMAP_RADIO3 "vcl/res/radio3.png" +#define SV_RESID_BITMAP_RADIO4 "vcl/res/radio4.png" +#define SV_RESID_BITMAP_RADIO5 "vcl/res/radio5.png" +#define SV_RESID_BITMAP_RADIO6 "vcl/res/radio6.png" +#define SV_RESID_BITMAP_RADIOMONO1 "vcl/res/radiomono1.png" +#define SV_RESID_BITMAP_RADIOMONO2 "vcl/res/radiomono2.png" +#define SV_RESID_BITMAP_RADIOMONO3 "vcl/res/radiomono3.png" +#define SV_RESID_BITMAP_RADIOMONO4 "vcl/res/radiomono4.png" +#define SV_RESID_BITMAP_RADIOMONO5 "vcl/res/radiomono5.png" +#define SV_RESID_BITMAP_RADIOMONO6 "vcl/res/radiomono6.png" + +#define SV_RESID_BITMAP_ERRORBOX "vcl/res/errorbox.png" +#define SV_RESID_BITMAP_QUERYBOX "vcl/res/querybox.png" +#define SV_RESID_BITMAP_WARNINGBOX "vcl/res/warningbox.png" +#define SV_RESID_BITMAP_INFOBOX "vcl/res/infobox.png" + +#define SV_RESID_BITMAP_SCROLLMSK "vcl/res/scrmsk.png" +#define SV_RESID_BITMAP_WHEELVH "vcl/res/wheelvh.png" +#define SV_RESID_BITMAP_WHEELV "vcl/res/wheelv.png" +#define SV_RESID_BITMAP_WHEELH "vcl/res/wheelh.png" +#define SV_RESID_BITMAP_SCROLLVH "vcl/res/scrollvh.png" +#define SV_RESID_BITMAP_SCROLLV "vcl/res/scrollv.png" +#define SV_RESID_BITMAP_SCROLLH "vcl/res/scrollh.png" +#define SV_RESID_BITMAP_CLOSEDOC "vcl/res/closedoc.png" +#define SV_RESID_BITMAP_INDEX "vcl/res/index.png" +#define SV_RESID_BITMAP_REFRESH "res/reload.png" +#define SV_RESID_BITMAP_NOTEBOOKBAR "res/notebookbar.png" + +#define SV_DISCLOSURE_PLUS "res/plus.png" +#define SV_DISCLOSURE_MINUS "res/minus.png" + +#define SV_PRINT_COLLATE_BMP "vcl/res/collate.png" +#define SV_PRINT_NOCOLLATE_BMP "vcl/res/ncollate.png" + +//start, Throbber::getDefaultImageURLs +#define SPINNER_16_01 "vcl/res/spinner-16-01.png" +#define SPINNER_16_02 "vcl/res/spinner-16-02.png" +#define SPINNER_16_03 "vcl/res/spinner-16-03.png" +#define SPINNER_16_04 "vcl/res/spinner-16-04.png" +#define SPINNER_16_05 "vcl/res/spinner-16-05.png" +#define SPINNER_16_06 "vcl/res/spinner-16-06.png" + +#define SPINNER_32_01 "vcl/res/spinner-32-01.png" +#define SPINNER_32_02 "vcl/res/spinner-32-02.png" +#define SPINNER_32_03 "vcl/res/spinner-32-03.png" +#define SPINNER_32_04 "vcl/res/spinner-32-04.png" +#define SPINNER_32_05 "vcl/res/spinner-32-05.png" +#define SPINNER_32_06 "vcl/res/spinner-32-06.png" +#define SPINNER_32_07 "vcl/res/spinner-32-07.png" +#define SPINNER_32_08 "vcl/res/spinner-32-08.png" +#define SPINNER_32_09 "vcl/res/spinner-32-09.png" +#define SPINNER_32_10 "vcl/res/spinner-32-10.png" +#define SPINNER_32_11 "vcl/res/spinner-32-11.png" +#define SPINNER_32_12 "vcl/res/spinner-32-12.png" + +#define SPINNER_64_01 "vcl/res/spinner-64-01.png" +#define SPINNER_64_02 "vcl/res/spinner-64-02.png" +#define SPINNER_64_03 "vcl/res/spinner-64-03.png" +#define SPINNER_64_04 "vcl/res/spinner-64-04.png" +#define SPINNER_64_05 "vcl/res/spinner-64-05.png" +#define SPINNER_64_06 "vcl/res/spinner-64-06.png" +#define SPINNER_64_07 "vcl/res/spinner-64-07.png" +#define SPINNER_64_08 "vcl/res/spinner-64-08.png" +#define SPINNER_64_09 "vcl/res/spinner-64-09.png" +#define SPINNER_64_10 "vcl/res/spinner-64-10.png" +#define SPINNER_64_11 "vcl/res/spinner-64-11.png" +#define SPINNER_64_12 "vcl/res/spinner-64-12.png" +//end, Throbber::getDefaultImageURLs + +#endif // INCLUDED_VCL_INC_BITMAPS_HRC + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index b3c7f466a3bc..1d8d5ad56367 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -88,6 +88,18 @@ class VclEventListeners2; class SalData; class OpenGLContext; +#define SV_ICON_ID_OFFICE 1 +#define SV_ICON_ID_TEXT 2 +#define SV_ICON_ID_TEXT_TEMPLATE 3 +#define SV_ICON_ID_SPREADSHEET 4 +#define SV_ICON_ID_SPREADSHEET_TEMPLATE 5 +#define SV_ICON_ID_DRAWING 6 +#define SV_ICON_ID_PRESENTATION 8 +#define SV_ICON_ID_MASTER_DOCUMENT 10 +#define SV_ICON_ID_TEMPLATE 11 +#define SV_ICON_ID_DATABASE 12 +#define SV_ICON_ID_FORMULA 13 + namespace vcl { class DisplayConnectionDispatch; class SettingsConfigItem; class DeleteOnDeinitBase; } class LocaleConfigurationListener : public utl::ConfigurationListener diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc index 8d1f06dbb8f9..4d825e106f2f 100644 --- a/vcl/inc/svids.hrc +++ b/vcl/inc/svids.hrc @@ -20,57 +20,6 @@ #ifndef INCLUDED_VCL_INC_SVIDS_HRC #define INCLUDED_VCL_INC_SVIDS_HRC -#define SV_RESID_BITMAP_CHECK1 1000 -#define SV_RESID_BITMAP_CHECK2 1001 -#define SV_RESID_BITMAP_CHECK3 1002 -#define SV_RESID_BITMAP_CHECK4 1003 -#define SV_RESID_BITMAP_CHECK5 1004 -#define SV_RESID_BITMAP_CHECK6 1005 -#define SV_RESID_BITMAP_CHECK7 1006 -#define SV_RESID_BITMAP_CHECK8 1007 -#define SV_RESID_BITMAP_CHECK9 1008 -#define SV_RESID_BITMAP_CHECKMONO1 1009 -#define SV_RESID_BITMAP_CHECKMONO2 1010 -#define SV_RESID_BITMAP_CHECKMONO3 1011 -#define SV_RESID_BITMAP_CHECKMONO4 1012 -#define SV_RESID_BITMAP_CHECKMONO5 1013 -#define SV_RESID_BITMAP_CHECKMONO6 1014 -#define SV_RESID_BITMAP_CHECKMONO7 1015 -#define SV_RESID_BITMAP_CHECKMONO8 1016 -#define SV_RESID_BITMAP_CHECKMONO9 1017 -#define SV_RESID_BITMAP_RADIO1 1018 -#define SV_RESID_BITMAP_RADIO2 1019 -#define SV_RESID_BITMAP_RADIO3 1020 -#define SV_RESID_BITMAP_RADIO4 1021 -#define SV_RESID_BITMAP_RADIO5 1022 -#define SV_RESID_BITMAP_RADIO6 1023 -#define SV_RESID_BITMAP_RADIOMONO1 1024 -#define SV_RESID_BITMAP_RADIOMONO2 1025 -#define SV_RESID_BITMAP_RADIOMONO3 1026 -#define SV_RESID_BITMAP_RADIOMONO4 1027 -#define SV_RESID_BITMAP_RADIOMONO5 1028 -#define SV_RESID_BITMAP_RADIOMONO6 1029 - -#define SV_RESID_BITMAP_ERRORBOX 1030 -#define SV_RESID_BITMAP_QUERYBOX 1031 -#define SV_RESID_BITMAP_WARNINGBOX 1032 -#define SV_RESID_BITMAP_INFOBOX 1033 - -#define SV_RESID_BITMAP_SCROLLMSK 1050 -#define SV_RESID_BITMAP_WHEELVH 1051 -#define SV_RESID_BITMAP_WHEELV 1052 -#define SV_RESID_BITMAP_WHEELH 1053 -#define SV_RESID_BITMAP_SCROLLVH 1054 -#define SV_RESID_BITMAP_SCROLLV 1055 -#define SV_RESID_BITMAP_SCROLLH 1056 -#define SV_RESID_BITMAP_CLOSEDOC 1057 -#define SV_RESID_BITMAP_INDEX 1058 -#define SV_RESID_BITMAP_REFRESH 1059 -#define SV_RESID_BITMAP_NOTEBOOKBAR 1060 - -#define SV_DISCLOSURE_PLUS 1070 -#define SV_DISCLOSURE_MINUS 1071 - #define RID_STR_PAPERNAMES 1080 #define SV_RESID_STRING_NOSELECTIONPOSSIBLE 2001 @@ -166,8 +115,6 @@ #define SV_PRINT_TOFILE_TXT 10610 #define SV_PRINT_DEFPRT_TXT 10611 #define SV_PRINT_PRINTPREVIEW_TXT 10612 -#define SV_PRINT_COLLATE_BMP 10613 -#define SV_PRINT_NOCOLLATE_BMP 10614 #define SV_PRINT_QUERYFAXNUMBER_TXT 10615 #define SV_PRINT_INVALID_TXT 10616 #define SV_PRINT_CUSTOM_TXT 10617 @@ -187,18 +134,6 @@ #define SV_ICON_SIZE32_START 21000 #define SV_ICON_SIZE16_START 23000 -#define SV_ICON_ID_OFFICE 1 -#define SV_ICON_ID_TEXT 2 -#define SV_ICON_ID_TEXT_TEMPLATE 3 -#define SV_ICON_ID_SPREADSHEET 4 -#define SV_ICON_ID_SPREADSHEET_TEMPLATE 5 -#define SV_ICON_ID_DRAWING 6 -#define SV_ICON_ID_PRESENTATION 8 -#define SV_ICON_ID_MASTER_DOCUMENT 10 -#define SV_ICON_ID_TEMPLATE 11 -#define SV_ICON_ID_DATABASE 12 -#define SV_ICON_ID_FORMULA 13 - #endif // INCLUDED_VCL_INC_SVIDS_HRC /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 493c74e4532f..ec1d80ca63e7 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -39,6 +39,7 @@ #include <vcl/uitest/uiobject.hxx> #include <svids.hrc> +#include <bitmaps.hlst> #include <svdata.hxx> #include <window.h> #include <controldata.hxx> @@ -2738,7 +2739,7 @@ Size RadioButton::ImplGetRadioImageSize() const } static void LoadThemedImageList(const StyleSettings &rStyleSettings, - std::vector<Image>& rList, const std::vector<ResId> &rResources) + std::vector<Image>& rList, const std::vector<OUString> &rResources) { Color aColorAry1[6]; Color aColorAry2[6]; @@ -2786,18 +2787,26 @@ Image RadioButton::GetRadioImage( const AllSettings& rSettings, DrawButtonFlags pSVData->maCtrlData.mnLastRadioWColor = rStyleSettings.GetWindowColor().GetColor(); pSVData->maCtrlData.mnLastRadioLColor = rStyleSettings.GetLightColor().GetColor(); - ResMgr* pResMgr = ImplGetResMgr(); - if (pResMgr) + std::vector<OUString> aResources; + if (nStyle) { - std::vector<ResId> aResources; - aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_RADIOMONO1 : SV_RESID_BITMAP_RADIO1, *pResMgr)); - aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_RADIOMONO2 : SV_RESID_BITMAP_RADIO2, *pResMgr)); - aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_RADIOMONO3 : SV_RESID_BITMAP_RADIO3, *pResMgr)); - aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_RADIOMONO4 : SV_RESID_BITMAP_RADIO4, *pResMgr)); - aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_RADIOMONO5 : SV_RESID_BITMAP_RADIO5, *pResMgr)); - aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_RADIOMONO6 : SV_RESID_BITMAP_RADIO6, *pResMgr)); - LoadThemedImageList( rStyleSettings, pSVData->maCtrlData.maRadioImgList, aResources); + aResources.push_back(SV_RESID_BITMAP_RADIOMONO1); + aResources.push_back(SV_RESID_BITMAP_RADIOMONO2); + aResources.push_back(SV_RESID_BITMAP_RADIOMONO3); + aResources.push_back(SV_RESID_BITMAP_RADIOMONO4); + aResources.push_back(SV_RESID_BITMAP_RADIOMONO5); + aResources.push_back(SV_RESID_BITMAP_RADIOMONO6); } + else + { + aResources.push_back(SV_RESID_BITMAP_RADIO1); + aResources.push_back(SV_RESID_BITMAP_RADIO2); + aResources.push_back(SV_RESID_BITMAP_RADIO3); + aResources.push_back(SV_RESID_BITMAP_RADIO4); + aResources.push_back(SV_RESID_BITMAP_RADIO5); + aResources.push_back(SV_RESID_BITMAP_RADIO6); + } + LoadThemedImageList( rStyleSettings, pSVData->maCtrlData.maRadioImgList, aResources); pSVData->maCtrlData.mnRadioStyle = nStyle; } @@ -3622,21 +3631,32 @@ Image CheckBox::GetCheckImage( const AllSettings& rSettings, DrawButtonFlags nFl pSVData->maCtrlData.mnLastCheckWColor = rStyleSettings.GetWindowColor().GetColor(); pSVData->maCtrlData.mnLastCheckLColor = rStyleSettings.GetLightColor().GetColor(); - ResMgr* pResMgr = ImplGetResMgr(); - if( pResMgr ) - { - std::vector<ResId> aResources; - aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO1 : SV_RESID_BITMAP_CHECK1, *pResMgr)); - aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO2 : SV_RESID_BITMAP_CHECK2, *pResMgr)); - aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO3 : SV_RESID_BITMAP_CHECK3, *pResMgr)); - aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO4 : SV_RESID_BITMAP_CHECK4, *pResMgr)); - aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO5 : SV_RESID_BITMAP_CHECK5, *pResMgr)); - aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO6 : SV_RESID_BITMAP_CHECK6, *pResMgr)); - aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO7 : SV_RESID_BITMAP_CHECK7, *pResMgr)); - aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO8 : SV_RESID_BITMAP_CHECK8, *pResMgr)); - aResources.push_back(ResId(nStyle ? SV_RESID_BITMAP_CHECKMONO9 : SV_RESID_BITMAP_CHECK9, *pResMgr)); - LoadThemedImageList(rStyleSettings, pSVData->maCtrlData.maCheckImgList, aResources); + std::vector<OUString> aResources; + if (nStyle) + { + aResources.push_back(SV_RESID_BITMAP_CHECKMONO1); + aResources.push_back(SV_RESID_BITMAP_CHECKMONO2); + aResources.push_back(SV_RESID_BITMAP_CHECKMONO3); + aResources.push_back(SV_RESID_BITMAP_CHECKMONO4); + aResources.push_back(SV_RESID_BITMAP_CHECKMONO5); + aResources.push_back(SV_RESID_BITMAP_CHECKMONO6); + aResources.push_back(SV_RESID_BITMAP_CHECKMONO7); + aResources.push_back(SV_RESID_BITMAP_CHECKMONO8); + aResources.push_back(SV_RESID_BITMAP_CHECKMONO9); } + else + { + aResources.push_back(SV_RESID_BITMAP_CHECK1); + aResources.push_back(SV_RESID_BITMAP_CHECK2); + aResources.push_back(SV_RESID_BITMAP_CHECK3); + aResources.push_back(SV_RESID_BITMAP_CHECK4); + aResources.push_back(SV_RESID_BITMAP_CHECK5); + aResources.push_back(SV_RESID_BITMAP_CHECK6); + aResources.push_back(SV_RESID_BITMAP_CHECK7); + aResources.push_back(SV_RESID_BITMAP_CHECK8); + aResources.push_back(SV_RESID_BITMAP_CHECK9); + } + LoadThemedImageList(rStyleSettings, pSVData->maCtrlData.maCheckImgList, aResources); pSVData->maCtrlData.mnCheckStyle = nStyle; } @@ -3826,9 +3846,9 @@ void DisclosureButton::ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext) { ImplSVCtrlData& rCtrlData(ImplGetSVData()->maCtrlData); if (!rCtrlData.mpDisclosurePlus) - rCtrlData.mpDisclosurePlus = new Image(BitmapEx(VclResId(SV_DISCLOSURE_PLUS))); + rCtrlData.mpDisclosurePlus = new Image(BitmapEx(SV_DISCLOSURE_PLUS)); if (!rCtrlData.mpDisclosureMinus) - rCtrlData.mpDisclosureMinus = new Image(BitmapEx(VclResId(SV_DISCLOSURE_MINUS))); + rCtrlData.mpDisclosureMinus = new Image(BitmapEx(SV_DISCLOSURE_MINUS)); Image* pImg = nullptr; pImg = IsChecked() ? rCtrlData.mpDisclosureMinus : rCtrlData.mpDisclosurePlus; diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 98bd3f8a3f36..de0c8d7952f9 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -32,6 +32,7 @@ #include <vcl/settings.hxx> #include <vcl/uitest/uiobject.hxx> #include <vcl/builderfactory.hxx> +#include <bitmaps.hlst> #include <svids.hrc> #include "controldata.hxx" @@ -2207,7 +2208,7 @@ NotebookbarTabControlBase::NotebookbarTabControlBase(vcl::Window* pParent) , bLastContextWasSupported(true) , eLastContext(vcl::EnumContext::Context::Any) { - BitmapEx aBitmap(VclResId(SV_RESID_BITMAP_NOTEBOOKBAR), Color()); + BitmapEx aBitmap(SV_RESID_BITMAP_NOTEBOOKBAR); InsertPage(1, ""); SetPageImage(1, Image(aBitmap)); } diff --git a/vcl/source/control/throbber.ilst b/vcl/source/control/throbber.ilst deleted file mode 100644 index 17f9e3eedf11..000000000000 --- a/vcl/source/control/throbber.ilst +++ /dev/null @@ -1,30 +0,0 @@ -%MODULE%/vcl/res/spinner-16-01.png -%MODULE%/vcl/res/spinner-16-02.png -%MODULE%/vcl/res/spinner-16-03.png -%MODULE%/vcl/res/spinner-16-04.png -%MODULE%/vcl/res/spinner-16-05.png -%MODULE%/vcl/res/spinner-16-06.png -%MODULE%/vcl/res/spinner-32-01.png -%MODULE%/vcl/res/spinner-32-02.png -%MODULE%/vcl/res/spinner-32-03.png -%MODULE%/vcl/res/spinner-32-04.png -%MODULE%/vcl/res/spinner-32-05.png -%MODULE%/vcl/res/spinner-32-06.png -%MODULE%/vcl/res/spinner-32-07.png -%MODULE%/vcl/res/spinner-32-08.png -%MODULE%/vcl/res/spinner-32-09.png -%MODULE%/vcl/res/spinner-32-10.png -%MODULE%/vcl/res/spinner-32-11.png -%MODULE%/vcl/res/spinner-32-12.png -%MODULE%/vcl/res/spinner-64-01.png -%MODULE%/vcl/res/spinner-64-02.png -%MODULE%/vcl/res/spinner-64-03.png -%MODULE%/vcl/res/spinner-64-04.png -%MODULE%/vcl/res/spinner-64-05.png -%MODULE%/vcl/res/spinner-64-06.png -%MODULE%/vcl/res/spinner-64-07.png -%MODULE%/vcl/res/spinner-64-08.png -%MODULE%/vcl/res/spinner-64-09.png -%MODULE%/vcl/res/spinner-64-10.png -%MODULE%/vcl/res/spinner-64-11.png -%MODULE%/vcl/res/spinner-64-12.png diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src deleted file mode 100644 index 10b0eb7bf292..000000000000 --- a/vcl/source/src/images.src +++ /dev/null @@ -1,437 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svids.hrc> - -Bitmap SV_RESID_BITMAP_CHECK1 -{ - File = "check1.png"; -}; - -Bitmap SV_RESID_BITMAP_CHECK2 -{ - File = "check2.png"; -}; - -Bitmap SV_RESID_BITMAP_CHECK3 -{ - File = "check3.png"; -}; - -Bitmap SV_RESID_BITMAP_CHECK4 -{ - File = "check4.png"; -}; - -Bitmap SV_RESID_BITMAP_CHECK5 -{ - File = "check5.png"; -}; - -Bitmap SV_RESID_BITMAP_CHECK6 -{ - File = "check6.png"; -}; - -Bitmap SV_RESID_BITMAP_CHECK7 -{ - File = "check7.png"; -}; - -Bitmap SV_RESID_BITMAP_CHECK8 -{ - File = "check8.png"; -}; - -Bitmap SV_RESID_BITMAP_CHECK9 -{ - File = "check9.png"; -}; - -Bitmap SV_RESID_BITMAP_CHECKMONO1 -{ - File = "checkmono1.png"; -}; - -Bitmap SV_RESID_BITMAP_CHECKMONO2 -{ - File = "checkmono2.png"; -}; - -Bitmap SV_RESID_BITMAP_CHECKMONO3 -{ - File = "checkmono3.png"; -}; - -Bitmap SV_RESID_BITMAP_CHECKMONO4 -{ - File = "checkmono4.png"; -}; - -Bitmap SV_RESID_BITMAP_CHECKMONO5 -{ - File = "checkmono5.png"; -}; - -Bitmap SV_RESID_BITMAP_CHECKMONO6 -{ - File = "checkmono6.png"; -}; - -Bitmap SV_RESID_BITMAP_CHECKMONO7 -{ - File = "checkmono7.png"; -}; - -Bitmap SV_RESID_BITMAP_CHECKMONO8 -{ - File = "checkmono8.png"; -}; - -Bitmap SV_RESID_BITMAP_CHECKMONO9 -{ - File = "checkmono9.png"; -}; - -Bitmap SV_RESID_BITMAP_SCROLLVH -{ - File = "scrollvh.png"; -}; - -Bitmap SV_RESID_BITMAP_SCROLLV -{ - File = "scrollv.png"; -}; - -Bitmap SV_RESID_BITMAP_SCROLLH -{ - File = "scrollh.png"; -}; - -Bitmap SV_RESID_BITMAP_WHEELVH -{ - File = "wheelvh.png"; -}; - -Bitmap SV_RESID_BITMAP_WHEELV -{ - File = "wheelv.png"; -}; - -Bitmap SV_RESID_BITMAP_WHEELH -{ - File = "wheelh.png"; -}; - -Bitmap SV_RESID_BITMAP_SCROLLMSK -{ - File = "scrmsk.png"; -}; - -Bitmap SV_RESID_BITMAP_RADIO1 -{ - File = "radio1.png"; -}; - -Bitmap SV_RESID_BITMAP_RADIO2 -{ - File = "radio2.png"; -}; - -Bitmap SV_RESID_BITMAP_RADIO3 -{ - File = "radio3.png"; -}; - -Bitmap SV_RESID_BITMAP_RADIO4 -{ - File = "radio4.png"; -}; - -Bitmap SV_RESID_BITMAP_RADIO5 -{ - File = "radio5.png"; -}; - -Bitmap SV_RESID_BITMAP_RADIO6 -{ - File = "radio6.png"; -}; - -Bitmap SV_RESID_BITMAP_RADIOMONO1 -{ - File = "radiomono1.png"; -}; - -Bitmap SV_RESID_BITMAP_RADIOMONO2 -{ - File = "radiomono2.png"; -}; - -Bitmap SV_RESID_BITMAP_RADIOMONO3 -{ - File = "radiomono3.png"; -}; - -Bitmap SV_RESID_BITMAP_RADIOMONO4 -{ - File = "radiomono4.png"; -}; - -Bitmap SV_RESID_BITMAP_RADIOMONO5 -{ - File = "radiomono5.png"; -}; - -Bitmap SV_RESID_BITMAP_RADIOMONO6 -{ - File = "radiomono6.png"; -}; - -Bitmap SV_RESID_BITMAP_ERRORBOX -{ - File = "errorbox.png"; -}; - -Bitmap SV_RESID_BITMAP_WARNINGBOX -{ - File = "warningbox.png"; -}; - -Bitmap SV_RESID_BITMAP_QUERYBOX -{ - File = "querybox.png"; -}; - -Bitmap SV_RESID_BITMAP_INFOBOX -{ - File = "infobox.png"; -}; - -Bitmap SV_RESID_BITMAP_CLOSEDOC -{ - File = "closedoc.png"; -}; - -Bitmap SV_RESID_BITMAP_INDEX -{ - File = "index.png"; -}; - -Bitmap SV_RESID_BITMAP_REFRESH -{ - File = "reload.png"; -}; - -Bitmap (SV_ICON_SIZE48_START) -{ - File = "mainapp_48_8.png" ; -}; - -Bitmap (SV_ICON_SIZE32_START) -{ - File = "mainapp_32_8.png" ; -}; - -Bitmap (SV_ICON_SIZE16_START) -{ - File = "mainapp_16_8.png" ; -}; - -Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_OFFICE) -{ - File = "mainapp_48_8.png" ; -}; - -Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_OFFICE) -{ - File = "mainapp_32_8.png" ; -}; - -Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_OFFICE) -{ - File = "mainapp_16_8.png" ; -}; - -Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_TEXT) -{ - File = "odt_48_8.png" ; -}; - -Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_TEXT) -{ - File = "odt_32_8.png" ; -}; - -Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_TEXT) -{ - File = "odt_16_8.png" ; -}; - -Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_TEXT_TEMPLATE) -{ - File = "ott_48_8.png" ; -}; - -Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_TEXT_TEMPLATE) -{ - File = "ott_32_8.png" ; -}; - -Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_TEXT_TEMPLATE) -{ - File = "ott_16_8.png" ; -}; - -Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_SPREADSHEET) -{ - File = "ods_48_8.png" ; -}; - -Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_SPREADSHEET) -{ - File = "ods_32_8.png" ; -}; - -Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_SPREADSHEET) -{ - File = "ods_16_8.png" ; -}; - -Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_SPREADSHEET_TEMPLATE) -{ - File = "ots_48_8.png" ; -}; - -Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_SPREADSHEET_TEMPLATE) -{ - File = "ots_32_8.png" ; -}; - -Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_SPREADSHEET_TEMPLATE) -{ - File = "ots_16_8.png" ; -}; - -Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_DRAWING) -{ - File = "odg_48_8.png" ; -}; - -Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_DRAWING) -{ - File = "odg_32_8.png" ; -}; - -Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_DRAWING) -{ - File = "odg_16_8.png" ; -}; - -Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_PRESENTATION) -{ - File = "odp_48_8.png" ; -}; - -Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_PRESENTATION) -{ - File = "odp_32_8.png" ; -}; - -Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_PRESENTATION) -{ - File = "odp_16_8.png" ; -}; - -Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_MASTER_DOCUMENT) -{ - File = "odm_48_8.png" ; -}; - -Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_MASTER_DOCUMENT) -{ - File = "odm_32_8.png" ; -}; - -Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_MASTER_DOCUMENT) -{ - File = "odm_16_8.png" ; -}; - -Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_DATABASE) -{ - File = "odb_48_8.png" ; -}; - -Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_DATABASE) -{ - File = "odb_32_8.png" ; -}; - -Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_DATABASE) -{ - File = "odb_16_8.png" ; -}; - -Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_FORMULA) -{ - File = "odf_48_8.png" ; -}; - -Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_FORMULA) -{ - File = "odf_32_8.png" ; -}; - -Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_FORMULA) -{ - File = "odf_16_8.png" ; -}; - -Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_TEMPLATE) -{ - File = "mainapp_48_8.png" ; -}; - -Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_TEMPLATE) -{ - File = "mainapp_32_8.png" ; -}; - -Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_TEMPLATE) -{ - File = "mainapp_16_8.png" ; -}; - -Bitmap SV_DISCLOSURE_PLUS -{ - File = "plus.png"; -}; - -Bitmap SV_DISCLOSURE_MINUS -{ - File = "minus.png"; -}; - -Bitmap SV_RESID_BITMAP_NOTEBOOKBAR -{ - File = "notebookbar.png"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src index 13db4a38c68b..160602f6e72e 100644 --- a/vcl/source/src/print.src +++ b/vcl/source/src/print.src @@ -95,16 +95,6 @@ String SV_PRINT_PRINTPREVIEW_TXT Text [en-US] = "Print preview"; }; -Bitmap SV_PRINT_COLLATE_BMP -{ - File = "collate.png" ; -}; - -Bitmap SV_PRINT_NOCOLLATE_BMP -{ - File = "ncollate.png" ; -}; - String SV_PRINT_QUERYFAXNUMBER_TXT { Text [ en-US ] = "Please enter the fax number"; diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 4e9901cc3bc4..d01f87e4a75e 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -38,6 +38,7 @@ #include <vcl/slider.hxx> #include <vcl/commandinfoprovider.hxx> #include <svdata.hxx> +#include <bitmaps.hlst> #include <svids.hrc> #include <window.h> #include <xmlreader/xmlreader.hxx> @@ -48,14 +49,13 @@ namespace { - sal_uInt16 mapStockToImageResource(const OString& sType) + OUString mapStockToImageResource(const OString& sType) { - sal_uInt16 nRet = 0; if (sType == "gtk-index") - nRet = SV_RESID_BITMAP_INDEX; + return OUString(SV_RESID_BITMAP_INDEX); else if (sType == "gtk-refresh") - nRet = SV_RESID_BITMAP_REFRESH; - return nRet; + return OUString(SV_RESID_BITMAP_REFRESH); + return OUString(); } SymbolType mapStockToSymbol(const OString& sType) @@ -87,7 +87,7 @@ namespace eRet = SymbolType::HELP; else if (sType == "gtk-close") eRet = SymbolType::CLOSE; - else if (mapStockToImageResource(sType)) + else if (!mapStockToImageResource(sType).isEmpty()) eRet = SymbolType::IMAGE; return eRet; } @@ -422,7 +422,7 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUStr SAL_WARN_IF(eType != SymbolType::IMAGE, "vcl.layout", "inimplemented symbol type for radiobuttons"); if (eType == SymbolType::IMAGE) { - Bitmap aBitmap(VclResId(mapStockToImageResource(rImageInfo.m_sStock))); + BitmapEx aBitmap(mapStockToImageResource(rImageInfo.m_sStock)); Image const aImage(aBitmap); if (!aI->m_bRadio) pTargetButton->SetModeImage(aImage); diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index e1f50c0b5632..46c453edb737 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -29,6 +29,7 @@ #include <salmenu.hxx> #include <svdata.hxx> #include <svids.hrc> +#include <bitmaps.hlst> #include <window.h> // document closing button @@ -58,12 +59,8 @@ void DecoToolBox::calcMinSize() ScopedVclPtrInstance<ToolBox> aTbx( GetParent() ); if( GetItemCount() == 0 ) { - ResMgr* pResMgr = ImplGetResMgr(); - - Bitmap aBitmap; - if( pResMgr ) - aBitmap = Bitmap( ResId( SV_RESID_BITMAP_CLOSEDOC, *pResMgr ) ); - aTbx->InsertItem( IID_DOCUMENTCLOSE, Image( aBitmap ) ); + BitmapEx aBitmap(SV_RESID_BITMAP_CLOSEDOC); + aTbx->InsertItem(IID_DOCUMENTCLOSE, Image(aBitmap)); } else { @@ -132,7 +129,7 @@ MenuBarWindow::MenuBarWindow( vcl::Window* pParent ) : if(pResMgr) { - BitmapEx aBitmap(ResId(SV_RESID_BITMAP_CLOSEDOC, *pResMgr)); + BitmapEx aBitmap(SV_RESID_BITMAP_CLOSEDOC); aCloseBtn->maImage = Image(aBitmap); aCloseBtn->SetOutStyle(TOOLBOX_STYLE_FLAT); diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index ef98a62246d1..ac5133506449 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -18,6 +18,7 @@ */ #include <svids.hrc> +#include <bitmaps.hlst> #include <svdata.hxx> #include <brdwin.hxx> #include <window.h> @@ -38,14 +39,10 @@ static void ImplInitMsgBoxImageList() ImplSVData* pSVData = ImplGetSVData(); if (pSVData->maWinData.maMsgBoxImgList.empty()) { - ResMgr* pResMgr = ImplGetResMgr(); - if (pResMgr) - { - pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_ERRORBOX, *pResMgr)))); - pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_QUERYBOX, *pResMgr)))); - pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_WARNINGBOX, *pResMgr)))); - pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_INFOBOX, *pResMgr)))); - } + pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_ERRORBOX))); + pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_QUERYBOX))); + pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_WARNINGBOX))); + pSVData->maWinData.maMsgBoxImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_INFOBOX))); } } diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 0e70173de74c..f793b852e4da 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -20,6 +20,7 @@ #include "printdlg.hxx" #include "svdata.hxx" #include "svids.hrc" +#include "bitmaps.hlst" #include <vcl/print.hxx> #include <vcl/dialog.hxx> @@ -475,8 +476,8 @@ void PrintDialog::NUpTabPage::initFromMultiPageSetup( const vcl::PrinterControll } PrintDialog::JobTabPage::JobTabPage( VclBuilder* pUIBuilder ) - : maCollateBmp(VclResId(SV_PRINT_COLLATE_BMP)) - , maNoCollateBmp(VclResId(SV_PRINT_NOCOLLATE_BMP)) + : maCollateBmp(SV_PRINT_COLLATE_BMP) + , maNoCollateBmp(SV_PRINT_NOCOLLATE_BMP) , mnCollateUIMode(0) { pUIBuilder->get(mpPrinters, "printers"); diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index a904064348f0..1d5f6f1dfcdd 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -22,6 +22,7 @@ #include <tools/debug.hxx> #include <svids.hrc> +#include <bitmaps.hlst> #include <svdata.hxx> #include <scrwnd.hxx> @@ -59,11 +60,8 @@ ImplWheelWindow::ImplWheelWindow( vcl::Window* pParent ) : // create wheel window SetTitleType( FloatWinTitleType::NONE ); ImplCreateImageList(); - ResMgr* pResMgr = ImplGetResMgr(); - Bitmap aBmp; - if( pResMgr ) - aBmp = Bitmap( ResId( SV_RESID_BITMAP_SCROLLMSK, *pResMgr ) ); - ImplSetRegion( aBmp ); + BitmapEx aBmp(SV_RESID_BITMAP_SCROLLMSK); + ImplSetRegion(aBmp.GetBitmap()); // set wheel mode if( bHorz && bVert ) @@ -121,16 +119,12 @@ void ImplWheelWindow::ImplSetRegion( const Bitmap& rRegionBmp ) void ImplWheelWindow::ImplCreateImageList() { - ResMgr* pResMgr = ImplGetResMgr(); - if (pResMgr) - { - maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_SCROLLVH, *pResMgr)))); - maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_SCROLLV, *pResMgr)))); - maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_SCROLLH, *pResMgr)))); - maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_WHEELVH, *pResMgr)))); - maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_WHEELV, *pResMgr)))); - maImgList.push_back(Image(BitmapEx(ResId(SV_RESID_BITMAP_WHEELH, *pResMgr)))); - } + maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_SCROLLVH))); + maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_SCROLLV))); + maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_SCROLLH))); + maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_WHEELVH))); + maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_WHEELV))); + maImgList.push_back(Image(BitmapEx(SV_RESID_BITMAP_WHEELH))); } void ImplWheelWindow::ImplSetWheelMode( WheelMode nWheelMode ) |
