[Libreoffice-commits] core.git: sfx2/inc sfx2/source
Caolán McNamara
caolanm at redhat.com
Wed Apr 26 09:52:54 UTC 2017
sfx2/inc/app.hrc | 23 ---------
sfx2/inc/bitmaps.hlst | 21 +++++++++
sfx2/source/appl/newhelp.cxx | 45 +++++++++----------
sfx2/source/appl/newhelp.src | 100 -------------------------------------------
4 files changed, 44 insertions(+), 145 deletions(-)
New commits:
commit d23af0cd71c655325f1b7821ebe1ca34cc34afff
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 26 10:49:43 2017 +0100
remove sfx2 bitmaps from .src files
Change-Id: I54448567db051f4446c36b16acdda2288b391537
diff --git a/sfx2/inc/app.hrc b/sfx2/inc/app.hrc
index 1a95425fecf8..24eba24c2dbc 100644
--- a/sfx2/inc/app.hrc
+++ b/sfx2/inc/app.hrc
@@ -38,20 +38,6 @@
#define STR_INFO_NOSEARCHRESULTS (RID_SFX_APP_START+106)
#define STR_INFO_NOSEARCHTEXTFOUND (RID_SFX_APP_START+107)
-#define BMP_HELP_TOOLBOX_INDEX_ON (RID_SFX_APP_START+110)
-#define BMP_HELP_TOOLBOX_INDEX_OFF (RID_SFX_APP_START+111)
-#define BMP_HELP_TOOLBOX_START (RID_SFX_APP_START+112)
-#define BMP_HELP_TOOLBOX_PREV (RID_SFX_APP_START+113)
-#define BMP_HELP_TOOLBOX_NEXT (RID_SFX_APP_START+114)
-#define BMP_HELP_TOOLBOX_PRINT (RID_SFX_APP_START+115)
-#define BMP_HELP_TOOLBOX_BOOKMARKS (RID_SFX_APP_START+116)
-#define BMP_HELP_TOOLBOX_SEARCHDIALOG (RID_SFX_APP_START+117)
-#define BMP_HELP_TOOLBOX_COPY (RID_SFX_APP_START+118)
-
-#define BMP_HELP_CONTENT_BOOK_OPEN (RID_SFX_APP_START+120)
-#define BMP_HELP_CONTENT_BOOK_CLOSED (RID_SFX_APP_START+122)
-#define BMP_HELP_CONTENT_DOC (RID_SFX_APP_START+124)
-
#define STR_HELP_WINDOW_TITLE (RID_SFX_APP_START+125) // string
#define STR_HELP_BUTTON_INDEX_ON (RID_SFX_APP_START+126)
@@ -79,15 +65,6 @@
#define RID_HELP_ONSTARTUP_TEXT (RID_SFX_APP_START+145)
-#define BMP_HELP_TOOLBOX_L_INDEX_ON (RID_SFX_APP_START+160)
-#define BMP_HELP_TOOLBOX_L_INDEX_OFF (RID_SFX_APP_START+161)
-#define BMP_HELP_TOOLBOX_L_START (RID_SFX_APP_START+162)
-#define BMP_HELP_TOOLBOX_L_PREV (RID_SFX_APP_START+163)
-#define BMP_HELP_TOOLBOX_L_NEXT (RID_SFX_APP_START+164)
-#define BMP_HELP_TOOLBOX_L_PRINT (RID_SFX_APP_START+165)
-#define BMP_HELP_TOOLBOX_L_BOOKMARKS (RID_SFX_APP_START+166)
-#define BMP_HELP_TOOLBOX_L_SEARCHDIALOG (RID_SFX_APP_START+167)
-
#define RID_SECURITY_WARNING_TITLE (RID_SFX_APP_START + 181)
#define RID_SVXSTR_XMLSEC_QUERY_LOSINGSIGNATURE (RID_SFX_APP_START + 186)
diff --git a/sfx2/inc/bitmaps.hlst b/sfx2/inc/bitmaps.hlst
index ff88d467071d..d6fb2f3416cc 100644
--- a/sfx2/inc/bitmaps.hlst
+++ b/sfx2/inc/bitmaps.hlst
@@ -10,6 +10,27 @@
#ifndef INCLUDED_SFX2_INC_BITMAPS_HRC
#define INCLUDED_SFX2_INC_BITMAPS_HRC
+#define BMP_HELP_TOOLBOX_INDEX_ON "sfx2/res/indexon_small.png"
+#define BMP_HELP_TOOLBOX_INDEX_OFF "sfx2/res/indexoff_small.png"
+#define BMP_HELP_TOOLBOX_START "res/sc06303.png"
+#define BMP_HELP_TOOLBOX_PREV "res/sc06301.png"
+#define BMP_HELP_TOOLBOX_NEXT "res/sc06300.png"
+#define BMP_HELP_TOOLBOX_PRINT "res/sc05504.png"
+#define BMP_HELP_TOOLBOX_BOOKMARKS "sfx2/res/favourite.png"
+#define BMP_HELP_TOOLBOX_SEARCHDIALOG "sfx2/res/sc05961.png"
+#define BMP_HELP_TOOLBOX_COPY "sfx2/res/sc05711.png"
+#define BMP_HELP_CONTENT_BOOK_OPEN "sfx2/res/hlpbookopen.png"
+#define BMP_HELP_CONTENT_BOOK_CLOSED "sfx2/res/hlpbookclosed.png"
+#define BMP_HELP_CONTENT_DOC "sfx2/res/hlpdoc.png"
+#define BMP_HELP_TOOLBOX_L_INDEX_ON "sfx2/res/indexon_big.png"
+#define BMP_HELP_TOOLBOX_L_INDEX_OFF "sfx2/res/indexoff_big.png"
+#define BMP_HELP_TOOLBOX_L_START "res/lc06303.png"
+#define BMP_HELP_TOOLBOX_L_PREV "res/lc06301.png"
+#define BMP_HELP_TOOLBOX_L_NEXT "res/lc06300.png"
+#define BMP_HELP_TOOLBOX_L_PRINT "res/lc05504.png"
+#define BMP_HELP_TOOLBOX_L_BOOKMARKS "sfx2/res/favourite_big.png"
+#define BMP_HELP_TOOLBOX_L_SEARCHDIALOG "res/lc05961.png"
+
//start, sfx2/source/sidebar/Theme.cxx
#define CLOSEDOC "sfx2/res/closedoc.png"
#define GRIP "sfx2/res/grip.png"
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 4cb7668d9135..363efea0bc38 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -34,6 +34,7 @@
#include "app.hrc"
#include "newhelp.hrc"
#include "helpid.hrc"
+#include "bitmaps.hlst"
#include <rtl/ustrbuf.hxx>
#include <comphelper/configurationhelper.hxx>
@@ -267,9 +268,9 @@ struct ContentEntry_Impl
ContentListBox_Impl::ContentListBox_Impl(vcl::Window* pParent, WinBits nStyle)
: SvTreeListBox(pParent, nStyle)
- , aOpenBookImage(BitmapEx(SfxResId(BMP_HELP_CONTENT_BOOK_OPEN)))
- , aClosedBookImage(BitmapEx(SfxResId(BMP_HELP_CONTENT_BOOK_CLOSED)))
- , aDocumentImage(BitmapEx(SfxResId(BMP_HELP_CONTENT_DOC)))
+ , aOpenBookImage(BitmapEx(BMP_HELP_CONTENT_BOOK_OPEN))
+ , aClosedBookImage(BitmapEx(BMP_HELP_CONTENT_BOOK_CLOSED))
+ , aDocumentImage(BitmapEx(BMP_HELP_CONTENT_DOC))
{
SetStyle( GetStyle() | WB_HIDESELECTION | WB_HSCROLL );
@@ -1862,8 +1863,8 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
aToolBox ( VclPtr<ToolBox>::Create(this, 0) ),
aOnStartupCB ( VclPtr<CheckBox>::Create(this, WB_HIDE | WB_TABSTOP) ),
aSelectIdle ( "sfx2 appl SfxHelpTextWindow_Impl Select" ),
- aIndexOnImage (BitmapEx(SfxResId(BMP_HELP_TOOLBOX_INDEX_ON))),
- aIndexOffImage (BitmapEx(SfxResId(BMP_HELP_TOOLBOX_INDEX_OFF))),
+ aIndexOnImage (BitmapEx(BMP_HELP_TOOLBOX_INDEX_ON)),
+ aIndexOffImage (BitmapEx(BMP_HELP_TOOLBOX_INDEX_OFF)),
aIndexOnText ( SfxResId( STR_HELP_BUTTON_INDEX_ON ).toString() ),
aIndexOffText ( SfxResId( STR_HELP_BUTTON_INDEX_OFF ).toString() ),
aOnStartupText ( SfxResId( RID_HELP_ONSTARTUP_TEXT ).toString() ),
@@ -1959,33 +1960,33 @@ void SfxHelpTextWindow_Impl::InitToolBoxImages()
{
bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
- aIndexOnImage = Image(BitmapEx(SfxResId(bLarge ? BMP_HELP_TOOLBOX_L_INDEX_ON : BMP_HELP_TOOLBOX_INDEX_ON)));
- aIndexOffImage = Image(BitmapEx(SfxResId(bLarge ? BMP_HELP_TOOLBOX_L_INDEX_OFF : BMP_HELP_TOOLBOX_INDEX_OFF)));
+ aIndexOnImage = Image(BitmapEx(bLarge ? OUString(BMP_HELP_TOOLBOX_L_INDEX_ON) : OUString(BMP_HELP_TOOLBOX_INDEX_ON)));
+ aIndexOffImage = Image(BitmapEx(bLarge ? OUString(BMP_HELP_TOOLBOX_L_INDEX_OFF) : OUString(BMP_HELP_TOOLBOX_INDEX_OFF)));
aToolBox->SetItemImage( TBI_INDEX, bIsIndexOn ? aIndexOffImage : aIndexOnImage );
aToolBox->SetItemImage( TBI_BACKWARD,
- Image(BitmapEx(SfxResId(bLarge ? BMP_HELP_TOOLBOX_L_PREV : BMP_HELP_TOOLBOX_PREV)))
+ Image(BitmapEx(bLarge ? OUString(BMP_HELP_TOOLBOX_L_PREV) : OUString(BMP_HELP_TOOLBOX_PREV)))
);
aToolBox->SetItemImage( TBI_FORWARD,
- Image(BitmapEx(SfxResId(bLarge ? BMP_HELP_TOOLBOX_L_NEXT : BMP_HELP_TOOLBOX_NEXT)))
+ Image(BitmapEx(bLarge ? OUString(BMP_HELP_TOOLBOX_L_NEXT) : OUString(BMP_HELP_TOOLBOX_NEXT)))
);
aToolBox->SetItemImage( TBI_START,
- Image(BitmapEx(SfxResId(bLarge ? BMP_HELP_TOOLBOX_L_START : BMP_HELP_TOOLBOX_START)))
+ Image(BitmapEx(bLarge ? OUString(BMP_HELP_TOOLBOX_L_START) : OUString(BMP_HELP_TOOLBOX_START)))
);
aToolBox->SetItemImage( TBI_PRINT,
- Image(BitmapEx(SfxResId(bLarge ? BMP_HELP_TOOLBOX_L_PRINT : BMP_HELP_TOOLBOX_PRINT)))
+ Image(BitmapEx(bLarge ? OUString(BMP_HELP_TOOLBOX_L_PRINT) : OUString(BMP_HELP_TOOLBOX_PRINT)))
);
aToolBox->SetItemImage( TBI_BOOKMARKS,
- Image(BitmapEx(SfxResId(bLarge ? BMP_HELP_TOOLBOX_L_BOOKMARKS : BMP_HELP_TOOLBOX_BOOKMARKS)))
+ Image(BitmapEx(bLarge ? OUString(BMP_HELP_TOOLBOX_L_BOOKMARKS) : OUString(BMP_HELP_TOOLBOX_BOOKMARKS)))
);
aToolBox->SetItemImage( TBI_SEARCHDIALOG,
- Image(BitmapEx(SfxResId(bLarge ? BMP_HELP_TOOLBOX_L_SEARCHDIALOG : BMP_HELP_TOOLBOX_SEARCHDIALOG)))
+ Image(BitmapEx(bLarge ? OUString(BMP_HELP_TOOLBOX_L_SEARCHDIALOG) : OUString(BMP_HELP_TOOLBOX_SEARCHDIALOG)))
);
Size aSize = aToolBox->CalcWindowSizePixel();
@@ -2344,43 +2345,43 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
aPos.Y() += pTextWin->GetPosPixel().Y();
ScopedVclPtrInstance<PopupMenu> aMenu;
if ( bIsIndexOn )
- aMenu->InsertItem(TBI_INDEX, aIndexOffText, Image(BitmapEx(SfxResId(BMP_HELP_TOOLBOX_INDEX_OFF))));
+ aMenu->InsertItem(TBI_INDEX, aIndexOffText, Image(BitmapEx(BMP_HELP_TOOLBOX_INDEX_OFF)));
else
- aMenu->InsertItem(TBI_INDEX, aIndexOnText, Image(BitmapEx(SfxResId(BMP_HELP_TOOLBOX_INDEX_ON))));
+ aMenu->InsertItem(TBI_INDEX, aIndexOnText, Image(BitmapEx(BMP_HELP_TOOLBOX_INDEX_ON)));
aMenu->SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX );
aMenu->InsertSeparator();
aMenu->InsertItem( TBI_BACKWARD,
SfxResId( STR_HELP_BUTTON_PREV ).toString(),
- Image(BitmapEx(SfxResId(BMP_HELP_TOOLBOX_PREV)))
+ Image(BitmapEx(BMP_HELP_TOOLBOX_PREV))
);
aMenu->SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD );
aMenu->EnableItem( TBI_BACKWARD, pHelpWin->HasHistoryPredecessor() );
aMenu->InsertItem( TBI_FORWARD,
SfxResId( STR_HELP_BUTTON_NEXT ).toString(),
- Image(BitmapEx(SfxResId(BMP_HELP_TOOLBOX_NEXT)))
+ Image(BitmapEx(BMP_HELP_TOOLBOX_NEXT))
);
aMenu->SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD );
aMenu->EnableItem( TBI_FORWARD, pHelpWin->HasHistorySuccessor() );
aMenu->InsertItem( TBI_START,
SfxResId( STR_HELP_BUTTON_START ).toString(),
- Image(BitmapEx(SfxResId(BMP_HELP_TOOLBOX_START)))
+ Image(BitmapEx(BMP_HELP_TOOLBOX_START))
);
aMenu->SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START );
aMenu->InsertSeparator();
aMenu->InsertItem( TBI_PRINT,
SfxResId( STR_HELP_BUTTON_PRINT ).toString(),
- Image(BitmapEx(SfxResId(BMP_HELP_TOOLBOX_PRINT)))
+ Image(BitmapEx(BMP_HELP_TOOLBOX_PRINT))
);
aMenu->SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT );
aMenu->InsertItem( TBI_BOOKMARKS,
SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ).toString(),
- Image(BitmapEx(SfxResId(BMP_HELP_TOOLBOX_BOOKMARKS)))
+ Image(BitmapEx(BMP_HELP_TOOLBOX_BOOKMARKS))
);
aMenu->SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS );
aMenu->InsertItem( TBI_SEARCHDIALOG,
SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ).toString(),
- Image(BitmapEx(SfxResId(BMP_HELP_TOOLBOX_SEARCHDIALOG)))
+ Image(BitmapEx(BMP_HELP_TOOLBOX_SEARCHDIALOG))
);
aMenu->SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG );
aMenu->InsertSeparator();
@@ -2404,7 +2405,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
aMenu->InsertSeparator();
aMenu->InsertItem( TBI_COPY,
SfxResId(STR_HELP_MENU_TEXT_COPY).toString(),
- Image(BitmapEx(SfxResId(BMP_HELP_TOOLBOX_COPY)))
+ Image(BitmapEx(BMP_HELP_TOOLBOX_COPY))
);
aMenu->SetHelpId( TBI_COPY, ".uno:Copy" );
aMenu->EnableItem( TBI_COPY, HasSelection() );
diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src
index ae0bd6d3bce9..704bedae3246 100644
--- a/sfx2/source/appl/newhelp.src
+++ b/sfx2/source/appl/newhelp.src
@@ -21,66 +21,6 @@
#include "newhelp.hrc"
#include "helpid.hrc"
-Bitmap BMP_HELP_TOOLBOX_INDEX_ON
-{
- File = "indexon_small.png" ;
-};
-
-Bitmap BMP_HELP_TOOLBOX_INDEX_OFF
-{
- File = "indexoff_small.png" ;
-};
-
-Bitmap BMP_HELP_TOOLBOX_START
-{
- File = "sc06303.png" ;
-};
-
-Bitmap BMP_HELP_TOOLBOX_PREV
-{
- File = "sc06301.png" ;
-};
-
-Bitmap BMP_HELP_TOOLBOX_NEXT
-{
- File = "sc06300.png" ;
-};
-
-Bitmap BMP_HELP_TOOLBOX_PRINT
-{
- File = "sc05504.png" ;
-};
-
-Bitmap BMP_HELP_TOOLBOX_BOOKMARKS
-{
- File = "favourite.png" ;
-};
-
-Bitmap BMP_HELP_TOOLBOX_SEARCHDIALOG
-{
- File = "sc05961.png" ;
-};
-
-Bitmap BMP_HELP_TOOLBOX_COPY
-{
- File = "sc05711.png" ;
-};
-
-Bitmap BMP_HELP_CONTENT_BOOK_OPEN
-{
- File = "hlpbookopen.png" ;
-};
-
-Bitmap BMP_HELP_CONTENT_BOOK_CLOSED
-{
- File = "hlpbookclosed.png" ;
-};
-
-Bitmap BMP_HELP_CONTENT_DOC
-{
- File = "hlpdoc.png" ;
-};
-
String STR_HELP_WINDOW_TITLE
{
Text [ en-US ] = "%PRODUCTNAME Help";
@@ -151,46 +91,6 @@ String STR_INFO_NOSEARCHTEXTFOUND
Text [ en-US ] = "The text you entered was not found.";
};
-Bitmap BMP_HELP_TOOLBOX_L_INDEX_ON
-{
- File = "indexon_big.png" ;
-};
-
-Bitmap BMP_HELP_TOOLBOX_L_INDEX_OFF
-{
- File = "indexoff_big.png" ;
-};
-
-Bitmap BMP_HELP_TOOLBOX_L_START
-{
- File = "lc06303.png" ;
-};
-
-Bitmap BMP_HELP_TOOLBOX_L_PREV
-{
- File = "lc06301.png" ;
-};
-
-Bitmap BMP_HELP_TOOLBOX_L_NEXT
-{
- File = "lc06300.png" ;
-};
-
-Bitmap BMP_HELP_TOOLBOX_L_PRINT
-{
- File = "lc05504.png" ;
-};
-
-Bitmap BMP_HELP_TOOLBOX_L_BOOKMARKS
-{
- File = "favourite_big.png" ;
-};
-
-Bitmap BMP_HELP_TOOLBOX_L_SEARCHDIALOG
-{
- File = "lc05961.png" ;
-};
-
String RID_HELP_ONSTARTUP_TEXT
{
Text [ en-US ] = "~Display %PRODUCTNAME %MODULENAME Help at Startup";
More information about the Libreoffice-commits
mailing list