5c425ca130
This reverts the configmgr part of 0a7eac8576 "use
more string_view in accessibility..configmgr": All calls to Data::parseSegment
(either directly, or indirectly either via Access::getSubChild or via
parseSegment in partial.cxx) pass in an OUString path, and in some cases (see
below)
> *name = path.substr(index, i - index);
in Data::parseSegment reconstructs an OUString from the full path (i.e.,
index == 0 and i == path.size()). And I see no code that actually benefited
from the switch to string_view.
One example call stack for such an expensive reconstruction of an OUString from
full path is
> #0 in configmgr::Data::parseSegment(path=u"ooSetupSystemLocale", index=0, name=0x7ffff5299280, setElement=0x7ffff52992a0, templateName=0x7ffff52992b0) in core/configmgr/source/data.cxx
> #1 in configmgr::Access::getSubChild(this=0x619000028f80, path=u"ooSetupSystemLocale") in core/configmgr/source/access.cxx
> #2 in configmgr::Access::getByHierarchicalName(this=0x619000028f80, aName="ooSetupSystemLocale") in core/configmgr/source/access.cxx
> #3 in utl::ConfigItem::GetProperties(xHierarchyAccess=uno::Reference to (configmgr::RootAccess *) 0x619000028fb8, rNames=uno::Sequence of length 6 = {...}, bAllLocales=false) in core/unotools/source/config/configitem.cxx
> #4 in utl::ConfigItem::GetProperties(this=0x61100000cad0, rNames=uno::Sequence of length 6 = {...}) in core/unotools/source/config/configitem.cxx
> #5 in SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl(this=0x61100000cad0) in core/unotools/source/config/syslocaleoptions.cxx
[...]
Change-Id: I51127d82aea927dd9aaf374880c406dbafaddcde
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140658
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
99 lines
2.8 KiB
C++
99 lines
2.8 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <climits>
|
|
#include "config_map.hxx"
|
|
#include <vector>
|
|
|
|
#include <rtl/ref.hxx>
|
|
#include <rtl/ustring.hxx>
|
|
#include <sal/types.h>
|
|
#include <salhelper/simplereferenceobject.hxx>
|
|
|
|
#include "additions.hxx"
|
|
#include "modifications.hxx"
|
|
#include "nodemap.hxx"
|
|
|
|
namespace configmgr {
|
|
|
|
class Node;
|
|
|
|
struct Data {
|
|
enum { NO_LAYER = INT_MAX };
|
|
|
|
struct ExtensionXcu: public salhelper::SimpleReferenceObject {
|
|
int layer;
|
|
Additions additions;
|
|
};
|
|
|
|
NodeMap templates;
|
|
|
|
Modifications modifications;
|
|
|
|
static OUString createSegment(
|
|
std::u16string_view templateName, OUString const & name);
|
|
|
|
static sal_Int32 parseSegment(
|
|
OUString const & path, sal_Int32 index, OUString * name,
|
|
bool * setElement, OUString * templateName);
|
|
|
|
static OUString fullTemplateName(
|
|
std::u16string_view component, std::u16string_view name);
|
|
|
|
//TODO: better rules under which circumstances a short template name matches
|
|
static bool equalTemplateNames(
|
|
OUString const & shortName, OUString const & longName);
|
|
|
|
Data();
|
|
|
|
rtl::Reference< Node > resolvePathRepresentation(
|
|
OUString const & pathRepresentation,
|
|
OUString * canonicRepresentation, std::vector<OUString> * path, int * finalizedLayer)
|
|
const;
|
|
|
|
rtl::Reference< Node > getTemplate(
|
|
int layer, OUString const & fullName) const;
|
|
|
|
NodeMap & getComponents() const;
|
|
|
|
Additions * addExtensionXcuAdditions(
|
|
OUString const & url, int layer);
|
|
|
|
rtl::Reference< ExtensionXcu > removeExtensionXcuAdditions(
|
|
OUString const & url);
|
|
|
|
private:
|
|
Data(const Data&) = delete;
|
|
Data& operator=(const Data&) = delete;
|
|
|
|
typedef config_map< rtl::Reference< ExtensionXcu > >
|
|
ExtensionXcuAdditions;
|
|
|
|
rtl::Reference< Node > root_;
|
|
|
|
ExtensionXcuAdditions extensionXcuAdditions_;
|
|
};
|
|
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|