summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-07-24 13:39:49 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-07-27 06:12:01 +0000
commitefac5fa06e2d00bd67c582d8a6b1f1fc69c9b9f5 (patch)
tree4fdf4539e1b876d4d3d671379be040661c6e847a /ucb
parentafbf466103fd8bb2f3c120a36c181852ad4c967f (diff)
remove some unused defines
Change-Id: Ib2d50e8c29ccbc5ffcb52cdff4ae3eaae9a62188 Reviewed-on: https://gerrit.libreoffice.org/17332 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/core/provprox.cxx5
-rw-r--r--ucb/source/core/provprox.hxx6
-rw-r--r--ucb/source/ucp/package/pkgcontent.cxx4
-rw-r--r--ucb/source/ucp/package/pkgcontent.hxx8
4 files changed, 4 insertions, 19 deletions
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index db5f4cd4ee2a..b77ab69b7b55 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -54,7 +54,7 @@ UcbContentProviderProxyFactory::~UcbContentProviderProxyFactory()
XSERVICEINFO_IMPL_1( UcbContentProviderProxyFactory,
OUString( "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" ),
- PROVIDER_FACTORY_SERVICE_NAME );
+ "com.sun.star.ucb.ContentProviderProxyFactory" );
@@ -185,8 +185,7 @@ Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes()
XSERVICEINFO_NOFACTORY_IMPL_1( UcbContentProviderProxy,
OUString( "com.sun.star.comp.ucb.UcbContentProviderProxy" ),
- PROVIDER_PROXY_SERVICE_NAME );
-
+ "com.sun.star.ucb.ContentProviderProxy" );
// XContentProvider methods.
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index e217e964f437..03ab40fb1aea 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -34,12 +34,6 @@
-#define PROVIDER_FACTORY_SERVICE_NAME \
- "com.sun.star.ucb.ContentProviderProxyFactory"
-#define PROVIDER_PROXY_SERVICE_NAME \
- "com.sun.star.ucb.ContentProviderProxy"
-
-
// class UcbContentProviderProxyFactory.
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 0bf3c71ad616..864593a901b9 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -417,9 +417,9 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
{
uno::Sequence< OUString > aSNS( 1 );
if ( isFolder() )
- aSNS.getArray()[ 0 ] = PACKAGE_FOLDER_CONTENT_SERVICE_NAME;
+ aSNS.getArray()[ 0 ] = "com.sun.star.ucb.PackageFolderContent";
else
- aSNS.getArray()[ 0 ] = PACKAGE_STREAM_CONTENT_SERVICE_NAME;
+ aSNS.getArray()[ 0 ] = "com.sun.star.ucb.PackageStreamContent";
return aSNS;
}
diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx
index b5e4f8d26f74..9f909ce7793f 100644
--- a/ucb/source/ucp/package/pkgcontent.hxx
+++ b/ucb/source/ucp/package/pkgcontent.hxx
@@ -59,14 +59,6 @@ namespace package_ucp
-// UNO service name for the content.
-#define PACKAGE_FOLDER_CONTENT_SERVICE_NAME \
- "com.sun.star.ucb.PackageFolderContent"
-#define PACKAGE_STREAM_CONTENT_SERVICE_NAME \
- "com.sun.star.ucb.PackageStreamContent"
-
-
-
struct ContentProperties
{
OUString aTitle; // Title