include/unotools/configitem.hxx | 19 --------
unotools/source/config/configitem.cxx | 79 +++++++++++++++-------------------
2 files changed, 35 insertions(+), 63 deletions(-)
New commits:
commit ba0ea7c7fbbca6ebe6ef339d0304e66852895fd4
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Aug 28 12:23:42 2024 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Aug 28 20:52:53 2024 +0200
Refactor impl_packLocalizedProperties
Make it more C++ish.
The change made two functional modifications:
1. It now doesn't filter out non-string values of the localized
properties. Since commit a5649055a0ec54ded05a879d018903628bfe2f0b
(INTEGRATION: CWS xmlfilter01 (1.38.18); FILE MERGED, 2003-04-04),
'OUString sLocaleValue' intermediate local variable was used for
values taken from XNameAccess::getByName before storing it to the
Sequence<PropertyValue>. It contradicts the documentation of the
impl_packLocalizedProperties function, created in commit
4bbc40bf5c29606c44934b18ed5962db8a0bc5d1 (#84766# new mode for
locale=*, 2001-04-11), which explicitly tells that the value type
"depends from cfg entry". The commit message of the later commit
is not clear, mentioning some "repair ALLO_LOCALE mode"; but it
likely refers to the change of CONFIG_MODE_ALL_LOCALES check that
was made bitwise, instead of direct ==. I think that sLocaleValue
was used during debugging, to check the value, similar to another
debug variable - sLocaleName - also introduced in that commit; it
was simply erroneously kept in the final patch.
2. When lOutValues has an XInterface, but not XNameContainer, it
now is copied to the out sequence (it was dropped before). Likely
it won't really happen in practice, but the limitation reason was
unclear.
The use of a sequence declared out of the loop, and realloc'd in
the loop, is in fact pessimization, because such a realloc would
need to copy the existing values, only to discard them later.
Change-Id: I726c7dbeae58cbf92b53233ae4eeb3cd070375ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172507
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx
index 7692bd3d6c9e..f04f2b057798 100644
--- a/include/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
@@ -83,25 +83,6 @@ namespace utl
void CallNotify(
const css::uno::Sequence<OUString>&
aPropertyNames);
- // In special mode ALL_LOCALES we must support reading/writing of
localized cfg entries as Sequence< PropertyValue >.
- // These methods are helper to convert given lists of names and
Any-values.
- // format: PropertyValue.Name = <locale as ISO string>
- // PropertyValue.Value = <value; type depends from cfg
entry!>
- // e.g.
- // LOCALIZED NODE
- // "UIName"
- // LOCALE VALUE
- // "de" "Mein Name"
- // "en-US" "my name"
- static void impl_packLocalizedProperties ( const
css::uno::Sequence< OUString >& lInNames ,
- const
css::uno::Sequence< css::uno::Any >& lInValues ,
-
css::uno::Sequence< css::uno::Any >& lOutValues );
- static void impl_unpackLocalizedProperties (
- const css::uno::Sequence< OUString >&
lInNames ,
- const css::uno::Sequence< css::uno::Any >&
lInValues ,
- css::uno::Sequence< OUString >&
lOutNames ,
- css::uno::Sequence< css::uno::Any >&
lOutValues);
-
css::uno::Reference< css::container::XHierarchicalNameAccess>
GetTree();
/** writes the changed values into the sub tree.
diff --git a/unotools/source/config/configitem.cxx
b/unotools/source/config/configitem.cxx
index efb90e0c5273..a8e82ba7602a 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -40,6 +40,7 @@
#include <comphelper/sequence.hxx>
#include <comphelper/solarmutex.hxx>
#include <comphelper/diagnose_ex.hxx>
+#include <comphelper/propertyvalue.hxx>
#include <cppuhelper/implbase.hxx>
#include <utility>
@@ -169,21 +170,23 @@ void ConfigItem::CallNotify( const
css::uno::Sequence<OUString>& rPropertyNames
Notify(rPropertyNames);
}
-void ConfigItem::impl_packLocalizedProperties( const Sequence< OUString >&
lInNames ,
- const Sequence< Any >&
lInValues ,
- Sequence< Any >&
lOutValues )
+// In special mode ALL_LOCALES we must support reading/writing of localized
cfg entries as Sequence< PropertyValue >.
+// These methods are helper to convert given lists of names and Any-values.
+// format: PropertyValue.Name = <locale as ISO string>
+// PropertyValue.Value = <value; type depends from cfg entry!>
+// e.g.
+// LOCALIZED NODE
+// "UIName"
+// LOCALE VALUE
+// "de" "Mein Name"
+// "en-US" "my name"
+
+static void impl_packLocalizedProperties( const Sequence< OUString >&
lInNames ,
+ const Sequence< Any >&
lInValues ,
+ Sequence< Any >&
lOutValues )
{
// This method should be called for special AllLocales ConfigItem-mode
only!
- sal_Int32 nSourceCounter; // used to step during
input lists
- sal_Int32 nSourceSize; // marks end of loop over
input lists
- sal_Int32 nDestinationCounter; // actual position in
output lists
- sal_Int32 nPropertyCounter; // counter of inner loop
for Sequence< PropertyValue >
- sal_Int32 nPropertiesSize; // marks end of inner loop
- Sequence< OUString > lPropertyNames; // list of all locales
for localized entry
- Sequence< PropertyValue > lProperties; // localized values of a
configuration entry packed for return
- Reference< XInterface > xLocalizedNode; // if cfg entry is
localized ... lInValues contains an XInterface!
-
// Optimise follow algorithm ... A LITTLE BIT :-)
// There exist two different possibilities:
// i ) There exist no localized entries ... =>
size of lOutValues will be the same like lInNames/lInValues!
@@ -191,9 +194,7 @@ void ConfigItem::impl_packLocalizedProperties( const
Sequence< OUString >&
// ... Why? If a localized value exist - the any is filled with an
XInterface object (is a SetNode-service).
// We read all his child nodes and pack it into Sequence<
PropertyValue >.
// The result list we pack into the return any. We never change size
of lists!
- nSourceSize = lInNames.getLength();
- lOutValues.realloc( nSourceSize );
- auto plOutValues = lOutValues.getArray();
+ lOutValues.realloc(lInNames.getLength());
// Algorithm:
// Copy all names and values from in to out lists.
@@ -201,45 +202,35 @@ void ConfigItem::impl_packLocalizedProperties( const
Sequence< OUString >&
// Use this XInterface-object to read all localized values and pack it
into Sequence< PropertyValue >.
// Add this list to out lists then.
- nDestinationCounter = 0;
- for( nSourceCounter=0; nSourceCounter<nSourceSize; ++nSourceCounter )
+ std::transform(lInValues.begin(), lInValues.end(), lOutValues.getArray(),
[](const Any& value)
{
- // If item a special localized one ... convert and pack it ...
- if( lInValues[nSourceCounter].getValueTypeName() ==
"com.sun.star.uno.XInterface" )
+ // If item is a special localized one ... convert and pack it ...
+ if (value.getValueTypeName() == "com.sun.star.uno.XInterface")
{
- lInValues[nSourceCounter] >>= xLocalizedNode;
- Reference< XNameContainer > xSetAccess( xLocalizedNode, UNO_QUERY
);
- if( xSetAccess.is() )
+ if (auto xSetAccess = value.query<XNameContainer>())
{
- lPropertyNames = xSetAccess->getElementNames();
- nPropertiesSize = lPropertyNames.getLength();
- lProperties.realloc( nPropertiesSize );
- auto plProperties = lProperties.getArray();
+ // list of all locales for localized entry
+ Sequence<OUString> locales = xSetAccess->getElementNames();
+ // localized values of a configuration entry packed for return
+ Sequence<PropertyValue> lProperties(locales.getLength());
- for( nPropertyCounter=0; nPropertyCounter<nPropertiesSize;
++nPropertyCounter )
- {
- plProperties[nPropertyCounter].Name =
lPropertyNames[nPropertyCounter];
- OUString sLocaleValue;
- xSetAccess->getByName( lPropertyNames[nPropertyCounter] )
>>= sLocaleValue;
- plProperties[nPropertyCounter].Value <<= sLocaleValue;
- }
+ std::transform(
+ locales.begin(), locales.end(), lProperties.getArray(),
+ [&xSetAccess](const OUString& s)
+ { return comphelper::makePropertyValue(s,
xSetAccess->getByName(s)); });
- plOutValues[nDestinationCounter] <<= lProperties;
+ return Any(lProperties);
}
}
// ... or copy normal items to return lists directly.
- else
- {
- plOutValues[nDestinationCounter] = lInValues[nSourceCounter];
- }
- ++nDestinationCounter;
- }
+ return value;
+ });
}
-void ConfigItem::impl_unpackLocalizedProperties( const Sequence< OUString
>& lInNames ,
- const Sequence< Any >&
lInValues ,
- Sequence< OUString
>& lOutNames ,
- Sequence< Any >&
lOutValues)
+static void impl_unpackLocalizedProperties( const Sequence< OUString >&
lInNames ,
+ const Sequence< Any >&
lInValues ,
+ Sequence< OUString >&
lOutNames ,
+ Sequence< Any >&
lOutValues)
{
// This method should be called for special AllLocales ConfigItem-mode
only!
