diff options
| author | Carsten Driesner <cd@openoffice.org> | 2002-07-11 13:58:04 +0000 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2002-07-11 13:58:04 +0000 |
| commit | 5cbe8c3d8b54c4aa897a4232407ef9944acd431c (patch) | |
| tree | 6bc4cd9ddd8c5fbf1ffe7b8512f736a99378013c | |
| parent | 7e40c4fd340ecf43e8f64296e76e8114af6fb22c (diff) | |
#100205# Support a configurable name for user defined toolboxes
| -rw-r--r-- | framework/dtd/toolbar.dtd | 3 | ||||
| -rwxr-xr-x | framework/inc/classes/toolboxconfiguration.hxx | 17 | ||||
| -rw-r--r-- | framework/inc/classes/toolboxconfigurationdefines.hxx | 1 | ||||
| -rw-r--r-- | framework/inc/classes/toolboxlayoutdocumenthandler.hxx | 5 |
4 files changed, 15 insertions, 11 deletions
diff --git a/framework/dtd/toolbar.dtd b/framework/dtd/toolbar.dtd index 77cc43817756..b33900155211 100644 --- a/framework/dtd/toolbar.dtd +++ b/framework/dtd/toolbar.dtd @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - $Id: toolbar.dtd,v 1.6 2001-10-17 10:57:37 cd Exp $ + $Id: toolbar.dtd,v 1.7 2002-07-11 14:58:04 cd Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -90,4 +90,5 @@ toolbar:visible %boolean; "false" toolbar:floating %boolean; "false" toolbar:style %style; "symbol" + toolbar:userdefname CDATA #IMPLIED > diff --git a/framework/inc/classes/toolboxconfiguration.hxx b/framework/inc/classes/toolboxconfiguration.hxx index 1ebb2dc8cb61..4c3374fb3e80 100755 --- a/framework/inc/classes/toolboxconfiguration.hxx +++ b/framework/inc/classes/toolboxconfiguration.hxx @@ -54,14 +54,15 @@ SV_DECL_PTRARR_DEL( ToolBoxDescriptor, ToolBoxItemDescriptorPtr, 10, 2) struct ToolBoxLayoutItemDescriptor { - String aName; // Name der Toolbox ( Objectbar, Toolbar etc. ) - Point aFloatingPos; // Position im nicht angedockten Zustand - USHORT nFloatingLines; // Anzahl der Zeilen im nicht angedockten Zustand - USHORT nLines; // Anzahl der Zeilen im angedockten Zustand - ToolBoxAlign eAlign; // Alignment im angedockten Zustand - BOOL bVisible; // ein - oder ausgeschaltet - BOOL bFloating; // angedockt oder nicht - ButtonType eType; // Text, Symbol or Text+Symbol + String aName; // Unique name of the toolbox ( Objectbar, Toolbar etc. ) + String aUserName; // Userspecified name for this toolbar + Point aFloatingPos; // Position in floating mode + USHORT nFloatingLines; // Number of lines in floating mode + USHORT nLines; // Number of lines in docking mode + ToolBoxAlign eAlign; // Aligned position in docking mode + BOOL bVisible; // Visible or not + BOOL bFloating; // Floating mode on/off + ButtonType eType; // text, symbol or text+symbol ToolBoxLayoutItemDescriptor() : nFloatingLines( 0 ) ,nLines( 1 ) diff --git a/framework/inc/classes/toolboxconfigurationdefines.hxx b/framework/inc/classes/toolboxconfigurationdefines.hxx index 974c3978669e..f9a2f8365583 100644 --- a/framework/inc/classes/toolboxconfigurationdefines.hxx +++ b/framework/inc/classes/toolboxconfigurationdefines.hxx @@ -39,6 +39,7 @@ #define ATTRIBUTE_ALIGN "align" #define ATTRIBUTE_FLOATING "floating" #define ATTRIBUTE_BUTTONTYPE "style" +#define ATTRIBUTE_USERDEFNAME "userdefname" #define ELEMENT_NS_TOOLBAR "toolbar:toolbar" #define ELEMENT_NS_TOOLBARITEM "toolbar:toolbaritem" diff --git a/framework/inc/classes/toolboxlayoutdocumenthandler.hxx b/framework/inc/classes/toolboxlayoutdocumenthandler.hxx index cd91d7972411..ef4d10140e89 100644 --- a/framework/inc/classes/toolboxlayoutdocumenthandler.hxx +++ b/framework/inc/classes/toolboxlayoutdocumenthandler.hxx @@ -2,9 +2,9 @@ * * $RCSfile: toolboxlayoutdocumenthandler.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2001-10-09 18:28:09 $ + * last change: $Author: cd $ $Date: 2002-07-11 14:56:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -129,6 +129,7 @@ class OReadToolBoxLayoutDocumentHandler : public ::com::sun::star::xml::sax::XDo TBL_ATTRIBUTE_FLOATINGPOSTOP, TBL_ATTRIBUTE_VISIBLE, TBL_ATTRIBUTE_STYLE, + TBL_ATTRIBUTE_USERDEFNAME, TBL_XML_ENTRY_COUNT }; |