sw/Library_sw.mk | 1 sw/source/uibase/uno/loktxdoc.cxx | 182 ++++++++++++++++++++++++++++++++++++++ sw/source/uibase/uno/unotxdoc.cxx | 140 ----------------------------- 3 files changed, 183 insertions(+), 140 deletions(-)
New commits: commit c2bcbd36d1913dc1d5ca4bb64fa30740f17bf326 Author: Miklos Vajna <[email protected]> AuthorDate: Wed Dec 7 08:28:00 2022 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Wed Dec 7 08:15:48 2022 +0000 sw: split out some of the LOK parts of SwXTextDocument into a separate file Because this has little to do with UNO. Change-Id: I683832d0704086f259a29bc1eefae77fd62f26e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143761 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 0e6c2679cb66..19cb6baeac74 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -767,6 +767,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/uibase/uno/unomod \ sw/source/uibase/uno/unomodule \ sw/source/uibase/uno/unotxdoc \ + sw/source/uibase/uno/loktxdoc \ sw/source/uibase/uno/unotxvw \ sw/source/uibase/utlui/AccessibilityStatusBarControl \ sw/source/uibase/utlui/attrdesc \ diff --git a/sw/source/uibase/uno/loktxdoc.cxx b/sw/source/uibase/uno/loktxdoc.cxx new file mode 100644 index 000000000000..cf58f1ca4a7b --- /dev/null +++ b/sw/source/uibase/uno/loktxdoc.cxx @@ -0,0 +1,182 @@ +/* -*- 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 <unotxdoc.hxx> + +#include <map> +#include <utility> +#include <vector> + +#include <com/sun/star/beans/XPropertyAccess.hpp> + +#include <comphelper/sequence.hxx> +#include <o3tl/string_view.hxx> +#include <tools/json_writer.hxx> +#include <tools/urlobj.hxx> +#include <xmloff/odffields.hxx> + +#include <IDocumentMarkAccess.hxx> +#include <doc.hxx> +#include <docsh.hxx> + +using namespace ::com::sun::star; + +namespace +{ +/// Implements getCommandValues(".uno:TextFormFields"). +/// +/// Parameters: +/// +/// - type: e.g. ODF_UNHANDLED +/// - commandPrefix: field comment prefix not not return all fieldmarks +void GetTextFormFields(tools::JsonWriter& rJsonWriter, SwDocShell* pDocShell, + const std::map<OUString, OUString>& rArguments) +{ + OUString aType; + OUString aCommandPrefix; + { + auto it = rArguments.find("type"); + if (it != rArguments.end()) + { + aType = it->second; + } + + it = rArguments.find("commandPrefix"); + if (it != rArguments.end()) + { + aCommandPrefix = it->second; + } + } + + SwDoc* pDoc = pDocShell->GetDoc(); + IDocumentMarkAccess* pMarkAccess = pDoc->getIDocumentMarkAccess(); + tools::ScopedJsonWriterArray aFields = rJsonWriter.startArray("fields"); + for (auto it = pMarkAccess->getFieldmarksBegin(); it != pMarkAccess->getFieldmarksEnd(); ++it) + { + auto pFieldmark = dynamic_cast<sw::mark::IFieldmark*>(*it); + assert(pFieldmark); + if (pFieldmark->GetFieldname() != aType) + { + continue; + } + + auto itParam = pFieldmark->GetParameters()->find(ODF_CODE_PARAM); + if (itParam == pFieldmark->GetParameters()->end()) + { + continue; + } + + OUString aCommand; + itParam->second >>= aCommand; + if (!aCommand.startsWith(aCommandPrefix)) + { + continue; + } + + tools::ScopedJsonWriterStruct aField = rJsonWriter.startStruct(); + rJsonWriter.put("type", aType); + rJsonWriter.put("command", aCommand); + } +} + +/// Implements getCommandValues(".uno:SetDocumentProperties"). +/// +/// Parameters: +/// +/// - namePrefix: field name prefix not not return all user-defined properties +void GetDocumentProperties(tools::JsonWriter& rJsonWriter, SwDocShell* pDocShell, + const std::map<OUString, OUString>& rArguments) +{ + OUString aNamePrefix; + auto it = rArguments.find("namePrefix"); + if (it != rArguments.end()) + { + aNamePrefix = it->second; + } + + uno::Reference<document::XDocumentPropertiesSupplier> xDPS(pDocShell->GetModel(), + uno::UNO_QUERY); + uno::Reference<document::XDocumentProperties> xDP = xDPS->getDocumentProperties(); + uno::Reference<beans::XPropertyAccess> xUDP(xDP->getUserDefinedProperties(), uno::UNO_QUERY); + auto aUDPs = comphelper::sequenceToContainer<std::vector<beans::PropertyValue>>( + xUDP->getPropertyValues()); + tools::ScopedJsonWriterArray aProperties = rJsonWriter.startArray("userDefinedProperties"); + for (const auto& rUDP : aUDPs) + { + if (!rUDP.Name.startsWith(aNamePrefix)) + { + continue; + } + + if (rUDP.Value.getValueTypeClass() != uno::TypeClass_STRING) + { + continue; + } + + OUString aValue; + rUDP.Value >>= aValue; + + tools::ScopedJsonWriterStruct aProperty = rJsonWriter.startStruct(); + rJsonWriter.put("name", rUDP.Name); + rJsonWriter.put("type", "string"); + rJsonWriter.put("value", aValue); + } +} +} + +void SwXTextDocument::getCommandValues(tools::JsonWriter& rJsonWriter, std::string_view rCommand) +{ + std::map<OUString, OUString> aMap; + + static constexpr OStringLiteral aTextFormFields(".uno:TextFormFields"); + static constexpr OStringLiteral aSetDocumentProperties(".uno:SetDocumentProperties"); + + INetURLObject aParser(OUString::fromUtf8(rCommand)); + OUString aArguments = aParser.GetParam(); + sal_Int32 nParamIndex = 0; + do + { + std::u16string_view aParam = o3tl::getToken(aArguments, 0, '&', nParamIndex); + sal_Int32 nIndex = 0; + OUString aKey; + OUString aValue; + do + { + std::u16string_view aToken = o3tl::getToken(aParam, 0, '=', nIndex); + if (aKey.isEmpty()) + aKey = aToken; + else + aValue = aToken; + } while (nIndex >= 0); + OUString aDecodedValue + = INetURLObject::decode(aValue, INetURLObject::DecodeMechanism::WithCharset); + aMap[aKey] = aDecodedValue; + } while (nParamIndex >= 0); + + if (o3tl::starts_with(rCommand, aTextFormFields)) + { + GetTextFormFields(rJsonWriter, m_pDocShell, aMap); + } + if (o3tl::starts_with(rCommand, aSetDocumentProperties)) + { + GetDocumentProperties(rJsonWriter, m_pDocShell, aMap); + } +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 8d8a7ca0f882..9cd00ead1c9e 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3513,146 +3513,6 @@ void SwXTextDocument::executeContentControlEvent(const StringMap& rArguments) } } -namespace -{ -/// Implements getCommandValues(".uno:TextFormFields"). -/// -/// Parameters: -/// -/// - type: e.g. ODF_UNHANDLED -/// - commandPrefix: field comment prefix not not return all fieldmarks -void GetTextFormFields(tools::JsonWriter& rJsonWriter, SwDocShell* pDocShell, - const std::map<OUString, OUString>& rArguments) -{ - OUString aType; - OUString aCommandPrefix; - { - auto it = rArguments.find("type"); - if (it != rArguments.end()) - { - aType = it->second; - } - - it = rArguments.find("commandPrefix"); - if (it != rArguments.end()) - { - aCommandPrefix = it->second; - } - } - - SwDoc* pDoc = pDocShell->GetDoc(); - IDocumentMarkAccess* pMarkAccess = pDoc->getIDocumentMarkAccess(); - tools::ScopedJsonWriterArray aFields = rJsonWriter.startArray("fields"); - for (auto it = pMarkAccess->getFieldmarksBegin(); it != pMarkAccess->getFieldmarksEnd(); ++it) - { - auto pFieldmark = dynamic_cast<sw::mark::IFieldmark*>(*it); - assert(pFieldmark); - if (pFieldmark->GetFieldname() != aType) - { - continue; - } - - auto itParam = pFieldmark->GetParameters()->find(ODF_CODE_PARAM); - if (itParam == pFieldmark->GetParameters()->end()) - { - continue; - } - - OUString aCommand; - itParam->second >>= aCommand; - if (!aCommand.startsWith(aCommandPrefix)) - { - continue; - } - - tools::ScopedJsonWriterStruct aField = rJsonWriter.startStruct(); - rJsonWriter.put("type", aType); - rJsonWriter.put("command", aCommand); - } -} - -/// Implements getCommandValues(".uno:SetDocumentProperties"). -/// -/// Parameters: -/// -/// - namePrefix: field name prefix not not return all user-defined properties -void GetDocumentProperties(tools::JsonWriter& rJsonWriter, SwDocShell* pDocShell, - const std::map<OUString, OUString>& rArguments) -{ - OUString aNamePrefix; - auto it = rArguments.find("namePrefix"); - if (it != rArguments.end()) - { - aNamePrefix = it->second; - } - - uno::Reference<document::XDocumentPropertiesSupplier> xDPS(pDocShell->GetModel(), uno::UNO_QUERY); - uno::Reference<document::XDocumentProperties> xDP = xDPS->getDocumentProperties(); - uno::Reference<beans::XPropertyAccess> xUDP(xDP->getUserDefinedProperties(), uno::UNO_QUERY); - auto aUDPs = comphelper::sequenceToContainer< std::vector<beans::PropertyValue> >(xUDP->getPropertyValues()); - tools::ScopedJsonWriterArray aProperties = rJsonWriter.startArray("userDefinedProperties"); - for (const auto& rUDP : aUDPs) - { - if (!rUDP.Name.startsWith(aNamePrefix)) - { - continue; - } - - if (rUDP.Value.getValueTypeClass() != TypeClass_STRING) - { - continue; - } - - OUString aValue; - rUDP.Value >>= aValue; - - tools::ScopedJsonWriterStruct aProperty = rJsonWriter.startStruct(); - rJsonWriter.put("name", rUDP.Name); - rJsonWriter.put("type", "string"); - rJsonWriter.put("value", aValue); - } -} -} - -void SwXTextDocument::getCommandValues(tools::JsonWriter& rJsonWriter, std::string_view rCommand) -{ - std::map<OUString, OUString> aMap; - - static constexpr OStringLiteral aTextFormFields(".uno:TextFormFields"); - static constexpr OStringLiteral aSetDocumentProperties(".uno:SetDocumentProperties"); - - INetURLObject aParser(OUString::fromUtf8(rCommand)); - OUString aArguments = aParser.GetParam(); - sal_Int32 nParamIndex = 0; - do - { - std::u16string_view aParam = o3tl::getToken(aArguments, 0, '&', nParamIndex); - sal_Int32 nIndex = 0; - OUString aKey; - OUString aValue; - do - { - std::u16string_view aToken = o3tl::getToken(aParam, 0, '=', nIndex); - if (aKey.isEmpty()) - aKey = aToken; - else - aValue = aToken; - } while (nIndex >= 0); - OUString aDecodedValue - = INetURLObject::decode(aValue, INetURLObject::DecodeMechanism::WithCharset); - aMap[aKey] = aDecodedValue; - } while (nParamIndex >= 0); - - if (o3tl::starts_with(rCommand, aTextFormFields)) - { - GetTextFormFields(rJsonWriter, m_pDocShell, aMap); - } - if (o3tl::starts_with(rCommand, aSetDocumentProperties)) - { - GetDocumentProperties(rJsonWriter, m_pDocShell, aMap); - } -} - int SwXTextDocument::getPart() { SolarMutexGuard aGuard;
