summaryrefslogtreecommitdiff
path: root/framework/inc
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-01-05 17:09:53 +0000
committerKurt Zenker <kz@openoffice.org>2006-01-05 17:09:53 +0000
commitf1b2af0f5e9c12e01a44cd4260f632bdf1e2c7b9 (patch)
tree0aac843ecbc0c6e7af8c4895505108d537f5c3e8 /framework/inc
parent1b2abb3bdd9fc82440d37c440a120bed51bfdd19 (diff)
INTEGRATION: CWS iconswitching1 (1.21.18); FILE MERGED
2005/11/30 14:25:32 kendy 1.21.18.4: RESYNC: (1.22-1.24); FILE MERGED 2005/11/01 20:20:06 kendy 1.21.18.3: RESYNC: (1.21-1.22); FILE MERGED 2005/07/20 14:04:01 kendy 1.21.18.2: #i36518# Implement the icon switching 2005/07/20 13:48:26 kendy 1.21.18.1: #i36518# Cleanup after cutnpaste in CWS oooicons
Diffstat (limited to 'framework/inc')
-rw-r--r--framework/inc/services/layoutmanager.hxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index cdffff7e366d..c6bd6dcb60a2 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: layoutmanager.hxx,v $
*
- * $Revision: 1.24 $
+ * $Revision: 1.25 $
*
- * last change: $Author: rt $ $Date: 2005-11-11 12:55:02 $
+ * last change: $Author: kz $ $Date: 2006-01-05 18:09:53 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -459,7 +459,8 @@ namespace framework
void implts_createCustomToolBar( const rtl::OUString& aTbxResName, const rtl::OUString& aTitle );
void implts_toggleFloatingUIElementsVisibility( sal_Bool bActive );
sal_Bool implts_isEmbeddedLayoutManager() const;
- sal_Int16 implts_getCurrentSymbolSet();
+ sal_Int16 implts_getCurrentSymbolsSize();
+ sal_Int16 implts_getCurrentSymbolsStyle();
::com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer > implts_createToolkitWindow( const ::com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer >& rParent );
::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_createElement( const rtl::OUString& aName );
rtl::OUString implts_generateGenericAddonToolbarTitle( sal_Int32 nNumber ) const;
@@ -600,7 +601,8 @@ namespace framework
rtl::OUString m_aCustomizeCmd;
AddonsOptions* m_pAddonOptions;
SvtMiscOptions* m_pMiscOptions;
- sal_Int16 m_eSymbolSet;
+ sal_Int16 m_eSymbolsSize;
+ sal_Int16 m_eSymbolsStyle;
Timer m_aAsyncLayoutTimer;
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; // container for ALL Listener
};