xmloff/Library_xo.mk | 5
xmloff/source/style/impastp1.cxx | 46 ---
xmloff/source/style/impastp2.cxx | 50 ---
xmloff/source/style/impastp3.cxx | 143 ---------
xmloff/source/style/impastp4.cxx | 404 ---------------------------
xmloff/source/style/impastpl.cxx | 574 +++++++++++++++++++++++++++++++++++++++
6 files changed, 575 insertions(+), 647 deletions(-)
New commits:
commit 69f08eda0bd999c827c76d3bf0b9c925b7eb25f7
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Sep 16 16:03:32 2013 +0300
Insert impastp4.cxx into impastpl.cxx
Change-Id: Iccd059e2d09666775f8391a1ac2a074518a5c111
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index d2d52a7..b72172b 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -247,7 +247,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/style/escphdl \
xmloff/source/style/fonthdl \
xmloff/source/style/impastpl \
- xmloff/source/style/impastp4 \
xmloff/source/style/kernihdl \
xmloff/source/style/lspachdl \
xmloff/source/style/numehelp \
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
deleted file mode 100644
index 8aa7214..0000000
--- a/xmloff/source/style/impastp4.cxx
+++ /dev/null
@@ -1,404 +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 <tools/debug.hxx>
-#include <xmloff/xmlaustp.hxx>
-#include <xmloff/xmltoken.hxx>
-#include <xmloff/nmspmap.hxx>
-#include "xmloff/xmlnmspe.hxx"
-#include <xmloff/attrlist.hxx>
-#include "impastpl.hxx"
-#include <xmloff/xmlexppr.hxx>
-#include <xmloff/xmlexp.hxx>
-#include <xmloff/families.hxx>
-#include <xmloff/PageMasterStyleMap.hxx>
-
-using namespace ::std;
-
-using namespace ::com::sun::star;
-using namespace ::xmloff::token;
-
-// Class SvXMLAutoStylePool_Impl
-// ctor/dtor class SvXMLAutoStylePool_Impl
-
-SvXMLAutoStylePoolP_Impl::SvXMLAutoStylePoolP_Impl( SvXMLExport& rExp)
- : rExport( rExp )
-{
-}
-
-SvXMLAutoStylePoolP_Impl::~SvXMLAutoStylePoolP_Impl()
-{
-}
-
-// Adds stylefamily-information to sorted list
-
-void SvXMLAutoStylePoolP_Impl::AddFamily(
- sal_Int32 nFamily,
- const OUString& rStrName,
- const UniReference < SvXMLExportPropertyMapper > & rMapper,
- const OUString& rStrPrefix,
- sal_Bool bAsFamily )
-{
- // store family in a list if not already stored
- sal_uInt16 nExportFlags = GetExport().getExportFlags();
- sal_Bool bStylesOnly = (nExportFlags & EXPORT_STYLES) != 0 &&
(nExportFlags & EXPORT_CONTENT) == 0;
-
- OUString aPrefix( rStrPrefix );
- if( bStylesOnly )
- {
- aPrefix = OUString( 'M' );
- aPrefix += rStrPrefix;
- }
-
-#if OSL_DEBUG_LEVEL > 0
- XMLAutoStyleFamily aTemporary( nFamily );
- FamilyListType::iterator aFind = maFamilyList.find(aTemporary);
- if( aFind != maFamilyList.end() )
- {
- // FIXME: do we really intend to replace the previous nFamily
- // entry in this case ?
- SAL_WARN_IF( aFind->mxMapper != rMapper, "xmloff",
- "Adding duplicate family " << rStrName <<
- " with mismatching mapper ! " <<
- typeid(*aFind->mxMapper.get()).name() << " " <<
- typeid(*rMapper.get()).name() );
- }
-#endif
-
- XMLAutoStyleFamily *pFamily = new XMLAutoStyleFamily( nFamily, rStrName,
rMapper, aPrefix, bAsFamily );
- maFamilyList.insert(pFamily);
-}
-
-void SvXMLAutoStylePoolP_Impl::SetFamilyPropSetMapper(
- sal_Int32 nFamily,
- const UniReference < SvXMLExportPropertyMapper > & rMapper )
-{
-
- XMLAutoStyleFamily aTemporary( nFamily );
- FamilyListType::iterator aFind = maFamilyList.find(aTemporary);
- if (aFind != maFamilyList.end())
- aFind->mxMapper = rMapper;
-}
-
-// Adds a name to list
-void SvXMLAutoStylePoolP_Impl::RegisterName( sal_Int32 nFamily, const
OUString& rName )
-{
- XMLAutoStyleFamily aTmp( nFamily );
- FamilyListType::iterator aFind = maFamilyList.find(aTmp);
- DBG_ASSERT( aFind != maFamilyList.end(),
- "SvXMLAutoStylePool_Impl::RegisterName: unknown family" );
- if (aFind != maFamilyList.end())
- aFind->maNameList.insert(rName);
-}
-
-//
-// Retrieve the list of registered names
-//
-
-void SvXMLAutoStylePoolP_Impl::GetRegisteredNames(
- uno::Sequence<sal_Int32>& rFamilies,
- uno::Sequence<OUString>& rNames )
-{
- // collect registered names + families
- vector<sal_Int32> aFamilies;
- vector<OUString> aNames;
-
- // iterate over families
- for (FamilyListType::iterator aJ = maFamilyList.begin(); aJ !=
maFamilyList.end(); ++aJ)
- {
- XMLAutoStyleFamily &rFamily = *aJ;
-
- // iterate over names
- for (XMLAutoStyleFamily::NameSetType::const_iterator aI =
rFamily.maNameList.begin(); aI != rFamily.maNameList.end(); ++aI)
- {
- aFamilies.push_back( rFamily.mnFamily );
- aNames.push_back( *aI );
- }
- }
-
- // copy the families + names into the sequence types
- DBG_ASSERT( aFamilies.size() == aNames.size(), "families != names" );
-
- rFamilies.realloc( aFamilies.size() );
- std::copy( aFamilies.begin(), aFamilies.end(), rFamilies.getArray() );
-
- rNames.realloc( aNames.size() );
- std::copy( aNames.begin(), aNames.end(), rNames.getArray() );
-}
-
-// Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) to list
-// if not added, yet.
-
-bool SvXMLAutoStylePoolP_Impl::Add(
- OUString& rName, sal_Int32 nFamily, const OUString& rParentName,
- const ::std::vector< XMLPropertyState >& rProperties, bool bDontSeek )
-{
- XMLAutoStyleFamily aTemporary( nFamily );
- FamilyListType::iterator aFind = maFamilyList.find(aTemporary);
- DBG_ASSERT(aFind != maFamilyList.end(), "SvXMLAutoStylePool_Impl::Add:
unknown family");
-
- if (aFind == maFamilyList.end())
- return false;
-
- XMLAutoStyleFamily &rFamily = *aFind;
-
- XMLAutoStylePoolParent aTmp(rParentName);
- XMLAutoStyleFamily::ParentsType::iterator it2 =
rFamily.maParents.find(aTmp);
- if (it2 == rFamily.maParents.end())
- {
- std::pair<XMLAutoStyleFamily::ParentsType::iterator,bool> r =
- rFamily.maParents.insert(new XMLAutoStylePoolParent(rParentName));
- it2 = r.first;
- }
-
- XMLAutoStylePoolParent& rParent = *it2;
-
- bool bRet = false;
- if (rParent.Add(rFamily, rProperties, rName, bDontSeek))
- {
- rFamily.mnCount++;
- bRet = true;
- }
-
- return bRet;
-}
-
-bool SvXMLAutoStylePoolP_Impl::AddNamed(
- const OUString& rName, sal_Int32 nFamily, const OUString& rParentName,
- const ::std::vector< XMLPropertyState >& rProperties )
-{
- // get family and parent the same way as in Add()
-
- XMLAutoStyleFamily aTemporary( nFamily );
- FamilyListType::iterator aFind = maFamilyList.find(aTemporary);
- DBG_ASSERT(aFind != maFamilyList.end(), "SvXMLAutoStylePool_Impl::Add:
unknown family");
-
- if (aFind == maFamilyList.end())
- return false;
-
- XMLAutoStyleFamily &rFamily = *aFind;
-
- XMLAutoStylePoolParent aTmp(rParentName);
- XMLAutoStyleFamily::ParentsType::iterator it2 =
rFamily.maParents.find(aTmp);
- if (it2 == rFamily.maParents.end())
- {
- std::pair<XMLAutoStyleFamily::ParentsType::iterator,bool> r =
- rFamily.maParents.insert(new XMLAutoStylePoolParent(rParentName));
- it2 = r.first;
- }
-
- XMLAutoStylePoolParent& rParent = *it2;
-
- bool bRet = false;
- if (rParent.AddNamed(rFamily, rProperties, rName))
- {
- rFamily.mnCount++;
- bRet = true;
- }
-
- return bRet;
-}
-
-//
-// Search for a array of XMLPropertyState ( vector< XMLPropertyState > ) in
list
-//
-
-OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily,
- const OUString& rParent,
- const vector< XMLPropertyState >&
rProperties ) const
-{
- OUString sName;
-
- XMLAutoStyleFamily aTemporary( nFamily );
- FamilyListType::const_iterator const iter = maFamilyList.find(aTemporary);
- OSL_ENSURE(iter != maFamilyList.end(), "SvXMLAutoStylePool_Impl::Find:
unknown family");
-
- if (iter != maFamilyList.end())
- {
- XMLAutoStyleFamily const& rFamily = *iter;
- XMLAutoStylePoolParent aTmp( rParent );
- XMLAutoStyleFamily::ParentsType::const_iterator it2 =
rFamily.maParents.find(aTmp);
- if (it2 != rFamily.maParents.end())
- {
- sName = it2->Find(rFamily, rProperties);
- }
- }
-
- return sName;
-}
-
-namespace {
-
-struct AutoStylePoolExport
-{
- const OUString* mpParent;
- const XMLAutoStylePoolProperties* mpProperties;
-
- AutoStylePoolExport() : mpParent(NULL), mpProperties(NULL) {}
-};
-
-}
-
-void SvXMLAutoStylePoolP_Impl::exportXML(
- sal_Int32 nFamily,
- const uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > &,
- const SvXMLUnitConverter&,
- const SvXMLNamespaceMap&,
- const SvXMLAutoStylePoolP *pAntiImpl) const
-{
- // Get list of parents for current family (nFamily)
- XMLAutoStyleFamily aTmp( nFamily );
- FamilyListType::const_iterator aFind = maFamilyList.find(aTmp);
- DBG_ASSERT( aFind != maFamilyList.end(),
- "SvXMLAutoStylePool_Impl::exportXML: unknown family" );
- if (aFind == maFamilyList.end())
- return;
-
- const XMLAutoStyleFamily &rFamily = *aFind;
- sal_uInt32 nCount = rFamily.mnCount;
-
- if (!nCount)
- return;
-
- // create, initialize and fill helper-structure
(SvXMLAutoStylePoolProperties_Impl)
- // which contains a parent-name and a SvXMLAutoStylePoolProperties_Impl
- std::vector<AutoStylePoolExport> aExpStyles(nCount);
-
- sal_uInt32 i;
- for( i=0; i < nCount; i++ )
- {
- aExpStyles[i].mpParent = 0;
- aExpStyles[i].mpProperties = 0;
- }
-
- XMLAutoStyleFamily::ParentsType::const_iterator it =
rFamily.maParents.begin(), itEnd = rFamily.maParents.end();
- for (; it != itEnd; ++it)
- {
- const XMLAutoStylePoolParent& rParent = *it;
- size_t nProperties = rParent.GetPropertiesList().size();
- for( size_t j = 0; j < nProperties; j++ )
- {
- const XMLAutoStylePoolProperties* pProperties =
- &rParent.GetPropertiesList()[j];
- sal_uLong nPos = pProperties->GetPos();
- DBG_ASSERT( nPos < nCount,
- "SvXMLAutoStylePool_Impl::exportXML: wrong position" );
- if( nPos < nCount )
- {
- DBG_ASSERT( !aExpStyles[nPos].mpProperties,
- "SvXMLAutoStylePool_Impl::exportXML: double position" );
- aExpStyles[nPos].mpProperties = pProperties;
- aExpStyles[nPos].mpParent = &rParent.GetParent();
- }
- }
- }
-
- //
- // create string to export for each XML-style. That means for each
property-list
- //
- OUString aStrFamilyName = rFamily.maStrFamilyName;
-
- for( i=0; i<nCount; i++ )
- {
- DBG_ASSERT( aExpStyles[i].mpProperties,
- "SvXMLAutoStylePool_Impl::exportXML: empty position" );
-
- if( aExpStyles[i].mpProperties )
- {
- GetExport().AddAttribute(
- XML_NAMESPACE_STYLE, XML_NAME,
- aExpStyles[i].mpProperties->GetName() );
-
- if( rFamily.mbAsFamily )
- {
- GetExport().AddAttribute(
- XML_NAMESPACE_STYLE, XML_FAMILY, aStrFamilyName );
- }
-
- if( !aExpStyles[i].mpParent->isEmpty() )
- {
- GetExport().AddAttribute(
- XML_NAMESPACE_STYLE, XML_PARENT_STYLE_NAME,
- GetExport().EncodeStyleName(
- *aExpStyles[i].mpParent ) );
- }
-
- OUString sName;
- if( rFamily.mbAsFamily )
- sName = GetXMLToken(XML_STYLE);
- else
- sName = rFamily.maStrFamilyName;
-
- pAntiImpl->exportStyleAttributes(
- GetExport().GetAttrList(),
- nFamily,
- aExpStyles[i].mpProperties->GetProperties(),
- *rFamily.mxMapper.get()
- , GetExport().GetMM100UnitConverter(),
- GetExport().GetNamespaceMap()
- );
-
- SvXMLElementExport aElem( GetExport(),
- XML_NAMESPACE_STYLE, sName,
- sal_True, sal_True );
-
- sal_Int32 nStart(-1);
- sal_Int32 nEnd(-1);
- if (nFamily == XML_STYLE_FAMILY_PAGE_MASTER)
- {
- nStart = 0;
- sal_Int32 nIndex = 0;
- UniReference< XMLPropertySetMapper > aPropMapper =
- rFamily.mxMapper->getPropertySetMapper();
- sal_Int16 nContextID;
- while(nIndex < aPropMapper->GetEntryCount() && nEnd == -1)
- {
- nContextID = aPropMapper->GetEntryContextId( nIndex );
- if (nContextID && ((nContextID & CTF_PM_FLAGMASK) !=
XML_PM_CTF_START))
- nEnd = nIndex;
- nIndex++;
- }
- if (nEnd == -1)
- nEnd = nIndex;
- }
-
- rFamily.mxMapper->exportXML(
- GetExport(),
- aExpStyles[i].mpProperties->GetProperties(),
- nStart, nEnd, XML_EXPORT_FLAG_IGN_WS );
-
- pAntiImpl->exportStyleContent(
- GetExport().GetDocHandler(),
- nFamily,
- aExpStyles[i].mpProperties->GetProperties(),
- *rFamily.mxMapper.get(),
- GetExport().GetMM100UnitConverter(),
- GetExport().GetNamespaceMap()
- );
- }
- }
-}
-
-void SvXMLAutoStylePoolP_Impl::ClearEntries()
-{
- for (FamilyListType::iterator aI = maFamilyList.begin(); aI !=
maFamilyList.end(); ++aI)
- aI->ClearEntries();
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index 608575f..d03ca31 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -19,11 +19,23 @@
#include <rtl/ustrbuf.hxx>
#include <tools/debug.hxx>
+#include <xmloff/PageMasterStyleMap.hxx>
+#include <xmloff/attrlist.hxx>
+#include <xmloff/families.hxx>
+#include <xmloff/nmspmap.hxx>
+#include <xmloff/xmlaustp.hxx>
+#include <xmloff/xmlexp.hxx>
+#include <xmloff/xmlexppr.hxx>
+#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmlprmap.hxx>
+#include <xmloff/xmltoken.hxx>
#include "impastpl.hxx"
-using namespace std;
+using namespace ::std;
+
+using namespace ::com::sun::star;
+using namespace ::xmloff::token;
// Class XMLAutoStyleFamily
// ctor/dtor class XMLAutoStyleFamily
@@ -192,4 +204,371 @@ bool XMLAutoStylePoolParent::operator< (const
XMLAutoStylePoolParent& rOther) co
return msParent < rOther.msParent;
}
+// Class SvXMLAutoStylePool_Impl
+// ctor/dtor class SvXMLAutoStylePool_Impl
+
+SvXMLAutoStylePoolP_Impl::SvXMLAutoStylePoolP_Impl( SvXMLExport& rExp)
+ : rExport( rExp )
+{
+}
+
+SvXMLAutoStylePoolP_Impl::~SvXMLAutoStylePoolP_Impl()
+{
+}
+
+// Adds stylefamily-information to sorted list
+
+void SvXMLAutoStylePoolP_Impl::AddFamily(
+ sal_Int32 nFamily,
+ const OUString& rStrName,
+ const UniReference < SvXMLExportPropertyMapper > & rMapper,
+ const OUString& rStrPrefix,
+ sal_Bool bAsFamily )
+{
+ // store family in a list if not already stored
+ sal_uInt16 nExportFlags = GetExport().getExportFlags();
+ sal_Bool bStylesOnly = (nExportFlags & EXPORT_STYLES) != 0 &&
(nExportFlags & EXPORT_CONTENT) == 0;
+
+ OUString aPrefix( rStrPrefix );
+ if( bStylesOnly )
+ {
+ aPrefix = OUString( 'M' );
+ aPrefix += rStrPrefix;
+ }
+
+#if OSL_DEBUG_LEVEL > 0
+ XMLAutoStyleFamily aTemporary( nFamily );
+ FamilyListType::iterator aFind = maFamilyList.find(aTemporary);
+ if( aFind != maFamilyList.end() )
+ {
+ // FIXME: do we really intend to replace the previous nFamily
+ // entry in this case ?
+ SAL_WARN_IF( aFind->mxMapper != rMapper, "xmloff",
+ "Adding duplicate family " << rStrName <<
+ " with mismatching mapper ! " <<
+ typeid(*aFind->mxMapper.get()).name() << " " <<
+ typeid(*rMapper.get()).name() );
+ }
+#endif
+
+ XMLAutoStyleFamily *pFamily = new XMLAutoStyleFamily( nFamily, rStrName,
rMapper, aPrefix, bAsFamily );
+ maFamilyList.insert(pFamily);
+}
+
+void SvXMLAutoStylePoolP_Impl::SetFamilyPropSetMapper(
+ sal_Int32 nFamily,
+ const UniReference < SvXMLExportPropertyMapper > & rMapper )
+{
+
+ XMLAutoStyleFamily aTemporary( nFamily );
+ FamilyListType::iterator aFind = maFamilyList.find(aTemporary);
+ if (aFind != maFamilyList.end())
+ aFind->mxMapper = rMapper;
+}
+
+// Adds a name to list
+void SvXMLAutoStylePoolP_Impl::RegisterName( sal_Int32 nFamily, const
OUString& rName )
+{
+ XMLAutoStyleFamily aTmp( nFamily );
+ FamilyListType::iterator aFind = maFamilyList.find(aTmp);
+ DBG_ASSERT( aFind != maFamilyList.end(),
+ "SvXMLAutoStylePool_Impl::RegisterName: unknown family" );
+ if (aFind != maFamilyList.end())
+ aFind->maNameList.insert(rName);
+}
+
+//
+// Retrieve the list of registered names
+//
+
+void SvXMLAutoStylePoolP_Impl::GetRegisteredNames(
+ uno::Sequence<sal_Int32>& rFamilies,
+ uno::Sequence<OUString>& rNames )
+{
+ // collect registered names + families
+ vector<sal_Int32> aFamilies;
+ vector<OUString> aNames;
+
+ // iterate over families
+ for (FamilyListType::iterator aJ = maFamilyList.begin(); aJ !=
maFamilyList.end(); ++aJ)
+ {
+ XMLAutoStyleFamily &rFamily = *aJ;
+
+ // iterate over names
+ for (XMLAutoStyleFamily::NameSetType::const_iterator aI =
rFamily.maNameList.begin(); aI != rFamily.maNameList.end(); ++aI)
+ {
+ aFamilies.push_back( rFamily.mnFamily );
+ aNames.push_back( *aI );
+ }
+ }
+
+ // copy the families + names into the sequence types
+ DBG_ASSERT( aFamilies.size() == aNames.size(), "families != names" );
+
+ rFamilies.realloc( aFamilies.size() );
+ std::copy( aFamilies.begin(), aFamilies.end(), rFamilies.getArray() );
+
+ rNames.realloc( aNames.size() );
+ std::copy( aNames.begin(), aNames.end(), rNames.getArray() );
+}
+
+// Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) to list
+// if not added, yet.
+
+bool SvXMLAutoStylePoolP_Impl::Add(
+ OUString& rName, sal_Int32 nFamily, const OUString& rParentName,
+ const ::std::vector< XMLPropertyState >& rProperties, bool bDontSeek )
+{
+ XMLAutoStyleFamily aTemporary( nFamily );
+ FamilyListType::iterator aFind = maFamilyList.find(aTemporary);
+ DBG_ASSERT(aFind != maFamilyList.end(), "SvXMLAutoStylePool_Impl::Add:
unknown family");
+
+ if (aFind == maFamilyList.end())
+ return false;
+
+ XMLAutoStyleFamily &rFamily = *aFind;
+
+ XMLAutoStylePoolParent aTmp(rParentName);
+ XMLAutoStyleFamily::ParentsType::iterator it2 =
rFamily.maParents.find(aTmp);
+ if (it2 == rFamily.maParents.end())
+ {
+ std::pair<XMLAutoStyleFamily::ParentsType::iterator,bool> r =
+ rFamily.maParents.insert(new XMLAutoStylePoolParent(rParentName));
+ it2 = r.first;
+ }
+
+ XMLAutoStylePoolParent& rParent = *it2;
+
+ bool bRet = false;
+ if (rParent.Add(rFamily, rProperties, rName, bDontSeek))
+ {
+ rFamily.mnCount++;
+ bRet = true;
+ }
+
+ return bRet;
+}
+
+bool SvXMLAutoStylePoolP_Impl::AddNamed(
+ const OUString& rName, sal_Int32 nFamily, const OUString& rParentName,
+ const ::std::vector< XMLPropertyState >& rProperties )
+{
+ // get family and parent the same way as in Add()
+
+ XMLAutoStyleFamily aTemporary( nFamily );
+ FamilyListType::iterator aFind = maFamilyList.find(aTemporary);
+ DBG_ASSERT(aFind != maFamilyList.end(), "SvXMLAutoStylePool_Impl::Add:
unknown family");
+
+ if (aFind == maFamilyList.end())
+ return false;
+
+ XMLAutoStyleFamily &rFamily = *aFind;
+
+ XMLAutoStylePoolParent aTmp(rParentName);
+ XMLAutoStyleFamily::ParentsType::iterator it2 =
rFamily.maParents.find(aTmp);
+ if (it2 == rFamily.maParents.end())
+ {
+ std::pair<XMLAutoStyleFamily::ParentsType::iterator,bool> r =
+ rFamily.maParents.insert(new XMLAutoStylePoolParent(rParentName));
+ it2 = r.first;
+ }
+
+ XMLAutoStylePoolParent& rParent = *it2;
+
+ bool bRet = false;
+ if (rParent.AddNamed(rFamily, rProperties, rName))
+ {
+ rFamily.mnCount++;
+ bRet = true;
+ }
+
+ return bRet;
+}
+
+//
+// Search for a array of XMLPropertyState ( vector< XMLPropertyState > ) in
list
+//
+
+OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily,
+ const OUString& rParent,
+ const vector< XMLPropertyState >&
rProperties ) const
+{
+ OUString sName;
+
+ XMLAutoStyleFamily aTemporary( nFamily );
+ FamilyListType::const_iterator const iter = maFamilyList.find(aTemporary);
+ OSL_ENSURE(iter != maFamilyList.end(), "SvXMLAutoStylePool_Impl::Find:
unknown family");
+
+ if (iter != maFamilyList.end())
+ {
+ XMLAutoStyleFamily const& rFamily = *iter;
+ XMLAutoStylePoolParent aTmp( rParent );
+ XMLAutoStyleFamily::ParentsType::const_iterator it2 =
rFamily.maParents.find(aTmp);
+ if (it2 != rFamily.maParents.end())
+ {
+ sName = it2->Find(rFamily, rProperties);
+ }
+ }
+
+ return sName;
+}
+
+namespace {
+
+struct AutoStylePoolExport
+{
+ const OUString* mpParent;
+ const XMLAutoStylePoolProperties* mpProperties;
+
+ AutoStylePoolExport() : mpParent(NULL), mpProperties(NULL) {}
+};
+
+}
+
+void SvXMLAutoStylePoolP_Impl::exportXML(
+ sal_Int32 nFamily,
+ const uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > &,
+ const SvXMLUnitConverter&,
+ const SvXMLNamespaceMap&,
+ const SvXMLAutoStylePoolP *pAntiImpl) const
+{
+ // Get list of parents for current family (nFamily)
+ XMLAutoStyleFamily aTmp( nFamily );
+ FamilyListType::const_iterator aFind = maFamilyList.find(aTmp);
+ DBG_ASSERT( aFind != maFamilyList.end(),
+ "SvXMLAutoStylePool_Impl::exportXML: unknown family" );
+ if (aFind == maFamilyList.end())
+ return;
+
+ const XMLAutoStyleFamily &rFamily = *aFind;
+ sal_uInt32 nCount = rFamily.mnCount;
+
+ if (!nCount)
+ return;
+
+ // create, initialize and fill helper-structure
(SvXMLAutoStylePoolProperties_Impl)
+ // which contains a parent-name and a SvXMLAutoStylePoolProperties_Impl
+ std::vector<AutoStylePoolExport> aExpStyles(nCount);
+
+ sal_uInt32 i;
+ for( i=0; i < nCount; i++ )
+ {
+ aExpStyles[i].mpParent = 0;
+ aExpStyles[i].mpProperties = 0;
+ }
+
+ XMLAutoStyleFamily::ParentsType::const_iterator it =
rFamily.maParents.begin(), itEnd = rFamily.maParents.end();
+ for (; it != itEnd; ++it)
+ {
+ const XMLAutoStylePoolParent& rParent = *it;
+ size_t nProperties = rParent.GetPropertiesList().size();
+ for( size_t j = 0; j < nProperties; j++ )
+ {
+ const XMLAutoStylePoolProperties* pProperties =
+ &rParent.GetPropertiesList()[j];
+ sal_uLong nPos = pProperties->GetPos();
+ DBG_ASSERT( nPos < nCount,
+ "SvXMLAutoStylePool_Impl::exportXML: wrong position" );
+ if( nPos < nCount )
+ {
+ DBG_ASSERT( !aExpStyles[nPos].mpProperties,
+ "SvXMLAutoStylePool_Impl::exportXML: double position" );
+ aExpStyles[nPos].mpProperties = pProperties;
+ aExpStyles[nPos].mpParent = &rParent.GetParent();
+ }
+ }
+ }
+
+ //
+ // create string to export for each XML-style. That means for each
property-list
+ //
+ OUString aStrFamilyName = rFamily.maStrFamilyName;
+
+ for( i=0; i<nCount; i++ )
+ {
+ DBG_ASSERT( aExpStyles[i].mpProperties,
+ "SvXMLAutoStylePool_Impl::exportXML: empty position" );
+
+ if( aExpStyles[i].mpProperties )
+ {
+ GetExport().AddAttribute(
+ XML_NAMESPACE_STYLE, XML_NAME,
+ aExpStyles[i].mpProperties->GetName() );
+
+ if( rFamily.mbAsFamily )
+ {
+ GetExport().AddAttribute(
+ XML_NAMESPACE_STYLE, XML_FAMILY, aStrFamilyName );
+ }
+
+ if( !aExpStyles[i].mpParent->isEmpty() )
+ {
+ GetExport().AddAttribute(
+ XML_NAMESPACE_STYLE, XML_PARENT_STYLE_NAME,
+ GetExport().EncodeStyleName(
+ *aExpStyles[i].mpParent ) );
+ }
+
+ OUString sName;
+ if( rFamily.mbAsFamily )
+ sName = GetXMLToken(XML_STYLE);
+ else
+ sName = rFamily.maStrFamilyName;
+
+ pAntiImpl->exportStyleAttributes(
+ GetExport().GetAttrList(),
+ nFamily,
+ aExpStyles[i].mpProperties->GetProperties(),
+ *rFamily.mxMapper.get()
+ , GetExport().GetMM100UnitConverter(),
+ GetExport().GetNamespaceMap()
+ );
+
+ SvXMLElementExport aElem( GetExport(),
+ XML_NAMESPACE_STYLE, sName,
+ sal_True, sal_True );
+
+ sal_Int32 nStart(-1);
+ sal_Int32 nEnd(-1);
+ if (nFamily == XML_STYLE_FAMILY_PAGE_MASTER)
+ {
+ nStart = 0;
+ sal_Int32 nIndex = 0;
+ UniReference< XMLPropertySetMapper > aPropMapper =
+ rFamily.mxMapper->getPropertySetMapper();
+ sal_Int16 nContextID;
+ while(nIndex < aPropMapper->GetEntryCount() && nEnd == -1)
+ {
+ nContextID = aPropMapper->GetEntryContextId( nIndex );
+ if (nContextID && ((nContextID & CTF_PM_FLAGMASK) !=
XML_PM_CTF_START))
+ nEnd = nIndex;
+ nIndex++;
+ }
+ if (nEnd == -1)
+ nEnd = nIndex;
+ }
+
+ rFamily.mxMapper->exportXML(
+ GetExport(),
+ aExpStyles[i].mpProperties->GetProperties(),
+ nStart, nEnd, XML_EXPORT_FLAG_IGN_WS );
+
+ pAntiImpl->exportStyleContent(
+ GetExport().GetDocHandler(),
+ nFamily,
+ aExpStyles[i].mpProperties->GetProperties(),
+ *rFamily.mxMapper.get(),
+ GetExport().GetMM100UnitConverter(),
+ GetExport().GetNamespaceMap()
+ );
+ }
+ }
+}
+
+void SvXMLAutoStylePoolP_Impl::ClearEntries()
+{
+ for (FamilyListType::iterator aI = maFamilyList.begin(); aI !=
maFamilyList.end(); ++aI)
+ aI->ClearEntries();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 2770de8b66e2f2a628ad0b6b00a66002c26b3cd7
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Sep 16 15:59:35 2013 +0300
Insert impastp3.cxx into impastpl.cxx
Change-Id: I8038a724d79a81ac5502f926f8b8f19e2a277e74
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 66bbb14..d2d52a7 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -247,7 +247,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/style/escphdl \
xmloff/source/style/fonthdl \
xmloff/source/style/impastpl \
- xmloff/source/style/impastp3 \
xmloff/source/style/impastp4 \
xmloff/source/style/kernihdl \
xmloff/source/style/lspachdl \
diff --git a/xmloff/source/style/impastp3.cxx b/xmloff/source/style/impastp3.cxx
deleted file mode 100644
index 589d7e3..0000000
--- a/xmloff/source/style/impastp3.cxx
+++ /dev/null
@@ -1,143 +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 "impastpl.hxx"
-#include <xmloff/xmlprmap.hxx>
-
-using namespace std;
-
-XMLAutoStylePoolParent::~XMLAutoStylePoolParent()
-{
-}
-
-// Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) to list
-// if not added, yet.
-
-sal_Bool XMLAutoStylePoolParent::Add( XMLAutoStyleFamily& rFamilyData, const
vector< XMLPropertyState >& rProperties, OUString& rName, bool bDontSeek )
-{
- sal_Bool bAdded = sal_False;
- XMLAutoStylePoolProperties *pProperties = 0;
- sal_Int32 nProperties = rProperties.size();
- size_t i = 0;
- for (size_t n = maPropertiesList.size(); i < n; ++i)
- {
- XMLAutoStylePoolProperties* pIS = &maPropertiesList[i];
- if( nProperties > (sal_Int32)pIS->GetProperties().size() )
- {
- continue;
- }
- else if( nProperties < (sal_Int32)pIS->GetProperties().size() )
- {
- break;
- }
- else if( !bDontSeek && rFamilyData.mxMapper->Equals(
pIS->GetProperties(), rProperties ) )
- {
- pProperties = pIS;
- break;
- }
- }
-
- if( !pProperties )
- {
- pProperties = new XMLAutoStylePoolProperties( rFamilyData, rProperties
);
- PropertiesListType::iterator it = maPropertiesList.begin();
- ::std::advance( it, i );
- maPropertiesList.insert( it, pProperties );
- bAdded = sal_True;
- }
-
- rName = pProperties->GetName();
-
- return bAdded;
-}
-
-//
-// Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) with a
given name.
-// If the name exists already, nothing is done. If a style with a different
name and
-// the same properties exists, a new one is added (like with bDontSeek).
-//
-
-sal_Bool XMLAutoStylePoolParent::AddNamed( XMLAutoStyleFamily& rFamilyData,
const vector< XMLPropertyState >& rProperties, const OUString& rName )
-{
- sal_Bool bAdded = sal_False;
- sal_Int32 nProperties = rProperties.size();
- size_t i = 0;
- for (size_t n = maPropertiesList.size(); i < n; ++i)
- {
- XMLAutoStylePoolProperties* pIS = &maPropertiesList[i];
- if( nProperties > (sal_Int32)pIS->GetProperties().size() )
- {
- continue;
- }
- else if( nProperties < (sal_Int32)pIS->GetProperties().size() )
- {
- break;
- }
- }
-
- if (rFamilyData.maNameList.find(rName) == rFamilyData.maNameList.end())
- {
- XMLAutoStylePoolProperties* pProperties =
- new XMLAutoStylePoolProperties( rFamilyData, rProperties );
- // ignore the generated name
- pProperties->SetName( rName );
- PropertiesListType::iterator it = maPropertiesList.begin();
- ::std::advance( it, i );
- maPropertiesList.insert( it, pProperties );
- bAdded = sal_True;
- }
-
- return bAdded;
-}
-
-//
-// Search for a array of XMLPropertyState ( vector< XMLPropertyState > ) in
list
-//
-
-OUString XMLAutoStylePoolParent::Find( const XMLAutoStyleFamily& rFamilyData,
const vector< XMLPropertyState >& rProperties ) const
-{
- OUString sName;
- vector< XMLPropertyState>::size_type nItems = rProperties.size();
- for (size_t i = 0, n = maPropertiesList.size(); i < n; ++i)
- {
- const XMLAutoStylePoolProperties* pIS = &maPropertiesList[i];
- if( nItems > pIS->GetProperties().size() )
- {
- continue;
- }
- else if( nItems < pIS->GetProperties().size() )
- {
- break;
- }
- else if( rFamilyData.mxMapper->Equals( pIS->GetProperties(),
rProperties ) )
- {
- sName = pIS->GetName();
- break;
- }
- }
-
- return sName;
-}
-
-bool XMLAutoStylePoolParent::operator< (const XMLAutoStylePoolParent& rOther)
const
-{
- return msParent < rOther.msParent;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index fce37ef..608575f 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -17,8 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/debug.hxx>
#include <rtl/ustrbuf.hxx>
+#include <tools/debug.hxx>
+#include <xmloff/xmlprmap.hxx>
#include "impastpl.hxx"
@@ -72,4 +73,123 @@ bool operator<( const XMLAutoStyleFamily& r1, const
XMLAutoStyleFamily& r2)
return r1.mnFamily < r2.mnFamily;
}
+
+XMLAutoStylePoolParent::~XMLAutoStylePoolParent()
+{
+}
+
+// Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) to list
+// if not added, yet.
+
+sal_Bool XMLAutoStylePoolParent::Add( XMLAutoStyleFamily& rFamilyData, const
vector< XMLPropertyState >& rProperties, OUString& rName, bool bDontSeek )
+{
+ sal_Bool bAdded = sal_False;
+ XMLAutoStylePoolProperties *pProperties = 0;
+ sal_Int32 nProperties = rProperties.size();
+ size_t i = 0;
+ for (size_t n = maPropertiesList.size(); i < n; ++i)
+ {
+ XMLAutoStylePoolProperties* pIS = &maPropertiesList[i];
+ if( nProperties > (sal_Int32)pIS->GetProperties().size() )
+ {
+ continue;
+ }
+ else if( nProperties < (sal_Int32)pIS->GetProperties().size() )
+ {
+ break;
+ }
+ else if( !bDontSeek && rFamilyData.mxMapper->Equals(
pIS->GetProperties(), rProperties ) )
+ {
+ pProperties = pIS;
+ break;
+ }
+ }
+
+ if( !pProperties )
+ {
+ pProperties = new XMLAutoStylePoolProperties( rFamilyData, rProperties
);
+ PropertiesListType::iterator it = maPropertiesList.begin();
+ ::std::advance( it, i );
+ maPropertiesList.insert( it, pProperties );
+ bAdded = sal_True;
+ }
+
+ rName = pProperties->GetName();
+
+ return bAdded;
+}
+
+//
+// Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) with a
given name.
+// If the name exists already, nothing is done. If a style with a different
name and
+// the same properties exists, a new one is added (like with bDontSeek).
+//
+
+sal_Bool XMLAutoStylePoolParent::AddNamed( XMLAutoStyleFamily& rFamilyData,
const vector< XMLPropertyState >& rProperties, const OUString& rName )
+{
+ sal_Bool bAdded = sal_False;
+ sal_Int32 nProperties = rProperties.size();
+ size_t i = 0;
+ for (size_t n = maPropertiesList.size(); i < n; ++i)
+ {
+ XMLAutoStylePoolProperties* pIS = &maPropertiesList[i];
+ if( nProperties > (sal_Int32)pIS->GetProperties().size() )
+ {
+ continue;
+ }
+ else if( nProperties < (sal_Int32)pIS->GetProperties().size() )
+ {
+ break;
+ }
+ }
+
+ if (rFamilyData.maNameList.find(rName) == rFamilyData.maNameList.end())
+ {
+ XMLAutoStylePoolProperties* pProperties =
+ new XMLAutoStylePoolProperties( rFamilyData, rProperties );
+ // ignore the generated name
+ pProperties->SetName( rName );
+ PropertiesListType::iterator it = maPropertiesList.begin();
+ ::std::advance( it, i );
+ maPropertiesList.insert( it, pProperties );
+ bAdded = sal_True;
+ }
+
+ return bAdded;
+}
+
+//
+// Search for a array of XMLPropertyState ( vector< XMLPropertyState > ) in
list
+//
+
+OUString XMLAutoStylePoolParent::Find( const XMLAutoStyleFamily& rFamilyData,
const vector< XMLPropertyState >& rProperties ) const
+{
+ OUString sName;
+ vector< XMLPropertyState>::size_type nItems = rProperties.size();
+ for (size_t i = 0, n = maPropertiesList.size(); i < n; ++i)
+ {
+ const XMLAutoStylePoolProperties* pIS = &maPropertiesList[i];
+ if( nItems > pIS->GetProperties().size() )
+ {
+ continue;
+ }
+ else if( nItems < pIS->GetProperties().size() )
+ {
+ break;
+ }
+ else if( rFamilyData.mxMapper->Equals( pIS->GetProperties(),
rProperties ) )
+ {
+ sName = pIS->GetName();
+ break;
+ }
+ }
+
+ return sName;
+}
+
+bool XMLAutoStylePoolParent::operator< (const XMLAutoStylePoolParent& rOther)
const
+{
+ return msParent < rOther.msParent;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 4b139b8d939376be2f6e5ca3568b0ec875a3f834
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Sep 16 15:57:09 2013 +0300
Insert impastp2.cxx into impastpl.cxx
I guess "impastp" could stand for "IMPort AutoSTyle Pool" but no idea what
the
"l" means, I chose the name "impastpl.cxx" just to match "impastpl.hxx"
Change-Id: I6e03df47f4782bfe5bd959d9b52f1fb666a3086f
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 0f8042e..66bbb14 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -247,7 +247,6 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/style/escphdl \
xmloff/source/style/fonthdl \
xmloff/source/style/impastpl \
- xmloff/source/style/impastp2 \
xmloff/source/style/impastp3 \
xmloff/source/style/impastp4 \
xmloff/source/style/kernihdl \
diff --git a/xmloff/source/style/impastp2.cxx b/xmloff/source/style/impastp2.cxx
deleted file mode 100644
index 74a591d..0000000
--- a/xmloff/source/style/impastp2.cxx
+++ /dev/null
@@ -1,50 +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 <rtl/ustrbuf.hxx>
-#include "impastpl.hxx"
-
-using namespace std;
-
-// Class SvXMLAutoStylePoolProperties_Impl
-// ctor class SvXMLAutoStylePoolProperties_Impl
-
-XMLAutoStylePoolProperties::XMLAutoStylePoolProperties( XMLAutoStyleFamily&
rFamilyData, const vector< XMLPropertyState >& rProperties )
-: maProperties( rProperties ),
- mnPos ( rFamilyData.mnCount )
-{
- // create a name that hasn't been used before. The created name has not
- // to be added to the array, because it will never tried again
- OUStringBuffer sBuffer( 7 );
- do
- {
- rFamilyData.mnName++;
- sBuffer.append( rFamilyData.maStrPrefix );
- sBuffer.append( OUString::number( rFamilyData.mnName ) );
- msName = sBuffer.makeStringAndClear();
- }
- while (rFamilyData.maNameList.find(msName) !=
rFamilyData.maNameList.end());
-}
-
-bool operator<( const XMLAutoStyleFamily& r1, const XMLAutoStyleFamily& r2)
-{
- return r1.mnFamily < r2.mnFamily;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index 63ce9de..fce37ef 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -18,8 +18,12 @@
*/
#include <tools/debug.hxx>
+#include <rtl/ustrbuf.hxx>
+
#include "impastpl.hxx"
+using namespace std;
+
// Class XMLAutoStyleFamily
// ctor/dtor class XMLAutoStyleFamily
@@ -43,4 +47,29 @@ void XMLAutoStyleFamily::ClearEntries()
maParents.clear();
}
+// Class SvXMLAutoStylePoolProperties_Impl
+// ctor class SvXMLAutoStylePoolProperties_Impl
+
+XMLAutoStylePoolProperties::XMLAutoStylePoolProperties( XMLAutoStyleFamily&
rFamilyData, const vector< XMLPropertyState >& rProperties )
+: maProperties( rProperties ),
+ mnPos ( rFamilyData.mnCount )
+{
+ // create a name that hasn't been used before. The created name has not
+ // to be added to the array, because it will never tried again
+ OUStringBuffer sBuffer( 7 );
+ do
+ {
+ rFamilyData.mnName++;
+ sBuffer.append( rFamilyData.maStrPrefix );
+ sBuffer.append( OUString::number( rFamilyData.mnName ) );
+ msName = sBuffer.makeStringAndClear();
+ }
+ while (rFamilyData.maNameList.find(msName) !=
rFamilyData.maNameList.end());
+}
+
+bool operator<( const XMLAutoStyleFamily& r1, const XMLAutoStyleFamily& r2)
+{
+ return r1.mnFamily < r2.mnFamily;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit e873440b49de8c9547e7c7029c3384372e2ba38a
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Sep 16 15:55:35 2013 +0300
Start of collecting the impastp*.cxx files into one
Change-Id: Ibb4e2475efc7f70c08035184cddedfaf40b7ec25
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index b3a100b..0f8042e 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -246,7 +246,7 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/style/durationhdl \
xmloff/source/style/escphdl \
xmloff/source/style/fonthdl \
- xmloff/source/style/impastp1 \
+ xmloff/source/style/impastpl \
xmloff/source/style/impastp2 \
xmloff/source/style/impastp3 \
xmloff/source/style/impastp4 \
diff --git a/xmloff/source/style/impastp1.cxx b/xmloff/source/style/impastpl.cxx
similarity index 100%
rename from xmloff/source/style/impastp1.cxx
rename to xmloff/source/style/impastpl.cxx
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
