diff options
| author | Carsten Driesner <cd@openoffice.org> | 2001-10-17 09:57:37 +0000 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2001-10-17 09:57:37 +0000 |
| commit | 6845330a228f7b516425e2dcb0aa5f2cdfaedc85 (patch) | |
| tree | a19bdd0efffdcdb3f68977dad6583db926b0fbdb /framework | |
| parent | fix: #92010# new class HelpDispatch_Impl (diff) | |
| download | core-6845330a228f7b516425e2dcb0aa5f2cdfaedc85.tar.gz core-6845330a228f7b516425e2dcb0aa5f2cdfaedc85.zip | |
#87255# support toolbar item style and help id
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/dtd/toolbar.dtd | 5 | ||||
| -rwxr-xr-x | framework/inc/classes/toolboxconfiguration.hxx | 1 | ||||
| -rw-r--r-- | framework/inc/classes/toolboxconfigurationdefines.hxx | 12 | ||||
| -rwxr-xr-x | framework/inc/classes/toolboxdocumenthandler.hxx | 13 |
4 files changed, 26 insertions, 5 deletions
diff --git a/framework/dtd/toolbar.dtd b/framework/dtd/toolbar.dtd index 15ec5ca73b89..77cc43817756 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.5 2001-09-25 12:37:20 cd Exp $ + $Id: toolbar.dtd,v 1.6 2001-10-17 10:57:37 cd Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -68,8 +68,9 @@ toolbar:userdefined %boolean; "false" toolbar:text CDATA #IMPLIED toolbar:width %numeric; "0" - toolbar:property %numeric; "0" + toolbar:style CDATA #IMPLIED toolbar:bitmap CDATA #IMPLIED + toolbar:helpid CDATA #IMPLIED > <!ELEMENT toolbar:toolbarspace EMPTY> <!ELEMENT toolbar:toolbarbreak EMPTY> diff --git a/framework/inc/classes/toolboxconfiguration.hxx b/framework/inc/classes/toolboxconfiguration.hxx index dd18a8523721..1ebb2dc8cb61 100755 --- a/framework/inc/classes/toolboxconfiguration.hxx +++ b/framework/inc/classes/toolboxconfiguration.hxx @@ -36,6 +36,7 @@ struct ToolBoxItemDescriptor USHORT nVisible; // toolbox item visible? USHORT nWidth; // width of a toolbox window (edit field, etc.) USHORT nUserDef; // user defined toolbox item (1=yes/0=no) + String aHelpId; // A help id associated with this toolbox item public: diff --git a/framework/inc/classes/toolboxconfigurationdefines.hxx b/framework/inc/classes/toolboxconfigurationdefines.hxx index ae0146bc97c5..974c3978669e 100644 --- a/framework/inc/classes/toolboxconfigurationdefines.hxx +++ b/framework/inc/classes/toolboxconfigurationdefines.hxx @@ -26,6 +26,8 @@ #define ATTRIBUTE_VISIBLE "visible" #define ATTRIBUTE_WIDTH "width" #define ATTRIBUTE_USER "userdefined" +#define ATTRIBUTE_HELPID "helpid" +#define ATTRIBUTE_ITEMSTYLE "style" #define ATTRIBUTE_ID "id" #define ATTRIBUTE_FLOATINGPOSLEFT "floatingposleft" @@ -64,6 +66,14 @@ #define ATTRIBUTE_STYLE_TEXT "text" #define ATTRIBUTE_STYLE_SYMBOL "symbol" -#define ATTRIBUTE_STYLE_SYMBOLTEXT "symbol+text" +#define ATTRIBUTE_STYLE_SYMBOLTEXT "symboltext" +#define ATTRIBUTE_STYLE_SYMBOLPLUSTEXT "symbol+text" + +#define ATTRIBUTE_ITEMSTYLE_RADIO "radio" +#define ATTRIBUTE_ITEMSTYLE_AUTO "auto" +#define ATTRIBUTE_ITEMSTYLE_LEFT "left" +#define ATTRIBUTE_ITEMSTYLE_AUTOSIZE "autosize" +#define ATTRIBUTE_ITEMSTYLE_DROPDOWN "dropdown" +#define ATTRIBUTE_ITEMSTYLE_REPEAT "repeat" #endif diff --git a/framework/inc/classes/toolboxdocumenthandler.hxx b/framework/inc/classes/toolboxdocumenthandler.hxx index f241b94bffa0..cd7506ec12f8 100755 --- a/framework/inc/classes/toolboxdocumenthandler.hxx +++ b/framework/inc/classes/toolboxdocumenthandler.hxx @@ -2,9 +2,9 @@ * * $RCSfile: toolboxdocumenthandler.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2001-10-09 18:28:09 $ + * last change: $Author: cd $ $Date: 2001-10-17 10:56:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -126,6 +126,8 @@ class OReadToolBoxDocumentHandler : public ::com::sun::star::xml::sax::XDocument TB_ATTRIBUTE_VISIBLE, TB_ATTRIBUTE_WIDTH, TB_ATTRIBUTE_USER, + TB_ATTRIBUTE_HELPID, + TB_ATTRIBUTE_STYLE, TB_XML_ENTRY_COUNT }; @@ -208,6 +210,13 @@ class OReadToolBoxDocumentHandler : public ::com::sun::star::xml::sax::XDocument ToolBoxHashMap m_aToolBoxMap; ToolBoxDescriptor& m_aToolBoxItems; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; + + sal_Int32 m_nHashCode_Style_Radio; + sal_Int32 m_nHashCode_Style_Auto; + sal_Int32 m_nHashCode_Style_Left; + sal_Int32 m_nHashCode_Style_AutoSize; + sal_Int32 m_nHashCode_Style_DropDown; + sal_Int32 m_nHashCode_Style_Repeat; }; class OWriteToolBoxDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses. |