added global.hxx and moved common typedef to that header.

4 files changed, 27 insertions, 16 deletions

diff --git a/inc/dpdimensions.hxx b/inc/dpdimensions.hxx
index cbdccb6..dfb45d8 100644
--- a/inc/dpdimensions.hxx
+++ b/inc/dpdimensions.hxx
@@ -1,13 +1,13 @@
 #ifndef __DPDIMENSIONS_HXX__
 #define __DPDIMENSIONS_HXX__
 
+#include "global.hxx"
+
 #include <cppuhelper/implbase2.hxx>
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <hash_map>
-
 namespace com { namespace sun { namespace star {
     namespace container {
         class XNamed;
@@ -58,10 +58,7 @@ private:
     void init();
 
 private:
-    typedef ::__gnu_cxx::hash_map< 
-        ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed >, ::rtl::OUStringHash >
-        DimensionMapType;
-    DimensionMapType maDimensions;
+    NamedObjMapType maDimensions;
 };
 
 }
diff --git a/inc/dphierarchies.hxx b/inc/dphierarchies.hxx
index 08bd84f..08c2a66 100644
--- a/inc/dphierarchies.hxx
+++ b/inc/dphierarchies.hxx
@@ -1,13 +1,13 @@
 #ifndef __DPHIEARCHIES_HXX__
 #define __DPHIEARCHIES_HXX__
 
+#include "global.hxx"
+
 #include <cppuhelper/implbase2.hxx>
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 
-#include <hash_map>
-
 namespace com { namespace sun { namespace star {
     namespace container {
         class XNamed;
@@ -57,10 +57,7 @@ private:
     void init();
 
 private:
-    typedef ::__gnu_cxx::hash_map< 
-        ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed >, ::rtl::OUStringHash >
-        HierarchyMapType;
-    HierarchyMapType maHierarchies;
+    NamedObjMapType maHierarchies;
 };
 
 
diff --git a/inc/global.hxx b/inc/global.hxx
new file mode 100644
index 0000000..a2b6fff
--- /dev/null
+++ b/inc/global.hxx
@@ -0,0 +1,17 @@
+#ifndef __GLOBAL_HXX__
+#define __GLOBAL_HXX__
+
+#include <cppuhelper/implementationentry.hxx>
+#include <com/sun/star/container/XNamed.hpp>
+
+#include <hash_map>
+
+namespace dpsource {
+
+typedef ::__gnu_cxx::hash_map< ::rtl::OUString, 
+    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed >, 
+    ::rtl::OUStringHash > NamedObjMapType;
+
+}
+
+#endif
diff --git a/source/dpdimensions.cxx b/source/dpdimensions.cxx
index 1fb550b..f3ebf71 100644
--- a/source/dpdimensions.cxx
+++ b/source/dpdimensions.cxx
@@ -73,7 +73,7 @@ void DPDimensions::init()
     OUString aDimName = OUString::createFromAscii("Andy");
     Reference<XNamed> xRef(new DPDimension);
     xRef->setName(aDimName);
-    maDimensions.insert(DimensionMapType::value_type(aDimName, xRef));
+    maDimensions.insert(NamedObjMapType::value_type(aDimName, xRef));
 }
 
 Any DPDimensions::getByName(const OUString& aName) 
@@ -81,7 +81,7 @@ Any DPDimensions::getByName(const OUString& aName)
 {
     StackPrinter __stack_printer__("dpsource/DPDimensions::getByName");
     fprintf(stdout, "DPDimensions::getByName:   name = '%s'\n", rtl::OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr());
-    DimensionMapType::const_iterator itr = maDimensions.find(aName);
+    NamedObjMapType::const_iterator itr = maDimensions.find(aName);
     if (itr == maDimensions.end())
         throw NoSuchElementException();
 
@@ -94,7 +94,7 @@ Sequence<OUString> DPDimensions::getElementNames() throw (RuntimeException)
 {
     StackPrinter __stack_printer__("dpsource/DPDimensions::getElementNames");
     Sequence<OUString> aElemNames(maDimensions.size());
-    DimensionMapType::const_iterator itr = maDimensions.begin(), itrEnd = maDimensions.end();
+    NamedObjMapType::const_iterator itr = maDimensions.begin(), itrEnd = maDimensions.end();
     for (sal_Int32 i = 0; itr != itrEnd; ++itr, ++i)
         aElemNames[i] = itr->first;
 
@@ -105,7 +105,7 @@ sal_Bool DPDimensions::hasByName(const OUString& aName) throw (RuntimeException)
 {
     StackPrinter __stack_printer__("dpsource/DPDimensions::hasByName");
     fprintf(stdout, "DPDimensions::hasByName:   name = '%s'\n", rtl::OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr());
-    DimensionMapType::const_iterator itr = maDimensions.find(aName);
+    NamedObjMapType::const_iterator itr = maDimensions.find(aName);
     return (itr != maDimensions.end());
 }