diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-11-16 17:33:36 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2015-11-16 17:34:25 +0100 |
| commit | 38839ae10cb565ff1977b1839de1c8278eac657b (patch) | |
| tree | f42d316abfe9f88bde24775daa01fc77bbcdd097 /framework/inc | |
| parent | 97fc4f7cb8d3c583503bdf9f6622c656f37002e8 (diff) | |
Remove the ability to set tooltips in the toolbar xml files
It was possible to set a tooltip for a certain toolbar entry.
However, this hasn't been used since that tooltip needed to be repeated for each occurence of the same command.
Instead, a TooltipLabel property has been introduced lately (see 9c2f197e8e945f584e718e889938c06fbf644897).
This doesn't affect extensions (They have their own format to specify toolbars).
Change-Id: I0f0fd05b310bb49dd5b4123e31d3e7fec997dd15
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/xml/toolboxconfigurationdefines.hxx | 1 | ||||
| -rw-r--r-- | framework/inc/xml/toolboxdocumenthandler.hxx | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/framework/inc/xml/toolboxconfigurationdefines.hxx b/framework/inc/xml/toolboxconfigurationdefines.hxx index 6f26715dd35e..a61cf0ab99fb 100644 --- a/framework/inc/xml/toolboxconfigurationdefines.hxx +++ b/framework/inc/xml/toolboxconfigurationdefines.hxx @@ -42,7 +42,6 @@ #define ATTRIBUTE_WIDTH "width" #define ATTRIBUTE_USER "userdefined" #define ATTRIBUTE_HELPID "helpid" -#define ATTRIBUTE_TOOLTIP "tooltip" #define ATTRIBUTE_ITEMSTYLE "style" #define ELEMENT_NS_TOOLBAR "toolbar:toolbar" diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index 58769fc8bc29..1d19bd4ae019 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -55,7 +55,6 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : TB_ATTRIBUTE_HELPID, TB_ATTRIBUTE_STYLE, TB_ATTRIBUTE_UINAME, - TB_ATTRIBUTE_TOOLTIP, TB_XML_ENTRY_COUNT }; @@ -139,7 +138,6 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : OUString m_aLabel; OUString m_aStyle; OUString m_aHelpURL; - OUString m_aTooltip; OUString m_aIsVisible; OUString m_aCommandURL; }; @@ -157,7 +155,7 @@ class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler css::uno::RuntimeException ); protected: - void WriteToolBoxItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, const OUString& aTooltip, sal_Int16 nStyle, + void WriteToolBoxItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle, sal_Int16 nWidth, bool bVisible ) throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); |