From 076a7eacca48f203f0a8b9aa537e88fea9a88409 Mon Sep 17 00:00:00 2001
From: Tobias Lippert <drtl@fastmail.fm>
Date: Sun, 9 Feb 2014 00:53:28 +0100
Subject: Bug #63962 Dynamically scan the config directory for icon themes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The hard-coded icon themes have been replaced by a dynamic list
which is filled by scanning the config directory

Conflicts:
	include/vcl/settings.hxx
	vcl/source/app/settings.cxx
	vcl/source/window/window.cxx

Change-Id: Ie3680ffe27d06e375acf22753e036cb6ddabc4ed
Reviewed-on: https://gerrit.libreoffice.org/7935
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 cui/source/options/optgdlg.hxx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'cui/source/options/optgdlg.hxx')

diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 6f2f7c80fc99..79aaeaed8c8a 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -28,6 +28,9 @@
 // predeclarations
 class CanvasSettings;
 class SvtOptionsDrawinglayer;
+namespace vcl {
+class IconThemeInfo;
+}
 
 // class OfaMiscTabPage --------------------------------------------------
 
@@ -104,13 +107,12 @@ private:
     sal_uInt16      nSizeLB_InitialSelection;
     sal_uInt16      nStyleLB_InitialSelection;
 
-    // item ID for the given icon theme
-    // might be zero when the theme is not installed and the item is removed
-    std::vector<unsigned> aIconStyleItemId;
     SvtTabAppearanceCfg*    pAppearanceCfg;
     CanvasSettings*         pCanvasSettings;
     SvtOptionsDrawinglayer* mpDrawinglayerOpt;
 
+    std::vector<vcl::IconThemeInfo> mInstalledIconThemes;
+
 #if defined( UNX )
     DECL_LINK( OnAntialiasingToggled, void* );
 #endif
-- 
cgit