diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-09 22:46:16 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-09 22:58:14 +0200 |
| commit | ee3cd777e187669f2d9dec156854c00cab948a50 (patch) | |
| tree | 2321b9df164ae86fe8a2fbe135641c5cb6f78bfa /framework/inc | |
| parent | 79af5b389b42284ddea3e486c17ace4776bd8e4c (diff) | |
Fix Addons.xcu toolbar items width handling
This is useful for some complex controls (e.g. Combobox).
Regression of cb4177b5f6d2c63548fa544a19b36001c57193e4
Change-Id: I683cc20e9db72a4dd58d89063ec6bfcd05a1068e
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/uielement/toolbarmerger.hxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx index ea1ab340ec33..4ad1467bbe64 100644 --- a/framework/inc/uielement/toolbarmerger.hxx +++ b/framework/inc/uielement/toolbarmerger.hxx @@ -44,6 +44,7 @@ struct AddonsParams OUString aImageId; OUString aTarget; OUString aControlType; + sal_uInt16 nWidth; }; struct AddonToolbarItem @@ -54,6 +55,7 @@ struct AddonToolbarItem OUString aTarget; OUString aContext; OUString aControlType; + sal_uInt16 nWidth; }; typedef ::std::vector< AddonToolbarItem > AddonToolbarItemContainer; @@ -79,7 +81,8 @@ class ToolBarMerger OUString& rImageIdentifier, OUString& rTarget, OUString& rContext, - OUString& rControlType ); + OUString& rControlType, + sal_uInt16& rWidth ); static ReferenceToolbarPathInfo FindReferencePoint( ToolBox* pToolbar, const OUString& rReferencePoint ); @@ -131,6 +134,7 @@ class ToolBarMerger ToolBox* pToolbar, const OUString& rCommandURL, sal_uInt16 nId, + sal_uInt16 nWidth, const OUString& rControlType ); static void CreateToolbarItem( ToolBox* pToolbox, |