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

3 files changed, 29 insertions, 51 deletions

diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 0f8042e3cabc..66bbb147fe09 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 74a591da2aaf..000000000000
--- 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 63ce9dee4522..fce37ef4cd48 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: */