[Libreoffice-commits] core.git: svx/source

[Maxim Monastirsky]

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

New commits:
commit 04d7143a5f47a3287d0e223352180024f13d9a3c
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Sep 4 12:58:43 2016 +0300

    Fix "CntUInt32Item::PutValue - Wrong type" warnings
    
    ... when clicking the currency button.
    
    Change-Id: I9e137b98a7c2c3025dfd66056b041257e7cf0a12

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 9434567..469ad68 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3053,16 +3053,16 @@ void SvxCurrencyToolBoxControl::Select( sal_uInt16 nSelectModifier )
             nFormatKey = m_nFormatKey;
     }
 
-    Sequence< PropertyValue > aArgs( 1 );
-    aArgs[0].Name = "NumberFormatCurrency";
     if( nFormatKey != NUMBERFORMAT_ENTRY_NOT_FOUND )
     {
+        Sequence< PropertyValue > aArgs( 1 );
+        aArgs[0].Name = "NumberFormatCurrency";
         aArgs[0].Value = makeAny( nFormatKey );
+        Dispatch( m_aCommandURL, aArgs );
         m_nFormatKey = nFormatKey;
     }
-    SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY ),
-                                 ".uno:NumberFormatCurrency",
-                                 aArgs );
+    else
+        SfxToolBoxControl::Select( nSelectModifier );
 }
 
 static void lcl_CalcSizeValueSet( vcl::Window &rWin, ValueSet &rValueSet, const Size &aItemSize )