diff options
| author | bjoern.michaelsen@canonical.com <Bjoern Michaelsen> | 2011-02-07 17:18:02 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-02-08 16:34:03 +0100 |
| commit | 462b3d61e352189d3d4c71acb7f62f6919381fd1 (patch) | |
| tree | cafab92ed2df8e4a6fcb55d111a52dcc8af4620e | |
| parent | 55b64863ec6eec23de004be6de7bcea7d47d806c (diff) | |
lp#696527: enable human icon theme in LibreOffice
(cherry picked from commit 00b43fc0d82950e2abc57cca3746d395252bc9e0)
Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
| -rw-r--r-- | vcl/inc/vcl/settings.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/app/settings.cxx | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx index 30308b26a5..5fa547d6cf 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 20adcc8783..ddcaf0d6bb 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; } |