dev/null |binary icon-themes/elementary/sw/res/sf01.png |binary icon-themes/elementary/sw/res/sf02.png |binary icon-themes/elementary/sw/res/sf03.png |binary icon-themes/elementary/sw/res/sf04.png |binary icon-themes/elementary/sw/res/sf05.png |binary icon-themes/galaxy/sw/res/sf01.png |binary icon-themes/galaxy/sw/res/sf02.png |binary icon-themes/galaxy/sw/res/sf03.png |binary icon-themes/galaxy/sw/res/sf04.png |binary icon-themes/galaxy/sw/res/sf05.png |binary icon-themes/galaxy/sw/res/sf06.png |binary icon-themes/hicontrast/sw/res/sf01.png |binary icon-themes/hicontrast/sw/res/sf02.png |binary icon-themes/hicontrast/sw/res/sf03.png |binary icon-themes/hicontrast/sw/res/sf04.png |binary icon-themes/hicontrast/sw/res/sf05.png |binary icon-themes/oxygen/sw/res/sf01.png |binary icon-themes/oxygen/sw/res/sf02.png |binary icon-themes/oxygen/sw/res/sf03.png |binary icon-themes/oxygen/sw/res/sf04.png |binary icon-themes/oxygen/sw/res/sf05.png |binary icon-themes/sifr/sw/res/sf03.png |binary icon-themes/tango/sw/res/sf01.png |binary icon-themes/tango/sw/res/sf02.png |binary icon-themes/tango/sw/res/sf03.png |binary icon-themes/tango/sw/res/sf04.png |binary icon-themes/tango/sw/res/sf05.png |binary icon-themes/tango/sw/res/sf06.png |binary icon-themes/tango_testing/sw/imglst/sf01.svg |14664 --------------------------- icon-themes/tango_testing/sw/imglst/sf02.svg | 7829 -------------- icon-themes/tango_testing/sw/imglst/sf03.svg | 904 - icon-themes/tango_testing/sw/imglst/sf04.svg | 264 icon-themes/tango_testing/sw/imglst/sf05.svg | 8834 ---------------- icon-themes/tango_testing/sw/res/sf01.png |binary icon-themes/tango_testing/sw/res/sf01.svg |14664 +++++++++++++++++++++++++++ icon-themes/tango_testing/sw/res/sf02.png |binary icon-themes/tango_testing/sw/res/sf02.svg | 7829 ++++++++++++++ icon-themes/tango_testing/sw/res/sf03.png |binary icon-themes/tango_testing/sw/res/sf03.svg | 904 + icon-themes/tango_testing/sw/res/sf04.png |binary icon-themes/tango_testing/sw/res/sf04.svg | 264 icon-themes/tango_testing/sw/res/sf05.png |binary icon-themes/tango_testing/sw/res/sf05.svg | 8834 ++++++++++++++++ sw/source/ui/app/app.src | 35 sw/source/uibase/app/swmodule.cxx | 14 sw/source/uibase/inc/app.hrc | 14 47 files changed, 32535 insertions(+), 32518 deletions(-)
New commits: commit e96e5512a94bd6fd354576ed033755998ec92bd7 Author: Caolán McNamara <[email protected]> Date: Mon Dec 5 11:27:38 2016 +0000 drop unused BMP_STYLES_FAMILY_NUM resource since... commit 197010643e7e1b8c973013efa9034ffc9bdb56c0 Author: Michael Stahl <[email protected]> Date: Fri Jul 26 22:38:28 2013 +0200 remove some more SfxObjectShell methods that only call each other Change-Id: Ife3e9add675a8163082cd0ba9b009ea0535d449d diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index 8e1dd67..5989ed3 100644 --- a/sw/source/ui/app/app.src +++ b/sw/source/ui/app/app.src @@ -201,12 +201,6 @@ Bitmap BMP_STYLES_FAMILY_TABLE File = "sf06.png" ; }; -// Bitmap for the NumberingTemplates in the Organizer -Bitmap BMP_STYLES_FAMILY_NUM -{ - File = "styfamnu.bmp" ; -}; - String STR_ENV_TITLE { Text [ en-US ] = "Envelope" ; diff --git a/sw/source/uibase/inc/app.hrc b/sw/source/uibase/inc/app.hrc index 915e64a..ad56544 100644 --- a/sw/source/uibase/inc/app.hrc +++ b/sw/source/uibase/inc/app.hrc @@ -30,9 +30,6 @@ #define STR_PRINT_MERGE_MACRO (RC_APP_BEGIN + 15) #define STR_PAGE_COUNT_MACRO (RC_APP_BEGIN + 16) -// Bitmap for the numbering style in organizer -#define BMP_STYLES_FAMILY_NUM (RC_APP_BEGIN + 17) - // Strings for regions in the configuration #define STR_PAGEOFFSET (RC_APP_BEGIN + 74) #define STR_PAGEBREAK (RC_APP_BEGIN + 75) commit de943f90ed1d1402d2eb9c778740b4e7dfcda92c Author: Caolán McNamara <[email protected]> Date: Mon Dec 5 11:25:13 2016 +0000 unwind RID_STYLEFAMILY_IMAGELIST imagelist Change-Id: I03f4058114bb837c3d8edd25791464e7d7ba16ed diff --git a/icon-themes/elementary/sw/imglst/sf01.png b/icon-themes/elementary/sw/res/sf01.png similarity index 100% rename from icon-themes/elementary/sw/imglst/sf01.png rename to icon-themes/elementary/sw/res/sf01.png diff --git a/icon-themes/elementary/sw/imglst/sf02.png b/icon-themes/elementary/sw/res/sf02.png similarity index 100% rename from icon-themes/elementary/sw/imglst/sf02.png rename to icon-themes/elementary/sw/res/sf02.png diff --git a/icon-themes/elementary/sw/imglst/sf03.png b/icon-themes/elementary/sw/res/sf03.png similarity index 100% rename from icon-themes/elementary/sw/imglst/sf03.png rename to icon-themes/elementary/sw/res/sf03.png diff --git a/icon-themes/elementary/sw/imglst/sf04.png b/icon-themes/elementary/sw/res/sf04.png similarity index 100% rename from icon-themes/elementary/sw/imglst/sf04.png rename to icon-themes/elementary/sw/res/sf04.png diff --git a/icon-themes/elementary/sw/imglst/sf05.png b/icon-themes/elementary/sw/res/sf05.png similarity index 100% rename from icon-themes/elementary/sw/imglst/sf05.png rename to icon-themes/elementary/sw/res/sf05.png diff --git a/icon-themes/galaxy/sw/imglst/sf01.png b/icon-themes/galaxy/sw/res/sf01.png similarity index 100% rename from icon-themes/galaxy/sw/imglst/sf01.png rename to icon-themes/galaxy/sw/res/sf01.png diff --git a/icon-themes/galaxy/sw/imglst/sf02.png b/icon-themes/galaxy/sw/res/sf02.png similarity index 100% rename from icon-themes/galaxy/sw/imglst/sf02.png rename to icon-themes/galaxy/sw/res/sf02.png diff --git a/icon-themes/galaxy/sw/imglst/sf03.png b/icon-themes/galaxy/sw/res/sf03.png similarity index 100% rename from icon-themes/galaxy/sw/imglst/sf03.png rename to icon-themes/galaxy/sw/res/sf03.png diff --git a/icon-themes/galaxy/sw/imglst/sf04.png b/icon-themes/galaxy/sw/res/sf04.png similarity index 100% rename from icon-themes/galaxy/sw/imglst/sf04.png rename to icon-themes/galaxy/sw/res/sf04.png diff --git a/icon-themes/galaxy/sw/imglst/sf05.png b/icon-themes/galaxy/sw/res/sf05.png similarity index 100% rename from icon-themes/galaxy/sw/imglst/sf05.png rename to icon-themes/galaxy/sw/res/sf05.png diff --git a/icon-themes/galaxy/sw/imglst/sf06.png b/icon-themes/galaxy/sw/res/sf06.png similarity index 100% rename from icon-themes/galaxy/sw/imglst/sf06.png rename to icon-themes/galaxy/sw/res/sf06.png diff --git a/icon-themes/hicontrast/sw/imglst/sf01.png b/icon-themes/hicontrast/sw/res/sf01.png similarity index 100% rename from icon-themes/hicontrast/sw/imglst/sf01.png rename to icon-themes/hicontrast/sw/res/sf01.png diff --git a/icon-themes/hicontrast/sw/imglst/sf02.png b/icon-themes/hicontrast/sw/res/sf02.png similarity index 100% rename from icon-themes/hicontrast/sw/imglst/sf02.png rename to icon-themes/hicontrast/sw/res/sf02.png diff --git a/icon-themes/hicontrast/sw/imglst/sf03.png b/icon-themes/hicontrast/sw/res/sf03.png similarity index 100% rename from icon-themes/hicontrast/sw/imglst/sf03.png rename to icon-themes/hicontrast/sw/res/sf03.png diff --git a/icon-themes/hicontrast/sw/imglst/sf04.png b/icon-themes/hicontrast/sw/res/sf04.png similarity index 100% rename from icon-themes/hicontrast/sw/imglst/sf04.png rename to icon-themes/hicontrast/sw/res/sf04.png diff --git a/icon-themes/hicontrast/sw/imglst/sf05.png b/icon-themes/hicontrast/sw/res/sf05.png similarity index 100% rename from icon-themes/hicontrast/sw/imglst/sf05.png rename to icon-themes/hicontrast/sw/res/sf05.png diff --git a/icon-themes/oxygen/sw/imglst/sf01.png b/icon-themes/oxygen/sw/res/sf01.png similarity index 100% rename from icon-themes/oxygen/sw/imglst/sf01.png rename to icon-themes/oxygen/sw/res/sf01.png diff --git a/icon-themes/oxygen/sw/imglst/sf02.png b/icon-themes/oxygen/sw/res/sf02.png similarity index 100% rename from icon-themes/oxygen/sw/imglst/sf02.png rename to icon-themes/oxygen/sw/res/sf02.png diff --git a/icon-themes/oxygen/sw/imglst/sf03.png b/icon-themes/oxygen/sw/res/sf03.png similarity index 100% rename from icon-themes/oxygen/sw/imglst/sf03.png rename to icon-themes/oxygen/sw/res/sf03.png diff --git a/icon-themes/oxygen/sw/imglst/sf04.png b/icon-themes/oxygen/sw/res/sf04.png similarity index 100% rename from icon-themes/oxygen/sw/imglst/sf04.png rename to icon-themes/oxygen/sw/res/sf04.png diff --git a/icon-themes/oxygen/sw/imglst/sf05.png b/icon-themes/oxygen/sw/res/sf05.png similarity index 100% rename from icon-themes/oxygen/sw/imglst/sf05.png rename to icon-themes/oxygen/sw/res/sf05.png diff --git a/icon-themes/sifr/sw/imglst/sf03.png b/icon-themes/sifr/sw/res/sf03.png similarity index 100% rename from icon-themes/sifr/sw/imglst/sf03.png rename to icon-themes/sifr/sw/res/sf03.png diff --git a/icon-themes/tango/sw/imglst/sf01.png b/icon-themes/tango/sw/res/sf01.png similarity index 100% rename from icon-themes/tango/sw/imglst/sf01.png rename to icon-themes/tango/sw/res/sf01.png diff --git a/icon-themes/tango/sw/imglst/sf02.png b/icon-themes/tango/sw/res/sf02.png similarity index 100% rename from icon-themes/tango/sw/imglst/sf02.png rename to icon-themes/tango/sw/res/sf02.png diff --git a/icon-themes/tango/sw/imglst/sf03.png b/icon-themes/tango/sw/res/sf03.png similarity index 100% rename from icon-themes/tango/sw/imglst/sf03.png rename to icon-themes/tango/sw/res/sf03.png diff --git a/icon-themes/tango/sw/imglst/sf04.png b/icon-themes/tango/sw/res/sf04.png similarity index 100% rename from icon-themes/tango/sw/imglst/sf04.png rename to icon-themes/tango/sw/res/sf04.png diff --git a/icon-themes/tango/sw/imglst/sf05.png b/icon-themes/tango/sw/res/sf05.png similarity index 100% rename from icon-themes/tango/sw/imglst/sf05.png rename to icon-themes/tango/sw/res/sf05.png diff --git a/icon-themes/tango/sw/imglst/sf06.png b/icon-themes/tango/sw/res/sf06.png similarity index 100% rename from icon-themes/tango/sw/imglst/sf06.png rename to icon-themes/tango/sw/res/sf06.png diff --git a/icon-themes/tango_testing/sw/imglst/sf01.png b/icon-themes/tango_testing/sw/res/sf01.png similarity index 100% rename from icon-themes/tango_testing/sw/imglst/sf01.png rename to icon-themes/tango_testing/sw/res/sf01.png diff --git a/icon-themes/tango_testing/sw/imglst/sf01.svg b/icon-themes/tango_testing/sw/res/sf01.svg similarity index 100% rename from icon-themes/tango_testing/sw/imglst/sf01.svg rename to icon-themes/tango_testing/sw/res/sf01.svg diff --git a/icon-themes/tango_testing/sw/imglst/sf02.png b/icon-themes/tango_testing/sw/res/sf02.png similarity index 100% rename from icon-themes/tango_testing/sw/imglst/sf02.png rename to icon-themes/tango_testing/sw/res/sf02.png diff --git a/icon-themes/tango_testing/sw/imglst/sf02.svg b/icon-themes/tango_testing/sw/res/sf02.svg similarity index 100% rename from icon-themes/tango_testing/sw/imglst/sf02.svg rename to icon-themes/tango_testing/sw/res/sf02.svg diff --git a/icon-themes/tango_testing/sw/imglst/sf03.png b/icon-themes/tango_testing/sw/res/sf03.png similarity index 100% rename from icon-themes/tango_testing/sw/imglst/sf03.png rename to icon-themes/tango_testing/sw/res/sf03.png diff --git a/icon-themes/tango_testing/sw/imglst/sf03.svg b/icon-themes/tango_testing/sw/res/sf03.svg similarity index 100% rename from icon-themes/tango_testing/sw/imglst/sf03.svg rename to icon-themes/tango_testing/sw/res/sf03.svg diff --git a/icon-themes/tango_testing/sw/imglst/sf04.png b/icon-themes/tango_testing/sw/res/sf04.png similarity index 100% rename from icon-themes/tango_testing/sw/imglst/sf04.png rename to icon-themes/tango_testing/sw/res/sf04.png diff --git a/icon-themes/tango_testing/sw/imglst/sf04.svg b/icon-themes/tango_testing/sw/res/sf04.svg similarity index 100% rename from icon-themes/tango_testing/sw/imglst/sf04.svg rename to icon-themes/tango_testing/sw/res/sf04.svg diff --git a/icon-themes/tango_testing/sw/imglst/sf05.png b/icon-themes/tango_testing/sw/res/sf05.png similarity index 100% rename from icon-themes/tango_testing/sw/imglst/sf05.png rename to icon-themes/tango_testing/sw/res/sf05.png diff --git a/icon-themes/tango_testing/sw/imglst/sf05.svg b/icon-themes/tango_testing/sw/res/sf05.svg similarity index 100% rename from icon-themes/tango_testing/sw/imglst/sf05.svg rename to icon-themes/tango_testing/sw/res/sf05.svg diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index 2796e9c..8e1dd67 100644 --- a/sw/source/ui/app/app.src +++ b/sw/source/ui/app/app.src @@ -171,18 +171,41 @@ StringArray RID_TABLESTYLEFAMILY }; }; -ImageList RID_STYLEFAMILY_IMAGELIST +Bitmap BMP_STYLES_FAMILY_PARA { - Prefix = "sf"; - IdList = - { - 1; 2; 3; 4; 5; 6; - }; - IdCount = 6; + File = "sf01.png" ; +}; + +Bitmap BMP_STYLES_FAMILY_CHAR +{ + File = "sf02.png" ; +}; + +Bitmap BMP_STYLES_FAMILY_FRAME +{ + File = "sf03.png" ; +}; + +Bitmap BMP_STYLES_FAMILY_PAGE +{ + File = "sf04.png" ; +}; + +Bitmap BMP_STYLES_FAMILY_LIST +{ + File = "sf05.png" ; +}; + +Bitmap BMP_STYLES_FAMILY_TABLE +{ + File = "sf06.png" ; }; // Bitmap for the NumberingTemplates in the Organizer -Bitmap BMP_STYLES_FAMILY_NUM { File = "styfamnu.bmp" ; }; +Bitmap BMP_STYLES_FAMILY_NUM +{ + File = "styfamnu.bmp" ; +}; String STR_ENV_TITLE { diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index b43c8fd..de6a738 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -401,36 +401,34 @@ SfxStyleFamilies* SwModule::CreateStyleFamilies() { SfxStyleFamilies *pStyleFamilies = new SfxStyleFamilies; - ImageList aEntryImages(SW_RES(RID_STYLEFAMILY_IMAGELIST)); - pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para, SW_RESSTR(STR_PARAGRAPHSTYLEFAMILY), - aEntryImages.GetImage(1), + Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_PARA))), SW_RES(RID_PARAGRAPHSTYLEFAMILY))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Char, SW_RESSTR(STR_CHARACTERSTYLEFAMILY), - aEntryImages.GetImage(2), + Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_CHAR))), SW_RES(RID_CHARACTERSTYLEFAMILY))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Frame, SW_RESSTR(STR_FRAMESTYLEFAMILY), - aEntryImages.GetImage(3), + Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_FRAME))), SW_RES(RID_FRAMESTYLEFAMILY))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Page, SW_RESSTR(STR_PAGESTYLEFAMILY), - aEntryImages.GetImage(4), + Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_PAGE))), SW_RES(RID_PAGESTYLEFAMILY))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo, SW_RESSTR(STR_LISTSTYLEFAMILY), - aEntryImages.GetImage(5), + Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_LIST))), SW_RES(RID_LISTSTYLEFAMILY))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Table, SW_RESSTR(STR_TABLESTYLEFAMILY), - aEntryImages.GetImage(6), + Image(BitmapEx(SW_RES(BMP_STYLES_FAMILY_TABLE))), SW_RES(RID_TABLESTYLEFAMILY))); return pStyleFamilies; diff --git a/sw/source/uibase/inc/app.hrc b/sw/source/uibase/inc/app.hrc index d39e4d5..915e64a 100644 --- a/sw/source/uibase/inc/app.hrc +++ b/sw/source/uibase/inc/app.hrc @@ -104,9 +104,14 @@ #define RID_PAGESTYLEFAMILY (RC_APP_BEGIN + 149) #define RID_LISTSTYLEFAMILY (RC_APP_BEGIN + 150) #define RID_TABLESTYLEFAMILY (RC_APP_BEGIN + 151) -#define RID_STYLEFAMILY_IMAGELIST (RC_APP_BEGIN + 152) - -#define APP_ACT_END RID_STYLEFAMILY_IMAGELIST +#define BMP_STYLES_FAMILY_PARA (RC_APP_BEGIN + 152) +#define BMP_STYLES_FAMILY_CHAR (RC_APP_BEGIN + 153) +#define BMP_STYLES_FAMILY_FRAME (RC_APP_BEGIN + 154) +#define BMP_STYLES_FAMILY_PAGE (RC_APP_BEGIN + 155) +#define BMP_STYLES_FAMILY_LIST (RC_APP_BEGIN + 156) +#define BMP_STYLES_FAMILY_TABLE (RC_APP_BEGIN + 157) + +#define APP_ACT_END BMP_STYLES_FAMILY_TABLE #if APP_ACT_END > RC_APP_END #error Resource-Id Ueberlauf in #file, #line
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
