[Libreoffice-commits] core.git: sfx2/source

[Caolán McNamara]

 sfx2/source/dialog/dialog.hrc   |    2 +-
 sfx2/source/dialog/templdlg.cxx |    2 +-
 sfx2/source/dialog/templdlg.src |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f144d592fb5c314680e397e3ac686721fb2bc3d6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 25 13:17:21 2016 +0100

    separate two different uses of DLG_STYLE_DESIGNER
    
    Change-Id: I1edbbb4e2f1326b189a80815b1c80bd0f9b52258

diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc
index 551478a..800f717 100644
--- a/sfx2/source/dialog/dialog.hrc
+++ b/sfx2/source/dialog/dialog.hrc
@@ -57,7 +57,7 @@
 
 #define STR_PDF_EXPORT_SEND             ( RC_DIALOG_BEGIN + 120 )
 #define IMG_INFO                        ( RC_DIALOG_BEGIN + 122 )
-
+#define RID_STYLE_DESIGNER_IMAGELIST    ( RC_DIALOG_BEGIN + 123 )
 #define SFX_ST_EDIT                     ( RC_DIALOG_BEGIN + 124 )
 #define STR_STYLE_ELEMTLIST             ( RC_DIALOG_BEGIN + 125 )
 #define STR_FONT_TABPAGE                ( RC_DIALOG_BEGIN + 126 )
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 6c98695..4f93ea9 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2331,7 +2331,7 @@ void SfxTemplateDialog_Impl::updateFamilyImages()
 
 void SfxTemplateDialog_Impl::updateNonFamilyImages()
 {
-    m_aActionTbR->SetImageList( ImageList( SfxResId( DLG_STYLE_DESIGNER ) ) );
+    m_aActionTbR->SetImageList(ImageList(SfxResId(RID_STYLE_DESIGNER_IMAGELIST)));
 }
 
 void SfxTemplateDialog_Impl::ClearFamilyList()
diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src
index 9ce2529..0381acf 100644
--- a/sfx2/source/dialog/templdlg.src
+++ b/sfx2/source/dialog/templdlg.src
@@ -21,7 +21,7 @@
 #include "dialog.hrc"
 #include "helpid.hrc"
 
-ImageList DLG_STYLE_DESIGNER
+ImageList RID_STYLE_DESIGNER_IMAGELIST
 {
     Prefix = "sc";
     IdList =