diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-07-18 13:18:11 +0900 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2023-07-18 15:11:02 +0200 |
commit | 2455826917868a5da5ab1bb4586e067d6c968c43 (patch) | |
tree | 114e31c804a5becc7a6e0d38bde0a7a64a29bf77 /xmloff/inc | |
parent | 4adc868328e958a4a9cead3731bd3468497c97c8 (diff) |
xmloff: move XMLComplexColor* import/export classes to public include
Change-Id: I52aad31f63858eba905481812cbf971493252642
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154570
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'xmloff/inc')
-rw-r--r-- | xmloff/inc/XMLBackgroundImageContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/inc/XMLComplexColorContext.hxx | 33 | ||||
-rw-r--r-- | xmloff/inc/XMLComplexColorExport.hxx | 30 | ||||
-rw-r--r-- | xmloff/inc/XMLComplexColorHandler.hxx | 44 | ||||
-rw-r--r-- | xmloff/inc/XMLElementPropertyContext.hxx | 51 | ||||
-rw-r--r-- | xmloff/inc/XMLTextColumnsContext.hxx | 2 | ||||
-rw-r--r-- | xmloff/inc/xmltabi.hxx | 2 |
7 files changed, 3 insertions, 161 deletions
diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx index ab81cc3cb461..c19032de2d70 100644 --- a/xmloff/inc/XMLBackgroundImageContext.hxx +++ b/xmloff/inc/XMLBackgroundImageContext.hxx @@ -20,7 +20,7 @@ #pragma once #include <com/sun/star/style/GraphicLocation.hpp> -#include "XMLElementPropertyContext.hxx" +#include <xmloff/XMLElementPropertyContext.hxx> namespace com::sun::star { namespace io { class XOutputStream; } diff --git a/xmloff/inc/XMLComplexColorContext.hxx b/xmloff/inc/XMLComplexColorContext.hxx deleted file mode 100644 index 2d43da23fedd..000000000000 --- a/xmloff/inc/XMLComplexColorContext.hxx +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- 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/. - */ - -#pragma once - -#include <memory> -#include "XMLElementPropertyContext.hxx" -#include <docmodel/uno/UnoComplexColor.hxx> - -class XMLComplexColorContext final : public XMLElementPropertyContext -{ - model::ComplexColor maComplexColor; - sal_Int32 mnRootElement; - -public: - XMLComplexColorContext(SvXMLImport& rImport, sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList, - const XMLPropertyState& rProp, std::vector<XMLPropertyState>& rProps); - - css::uno::Reference<css::xml::sax::XFastContextHandler> SAL_CALL createFastChildContext( - sal_Int32 nElement, - const css::uno::Reference<css::xml::sax::XFastAttributeList>& AttrList) override; - - void SAL_CALL endFastElement(sal_Int32 nElement) override; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/inc/XMLComplexColorExport.hxx b/xmloff/inc/XMLComplexColorExport.hxx deleted file mode 100644 index d62e10fd5c1b..000000000000 --- a/xmloff/inc/XMLComplexColorExport.hxx +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- 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/. - */ -#pragma once - -#include <sal/types.h> -#include <rtl/ustring.hxx> - -namespace com::sun::star::uno -{ -class Any; -} -class SvXMLExport; - -class XMLComplexColorExport -{ - SvXMLExport& mrExport; - -public: - XMLComplexColorExport(SvXMLExport& rExport); - - void exportXML(const css::uno::Any& rAny, sal_uInt16 nPrefix, const OUString& rLocalName); -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/inc/XMLComplexColorHandler.hxx b/xmloff/inc/XMLComplexColorHandler.hxx deleted file mode 100644 index 052b0db6c1d4..000000000000 --- a/xmloff/inc/XMLComplexColorHandler.hxx +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- 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/. - */ - -#pragma once - -#include <docmodel/uno/UnoComplexColor.hxx> - -using namespace ::xmloff::token; -using namespace css; - -class XMLComplexColorHandler : public XMLPropertyHandler -{ -public: - bool importXML(const OUString& /*rStrImpValue*/, css::uno::Any& /*rValue*/, - const SvXMLUnitConverter&) const override - { - return false; - } - - bool exportXML(OUString& /*rStrExpValue*/, const css::uno::Any& /*rValue*/, - const SvXMLUnitConverter&) const override - { - return false; - } - - bool equals(const css::uno::Any& rAny1, const css::uno::Any& rAny2) const override - { - uno::Reference<util::XComplexColor> xComplexColor1; - uno::Reference<util::XComplexColor> xComplexColor2; - rAny1 >>= xComplexColor1; - rAny2 >>= xComplexColor2; - model::ComplexColor aComplexColor1 = model::color::getFromXComplexColor(xComplexColor1); - model::ComplexColor aComplexColor2 = model::color::getFromXComplexColor(xComplexColor2); - return aComplexColor1 == aComplexColor2; - } -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/inc/XMLElementPropertyContext.hxx b/xmloff/inc/XMLElementPropertyContext.hxx deleted file mode 100644 index 70b915f17f59..000000000000 --- a/xmloff/inc/XMLElementPropertyContext.hxx +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- 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 <xmloff/xmlictxt.hxx> -#include <xmloff/maptype.hxx> - -class SvXMLImport; - - -class XMLElementPropertyContext : public SvXMLImportContext -{ - bool bInsert; - -protected: - - ::std::vector< XMLPropertyState > &rProperties; - XMLPropertyState aProp; - - void SetInsert( bool bIns ) { bInsert = bIns; } - -public: - - XMLElementPropertyContext( SvXMLImport& rImport, sal_Int32 nElement, - XMLPropertyState aProp, - ::std::vector< XMLPropertyState > &rProps ); - - virtual ~XMLElementPropertyContext() override; - - virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; -}; - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx index 438f01c3a8ca..e3993b2853a3 100644 --- a/xmloff/inc/XMLTextColumnsContext.hxx +++ b/xmloff/inc/XMLTextColumnsContext.hxx @@ -23,7 +23,7 @@ #include <memory> -#include "XMLElementPropertyContext.hxx" +#include <xmloff/XMLElementPropertyContext.hxx> class XMLTextColumnContext_Impl; class XMLTextColumnSepContext_Impl; diff --git a/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx index c2e66f1a050d..e5ba010488e2 100644 --- a/xmloff/inc/xmltabi.hxx +++ b/xmloff/inc/xmltabi.hxx @@ -21,7 +21,7 @@ #include <memory> -#include "XMLElementPropertyContext.hxx" +#include <xmloff/XMLElementPropertyContext.hxx> class SvXMLImport; class SvxXMLTabStopContext_Impl; |