[Libreoffice-commits] .: 2 commits - sc/source

[Kohei Yoshida]

 sc/source/ui/styleui/scstyles.src |   26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

New commits:
commit 4a26a8f2b46051138e2662be2fcf446ee3fca075
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Mar 23 19:00:03 2011 -0400

    These string ID's are no longer resolved. Do as Writer does.

diff --git a/sc/source/ui/styleui/scstyles.src b/sc/source/ui/styleui/scstyles.src
index 0011238..0cc89ca 100644
--- a/sc/source/ui/styleui/scstyles.src
+++ b/sc/source/ui/styleui/scstyles.src
@@ -37,9 +37,9 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
             StyleFamily = SFX_STYLE_FAMILY_PARA ;
             FilterList =
             {
-                < STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ;
-                < STR_STYLE_FILTER_USED ; SFXSTYLEBIT_USED ; > ;
-                < STR_STYLE_FILTER_USERDEF ; SFXSTYLEBIT_USERDEF ; >  ;
+                < "All Styles" ; SFXSTYLEBIT_ALL ; > ;
+                < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
+                < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; >  ;
             };
             Text [ en-US ] = "Cell Styles" ;
         };
@@ -49,8 +49,8 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
             StyleFamily = SFX_STYLE_FAMILY_PAGE ;
             FilterList =
             {
-                < STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ;
-                < STR_STYLE_FILTER_USERDEF ; SFXSTYLEBIT_USERDEF ; > ;
+                < "All Styles" ; SFXSTYLEBIT_ALL ; > ;
+                < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
             };
             Text [ en-US ] = "Page Styles" ;
         };
commit 503bf5d83531f7ad9e3aa1fc8b47975fe2eeb23e
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Mar 23 18:55:32 2011 -0400

    Remove IMPL_FAMILY macro; this is too much.

diff --git a/sc/source/ui/styleui/scstyles.src b/sc/source/ui/styleui/scstyles.src
index 6fdd132..0011238 100644
--- a/sc/source/ui/styleui/scstyles.src
+++ b/sc/source/ui/styleui/scstyles.src
@@ -28,29 +28,30 @@
 #include "sc.hrc"
 #include <svl/style.hrc>
 
-#define IMPL_FAMILY(family,filter) \
-    StyleFamily = family;						\
-    FilterList = { filter }
-
- //------------------------------------------------------------------------
 SfxStyleFamilies DLG_STYLE_DESIGNER
 {
     StyleFamilyList =
     {
         SfxStyleFamilyItem
         {
-            IMPL_FAMILY ( SFX_STYLE_FAMILY_PARA ,
-            < STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ;
-            < STR_STYLE_FILTER_USED ; SFXSTYLEBIT_USED ; > ;
-            < STR_STYLE_FILTER_USERDEF ; SFXSTYLEBIT_USERDEF ; > ; ) ;
+            StyleFamily = SFX_STYLE_FAMILY_PARA ;
+            FilterList =
+            {
+                < STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ;
+                < STR_STYLE_FILTER_USED ; SFXSTYLEBIT_USED ; > ;
+                < STR_STYLE_FILTER_USERDEF ; SFXSTYLEBIT_USERDEF ; >  ;
+            };
             Text [ en-US ] = "Cell Styles" ;
         };
 
         SfxStyleFamilyItem
         {
-            IMPL_FAMILY ( SFX_STYLE_FAMILY_PAGE ,
-            < STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ;
-            < STR_STYLE_FILTER_USERDEF ; SFXSTYLEBIT_USERDEF ; > ; ) ;
+            StyleFamily = SFX_STYLE_FAMILY_PAGE ;
+            FilterList =
+            {
+                < STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ;
+                < STR_STYLE_FILTER_USERDEF ; SFXSTYLEBIT_USERDEF ; > ;
+            };
             Text [ en-US ] = "Page Styles" ;
         };
     };
@@ -64,3 +65,4 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
         IdList = { 1; 2; };
     };
 };
+