[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source svx/inc svx/source

[Caolán McNamara]

 sc/inc/sc.hrc                     |    3 ++-
 sc/source/ui/app/scmod.cxx        |    6 ++----
 sc/source/ui/styleui/scstyles.src |   12 +++++++-----
 svx/inc/gallery.hrc               |    4 ++--
 svx/source/gallery2/galbrws2.cxx  |    4 ++--
 svx/source/gallery2/gallery.src   |    8 ++++----
 6 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit 08f7304fa3ed174ea47e9c90a21ed64219b1a969
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 5 17:16:17 2016 +0000

    drop these intermediate Images and use BitmapEx directly
    
    Change-Id: Ief15df1722bb59323563c21d76f5af624fbef8c9

diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc
index 659166d..b710d7c 100644
--- a/svx/inc/gallery.hrc
+++ b/svx/inc/gallery.hrc
@@ -58,8 +58,8 @@
 #define RID_SVXBMP_THEME_NORMAL                 (RID_SVX_GALLERY_START + 48)
 #define RID_SVXBMP_THEME_READONLY               (RID_SVX_GALLERY_START + 52)
 #define RID_SVXBMP_THEME_DEFAULT                (RID_SVX_GALLERY_START + 54)
-#define RID_SVXIMG_GALLERY_VIEW_ICON            (RID_SVX_GALLERY_START + 56)
-#define RID_SVXIMG_GALLERY_VIEW_LIST            (RID_SVX_GALLERY_START + 57)
+#define RID_SVXBMP_GALLERY_VIEW_ICON            (RID_SVX_GALLERY_START + 56)
+#define RID_SVXBMP_GALLERY_VIEW_LIST            (RID_SVX_GALLERY_START + 57)
 
 // Gallery-Bitmaps fuer Sounds
 #define RID_SVXBMP_GALLERY_SOUND_1              (RID_SVX_GALLERY_START + 62)
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 7e4cdca..41ee2b8 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -1304,8 +1304,8 @@ IMPL_LINK_NOARG(GalleryBrowser2, MiscHdl, LinkParamNone*, void)
 {
     maViewBox->SetOutStyle( maMiscOptions.GetToolboxStyle() );
 
-    BitmapEx aIconBmpEx = BitmapEx( Image( GAL_RES( RID_SVXIMG_GALLERY_VIEW_ICON ) ).GetBitmapEx() );
-    BitmapEx aListBmpEx = BitmapEx( Image( GAL_RES( RID_SVXIMG_GALLERY_VIEW_LIST ) ).GetBitmapEx() );
+    BitmapEx aIconBmpEx(GAL_RES(RID_SVXBMP_GALLERY_VIEW_ICON));
+    BitmapEx aListBmpEx(GAL_RES(RID_SVXBMP_GALLERY_VIEW_LIST));
 
     if( maMiscOptions.AreCurrentSymbolsLarge() )
     {
diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src
index abd82ce..bbea8503 100644
--- a/svx/source/gallery2/gallery.src
+++ b/svx/source/gallery2/gallery.src
@@ -178,14 +178,14 @@ Bitmap RID_SVXBMP_GALLERY_SOUND_7
     File = "galsnd7.png";
 };
 
-Image RID_SVXIMG_GALLERY_VIEW_ICON
+Bitmap RID_SVXBMP_GALLERY_VIEW_ICON
 {
-    ImageBitmap = Bitmap { File = "galicon.png"; };
+    File = "galicon.png";
 };
 
-Image RID_SVXIMG_GALLERY_VIEW_LIST
+Bitmap RID_SVXBMP_GALLERY_VIEW_LIST
 {
-    ImageBitmap = Bitmap { File = "gallist.png"; };
+    File = "gallist.png";
 };
 
 Menu RID_SVXMN_GALLERY1
commit e7a3a9104a4ab5709583b7506b0bd10ec6163fba
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 5 17:08:08 2016 +0000

    unwind sc RID_STYLEFAMILY_IMAGELIST imagelist
    
    Change-Id: I22bc4a615295bf43110633e22b5884b511777c2b

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 64ae387..d5b87c4 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1093,7 +1093,8 @@
 
 #define RID_CELLSTYLEFAMILY             (SC_DIALOGS_START + 138)
 #define RID_PAGESTYLEFAMILY             (SC_DIALOGS_START + 139)
-#define RID_STYLEFAMILY_IMAGELIST       (SC_DIALOGS_START + 140)
+#define BMP_STYLES_FAMILY_CELL          (SC_DIALOGS_START + 140)
+#define BMP_STYLES_FAMILY_PAGE          (SC_DIALOGS_START + 141)
 
 #define RID_POPUP_FILTER                (SC_DIALOGS_START + 153)
 
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 99e59de..ff0b4c95 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2274,16 +2274,14 @@ SfxStyleFamilies* ScModule::CreateStyleFamilies()
 {
     SfxStyleFamilies *pStyleFamilies = new SfxStyleFamilies;
 
-    ImageList aEntryImages(ScResId(RID_STYLEFAMILY_IMAGELIST));
-
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para,
                                                     ScGlobal::GetRscString(STR_STYLE_FAMILY_CELL),
-                                                    aEntryImages.GetImage(1),
+                                                    Image(BitmapEx(ScResId(BMP_STYLES_FAMILY_CELL))),
                                                     ScResId(RID_CELLSTYLEFAMILY)));
 
     pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Page,
                                                     ScGlobal::GetRscString(STR_STYLE_FAMILY_PAGE),
-                                                    aEntryImages.GetImage(2),
+                                                    Image(BitmapEx(ScResId(BMP_STYLES_FAMILY_PAGE))),
                                                     ScResId(RID_PAGESTYLEFAMILY)));
 
     return pStyleFamilies;
diff --git a/sc/source/ui/styleui/scstyles.src b/sc/source/ui/styleui/scstyles.src
index 2502cee..60f304b 100644
--- a/sc/source/ui/styleui/scstyles.src
+++ b/sc/source/ui/styleui/scstyles.src
@@ -41,12 +41,14 @@ StringArray RID_PAGESTYLEFAMILY
     };
 };
 
-//  style family images are now taken from an ImageList
-//  (for each family, there's one entry in the IdList)
-ImageList RID_STYLEFAMILY_IMAGELIST
+Bitmap BMP_STYLES_FAMILY_CELL
 {
-    Prefix = "sf";
-    IdList = { 1; 2; };
+    File = "sf01.png";
+};
+
+Bitmap BMP_STYLES_FAMILY_PAGE
+{
+    File = "sf02.png";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */