summaryrefslogtreecommitdiffstats
path: root/framework
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-03-28 00:44:33 +0100
committerEike Rathke <erack@redhat.com>2013-03-28 01:39:08 +0100
commit2ac8508a2fd538183953dfa0a283c8c829bb066f (patch)
tree8c3f1bf4166852eb264344dc5ea36e7865ec62b5 /framework
parenteliminated useless back and forth conversion (diff)
downloadcore-2ac8508a2fd538183953dfa0a283c8c829bb066f.tar.gz
core-2ac8508a2fd538183953dfa0a283c8c829bb066f.zip
we really don't need to assign the same value again
... to be extra sure? Change-Id: I00d6cfafe5419b01e3e827377be030b5d1a4ee34
Diffstat (limited to 'framework')
-rw-r--r--framework/source/accelerators/presethandler.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 7e5002883ad1..304f92faca4f 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -807,6 +807,12 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring
if (bAllowFallbacks)
{
pFound = LanguageTag::getFallback(lLocalizedValues, rLanguageTag);
+ // if we found a valid locale ... take it over to our in/out parameter
+ // rLanguageTag
+ if (pFound != lLocalizedValues.end())
+ {
+ rLanguageTag = *pFound;
+ }
}
else
{
@@ -819,12 +825,6 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring
}
}
- // if we found a valid locale ... take it over to our in/out parameter rLanguageTag
- if (pFound != lLocalizedValues.end())
- {
- rLanguageTag = *pFound;
- }
-
return pFound;
}