cui/source/options/optsave.cxx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 3a2c872b90f4d1af212ec55dcdd4bcd3e16d61ae
Author: Herbert Dürr <h...@apache.org>
Date: Wed Jul 17 14:49:57 2013 +0000
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 <hanya.r...@gmail.com>
(cherry picked from commit 963530a3b78ace2e21cf73c161996f613256b367)
Conflicts:
cui/source/options/optsave.cxx
Change-Id: Id83dd0859275a8b0ac52bfd65bd1fd7dcfb4362e
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index ada076e..27f7b78 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -539,12 +539,13 @@ static OUString lcl_ExtracUIName(const
Sequence<PropertyValue> 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
