merge with DEV300_m68

11 files changed, 9 insertions, 47 deletions

diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index 357f908c7312..a902e2e7c486 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -33,7 +33,6 @@
 #include "precompiled_sdext.hxx"
 
 #include "configurationaccess.hxx"
-#include <comphelper/processfactory.hxx>
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx
index a20d6900964e..8135335a8221 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -60,7 +60,6 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XContainerQuery.hpp>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
-#include <comphelper/types.hxx>
 
 
 using namespace ::rtl;
diff --git a/sdext/source/minimizer/fileopendialog.hxx b/sdext/source/minimizer/fileopendialog.hxx
index 6ab275fe95f0..afcfee1e49ac 100644
--- a/sdext/source/minimizer/fileopendialog.hxx
+++ b/sdext/source/minimizer/fileopendialog.hxx
@@ -33,10 +33,10 @@
 #define _FILEOPEN_DIALOG_HXX_
 
 #include <vector>
-#include <comphelper/processfactory.hxx>
 #include <com/sun/star/beans/StringPair.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 class FileOpenDialog
 {
diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx
index 5bc80399ff3d..fc0b19997eb5 100644
--- a/sdext/source/minimizer/pppoptimizer.cxx
+++ b/sdext/source/minimizer/pppoptimizer.cxx
@@ -36,6 +36,8 @@
 #include "impoptimizer.hxx"
 #include <osl/file.hxx>
 
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx
index 53e2aedb3bfa..c02b5579082b 100644
--- a/sdext/source/minimizer/pppoptimizer.hxx
+++ b/sdext/source/minimizer/pppoptimizer.hxx
@@ -39,7 +39,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/frame/XController.hpp>
-#include <comphelper/property.hxx>
 
 // ----------------
 // - PPPOptimizer -
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index 1545bec51f3d..eb194b36c75b 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -42,7 +42,6 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/compbase2.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <comphelper/anytostring.hxx>
 
 
 using namespace com::sun::star;
@@ -150,12 +149,6 @@ bool getPassword( const uno::Reference< task::XInteractionHandler >& xHandler,
     }
     catch( uno::Exception& )
     {
-#if 0
-        OSL_ENSURE( false,
-                    rtl::OUStringToOString(
-                        comphelper::anyToString( cppu::getCaughtException() ),
-                        RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
     }
 
     OSL_TRACE( "request %s selected\n", pRequest->isSelected() ? "was" : "was not" );
diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx
index 12750db201b4..283e0f9500df 100644
--- a/sdext/source/pdfimport/odf/odfemitter.cxx
+++ b/sdext/source/pdfimport/odf/odfemitter.cxx
@@ -35,7 +35,6 @@
 #include "odfemitter.hxx"
 
 #include <rtl/ustrbuf.hxx>
-#include <comphelper/anytostring.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx
index fc5809c4f7d5..17ff27e8dfc5 100644
--- a/sdext/source/pdfimport/sax/emitcontext.cxx
+++ b/sdext/source/pdfimport/sax/emitcontext.cxx
@@ -37,7 +37,6 @@
 #include "saxattrlist.hxx"
 
 #include <rtl/strbuf.hxx>
-#include <comphelper/anytostring.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 
@@ -62,12 +61,6 @@ SaxEmitter::SaxEmitter( const uno::Reference< xml::sax::XDocumentHandler >& xDoc
     }
     catch( xml::sax::SAXException& )
     {
-#if 0
-        OSL_ENSURE( false,
-                    rtl::OUStringToOString(
-                        comphelper::anyToString( cppu::getCaughtException() ),
-                        RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
     }
 #if OSL_DEBUG_LEVEL > 1
     static const char* pDir = getenv( "DBG_PDFIMPORT_DIR" );
@@ -99,12 +92,6 @@ SaxEmitter::~SaxEmitter()
     }
     catch( xml::sax::SAXException& )
     {
-#if 0
-        OSL_ENSURE( false,
-                    rtl::OUStringToOString(
-                        comphelper::anyToString( cppu::getCaughtException() ),
-                        RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
     }
 #if OSL_DEBUG_LEVEL > 1
     if( pStream )
@@ -127,12 +114,6 @@ void SaxEmitter::beginTag( const char* pTag, const PropertyMap& rProperties )
     }
     catch( xml::sax::SAXException& )
     {
-#if 0
-        OSL_ENSURE( false,
-                    rtl::OUStringToOString(
-                        comphelper::anyToString( cppu::getCaughtException() ),
-                        RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
     }
 #if OSL_DEBUG_LEVEL > 1
     if( pStream )
@@ -167,12 +148,6 @@ void SaxEmitter::write( const rtl::OUString& rText )
     }
     catch( xml::sax::SAXException& )
     {
-#if 0
-        OSL_ENSURE( false,
-                    rtl::OUStringToOString(
-                        comphelper::anyToString( cppu::getCaughtException() ),
-                        RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
     }
 #if OSL_DEBUG_LEVEL > 1
     if( pStream )
@@ -193,12 +168,6 @@ void SaxEmitter::endTag( const char* pTag )
     }
     catch( xml::sax::SAXException& )
     {
-#if 0
-        OSL_ENSURE( false,
-                    rtl::OUStringToOString(
-                        comphelper::anyToString( cppu::getCaughtException() ),
-                        RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
     }
 #if OSL_DEBUG_LEVEL > 1
     if( pStream )
diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx
index d6d79204cef1..548961ace6f2 100644
--- a/sdext/source/pdfimport/services.cxx
+++ b/sdext/source/pdfimport/services.cxx
@@ -38,7 +38,6 @@
 
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
-#include <comphelper/servicedecl.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sdext/source/pdfimport/test/makefile.mk b/sdext/source/pdfimport/test/makefile.mk
index 2fb8d3a62417..eea005178ae3 100755
--- a/sdext/source/pdfimport/test/makefile.mk
+++ b/sdext/source/pdfimport/test/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2008 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -70,6 +70,7 @@ SHL1STDLIBS=\
     $(COMPHELPERLIB)	\
     $(CPPUHELPERLIB)	\
     $(CPPUNITLIB)		\
+        $(TESTSHL2LIB)           \
     $(ZLIB3RDLIB)	    \
     $(CPPULIB)			\
     $(SALLIB)
@@ -103,6 +104,7 @@ APP1STDLIBS=\
     $(COMPHELPERLIB)	\
     $(CPPUHELPERLIB)	\
     $(CPPUNITLIB)		\
+        $(TESTSHL2LIB)           \
     $(ZLIB3RDLIB)	    \
     $(CPPULIB)			\
     $(SALLIB)
@@ -131,6 +133,7 @@ APP2STDLIBS=\
       $(COMPHELPERLIB)	\
       $(CPPUHELPERLIB)	\
       $(CPPUNITLIB)		\
+        $(TESTSHL2LIB)           \
       $(ZLIB3RDLIB)	    \
       $(CPPULIB)			\
       $(SALLIB)
@@ -161,5 +164,5 @@ APP2STDLIBS=\
           @echo ----------------------------------------------------------
           testshl2 -forward $(BIN)$/ $(SHL1TARGETN)
            $(TOUCH) $@
-  
+
 #ALLTAR : $(MISC)$/pdfi_unittest_succeeded
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index b66e1812d9e0..075116e3784a 100755
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -48,7 +48,7 @@
 #include <rtl/math.hxx>
 #include <osl/file.hxx>
 #include <osl/process.h>
-#include <cppunit/simpleheader.hxx>
+#include <testshl/simpleheader.hxx>
 #include <cppuhelper/compbase1.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/basemutex.hxx>