svn commit: r1504159 - /openoffice/trunk/main/cui/source/options/optsave.cxx

[hd...@apache.org]

Author: hdu
Date: Wed Jul 17 14:49:57 2013
New Revision: 1504159

URL: http://svn.apache.org/r1504159
Log:
#i122759# prefer the UIName for the list of "Always save as" filter names

the listbox in the Tools->Options->Load/Save->General->AlwaysSaveAs listbox
did not prefer the localized UIName, so sometimes the internal filter name
was shown in the user interface even when an UIName was provided.

Patch by: Tsutomu Uchino <ha...@gmail.com>

Modified:
    openoffice/trunk/main/cui/source/options/optsave.cxx

Modified: openoffice/trunk/main/cui/source/options/optsave.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/options/optsave.cxx?rev=1504159&r1=1504158&r2=1504159&view=diff
==============================================================================
--- openoffice/trunk/main/cui/source/options/optsave.cxx (original)
+++ openoffice/trunk/main/cui/source/options/optsave.cxx Wed Jul 17 14:49:57 2013
@@ -664,8 +664,8 @@ OUString lcl_ExtracUIName(const Sequence
     {
         if(!pProperties[nProp].Name.compareToAscii("UIName"))
         {
-            pProperties[nProp].Value >>= sRet;
-//!            break;
+            if ( pProperties[nProp].Value >>= sRet )
+                break;
         }
         else if(!pProperties[nProp].Name.compareToAscii("Flags"))
         {
@@ -676,7 +676,8 @@ OUString lcl_ExtracUIName(const Sequence
         }
         else if(!pProperties[nProp].Name.compareToAscii("Name"))
         {
-            pProperties[nProp].Value >>= sRet;
+            if ( !sRet.getLength() )
+                pProperties[nProp].Value >>= sRet;
         }
     }
     return sRet;