From edbca87dea4d7ab7c70039579f90c6d22e076b1b Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@suse.cz>
Date: Fri, 14 Jun 2013 16:33:23 +0200
Subject: widget layout: Allow specification of size request for toolbox items.

Change-Id: I4b2f1ca9eb0b5bdb77e16a969918dd4f6afefb53
---
 sfx2/source/sidebar/SidebarToolBox.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sfx2/source')

diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index 5039a1a675b0..be0187e17a0f 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -125,11 +125,11 @@ SidebarToolBox::~SidebarToolBox (void)
 
 void SidebarToolBox::InsertItem(const OUString& rCommand,
         const com::sun::star::uno::Reference<com::sun::star::frame::XFrame>& rFrame,
-        ToolBoxItemBits nBits, sal_uInt16 nPos)
+        ToolBoxItemBits nBits, const Size& rRequestedSize, sal_uInt16 nPos)
 {
-    ToolBox::InsertItem(rCommand, rFrame, nBits, nPos);
+    ToolBox::InsertItem(rCommand, rFrame, nBits, rRequestedSize, nPos);
 
-    CreateController(GetItemId(rCommand), rFrame, 0);
+    CreateController(GetItemId(rCommand), rFrame, std::max(rRequestedSize.Width(), 0L));
     RegisterHandlers();
 }
 
-- 
cgit