inline a bunch of use-once macros

no point in having a macro unless it's actually going to reduce the
number of lines of code

Change-Id: Ic8760d6506cf272d7bd088f7b3b4dcbf288099fc

5 files changed, 6 insertions, 22 deletions

diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 44dffe67a7a1..5d5efeb013ec 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -300,11 +300,11 @@ HierarchyContent::getSupportedServiceNames()
     uno::Sequence< OUString > aSNS( 1 );
 
     if ( m_eKind == LINK )
-        aSNS.getArray()[ 0 ] = HIERARCHY_LINK_CONTENT_SERVICE_NAME;
+        aSNS.getArray()[ 0 ] = "com.sun.star.ucb.HierarchyLinkContent";
     else if ( m_eKind == FOLDER )
-        aSNS.getArray()[ 0 ] = HIERARCHY_FOLDER_CONTENT_SERVICE_NAME;
+        aSNS.getArray()[ 0 ] = "com.sun.star.ucb.HierarchyFolderContent";
     else
-        aSNS.getArray()[ 0 ] = HIERARCHY_ROOT_FOLDER_CONTENT_SERVICE_NAME;
+        aSNS.getArray()[ 0 ] = "com.sun.star.ucb.HierarchyRootFolderContent";
 
     return aSNS;
 }
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index 876e9446561a..e00a507fefd7 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -45,15 +45,6 @@ namespace hierarchy_ucp
 
 
 
-#define HIERARCHY_ROOT_FOLDER_CONTENT_SERVICE_NAME \
-                            "com.sun.star.ucb.HierarchyRootFolderContent"
-#define HIERARCHY_FOLDER_CONTENT_SERVICE_NAME \
-                            "com.sun.star.ucb.HierarchyFolderContent"
-#define HIERARCHY_LINK_CONTENT_SERVICE_NAME \
-                            "com.sun.star.ucb.HierarchyLinkContent"
-
-
-
 class HierarchyContentProperties
 {
 public:
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 36a714815b71..cd3f0d9092ec 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -52,10 +52,6 @@ using namespace hierarchy_ucp;
 #define READ_SERVICE_NAME      "com.sun.star.ucb.HierarchyDataReadAccess"
 #define READWRITE_SERVICE_NAME "com.sun.star.ucb.HierarchyDataReadWriteAccess"
 
-#define CONFIG_READ_SERVICE_NAME      \
-                        "com.sun.star.configuration.ConfigurationAccess"
-#define CONFIG_READWRITE_SERVICE_NAME \
-                        "com.sun.star.configuration.ConfigurationUpdateAccess"
 #define CONFIG_DATA_ROOT_KEY          \
                         "/org.openoffice.ucb.Hierarchy/Root"
 
@@ -500,7 +496,7 @@ HierarchyDataSource::createInstanceWithArguments(
         {
             // Create configuration read-only access object.
             xConfigAccess = xProv->createInstanceWithArguments(
-                                OUString( CONFIG_READ_SERVICE_NAME  ),
+                                OUString( "com.sun.star.configuration.ConfigurationAccess"  ),
                                 aNewArgs );
         }
         else
@@ -519,7 +515,7 @@ HierarchyDataSource::createInstanceWithArguments(
 
             // Create configuration read-write access object.
             xConfigAccess = xProv->createInstanceWithArguments(
-                                OUString( CONFIG_READWRITE_SERVICE_NAME  ),
+                                OUString( "com.sun.star.configuration.ConfigurationUpdateAccess"  ),
                                 aNewArgs );
         }
     }
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index 7a107c1e7b29..ac68a59590e9 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -106,7 +106,7 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider,
 
 XSERVICEINFO_IMPL_1_CTX( HierarchyContentProvider,
                      OUString( "com.sun.star.comp.ucb.HierarchyContentProvider" ),
-                     HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME );
+                     "com.sun.star.ucb.HierarchyContentProvider" );
 
 
 
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index c33795e4457c..494e11a3b105 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -37,9 +37,6 @@ namespace hierarchy_ucp {
 
 
 
-#define HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME \
-                "com.sun.star.ucb.HierarchyContentProvider"
-
 #define HIERARCHY_URL_SCHEME \
                 "vnd.sun.star.hier"
 #define HIERARCHY_URL_SCHEME_LENGTH 17