diff options
author | Carsten Driesner <cd@openoffice.org> | 2001-09-25 11:22:06 +0000 |
---|---|---|
committer | Carsten Driesner <cd@openoffice.org> | 2001-09-25 11:22:06 +0000 |
commit | 81d0fbcb75d64d543a4e738e0d20620440c67765 (patch) | |
tree | 17f49fd8d4d416fdbbe8e50b44cfa442200abab8 /framework/inc/classes | |
parent | 3a7a3bc16ea53734db08199acb92fd2df25ccc3e (diff) |
#91685# support toolbar style for every toolbar separately
Diffstat (limited to 'framework/inc/classes')
-rwxr-xr-x | framework/inc/classes/toolboxconfiguration.hxx | 4 | ||||
-rw-r--r-- | framework/inc/classes/toolboxconfigurationdefines.hxx | 2 | ||||
-rw-r--r-- | framework/inc/classes/toolboxlayoutdocumenthandler.hxx | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/framework/inc/classes/toolboxconfiguration.hxx b/framework/inc/classes/toolboxconfiguration.hxx index 6c297ef7d178..dd18a8523721 100755 --- a/framework/inc/classes/toolboxconfiguration.hxx +++ b/framework/inc/classes/toolboxconfiguration.hxx @@ -60,12 +60,14 @@ struct ToolBoxLayoutItemDescriptor ToolBoxAlign eAlign; // Alignment im angedockten Zustand BOOL bVisible; // ein - oder ausgeschaltet BOOL bFloating; // angedockt oder nicht + ButtonType eType; // Text, Symbol or Text+Symbol ToolBoxLayoutItemDescriptor() : nFloatingLines( 0 ) ,nLines( 1 ) ,eAlign( BOXALIGN_LEFT ) ,bVisible( sal_False ) - ,bFloating( sal_False ) {} + ,bFloating( sal_False ) + ,eType( BUTTON_SYMBOL ) {} }; typedef ToolBoxLayoutItemDescriptor* ToolBoxLayoutItemDescriptorPtr; diff --git a/framework/inc/classes/toolboxconfigurationdefines.hxx b/framework/inc/classes/toolboxconfigurationdefines.hxx index 6702bd3e2c32..ae0146bc97c5 100644 --- a/framework/inc/classes/toolboxconfigurationdefines.hxx +++ b/framework/inc/classes/toolboxconfigurationdefines.hxx @@ -64,6 +64,6 @@ #define ATTRIBUTE_STYLE_TEXT "text" #define ATTRIBUTE_STYLE_SYMBOL "symbol" -#define ATTRIBUTE_STYLE_SYMBOLTEXT "symboltext" +#define ATTRIBUTE_STYLE_SYMBOLTEXT "symbol+text" #endif diff --git a/framework/inc/classes/toolboxlayoutdocumenthandler.hxx b/framework/inc/classes/toolboxlayoutdocumenthandler.hxx index 8be2b9b338f8..b8f68479e69d 100644 --- a/framework/inc/classes/toolboxlayoutdocumenthandler.hxx +++ b/framework/inc/classes/toolboxlayoutdocumenthandler.hxx @@ -2,9 +2,9 @@ * * $RCSfile: toolboxlayoutdocumenthandler.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: cd $ $Date: 2001-08-03 16:50:24 $ + * last change: $Author: cd $ $Date: 2001-09-25 12:22:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -233,6 +233,8 @@ class OWriteToolBoxLayoutDocumentHandler : private ThreadHelpBase // Struct for ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; ::rtl::OUString m_aXMLToolbarNS; ::rtl::OUString m_aAttributeType; + ::rtl::OUString m_aTrueValue; + ::rtl::OUString m_aFalseValue; }; } // namespace framework |