[Libreoffice-commits] .: Branch 'libreoffice-3-3-1' - vcl/inc vcl/source

[Thorsten Behrens]

 vcl/inc/vcl/settings.hxx    |    3 ++-
 vcl/source/app/settings.cxx |    3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 204b4ff9089332c833fea834b15c0fc3a3ead439
Author: bjoern.michaelsen at canonical.com <Bjoern Michaelsen>
Date:   Mon Feb 7 17:18:02 2011 +0100

    lp#696527: enable human icon theme in LibreOffice
    (cherry picked from commit 00b43fc0d82950e2abc57cca3746d395252bc9e0)
    
    Signed-off-by: Thorsten Behrens <tbehrens at novell.com>
    (cherry picked from commit 462b3d61e352189d3d4c71acb7f62f6919381fd1)
    
    Signed-off-by: Cedric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 30308b2..5fa547d 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -525,7 +525,8 @@ private:
 #define STYLE_SYMBOLS_TANGO         ((ULONG)5)
 #define STYLE_SYMBOLS_OXYGEN        ((ULONG)6)
 #define STYLE_SYMBOLS_CLASSIC		((ULONG)7)
-#define STYLE_SYMBOLS_THEMES_MAX	((ULONG)8)
+#define STYLE_SYMBOLS_HUMAN		((ULONG)8)
+#define STYLE_SYMBOLS_THEMES_MAX	((ULONG)9)
 
 #define STYLE_MENUIMAGES_OFF  ((USHORT)0)
 #define STYLE_MENUIMAGES_ON   ((USHORT)1)
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 20adcc8..ddcaf0d 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -712,6 +712,7 @@ void StyleSettings::Set3DColors( const Color& rColor )
         case STYLE_SYMBOLS_TANGO:      return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tango"));
         case STYLE_SYMBOLS_OXYGEN:     return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("oxygen"));
         case STYLE_SYMBOLS_CLASSIC:    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("classic"));
+        case STYLE_SYMBOLS_HUMAN:      return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("human"));
     }
 
     return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("auto"));
@@ -735,6 +736,8 @@ ULONG StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) cons
         return STYLE_SYMBOLS_OXYGEN;
     else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("classic")) )
         return STYLE_SYMBOLS_CLASSIC;
+    else if ( rName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("human")) )
+        return STYLE_SYMBOLS_HUMAN;
 
     return STYLE_SYMBOLS_AUTO;
 }