From 9ac86f484b0c278aafbce685ed19d3ea005ee8f8 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 14 Sep 2012 18:08:57 +0200
Subject: Improvement on previous commit, UCB clean up

* As UCB is only ever initialized with "Local"/"Office", remove this
  configuration vector completely.  The "create" ctor creates an instance
  internally initialized with those "Local"/"Office" keys.  Special (test) code
  can still instantiate an uninitialized one via plain createInstance.  And for
  backwards compatilibity process startup still ensures to create an initialized
  instance early, in case there is still code out there (in extensions) that
  later calls plain createInstance and expects to get the already-initialized
  (single) instance.

* XInitialization is an "implementation detail" of the UniversalContentBroker
  service, do not expose in XUniversalContentBroker.

* ucbhelper/configurationkeys.hxx is no longer needed and is removed.

* ucbhelper/contentbroker.hxx is an empty wrapper and is removed; however, that
  requires ucbhelper::Content constructors to take explicit XComponentContext
  arguments now.

* The only remaining code in ucbhelper/source/client/contentbroker.cxx is
  Android-only InitUCBHelper.  Is that relevant still?

Change-Id: I3f7bddd0456bffbcd13590c66d9011915c760f28
---
 hwpfilter/source/hwpreader.hxx | 23 -----------------------
 1 file changed, 23 deletions(-)

(limited to 'hwpfilter/source/hwpreader.hxx')

diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index eb759d01713b..825094b7909a 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -31,14 +31,6 @@
 #include <com/sun/star/document/XImporter.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 
-#include <com/sun/star/ucb/XContentIdentifierFactory.hpp>
-#include <com/sun/star/ucb/XContentProvider.hpp>
-#include <com/sun/star/ucb/XContentIdentifier.hpp>
-#include <com/sun/star/ucb/XContent.hpp>
-#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
-#include <com/sun/star/ucb/OpenMode.hpp>
-#include <com/sun/star/ucb/XCommandProcessor.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/io/XActiveDataControl.hpp>
@@ -53,7 +45,6 @@
 
 using namespace ::rtl;
 using namespace ::cppu;
-using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
@@ -101,13 +92,8 @@ public:
     {
         m_rxDocumentHandler = xHandler;
     }
-    void setUCB( Reference< XInterface > xUCB )
-    {
-         rUCB = xUCB;
-    }
 private:
     Reference< XDocumentHandler > m_rxDocumentHandler;
-    Reference< XInterface > rUCB;
     Reference< XAttributeList > rList;
     AttributeListImpl *pList;
     HWPFile hwpfile;
@@ -227,15 +213,6 @@ HwpImportFilter::HwpImportFilter( const Reference< XMultiServiceFactory > xFact
         HwpReader *p = new HwpReader;
         p->setDocumentHandler( xHandler );
 
-        Sequence< Any > aArgs( 2 );
-        aArgs[0] <<= OUString("Local");
-        aArgs[1] <<= OUString("Office");
-        Reference< XInterface > xUCB
-            ( xFact->createInstanceWithArguments
-               (OUString("com.sun.star.ucb.UniversalContentBroker"),
-                aArgs));
-        p->setUCB( xUCB );
-
         Reference< XImporter > xImporter = Reference< XImporter >( xHandler, UNO_QUERY );
         rImporter = xImporter;
         Reference< XFilter > xFilter = Reference< XFilter >( p );
-- 
cgit