summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/style/impastp3.cxx10
-rw-r--r--xmloff/source/style/impastp4.cxx16
-rw-r--r--xmloff/source/style/impastpl.hxx14
3 files changed, 20 insertions, 20 deletions
diff --git a/xmloff/source/style/impastp3.cxx b/xmloff/source/style/impastp3.cxx
index e6a644d010ca..6ab2016541a4 100644
--- a/xmloff/source/style/impastp3.cxx
+++ b/xmloff/source/style/impastp3.cxx
@@ -22,14 +22,14 @@
using namespace std;
-SvXMLAutoStylePoolParentP_Impl::~SvXMLAutoStylePoolParentP_Impl()
+XMLAutoStylePoolParent::~XMLAutoStylePoolParent()
{
}
// Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) to list
// if not added, yet.
-sal_Bool SvXMLAutoStylePoolParentP_Impl::Add( XMLAutoStyleFamily& rFamilyData, const vector< XMLPropertyState >& rProperties, OUString& rName, bool bDontSeek )
+sal_Bool XMLAutoStylePoolParent::Add( XMLAutoStyleFamily& rFamilyData, const vector< XMLPropertyState >& rProperties, OUString& rName, bool bDontSeek )
{
sal_Bool bAdded = sal_False;
SvXMLAutoStylePoolPropertiesP_Impl *pProperties = 0;
@@ -73,7 +73,7 @@ sal_Bool SvXMLAutoStylePoolParentP_Impl::Add( XMLAutoStyleFamily& rFamilyData, c
// the same properties exists, a new one is added (like with bDontSeek).
//
-sal_Bool SvXMLAutoStylePoolParentP_Impl::AddNamed( XMLAutoStyleFamily& rFamilyData, const vector< XMLPropertyState >& rProperties, const OUString& rName )
+sal_Bool XMLAutoStylePoolParent::AddNamed( XMLAutoStyleFamily& rFamilyData, const vector< XMLPropertyState >& rProperties, const OUString& rName )
{
sal_Bool bAdded = sal_False;
sal_Int32 nProperties = rProperties.size();
@@ -110,7 +110,7 @@ sal_Bool SvXMLAutoStylePoolParentP_Impl::AddNamed( XMLAutoStyleFamily& rFamilyDa
// Search for a array of XMLPropertyState ( vector< XMLPropertyState > ) in list
//
-OUString SvXMLAutoStylePoolParentP_Impl::Find( const XMLAutoStyleFamily& rFamilyData, const vector< XMLPropertyState >& rProperties ) const
+OUString XMLAutoStylePoolParent::Find( const XMLAutoStyleFamily& rFamilyData, const vector< XMLPropertyState >& rProperties ) const
{
OUString sName;
vector< XMLPropertyState>::size_type nItems = rProperties.size();
@@ -135,7 +135,7 @@ OUString SvXMLAutoStylePoolParentP_Impl::Find( const XMLAutoStyleFamily& rFamily
return sName;
}
-bool SvXMLAutoStylePoolParentP_Impl::operator< (const SvXMLAutoStylePoolParentP_Impl& rOther) const
+bool XMLAutoStylePoolParent::operator< (const XMLAutoStylePoolParent& rOther) const
{
return msParent < rOther.msParent;
}
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index 56cbffad794d..1a7235e0e7e4 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -161,16 +161,16 @@ bool SvXMLAutoStylePoolP_Impl::Add(
XMLAutoStyleFamily &rFamily = *aFind;
- SvXMLAutoStylePoolParentP_Impl aTmp(rParentName);
+ 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 SvXMLAutoStylePoolParentP_Impl(rParentName));
+ rFamily.maParents.insert(new XMLAutoStylePoolParent(rParentName));
it2 = r.first;
}
- SvXMLAutoStylePoolParentP_Impl& rParent = *it2;
+ XMLAutoStylePoolParent& rParent = *it2;
bool bRet = false;
if (rParent.Add(rFamily, rProperties, rName, bDontSeek))
@@ -197,16 +197,16 @@ bool SvXMLAutoStylePoolP_Impl::AddNamed(
XMLAutoStyleFamily &rFamily = *aFind;
- SvXMLAutoStylePoolParentP_Impl aTmp(rParentName);
+ 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 SvXMLAutoStylePoolParentP_Impl(rParentName));
+ rFamily.maParents.insert(new XMLAutoStylePoolParent(rParentName));
it2 = r.first;
}
- SvXMLAutoStylePoolParentP_Impl& rParent = *it2;
+ XMLAutoStylePoolParent& rParent = *it2;
bool bRet = false;
if (rParent.AddNamed(rFamily, rProperties, rName))
@@ -235,7 +235,7 @@ OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily,
if (iter != maFamilyList.end())
{
XMLAutoStyleFamily const& rFamily = *iter;
- SvXMLAutoStylePoolParentP_Impl aTmp( rParent );
+ XMLAutoStylePoolParent aTmp( rParent );
XMLAutoStyleFamily::ParentsType::const_iterator it2 = rFamily.maParents.find(aTmp);
if (it2 != rFamily.maParents.end())
{
@@ -287,7 +287,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
XMLAutoStyleFamily::ParentsType::const_iterator it = rFamily.maParents.begin(), itEnd = rFamily.maParents.end();
for (; it != itEnd; ++it)
{
- const SvXMLAutoStylePoolParentP_Impl& rParent = *it;
+ const XMLAutoStylePoolParent& rParent = *it;
size_t nProperties = rParent.GetPropertiesList().size();
for( size_t j = 0; j < nProperties; j++ )
{
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index 6b4aa6d6d99a..077456e600ad 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -36,7 +36,7 @@
#include <boost/ptr_container/ptr_vector.hpp>
class SvXMLAutoStylePoolP;
-class SvXMLAutoStylePoolParentP_Impl;
+class XMLAutoStylePoolParent;
typedef std::set<OUString> SvXMLAutoStylePoolNamesP_Impl;
class SvXMLExportPropertyMapper;
class SvXMLExport;
@@ -47,7 +47,7 @@ class SvXMLExport;
struct XMLAutoStyleFamily : boost::noncopyable
{
- typedef boost::ptr_set<SvXMLAutoStylePoolParentP_Impl> ParentsType;
+ typedef boost::ptr_set<XMLAutoStylePoolParent> ParentsType;
sal_uInt32 mnFamily;
OUString maStrFamilyName;
@@ -96,7 +96,7 @@ public:
};
// Parents of AutoStylePool's
-class SvXMLAutoStylePoolParentP_Impl
+class XMLAutoStylePoolParent
{
public:
typedef boost::ptr_vector<SvXMLAutoStylePoolPropertiesP_Impl> PropertiesListType;
@@ -107,12 +107,12 @@ private:
public:
- SvXMLAutoStylePoolParentP_Impl( const OUString & rParent ) :
+ XMLAutoStylePoolParent( const OUString & rParent ) :
msParent( rParent )
{
}
- ~SvXMLAutoStylePoolParentP_Impl();
+ ~XMLAutoStylePoolParent();
sal_Bool Add( XMLAutoStyleFamily& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties, OUString& rName, bool bDontSeek = false );
@@ -127,12 +127,12 @@ public:
return maPropertiesList;
}
- bool operator< (const SvXMLAutoStylePoolParentP_Impl& rOther) const;
+ bool operator< (const XMLAutoStylePoolParent& rOther) const;
};
struct SvXMLAutoStylePoolParentPCmp_Impl
{
- bool operator()( SvXMLAutoStylePoolParentP_Impl* const& lhs, SvXMLAutoStylePoolParentP_Impl* const& rhs) const
+ bool operator()( XMLAutoStylePoolParent* const& lhs, XMLAutoStylePoolParent* const& rhs) const
{
return lhs->GetParent().compareTo( rhs->GetParent() ) < 0;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 17:34:15 +0000