From 3a2c872b90f4d1af212ec55dcdd4bcd3e16d61ae Mon Sep 17 00:00:00 2001 From: Herbert Dürr Date: Wed, 17 Jul 2013 14:49:57 +0000 Subject: Resolves: #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 (cherry picked from commit 963530a3b78ace2e21cf73c161996f613256b367) Conflicts: cui/source/options/optsave.cxx Change-Id: Id83dd0859275a8b0ac52bfd65bd1fd7dcfb4362e --- cui/source/options/optsave.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'cui') diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index ada076ea622f..27f7b7885a7c 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -539,12 +539,13 @@ static OUString lcl_ExtracUIName(const Sequence rProperties) { if(!pProperties[nProp].Name.compareToAscii("UIName")) { - pProperties[nProp].Value >>= sRet; - break; + if ( pProperties[nProp].Value >>= sRet ) + break; } else if(!pProperties[nProp].Name.compareToAscii("Name")) { - pProperties[nProp].Value >>= sRet; + if ( !sRet.getLength() ) + pProperties[nProp].Value >>= sRet; } } return sRet; -- cgit v1.2.3