diff options
Diffstat (limited to 'writerfilter')
10 files changed, 165 insertions, 275 deletions
diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk index 23110eeea852..ae2fb2c16144 100644 --- a/writerfilter/CppunitTest_writerfilter_doctok.mk +++ b/writerfilter/CppunitTest_writerfilter_doctok.mk @@ -36,7 +36,6 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_doctok, \ cppu \ cppuhelper \ sal \ - ucbhelper \ writerfilter \ $(gb_STDLIBS) \ )) diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index 9b660d30abac..6e583e9227f5 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -40,7 +40,6 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \ cppuhelper \ sal \ test \ - ucbhelper \ unotest \ vcl \ writerfilter \ diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 202990d6472d..c0088eac61f3 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -78,7 +78,6 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\ sot \ svt \ tl \ - ucbhelper \ utl \ vcl \ $(gb_STDLIBS) \ diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk index ddf51243f4d9..1eeccd538349 100644 --- a/writerfilter/Library_writerfilter_uno.mk +++ b/writerfilter/Library_writerfilter_uno.mk @@ -43,7 +43,6 @@ $(eval $(call gb_Library_use_libraries,writerfilter_uno,\ cppu \ cppuhelper \ sal \ - ucbhelper \ writerfilter \ $(gb_STDLIBS) \ )) diff --git a/writerfilter/prj/build.lst b/writerfilter/prj/build.lst index b31510ab2b28..dc8a005a2391 100644 --- a/writerfilter/prj/build.lst +++ b/writerfilter/prj/build.lst @@ -1,3 +1,3 @@ -wf writerfilter : soltools sal BOOST:boost configmgr cppu cppuhelper ucbhelper tools svx LIBXSLT:libxslt oox test NULL +wf writerfilter : soltools sal BOOST:boost configmgr cppu cppuhelper tools svx LIBXSLT:libxslt oox test NULL wf writerfilter usr1 - all wf_mkout NULL wf writerfilter\prj nmake - all wf_prj NULL diff --git a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx index 32017595bc92..b86fb925f67b 100644 --- a/writerfilter/qa/cppunittests/doctok/testdoctok.cxx +++ b/writerfilter/qa/cppunittests/doctok/testdoctok.cxx @@ -23,7 +23,6 @@ #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" -#include <ucbhelper/contentbroker.hxx> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -59,7 +58,6 @@ public: { bool bResult = false; - // initialise UCB-Broker uno::Reference<uno::XComponentContext> xComponentContext (::cppu::defaultBootstrap_InitialComponentContext()); @@ -71,36 +69,22 @@ public: xFactory(xComponentContext->getServiceManager() ); OSL_ASSERT(xFactory.is()); - uno::Sequence<uno::Any> aUcbInitSequence(2); - aUcbInitSequence[0] <<= - OUString("Local"); - aUcbInitSequence[1] <<= - OUString("Office"); - uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xFactory, uno::UNO_QUERY); OSL_ASSERT( xServiceFactory.is() ); if (xServiceFactory.is()) { - sal_Bool bRet = - ::ucbhelper::ContentBroker::initialize(xServiceFactory, - aUcbInitSequence); + uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > + xNameContainer(xFactory->createInstanceWithContext + ("com.sun.star.ucb.SimpleFileAccess", + xComponentContext), uno::UNO_QUERY ); - OSL_ASSERT(bRet); - if (bRet) + if (xNameContainer.is()) { - uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess > - xNameContainer(xFactory->createInstanceWithContext - ("com.sun.star.ucb.SimpleFileAccess", - xComponentContext), uno::UNO_QUERY ); - - if (xNameContainer.is()) - { - xSimpleFileAccess = xNameContainer; + xSimpleFileAccess = xNameContainer; - bResult = true; - } + bResult = true; } } @@ -150,11 +134,6 @@ public: pDocument->resolve(*pStream); } - void testEnd() - { - ::ucbhelper::ContentBroker::deinitialize(); - } - // Change the following lines only, if you add, remove or rename // member functions of the current class, // because these macros are need by auto register mechanism. @@ -163,7 +142,6 @@ public: CPPUNIT_TEST(testInitUno); CPPUNIT_TEST(testOpenFile); CPPUNIT_TEST(testEvents); - CPPUNIT_TEST(testEnd); CPPUNIT_TEST_SUITE_END(); }; // class test diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx index d35f3b6014d8..352bdc7b3f54 100644 --- a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx +++ b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <ucbhelper/contentbroker.hxx> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/ucb/XSimpleFileAccess2.hpp> #include <osl/process.h> @@ -41,9 +40,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/seqstream.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/uno/Any.hxx> #include <resourcemodel/WW8ResourceModel.hxx> #include <resourcemodel/exceptions.hxx> #include <doctok/WW8Document.hxx> @@ -140,111 +136,93 @@ sal_Int32 SAL_CALL AnalyzeService::run ( const uno::Sequence< OUString >& aArguments ) throw (uno::RuntimeException) { - uno::Sequence<uno::Any> aUcbInitSequence(2); - aUcbInitSequence[0] <<= OUString("Local"); - aUcbInitSequence[1] <<= - OUString("Office"); - uno::Reference<lang::XMultiServiceFactory> - xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW); - uno::Reference<lang::XMultiComponentFactory> - xFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW ); - - if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence)) - { - OUString arg=aArguments[0]; + OUString arg=aArguments[0]; - rtl_uString *dir=NULL; - osl_getProcessWorkingDir(&dir); + rtl_uString *dir=NULL; + osl_getProcessWorkingDir(&dir); - OUString absFileUrlUrls; - osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrlUrls.pData); + OUString absFileUrlUrls; + osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrlUrls.pData); - URLLister aLister(xContext, absFileUrlUrls); + URLLister aLister(xContext, absFileUrlUrls); - fprintf(stdout, "<analyze>\n"); + fprintf(stdout, "<analyze>\n"); - OUString aURL = aLister.getURL(); + OUString aURL = aLister.getURL(); - while (!aURL.isEmpty()) - { - uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext)); + while (!aURL.isEmpty()) + { + uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext)); - OString aStr; - aURL.convertToString(&aStr, RTL_TEXTENCODING_ASCII_US, - OUSTRING_TO_OSTRING_CVTFLAGS); + OString aStr; + aURL.convertToString(&aStr, RTL_TEXTENCODING_ASCII_US, + OUSTRING_TO_OSTRING_CVTFLAGS); - fprintf(stdout, "<file><name>%s</name>\n", aStr.getStr()); - fprintf(stderr, "%s\n", aStr.getStr()); - fflush(stderr); + fprintf(stdout, "<file><name>%s</name>\n", aStr.getStr()); + fprintf(stderr, "%s\n", aStr.getStr()); + fflush(stderr); - bool bStatus = true; + bool bStatus = true; + try + { try { - try + uno::Reference<io::XInputStream> xInputStream = + xFileAccess->openFileRead(aURL); { - uno::Reference<io::XInputStream> xInputStream = - xFileAccess->openFileRead(aURL); + doctok::WW8Stream::Pointer_t pDocStream = + doctok::WW8DocumentFactory::createStream + (xContext, xInputStream); + + if (pDocStream.get() != NULL) { - doctok::WW8Stream::Pointer_t pDocStream = - doctok::WW8DocumentFactory::createStream - (xContext, xInputStream); - - if (pDocStream.get() != NULL) - { - doctok::WW8Document::Pointer_t pDocument - (doctok::WW8DocumentFactory::createDocument - (pDocStream)); - - Stream::Pointer_t pAnalyzer = - writerfilter::createAnalyzer(); - pDocument->resolve(*pAnalyzer); - } - else - { - fprintf(stdout, - "<exception>file open failed</exception>\n"); - bStatus = false; - } - fprintf(stderr, "done\n"); - } + doctok::WW8Document::Pointer_t pDocument + (doctok::WW8DocumentFactory::createDocument + (pDocStream)); - xInputStream->closeInput(); - } - catch (const Exception &e) - { - fprintf(stdout, "<exception>%s</exception>\n", - e.getText().c_str()); - bStatus = false; + Stream::Pointer_t pAnalyzer = + writerfilter::createAnalyzer(); + pDocument->resolve(*pAnalyzer); + } + else + { + fprintf(stdout, + "<exception>file open failed</exception>\n"); + bStatus = false; + } + fprintf(stderr, "done\n"); } + + xInputStream->closeInput(); } - catch (...) + catch (const Exception &e) { - fprintf(stdout, "<exception>unknown</exception>\n"); + fprintf(stdout, "<exception>%s</exception>\n", + e.getText().c_str()); bStatus = false; } + } + catch (...) + { + fprintf(stdout, "<exception>unknown</exception>\n"); + bStatus = false; + } - if (bStatus) - fprintf(stdout, "<status>ok</status>\n"); - else - fprintf(stdout, "<status>failed</status>\n"); + if (bStatus) + fprintf(stdout, "<status>ok</status>\n"); + else + fprintf(stdout, "<status>failed</status>\n"); - aURL = aLister.getURL(); + aURL = aLister.getURL(); - fprintf(stdout, "</file>\n"); - fflush(stdout); - } - - fprintf(stdout, "</analyze>\n"); + fprintf(stdout, "</file>\n"); + fflush(stdout); + } - rtl_uString_release(dir); - ::ucbhelper::ContentBroker::deinitialize(); + fprintf(stdout, "</analyze>\n"); + rtl_uString_release(dir); - } - else - { - fprintf(stdout, "can't initialize UCB"); - } return 0; } diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx b/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx index a2ae1b72b386..56d2c003f26e 100644 --- a/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx +++ b/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <ucbhelper/contentbroker.hxx> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/ucb/XSimpleFileAccess2.hpp> #include <osl/process.h> @@ -41,9 +40,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/seqstream.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/uno/Any.hxx> #include <resourcemodel/WW8ResourceModel.hxx> #include <resourcemodel/exceptions.hxx> #include <doctok/WW8Document.hxx> @@ -67,37 +63,24 @@ xContext( xContext_ ) sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< OUString >& aArguments ) throw (uno::RuntimeException) { - uno::Sequence<uno::Any> aUcbInitSequence(2); - aUcbInitSequence[0] <<= OUString("Local"); - aUcbInitSequence[1] <<= OUString("Office"); - uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW); - uno::Reference<lang::XMultiComponentFactory> xFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW ); - if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence)) - { - OUString arg=aArguments[0]; - - uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext)); - - rtl_uString *dir=NULL; - osl_getProcessWorkingDir(&dir); - OUString absFileUrl; - osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrl.pData); - rtl_uString_release(dir); - - uno::Reference<io::XInputStream> xInputStream = xFileAccess->openFileRead(absFileUrl); - doctok::WW8Stream::Pointer_t pDocStream = doctok::WW8DocumentFactory::createStream(xContext, xInputStream); - - doctok::WW8Document::Pointer_t pDocument(doctok::WW8DocumentFactory::createDocument(pDocStream)); - - Stream::Pointer_t pStream = createStreamHandler(); - pDocument->resolve(*pStream); - - ::ucbhelper::ContentBroker::deinitialize(); - } - else - { - fprintf(stderr, "can't initialize UCB"); - } + OUString arg=aArguments[0]; + + uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext)); + + rtl_uString *dir=NULL; + osl_getProcessWorkingDir(&dir); + OUString absFileUrl; + osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrl.pData); + rtl_uString_release(dir); + + uno::Reference<io::XInputStream> xInputStream = xFileAccess->openFileRead(absFileUrl); + doctok::WW8Stream::Pointer_t pDocStream = doctok::WW8DocumentFactory::createStream(xContext, xInputStream); + + doctok::WW8Document::Pointer_t pDocument(doctok::WW8DocumentFactory::createDocument(pDocStream)); + + Stream::Pointer_t pStream = createStreamHandler(); + pDocument->resolve(*pStream); + return 0; } diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx index 8e6535876f81..7abb841a3707 100644 --- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx +++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <comphelper/processfactory.hxx> - #include "OOXMLAnalyzeService.hxx" #include <stdio.h> #include <wchar.h> @@ -28,7 +26,6 @@ #include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <ucbhelper/contentbroker.hxx> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/ucb/XSimpleFileAccess2.hpp> #include <osl/process.h> @@ -43,9 +40,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/seqstream.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/uno/Any.hxx> #include <resourcemodel/WW8ResourceModel.hxx> #include <ooxml/OOXMLDocument.hxx> @@ -141,107 +135,88 @@ sal_Int32 SAL_CALL AnalyzeService::run ( const uno::Sequence< OUString >& aArguments ) throw (uno::RuntimeException) { - uno::Sequence<uno::Any> aUcbInitSequence(2); - aUcbInitSequence[0] <<= OUString("Local"); - aUcbInitSequence[1] <<= OUString("Office"); - uno::Reference<lang::XMultiServiceFactory> - xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW); - uno::Reference<lang::XMultiComponentFactory> - xFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW ); - - if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence)) - { - ::comphelper::setProcessServiceFactory(xServiceFactory); + OUString arg=aArguments[0]; - OUString arg=aArguments[0]; + rtl_uString *dir=NULL; + osl_getProcessWorkingDir(&dir); - rtl_uString *dir=NULL; - osl_getProcessWorkingDir(&dir); + OUString absFileUrlUrls; + osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrlUrls.pData); - OUString absFileUrlUrls; - osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrlUrls.pData); + URLLister aLister(xContext, absFileUrlUrls); - URLLister aLister(xContext, absFileUrlUrls); + fprintf(stdout, "<analyze>\n"); - fprintf(stdout, "<analyze>\n"); + writerfilter::analyzerIds(); - writerfilter::analyzerIds(); + OUString aURL = aLister.getURL(); - OUString aURL = aLister.getURL(); + while (!aURL.isEmpty()) + { + uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext)); - while (!aURL.isEmpty()) - { - uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext)); + OString aStr; + aURL.convertToString(&aStr, RTL_TEXTENCODING_ASCII_US, + OUSTRING_TO_OSTRING_CVTFLAGS); - OString aStr; - aURL.convertToString(&aStr, RTL_TEXTENCODING_ASCII_US, - OUSTRING_TO_OSTRING_CVTFLAGS); + fprintf(stdout, "<file><name>%s</name>\n", aStr.getStr()); + fprintf(stderr, "%s\n", aStr.getStr()); + fflush(stderr); - fprintf(stdout, "<file><name>%s</name>\n", aStr.getStr()); - fprintf(stderr, "%s\n", aStr.getStr()); - fflush(stderr); + bool bStatus = true; + try + { + uno::Reference<io::XInputStream> xInputStream = + xFileAccess->openFileRead(aURL); - bool bStatus = true; - try + if (xInputStream.is()) { - uno::Reference<io::XInputStream> xInputStream = - xFileAccess->openFileRead(aURL); + ooxml::OOXMLStream::Pointer_t pDocStream = + ooxml::OOXMLDocumentFactory::createStream + (xContext, xInputStream); - if (xInputStream.is()) + if (pDocStream.get() != NULL) { - ooxml::OOXMLStream::Pointer_t pDocStream = - ooxml::OOXMLDocumentFactory::createStream - (xContext, xInputStream); - - if (pDocStream.get() != NULL) - { - ooxml::OOXMLDocument::Pointer_t pDocument - (ooxml::OOXMLDocumentFactory::createDocument - (pDocStream)); - - Stream::Pointer_t pAnalyzer = - writerfilter::createAnalyzer(); - pDocument->resolve(*pAnalyzer); - } - else - { - fprintf(stdout, - "<exception>file open failed</exception>\n"); - bStatus = false; - } - fprintf(stderr, "done\n"); - } + ooxml::OOXMLDocument::Pointer_t pDocument + (ooxml::OOXMLDocumentFactory::createDocument + (pDocStream)); - xInputStream->closeInput(); - } - catch (...) - { - fprintf(stdout, "<exception>unknown</exception>\n"); - bStatus = false; + Stream::Pointer_t pAnalyzer = + writerfilter::createAnalyzer(); + pDocument->resolve(*pAnalyzer); + } + else + { + fprintf(stdout, + "<exception>file open failed</exception>\n"); + bStatus = false; + } + fprintf(stderr, "done\n"); } - if (bStatus) - fprintf(stdout, "<status>ok</status>\n"); - else - fprintf(stdout, "<status>failed</status>\n"); + xInputStream->closeInput(); + } + catch (...) + { + fprintf(stdout, "<exception>unknown</exception>\n"); + bStatus = false; + } - aURL = aLister.getURL(); + if (bStatus) + fprintf(stdout, "<status>ok</status>\n"); + else + fprintf(stdout, "<status>failed</status>\n"); - fprintf(stdout, "</file>\n"); - fflush(stdout); - } + aURL = aLister.getURL(); - fprintf(stdout, "</analyze>\n"); + fprintf(stdout, "</file>\n"); + fflush(stdout); + } - rtl_uString_release(dir); - ::ucbhelper::ContentBroker::deinitialize(); + fprintf(stdout, "</analyze>\n"); + rtl_uString_release(dir); - } - else - { - fprintf(stdout, "can't initialize UCB"); - } return 0; } diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx index 92d0144aa518..b6423f0cc4b7 100644 --- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx +++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx @@ -20,7 +20,6 @@ #include <cppuhelper/implbase1.hxx> #include <com/sun/star/lang/XMain.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <comphelper/processfactory.hxx> #include "OOXMLTestService.hxx" #include <stdio.h> @@ -31,7 +30,6 @@ #include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <ucbhelper/contentbroker.hxx> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/ucb/XSimpleFileAccess2.hpp> #include <osl/process.h> @@ -47,9 +45,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/seqstream.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/uno/Any.hxx> #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <ooxml/OOXMLDocument.hxx> @@ -74,52 +69,37 @@ xContext( xContext_ ) sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< OUString >& aArguments ) throw (uno::RuntimeException) { - uno::Sequence<uno::Any> aUcbInitSequence(2); - aUcbInitSequence[0] <<= OUString("Local"); - aUcbInitSequence[1] <<= OUString("Office"); - uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW); - uno::Reference<lang::XMultiComponentFactory> xFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW ); - if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence)) - { #ifdef DEBUG_ELEMENT - writerfilter::TagLogger::Pointer_t debugLogger + writerfilter::TagLogger::Pointer_t debugLogger (writerfilter::TagLogger::getInstance("DEBUG")); - debugLogger->startDocument(); + debugLogger->startDocument(); #endif - OUString arg=aArguments[0]; + OUString arg=aArguments[0]; - ::comphelper::setProcessServiceFactory(xServiceFactory); + uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext)); - uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext)); + rtl_uString *dir=NULL; + osl_getProcessWorkingDir(&dir); + OUString absFileUrl; + osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrl.pData); + rtl_uString_release(dir); - rtl_uString *dir=NULL; - osl_getProcessWorkingDir(&dir); - OUString absFileUrl; - osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrl.pData); - rtl_uString_release(dir); + uno::Reference<io::XInputStream> xInputStream = + xFileAccess->openFileRead(absFileUrl); + ooxml::OOXMLStream::Pointer_t pDocStream = + ooxml::OOXMLDocumentFactory::createStream(xContext, xInputStream); - uno::Reference<io::XInputStream> xInputStream = - xFileAccess->openFileRead(absFileUrl); - ooxml::OOXMLStream::Pointer_t pDocStream = - ooxml::OOXMLDocumentFactory::createStream(xContext, xInputStream); + ooxml::OOXMLDocument::Pointer_t pDocument + (ooxml::OOXMLDocumentFactory::createDocument(pDocStream)); - ooxml::OOXMLDocument::Pointer_t pDocument - (ooxml::OOXMLDocumentFactory::createDocument(pDocStream)); - - Stream::Pointer_t pStream = createStreamHandler(); - pDocument->resolve(*pStream); + Stream::Pointer_t pStream = createStreamHandler(); + pDocument->resolve(*pStream); #ifdef DEBUG_ELEMENT - debugLogger->endDocument(); + debugLogger->endDocument(); #endif - ::ucbhelper::ContentBroker::deinitialize(); - } - else - { - fprintf(stderr, "can't initialize UCB"); - } return 0; } |