summaryrefslogtreecommitdiff
path: root/configmgr/source/parsemanager.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2022-09-14 13:16:31 +0200
committerStephan Bergmann <sbergman@redhat.com>2022-09-15 14:27:31 +0200
commit7f04bb393f830a2983e3e26485bbe217c66006ff (patch)
tree2cea43fc76093ac7f3ae4eb741d439717b409dae /configmgr/source/parsemanager.hxx
parenteb30df9b8e86f756ebc66be86ae2eb345fafc850 (diff)
Clean up color scheme migration
...avoiding to have code in configmgr that knows about the details of the data stored in the configuration. (See the comments starting at <https://gerrit.libreoffice.org/c/core/+/139690/9#message-44703a2529c07bf1b0202ed3a232aa661784b159> "Migrating product name related color schemes between different versions" for details.) This reverts the dubious changes of 583ea856f2aa227bb04581c5bcdc3a402f5a184f "Migrating product name related color schemes between different versions" in configmgr and offapi. (Also, this moves the computation of sMigratedProductName in MigrationImpl::copyConfig, desktop/source/migration/migration.cxx, to a saner location than in the middle of the "check if the shared registrymodifications.xcu file exists" block where that 583ea856f2aa227bb04581c5bcdc3a402f5a184f had placed it.) Change-Id: I7ab3d57db19065c7c818e697300a2abd9e7f72bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139963 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'configmgr/source/parsemanager.hxx')
-rw-r--r--configmgr/source/parsemanager.hxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/configmgr/source/parsemanager.hxx b/configmgr/source/parsemanager.hxx
index eb91cf201ee6..fba61ec07b94 100644
--- a/configmgr/source/parsemanager.hxx
+++ b/configmgr/source/parsemanager.hxx
@@ -36,7 +36,7 @@ class Parser;
class ParseManager: public salhelper::SimpleReferenceObject {
public:
ParseManager(
- OUString const & url, OUString const & oldProductName, rtl::Reference< Parser > const & parser);
+ OUString const & url, rtl::Reference< Parser > const & parser);
bool parse(std::set< OUString > const * existingDependencies);
@@ -46,7 +46,6 @@ private:
virtual ~ParseManager() override;
xmlreader::XmlReader reader_;
- OUString oldProductName_;
rtl::Reference< Parser > parser_;
xmlreader::Span itemData_;
int itemNamespaceId_;