[Libreoffice-commits] core.git: Branch 'feature/fixes11' - svx/source

[Jan Holesovsky]

 svx/source/tbxctrls/tbcontrl.cxx |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 1596ee98e8c0f59373a0ed908e8573e97dc0b630
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Oct 8 11:28:59 2015 +0200

    Fix build.
    
    Change-Id: Ie96ae2a5f37a817eea899e32adf8e68737c4253f

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 0c756d6..3dcc35f 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -138,7 +138,7 @@ public:
 
 protected:
     /// Calculate the optimal width of the dropdown.  Very expensive operation, triggers lots of font measurement.
-    DECL_DLLPRIVATE_LINK_TYPED(CalcOptimalExtraUserWidth, VclWindowEvent&, void);
+    DECL_DLLPRIVATE_LINK(CalcOptimalExtraUserWidth, VclWindowEvent*);
 
     virtual void    Select() SAL_OVERRIDE;
 
@@ -797,11 +797,11 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
     DrawEntry( rUDEvt, false, false );
 }
 
-IMPL_LINK_TYPED(SvxStyleBox_Impl, CalcOptimalExtraUserWidth, VclWindowEvent&, event, void)
+IMPL_LINK(SvxStyleBox_Impl, CalcOptimalExtraUserWidth, VclWindowEvent*, event)
 {
     // perform the calculation only when we are opening the dropdown
-    if (event.GetId() != VCLEVENT_DROPDOWN_PRE_OPEN)
-        return;
+    if (event->GetId() != VCLEVENT_DROPDOWN_PRE_OPEN)
+        return 0;
 
     long nMaxNormalFontWidth = 0;
     sal_Int32 nEntryCount = GetEntryCount();
@@ -838,6 +838,8 @@ IMPL_LINK_TYPED(SvxStyleBox_Impl, CalcOptimalExtraUserWidth, VclWindowEvent&, ev
     }
 
     SetUserItemSize(Size(nMaxUserDrawFontWidth - nMaxNormalFontWidth, ITEM_HEIGHT));
+
+    return 0;
 }
 
 // test is the color between Font- and background-color to be identify