Tuck this typedef inside class scope where it's used.

Change-Id: I2b3a0479f9aeecd601b3fea4a262f614ec437945

2 files changed, 14 insertions, 17 deletions

diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index c211945b2937..0edfb0a5aa75 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -68,7 +68,7 @@ void SvXMLAutoStylePoolP_Impl::AddFamily(
 
 #if OSL_DEBUG_LEVEL > 0
     XMLFamilyData_Impl aTemporary( nFamily );
-    XMLFamilyDataList_Impl::iterator aFind = maFamilyList.find(aTemporary);
+    FamilyListType::iterator aFind = maFamilyList.find(aTemporary);
     if( aFind != maFamilyList.end() )
     {
         // FIXME: do we really intend to replace the previous nFamily
@@ -91,7 +91,7 @@ void SvXMLAutoStylePoolP_Impl::SetFamilyPropSetMapper(
 {
 
     XMLFamilyData_Impl aTemporary( nFamily );
-    XMLFamilyDataList_Impl::iterator aFind = maFamilyList.find(aTemporary);
+    FamilyListType::iterator aFind = maFamilyList.find(aTemporary);
     if (aFind != maFamilyList.end())
         aFind->mxMapper = rMapper;
 }
@@ -100,7 +100,7 @@ void SvXMLAutoStylePoolP_Impl::SetFamilyPropSetMapper(
 void SvXMLAutoStylePoolP_Impl::RegisterName( sal_Int32 nFamily, const OUString& rName )
 {
     XMLFamilyData_Impl aTmp( nFamily );
-    XMLFamilyDataList_Impl::iterator aFind = maFamilyList.find(aTmp);
+    FamilyListType::iterator aFind = maFamilyList.find(aTmp);
     DBG_ASSERT( aFind != maFamilyList.end(),
                 "SvXMLAutoStylePool_Impl::RegisterName: unknown family" );
     if (aFind != maFamilyList.end())
@@ -120,7 +120,7 @@ void SvXMLAutoStylePoolP_Impl::GetRegisteredNames(
     vector<OUString> aNames;
 
     // iterate over families
-    for(XMLFamilyDataList_Impl::iterator aJ = maFamilyList.begin(); aJ != maFamilyList.end(); ++aJ)
+    for (FamilyListType::iterator aJ = maFamilyList.begin(); aJ != maFamilyList.end(); ++aJ)
     {
         XMLFamilyData_Impl &rFamily = *aJ;
 
@@ -157,7 +157,7 @@ sal_Bool SvXMLAutoStylePoolP_Impl::Add(OUString& rName, sal_Int32 nFamily,
     sal_Bool bRet(sal_False);
 
     XMLFamilyData_Impl aTemporary( nFamily );
-    XMLFamilyDataList_Impl::iterator aFind = maFamilyList.find(aTemporary);
+    FamilyListType::iterator aFind = maFamilyList.find(aTemporary);
     DBG_ASSERT(aFind != maFamilyList.end(), "SvXMLAutoStylePool_Impl::Add: unknown family");
 
     if (aFind != maFamilyList.end())
@@ -205,7 +205,7 @@ sal_Bool SvXMLAutoStylePoolP_Impl::AddNamed(const OUString& rName, sal_Int32 nFa
     sal_Bool bRet(sal_False);
 
     XMLFamilyData_Impl aTemporary( nFamily );
-    XMLFamilyDataList_Impl::iterator aFind = maFamilyList.find(aTemporary);
+    FamilyListType::iterator aFind = maFamilyList.find(aTemporary);
     DBG_ASSERT(aFind != maFamilyList.end(), "SvXMLAutoStylePool_Impl::Add: unknown family");
 
     if (aFind != maFamilyList.end())
@@ -249,10 +249,8 @@ OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily,
     OUString sName;
 
     XMLFamilyData_Impl aTemporary( nFamily );
-    XMLFamilyDataList_Impl::const_iterator const iter =
-        maFamilyList.find(aTemporary);
-    OSL_ENSURE(iter != maFamilyList.end(),
-            "SvXMLAutoStylePool_Impl::Find: unknown family");
+    FamilyListType::const_iterator const iter = maFamilyList.find(aTemporary);
+    OSL_ENSURE(iter != maFamilyList.end(), "SvXMLAutoStylePool_Impl::Find: unknown family");
 
     if (iter != maFamilyList.end())
     {
@@ -285,7 +283,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
 {
     // Get list of parents for current family (nFamily)
     XMLFamilyData_Impl aTmp( nFamily );
-    XMLFamilyDataList_Impl::const_iterator aFind = maFamilyList.find(aTmp);
+    FamilyListType::const_iterator aFind = maFamilyList.find(aTmp);
     DBG_ASSERT( aFind != maFamilyList.end(),
                 "SvXMLAutoStylePool_Impl::exportXML: unknown family" );
     if (aFind == maFamilyList.end())
@@ -424,7 +422,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
 
 void SvXMLAutoStylePoolP_Impl::ClearEntries()
 {
-    for(XMLFamilyDataList_Impl::iterator aI = maFamilyList.begin(); aI != maFamilyList.end(); ++aI)
+    for (FamilyListType::iterator aI = maFamilyList.begin(); aI != maFamilyList.end(); ++aI)
         aI->ClearEntries();
 }
 
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index 1d8969f91bb5..140cc43e21c5 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -79,9 +79,6 @@ public:
     void ClearEntries();
 };
 
-// A set that finds and sorts based only on mnFamily
-typedef boost::ptr_set<XMLFamilyData_Impl> XMLFamilyDataList_Impl;
-
 // Properties of a pool
 
 class SvXMLAutoStylePoolPropertiesP_Impl
@@ -154,9 +151,11 @@ public:
 
 class SvXMLAutoStylePoolP_Impl
 {
-    SvXMLExport& rExport;
+    // A set that finds and sorts based only on mnFamily
+    typedef boost::ptr_set<XMLFamilyData_Impl> FamilyListType;
 
-    XMLFamilyDataList_Impl      maFamilyList;
+    SvXMLExport& rExport;
+    FamilyListType maFamilyList;
 
 public: