Remove unused toolbaritem properties

The following properties have been removed:
toolbar:bitmap
toolbar:property
toolbar:width
toolbar:userdefined

This should have no impact on existing functionality or AddOns, since these properties were not in use.

Change-Id: I07574f8102648ee0713379be8cb0b605d2c76364

4 files changed, 24 insertions, 38 deletions

diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx
index eab635cc3f6c..565478b1de42 100644
--- a/framework/inc/uielement/commandinfo.hxx
+++ b/framework/inc/uielement/commandinfo.hxx
@@ -28,17 +28,15 @@ namespace framework
 struct CommandInfo
 {
     CommandInfo() : nId( 0 ),
-                    nWidth( 0 ),
                     nImageInfo( 0 ),
                     bMirrored( false ),
                     bRotated( false ) {}
 
     sal_uInt16                  nId;
-    sal_uInt16                  nWidth;
     ::std::vector< sal_uInt16 > aIds;
-    sal_Int16               nImageInfo;
-    bool                bMirrored : 1,
-                            bRotated  : 1;
+    sal_Int16                   nImageInfo;
+    bool                        bMirrored : 1,
+                                bRotated  : 1;
 };
 
 typedef BaseHash< CommandInfo > CommandToInfoMap;
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index bf4c586a5ab8..ea1ab340ec33 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -54,7 +54,6 @@ struct AddonToolbarItem
     OUString aTarget;
     OUString aContext;
     OUString aControlType;
-    sal_uInt16      nWidth;
 };
 
 typedef ::std::vector< AddonToolbarItem > AddonToolbarItemContainer;
@@ -80,17 +79,16 @@ class ToolBarMerger
                                                    OUString& rImageIdentifier,
                                                    OUString& rTarget,
                                                    OUString& rContext,
-                                                   OUString& rControlType,
-                                                   sal_uInt16&      rWidth );
+                                                   OUString& rControlType );
 
-        static ReferenceToolbarPathInfo FindReferencePoint( ToolBox*               pToolbar,
+        static ReferenceToolbarPathInfo FindReferencePoint( ToolBox* pToolbar,
                                                             const OUString& rReferencePoint );
 
         static bool       ProcessMergeOperation( const css::uno::Reference< css::frame::XFrame >& xFrame,
-                                                 ToolBox*                         pToolbar,
-                                                 sal_uInt16                       nPos,
-                                                 sal_uInt16&                      rItemId,
-                                                 CommandToInfoMap&                rCommandMap,
+                                                 ToolBox*                  pToolbar,
+                                                 sal_uInt16                nPos,
+                                                 sal_uInt16&               rItemId,
+                                                 CommandToInfoMap&         rCommandMap,
                                                  const OUString&           rModuleIdentifier,
                                                  const OUString&           rMergeCommand,
                                                  const OUString&           rMergeCommandParameter,
@@ -112,7 +110,7 @@ class ToolBarMerger
                                       sal_uInt16                nModIndex,
                                       sal_uInt16&               rItemId,
                                       CommandToInfoMap&         rCommandMap,
-                                      const OUString&    rModuleIdentifier,
+                                      const OUString&           rModuleIdentifier,
                                       const AddonToolbarItemContainer& rAddonToolbarItems );
 
         static bool       ReplaceItem( const css::uno::Reference< css::frame::XFrame >& xFrame,
@@ -120,24 +118,22 @@ class ToolBarMerger
                                        sal_uInt16                nPos,
                                        sal_uInt16&               rItemId,
                                        CommandToInfoMap&         rCommandMap,
-                                       const OUString&    rModuleIdentifier,
+                                       const OUString&           rModuleIdentifier,
                                        const AddonToolbarItemContainer& rAddonToolbarItems );
 
-        static bool       RemoveItems( ToolBox*                  pToolbar,
-                                       sal_uInt16                nPos,
+        static bool       RemoveItems( ToolBox*           pToolbar,
+                                       sal_uInt16         nPos,
                                        const OUString&    rMergeCommandParameter );
 
         static ::cppu::OWeakObject* CreateController(
             const css::uno::Reference< css::uno::XComponentContext > & rxContext,
             const css::uno::Reference< css::frame::XFrame > & xFrame,
-            ToolBox*               pToolbar,
+            ToolBox*        pToolbar,
             const OUString& rCommandURL,
-            sal_uInt16             nId,
-            sal_uInt16             nWidth,
+            sal_uInt16      nId,
             const OUString& rControlType );
 
         static void CreateToolbarItem( ToolBox* pToolbox,
-                                       CommandToInfoMap& rCommandMap,
                                        sal_uInt16 nPos,
                                        sal_uInt16 nItemId,
                                        const AddonToolbarItem& rAddonToolbarItem );
diff --git a/framework/inc/xml/toolboxconfigurationdefines.hxx b/framework/inc/xml/toolboxconfigurationdefines.hxx
index a61cf0ab99fb..eb376513ce0f 100644
--- a/framework/inc/xml/toolboxconfigurationdefines.hxx
+++ b/framework/inc/xml/toolboxconfigurationdefines.hxx
@@ -34,13 +34,9 @@
 
 #define ATTRIBUTE_UINAME            "uiname"
 
-#define ATTRIBUTE_BITMAP            "bitmap"
 #define ATTRIBUTE_TEXT              "text"
 #define ATTRIBUTE_URL               "href"
-#define ATTRIBUTE_ITEMBITS          "property"
 #define ATTRIBUTE_VISIBLE           "visible"
-#define ATTRIBUTE_WIDTH             "width"
-#define ATTRIBUTE_USER              "userdefined"
 #define ATTRIBUTE_HELPID            "helpid"
 #define ATTRIBUTE_ITEMSTYLE         "style"
 
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index 1d19bd4ae019..8b9cc347491d 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -46,12 +46,8 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler :
             TB_ELEMENT_TOOLBARBREAK,
             TB_ELEMENT_TOOLBARSEPARATOR,
             TB_ATTRIBUTE_TEXT,
-            TB_ATTRIBUTE_BITMAP,
             TB_ATTRIBUTE_URL,
-            TB_ATTRIBUTE_ITEMBITS,
             TB_ATTRIBUTE_VISIBLE,
-            TB_ATTRIBUTE_WIDTH,
-            TB_ATTRIBUTE_USER,
             TB_ATTRIBUTE_HELPID,
             TB_ATTRIBUTE_STYLE,
             TB_ATTRIBUTE_UINAME,
@@ -155,8 +151,8 @@ class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler
               css::uno::RuntimeException );
 
     protected:
-        void WriteToolBoxItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle,
-                                       sal_Int16 nWidth, bool bVisible ) throw
+        void WriteToolBoxItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL,
+                               sal_Int16 nStyle, bool bVisible ) throw
             ( css::xml::sax::SAXException,
               css::uno::RuntimeException );
 
@@ -172,13 +168,13 @@ class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler
             ( css::xml::sax::SAXException,
               css::uno::RuntimeException );
 
-        css::uno::Reference< css::xml::sax::XDocumentHandler >    m_xWriteDocumentHandler;
-        css::uno::Reference< css::xml::sax::XAttributeList >      m_xEmptyList;
-        css::uno::Reference< css::container::XIndexAccess >           m_rItemAccess;
-        OUString                                                                     m_aXMLToolbarNS;
-        OUString                                                                     m_aXMLXlinkNS;
-        OUString                                                                     m_aAttributeType;
-        OUString                                                                     m_aAttributeURL;
+        css::uno::Reference< css::xml::sax::XDocumentHandler > m_xWriteDocumentHandler;
+        css::uno::Reference< css::xml::sax::XAttributeList >   m_xEmptyList;
+        css::uno::Reference< css::container::XIndexAccess >    m_rItemAccess;
+        OUString                                               m_aXMLToolbarNS;
+        OUString                                               m_aXMLXlinkNS;
+        OUString                                               m_aAttributeType;
+        OUString                                               m_aAttributeURL;
 };
 
 } // namespace framework