summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-01-05 17:21:19 +0000
committerKurt Zenker <kz@openoffice.org>2006-01-05 17:21:19 +0000
commit8dd78456e5d3dbcfd6c422be74d2a478270a6ec3 (patch)
treea326360d24baf05a6a57d6c733f6e336aebbadc6 /sfx2
parent83174efb88df19573c5065539c70cdbb76b4eb2f (diff)
INTEGRATION: CWS iconswitching1 (1.15.258); FILE MERGED
2005/11/02 00:19:15 kendy 1.15.258.2: RESYNC: (1.15-1.16); FILE MERGED 2005/07/20 13:48:36 kendy 1.15.258.1: #i36518# Cleanup after cutnpaste in CWS oooicons
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/imgmgr.hxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/sfx2/inc/imgmgr.hxx b/sfx2/inc/imgmgr.hxx
index bb14256fe5b5..b66d06854dcb 100644
--- a/sfx2/inc/imgmgr.hxx
+++ b/sfx2/inc/imgmgr.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: imgmgr.hxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 16:58:13 $
+ * last change: $Author: kz $ $Date: 2006-01-05 18:21:19 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -61,7 +61,6 @@ class SFX2_DLLPUBLIC SfxImageManager
SfxImageManager_Impl* pImp;
public:
- static sal_Int16 GetCurrentSymbolSet();
static SfxImageManager* GetImageManager( SfxModule* );
SfxImageManager( SfxModule* pModule = 0 );