#87255# support toolbar item style and help id
This commit is contained in:
parent
3656246823
commit
6845330a22
4 changed files with 26 additions and 5 deletions
|
@ -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>
|
||||
|
|
|
@ -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:
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue