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>
134 lines
4.3 KiB
C++
134 lines
4.3 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 .
|
|
*/
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <cassert>
|
|
#include <set>
|
|
|
|
#include <com/sun/star/uno/RuntimeException.hpp>
|
|
#include <rtl/ustring.hxx>
|
|
#include <sal/types.h>
|
|
|
|
#include "data.hxx"
|
|
#include "partial.hxx"
|
|
|
|
namespace configmgr {
|
|
|
|
namespace {
|
|
|
|
bool parseSegment(
|
|
OUString const & path, sal_Int32 * index, OUString * segment)
|
|
{
|
|
assert(
|
|
index != nullptr && *index >= 0 && *index <= path.getLength() &&
|
|
segment != nullptr);
|
|
if (path[(*index)++] == '/') {
|
|
OUString name;
|
|
bool setElement;
|
|
OUString templateName;
|
|
*index = Data::parseSegment(
|
|
path, *index, &name, &setElement, &templateName);
|
|
if (*index != -1) {
|
|
*segment = Data::createSegment(templateName, name);
|
|
return *index == path.getLength();
|
|
}
|
|
}
|
|
throw css::uno::RuntimeException("bad path " + path);
|
|
}
|
|
|
|
}
|
|
|
|
Partial::Partial(
|
|
std::set< OUString > const & includedPaths,
|
|
std::set< OUString > const & excludedPaths)
|
|
{
|
|
// The Partial::Node tree built up here encodes the following information:
|
|
// * Inner node, startInclude: an include starts here that contains excluded
|
|
// sub-trees
|
|
// * Inner node, !startInclude: contains in-/excluded sub-trees
|
|
// * Leaf node, startInclude: an include starts here
|
|
// * Leaf node, !startInclude: an exclude starts here
|
|
for (auto const& includedPath : includedPaths)
|
|
{
|
|
sal_Int32 n = 0;
|
|
for (Node * p = &root_;;) {
|
|
OUString seg;
|
|
bool end = parseSegment(includedPath, &n, &seg);
|
|
p = &p->children[seg];
|
|
if (p->startInclude) {
|
|
break;
|
|
}
|
|
if (end) {
|
|
p->children.clear();
|
|
p->startInclude = true;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
for (auto const& excludedPath : excludedPaths)
|
|
{
|
|
sal_Int32 n = 0;
|
|
for (Node * p = &root_;;) {
|
|
OUString seg;
|
|
bool end = parseSegment(excludedPath, &n, &seg);
|
|
if (end) {
|
|
p->children[seg].clear();
|
|
break;
|
|
}
|
|
Node::Children::iterator j(p->children.find(seg));
|
|
if (j == p->children.end()) {
|
|
break;
|
|
}
|
|
p = &j->second;
|
|
}
|
|
}
|
|
}
|
|
|
|
Partial::~Partial() {}
|
|
|
|
Partial::Containment Partial::contains(std::vector<OUString> const & path) const {
|
|
//TODO: For set elements, the segment names recorded in the node tree need
|
|
// not match the corresponding path segments, so this function can fail.
|
|
|
|
// * If path ends at a leaf node or goes past a leaf node:
|
|
// ** If that leaf node is startInclude: => CONTAINS_NODE
|
|
// ** If that leaf node is !startInclude: => CONTAINS_NOT
|
|
// * If path ends at inner node:
|
|
// ** If there is some startInclude along its trace: => CONTAINS_NODE
|
|
// ** If there is no startInclude along its trace: => CONTAINS_SUBNODES
|
|
Node const * p = &root_;
|
|
bool bIncludes = false;
|
|
for (auto const& elemPath : path)
|
|
{
|
|
Node::Children::const_iterator j(p->children.find(elemPath));
|
|
if (j == p->children.end()) {
|
|
return p->startInclude ? CONTAINS_NODE : CONTAINS_NOT;
|
|
}
|
|
p = &j->second;
|
|
bIncludes |= p->startInclude;
|
|
}
|
|
return p->children.empty() && !p->startInclude
|
|
? CONTAINS_NOT
|
|
: bIncludes ? CONTAINS_NODE : CONTAINS_SUBNODES;
|
|
}
|
|
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|