[Libreoffice-commits] .: Branch 'libreoffice-3-6' - svx/source

[Libreoffice Gerrit user]

 svx/source/tbxctrls/linectrl.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit ee1d26740fbd8e9c9d6c1ee7e493f136c25b038c
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Tue Dec 4 18:19:07 2012 +0400

    fdo#40339: line style toolbar dropdown list not updated
    
    ... because XLineDashItem::GetName returns the so-called "api name"
    (from RID_SVXSTR_DASH_DEF_START..RID_SVXSTR_DASH_DEF_END range), while
    the listbox is filled with corresponding translated names.
    
    Change-Id: I9edeeee6f6219f2b31fb02c24c70f3fef4f0efcb
    (cherry picked from commit 44ee3ce747058eaf7ca241fe482f4aab54c9bc92)
    Reviewed-on: https://gerrit.libreoffice.org/1238
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 0b75ce7..e1c7670 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -45,6 +45,7 @@
 #include "svx/linectrl.hxx"
 #include <svx/itemwin.hxx>
 #include <svx/dialmgr.hxx>
+#include <svx/unoapi.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -169,7 +170,9 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState )
             {
                 if( pDashItem )
                 {
-                    String aString( pDashItem->GetName() );
+                    String aString;
+                    SvxUnogetInternalNameForItem(
+                        XATTR_LINEDASH, pDashItem->GetName(), aString );
                     pBox->SelectEntry( aString );
                 }
                 else