Kaydet (Commit) aaf41776 authored tarafından Vitaliy Anderson's avatar Vitaliy Anderson Kaydeden (comit) Mike Kaganski

Compatibility options refactoring. Part 1 small fix

SvtCompatibilityOptions_Impl::impl_GetPropertyNames() solve problem with wrong lProperties names

Change-Id: I0b71a80d542d8175c3f6e6cdf5fe857143714acb
Reviewed-on: https://gerrit.libreoffice.org/33752Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst 1478f81f
...@@ -145,17 +145,6 @@ class SvtCompatibilityOptions_Impl : public ConfigItem ...@@ -145,17 +145,6 @@ class SvtCompatibilityOptions_Impl : public ConfigItem
*//*-*****************************************************************************************************/ *//*-*****************************************************************************************************/
Sequence< OUString > impl_GetPropertyNames( Sequence< OUString >& rItems ); Sequence< OUString > impl_GetPropertyNames( Sequence< OUString >& rItems );
/*-****************************************************************************************************
@short expand the list for all well known properties to destination
@seealso method impl_GetPropertyNames()
@param "lSource" , original list
@param "lDestination" , destination of operation
@return A list of configuration key names is returned.
*//*-*****************************************************************************************************/
static void impl_ExpandPropertyNames( const Sequence< OUString >& lSource,
Sequence< OUString >& lDestination );
private: private:
std::vector< SvtCompatibilityEntry > m_aOptions; std::vector< SvtCompatibilityEntry > m_aOptions;
SvtCompatibilityEntry m_aDefOptions; SvtCompatibilityEntry m_aDefOptions;
...@@ -292,29 +281,29 @@ Sequence< OUString > SvtCompatibilityOptions_Impl::impl_GetPropertyNames( Sequen ...@@ -292,29 +281,29 @@ Sequence< OUString > SvtCompatibilityOptions_Impl::impl_GetPropertyNames( Sequen
{ {
// First get ALL names of current existing list items in configuration! // First get ALL names of current existing list items in configuration!
rItems = GetNodeNames( SETNODE_ALLFILEFORMATS ); rItems = GetNodeNames( SETNODE_ALLFILEFORMATS );
// expand list to result list ... // expand list to result list ...
Sequence< OUString > lProperties( rItems.getLength() * ( SvtCompatibilityEntry::getElementCount() - 1 ) ); Sequence< OUString > lProperties( rItems.getLength() * ( SvtCompatibilityEntry::getElementCount() - 1 ) );
impl_ExpandPropertyNames( rItems, lProperties );
// Return result.
return lProperties;
}
void SvtCompatibilityOptions_Impl::impl_ExpandPropertyNames( sal_Int32 nSourceCount = rItems.getLength();
const Sequence< OUString >& lSource, Sequence< OUString >& lDestination ) sal_Int32 nDestStep = 0;
{
sal_Int32 nSourceCount = lSource.getLength();
// Copy entries to destination and expand every item with 2 supported sub properties. // Copy entries to destination and expand every item with 2 supported sub properties.
for ( sal_Int32 nSourceStep = 0; nSourceStep < nSourceCount; ++nSourceStep ) for ( sal_Int32 nSourceStep = 0; nSourceStep < nSourceCount; ++nSourceStep )
{ {
OUString sFixPath; OUString sFixPath;
sFixPath = SETNODE_ALLFILEFORMATS; sFixPath = SETNODE_ALLFILEFORMATS;
sFixPath += PATHDELIMITER; sFixPath += PATHDELIMITER;
sFixPath += lSource[ nSourceStep ]; sFixPath += rItems[ nSourceStep ];
sFixPath += PATHDELIMITER; sFixPath += PATHDELIMITER;
for ( int i = static_cast<int>(SvtCompatibilityEntry::Index::Module); i < static_cast<int>(SvtCompatibilityEntry::Index::INVALID); ++i ) for ( int i = static_cast<int>(SvtCompatibilityEntry::Index::Module); i < static_cast<int>(SvtCompatibilityEntry::Index::INVALID); ++i )
lDestination[ i - 1 ] = sFixPath + SvtCompatibilityEntry::getName( SvtCompatibilityEntry::Index(i) ); {
lProperties[ nDestStep ] = sFixPath + SvtCompatibilityEntry::getName( SvtCompatibilityEntry::Index(i) );
nDestStep++;
}
} }
// Return result.
return lProperties;
} }
namespace namespace
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment