diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-22 12:23:14 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-22 19:33:56 +0100 |
commit | 6023347ab02a059011e9d4dde578e5b2a0b2903b (patch) | |
tree | e6afa9966586311526814f5eea5888164aa2a129 | |
parent | Factor out SwFmtAnchor::dumpAsXml() from nodedump (diff) | |
download | core-6023347ab02a059011e9d4dde578e5b2a0b2903b.tar.gz core-6023347ab02a059011e9d4dde578e5b2a0b2903b.zip |
resolveSprmProps() is used only in dmapper
Change-Id: I24227d700830a227ed8aa780b3b9e15c57b46f6e
-rw-r--r-- | writerfilter/Library_writerfilter.mk | 1 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/ResourceModelHelper.hxx | 33 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 14 | ||||
-rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/SettingsTable.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 6 | ||||
-rw-r--r-- | writerfilter/source/dmapper/WrapPolygonHandler.cxx | 3 | ||||
-rw-r--r-- | writerfilter/source/dmapper/util.cxx | 7 | ||||
-rw-r--r-- | writerfilter/source/dmapper/util.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/resourcemodel/ResourceModelHelper.cxx | 34 |
10 files changed, 21 insertions, 87 deletions
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index e84bf5b65168..1bdfa8ee6a1f 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -126,7 +126,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\ writerfilter/source/ooxml/OOXMLPropertySetImpl \ writerfilter/source/ooxml/OOXMLStreamImpl \ writerfilter/source/ooxml/qnametostrcore \ - writerfilter/source/resourcemodel/ResourceModelHelper \ )) $(eval $(call gb_Library_add_generated_exception_objects,writerfilter,\ diff --git a/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx b/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx deleted file mode 100644 index b913cadab6a5..000000000000 --- a/writerfilter/inc/resourcemodel/ResourceModelHelper.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/. - * - * 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 . - */ -#ifndef INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_RESOURCEMODELHELPER_HXX -#define INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_RESOURCEMODELHELPER_HXX - -#include <resourcemodel/WW8ResourceModel.hxx> - -namespace writerfilter { -namespace resourcemodel { - -void resolveSprmProps(Properties & rHandler, Sprm & rSprm); - -}} - -#endif // INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_RESOURCEMODELHELPER_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index b85538c14bde..9df50e43881a 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -18,7 +18,7 @@ */ #include "PageBordersHandler.hxx" -#include <resourcemodel/ResourceModelHelper.hxx> +#include "util.hxx" #include <SdtHelper.hxx> #include <TDefTableHandler.hxx> #include <DomainMapper_Impl.hxx> @@ -77,8 +77,6 @@ using namespace oox; namespace writerfilter { -using resourcemodel::resolveSprmProps; - namespace dmapper{ TagLogger::Pointer_t dmapper_logger(TagLogger::getInstance("DOMAINMAPPER")); @@ -2325,12 +2323,12 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) case NS_ooxml::LN_CT_SdtPr_date: { if (!IsInHeaderFooter()) - resourcemodel::resolveSprmProps(*this, rSprm); + resolveSprmProps(*this, rSprm); else { OUString sName = "ooxml:CT_SdtPr_date"; enableInteropGrabBag(sName); - resourcemodel::resolveSprmProps(*this, rSprm); + resolveSprmProps(*this, rSprm); m_pImpl->m_pSdtHelper->appendToInteropGrabBag(getInteropGrabBag()); m_pImpl->disableInteropGrabBag(); } @@ -2505,7 +2503,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) case NS_ooxml::LN_CT_TrPrBase_cnfStyle: { m_pImpl->enableInteropGrabBag("cnfStyle"); - resourcemodel::resolveSprmProps(*this, rSprm); + resolveSprmProps(*this, rSprm); TablePropertyMapPtr pPropMap(new TablePropertyMap()); pPropMap->Insert(PROP_ROW_CNF_STYLE, uno::makeAny(uno::makeAny(m_pImpl->m_aInteropGrabBag.getAsConstList())), true, ROW_GRAB_BAG); @@ -2517,7 +2515,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) case NS_ooxml::LN_CT_TcPrBase_cnfStyle: { m_pImpl->enableInteropGrabBag("cnfStyle"); - resourcemodel::resolveSprmProps(*this, rSprm); + resolveSprmProps(*this, rSprm); TablePropertyMapPtr pPropMap(new TablePropertyMap()); pPropMap->Insert(PROP_CELL_CNF_STYLE, uno::makeAny(uno::makeAny(m_pImpl->m_aInteropGrabBag.getAsConstList())), true, CELL_GRAB_BAG); @@ -2529,7 +2527,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) case NS_ooxml::LN_CT_PPrBase_cnfStyle: { m_pImpl->enableInteropGrabBag("cnfStyle"); - resourcemodel::resolveSprmProps(*this, rSprm); + resolveSprmProps(*this, rSprm); rContext->Insert(PROP_PARA_CNF_STYLE, uno::makeAny(m_pImpl->m_aInteropGrabBag.getAsConstList()), true, PARA_GRAB_BAG); m_pImpl->disableInteropGrabBag(); } diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 9f91f300c1eb..a0871565638d 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -55,7 +55,6 @@ #include <DomainMapper.hxx> #include <dmapper/GraphicZOrderHelper.hxx> #include <ooxml/resourceids.hxx> -#include <resourcemodel/ResourceModelHelper.hxx> #include "ConversionHelper.hxx" #include "GraphicHelpers.hxx" @@ -63,11 +62,10 @@ #include "PropertyMap.hxx" #include "WrapPolygonHandler.hxx" #include "dmapperLoggers.hxx" +#include "util.hxx" namespace writerfilter { -using resourcemodel::resolveSprmProps; - namespace dmapper { using namespace std; diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx index 76dff4cf4790..28945fb6f27d 100644 --- a/writerfilter/source/dmapper/SettingsTable.cxx +++ b/writerfilter/source/dmapper/SettingsTable.cxx @@ -19,7 +19,6 @@ #include <stdio.h> #include <rtl/ustring.hxx> -#include <resourcemodel/ResourceModelHelper.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/container/XNameContainer.hpp> @@ -30,13 +29,12 @@ #include <ConversionHelper.hxx> #include "dmapperLoggers.hxx" +#include "util.hxx" using namespace com::sun::star; namespace writerfilter { -using resourcemodel::resolveSprmProps; - namespace dmapper { diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index dcdad731d92a..f0a537282c92 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <resourcemodel/ResourceModelHelper.hxx> #include <StyleSheetTable.hxx> +#include "util.hxx" #include <NumberingManager.hxx> #include <ConversionHelper.hxx> #include <TblStylePrHandler.hxx> @@ -682,14 +682,14 @@ void StyleSheetTable::lcl_sprm(Sprm & rSprm) case NS_ooxml::LN_CT_PPrDefault_pPr: case NS_ooxml::LN_CT_DocDefaults_pPrDefault: m_pImpl->m_rDMapper.PushStyleSheetProperties( m_pImpl->m_pDefaultParaProps ); - resourcemodel::resolveSprmProps( m_pImpl->m_rDMapper, rSprm ); + resolveSprmProps( m_pImpl->m_rDMapper, rSprm ); m_pImpl->m_rDMapper.PopStyleSheetProperties(); applyDefaults( true ); break; case NS_ooxml::LN_CT_RPrDefault_rPr: case NS_ooxml::LN_CT_DocDefaults_rPrDefault: m_pImpl->m_rDMapper.PushStyleSheetProperties( m_pImpl->m_pDefaultCharProps ); - resourcemodel::resolveSprmProps( m_pImpl->m_rDMapper, rSprm ); + resolveSprmProps( m_pImpl->m_rDMapper, rSprm ); m_pImpl->m_rDMapper.PopStyleSheetProperties(); applyDefaults( false ); break; diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx index 6239dc183e32..8b3d5e05bc2d 100644 --- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx +++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx @@ -20,15 +20,14 @@ #include <com/sun/star/drawing/PointSequence.hpp> #include <ooxml/resourceids.hxx> -#include <resourcemodel/ResourceModelHelper.hxx> #include "ConversionHelper.hxx" #include "WrapPolygonHandler.hxx" #include "dmapperLoggers.hxx" +#include "util.hxx" namespace writerfilter { -using resourcemodel::resolveSprmProps; using namespace com::sun::star; namespace dmapper { diff --git a/writerfilter/source/dmapper/util.cxx b/writerfilter/source/dmapper/util.cxx index f0df3987ada6..6d9fbf33b760 100644 --- a/writerfilter/source/dmapper/util.cxx +++ b/writerfilter/source/dmapper/util.cxx @@ -51,6 +51,13 @@ string XTextRangeToString(uno::Reference< text::XTextRange > textRange) return result; } +void resolveSprmProps(Properties & rHandler, Sprm & rSprm) +{ + writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); + if( pProperties.get()) + pProperties->resolve(rHandler); +} + } } diff --git a/writerfilter/source/dmapper/util.hxx b/writerfilter/source/dmapper/util.hxx index 29ef0de5cb71..2f1a248d6fb3 100644 --- a/writerfilter/source/dmapper/util.hxx +++ b/writerfilter/source/dmapper/util.hxx @@ -22,12 +22,14 @@ #include <com/sun/star/text/XTextRange.hpp> #include <string> +#include <resourcemodel/WW8ResourceModel.hxx> namespace writerfilter { namespace dmapper { std::string XTextRangeToString(css::uno::Reference< css::text::XTextRange > textRange); + void resolveSprmProps(Properties & rHandler, Sprm & rSprm); } } diff --git a/writerfilter/source/resourcemodel/ResourceModelHelper.cxx b/writerfilter/source/resourcemodel/ResourceModelHelper.cxx deleted file mode 100644 index f60501746932..000000000000 --- a/writerfilter/source/resourcemodel/ResourceModelHelper.cxx +++ /dev/null @@ -1,34 +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 . - */ - -#include "resourcemodel/ResourceModelHelper.hxx" - -namespace writerfilter { -namespace resourcemodel { - -void resolveSprmProps(Properties & rHandler, Sprm & rSprm) -{ - writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); - if( pProperties.get()) - pProperties->resolve(rHandler); -} - -}} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |