diff options
Diffstat (limited to 'sdext/source')
-rw-r--r-- | sdext/source/minimizer/configurationaccess.cxx | 3 | ||||
-rw-r--r-- | sdext/source/minimizer/fileopendialog.cxx | 3 | ||||
-rw-r--r-- | sdext/source/minimizer/fileopendialog.hxx | 6 | ||||
-rw-r--r-- | sdext/source/minimizer/pppoptimizer.cxx | 10 | ||||
-rw-r--r-- | sdext/source/minimizer/pppoptimizer.hxx | 3 | ||||
-rw-r--r-- | sdext/source/pdfimport/misc/pwdinteract.cxx | 25 | ||||
-rw-r--r-- | sdext/source/pdfimport/odf/odfemitter.cxx | 5 | ||||
-rw-r--r-- | sdext/source/pdfimport/sax/emitcontext.cxx | 39 | ||||
-rw-r--r-- | sdext/source/pdfimport/services.cxx | 3 | ||||
-rwxr-xr-x | sdext/source/pdfimport/test/makefile.mk | 7 | ||||
-rw-r--r-- | sdext/source/pdfimport/test/pdf2xml.cxx | 12 | ||||
-rwxr-xr-x | sdext/source/pdfimport/test/tests.cxx | 62 | ||||
-rw-r--r-- | sdext/source/pdfimport/tree/imagecontainer.cxx | 20 | ||||
-rw-r--r-- | sdext/source/presenter/PresenterComponent.hxx | 2 |
14 files changed, 81 insertions, 119 deletions
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index cca5bc8..088e286 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -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 @@ -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 fb88080..f88fcac 100644 --- a/sdext/source/minimizer/fileopendialog.cxx +++ b/sdext/source/minimizer/fileopendialog.cxx @@ -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 @@ -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 e0ef1f8..5b3369e 100644 --- a/sdext/source/minimizer/fileopendialog.hxx +++ b/sdext/source/minimizer/fileopendialog.hxx @@ -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 @@ -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 { @@ -72,4 +72,4 @@ public : }; #endif // _FILEOPEN_DIALOG_HXX_ - + diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx index a1782b6..6f20db6 100644 --- a/sdext/source/minimizer/pppoptimizer.cxx +++ b/sdext/source/minimizer/pppoptimizer.cxx @@ -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 @@ -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; @@ -67,7 +69,7 @@ PPPOptimizer::~PPPOptimizer() void SAL_CALL PPPOptimizer::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) { - if( aArguments.getLength() != 1 ) + if( aArguments.getLength() != 1 ) throw IllegalArgumentException(); Reference< XFrame > xFrame; @@ -80,13 +82,13 @@ void SAL_CALL PPPOptimizer::initialize( const Sequence< Any >& aArguments ) // XServiceInfo // ----------------------------------------------------------------------------- -OUString SAL_CALL PPPOptimizer::getImplementationName() +OUString SAL_CALL PPPOptimizer::getImplementationName() throw ( RuntimeException ) { return PPPOptimizer_getImplementationName(); } -sal_Bool SAL_CALL PPPOptimizer::supportsService( const OUString& rServiceName ) +sal_Bool SAL_CALL PPPOptimizer::supportsService( const OUString& rServiceName ) throw ( RuntimeException ) { return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SERVICE_NAME ) ); diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx index cf1c340..1eb5545 100644 --- a/sdext/source/minimizer/pppoptimizer.hxx +++ b/sdext/source/minimizer/pppoptimizer.hxx @@ -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 @@ -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 45e77e9..eb194b3 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -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 @@ -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; @@ -50,7 +49,7 @@ using namespace com::sun::star; namespace { -typedef ::cppu::WeakComponentImplHelper2< +typedef ::cppu::WeakComponentImplHelper2< com::sun::star::task::XInteractionRequest, com::sun::star::task::XInteractionPassword > PDFPasswordRequestBase; @@ -64,18 +63,18 @@ private: public: explicit PDFPasswordRequest(bool bFirstTry); - + // XInteractionRequest virtual uno::Any SAL_CALL getRequest( ) throw (uno::RuntimeException); virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations( ) throw (uno::RuntimeException); - + // XInteractionPassword virtual void SAL_CALL setPassword( const rtl::OUString& rPwd ) throw (uno::RuntimeException); virtual rtl::OUString SAL_CALL getPassword() throw (uno::RuntimeException); // XInteractionContinuation virtual void SAL_CALL select() throw (uno::RuntimeException); - + bool isSelected() const { osl::MutexGuard const guard( m_aMutex ); return m_bSelected; } }; @@ -140,9 +139,9 @@ bool getPassword( const uno::Reference< task::XInteractionHandler >& xHandler, bool bFirstTry ) { bool bSuccess = false; - + PDFPasswordRequest* pRequest; - uno::Reference< task::XInteractionRequest > xReq( + uno::Reference< task::XInteractionRequest > xReq( pRequest = new PDFPasswordRequest( bFirstTry ) ); try { @@ -150,21 +149,15 @@ 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" ); if( pRequest->isSelected() ) { bSuccess = true; rOutPwd = pRequest->getPassword(); } - + return bSuccess; } diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx index e960fbc..283e0f9 100644 --- a/sdext/source/pdfimport/odf/odfemitter.cxx +++ b/sdext/source/pdfimport/odf/odfemitter.cxx @@ -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 @@ -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> @@ -101,7 +100,7 @@ void OdfEmitter::beginTag( const char* pTag, const PropertyMap& rProperties ) // platforms, and even between different compile-time settings), // sort the attributes. std::sort(aAttributes.begin(), aAttributes.end()); - std::for_each(aAttributes.begin(), + std::for_each(aAttributes.begin(), aAttributes.end(), boost::bind( (rtl::OUStringBuffer& (rtl::OUStringBuffer::*)(const rtl::OUString&)) (&rtl::OUStringBuffer::append), diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx index 07f418e..17ff27e 100644 --- a/sdext/source/pdfimport/sax/emitcontext.cxx +++ b/sdext/source/pdfimport/sax/emitcontext.cxx @@ -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 @@ -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 ) @@ -119,7 +106,7 @@ SaxEmitter::~SaxEmitter() void SaxEmitter::beginTag( const char* pTag, const PropertyMap& rProperties ) { rtl::OUString aTag = rtl::OUString::createFromAscii( pTag ); - uno::Reference< xml::sax::XAttributeList > xAttr( + uno::Reference< xml::sax::XAttributeList > xAttr( new SaxAttrList( rProperties ) ); try { @@ -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 ) @@ -140,7 +121,7 @@ void SaxEmitter::beginTag( const char* pTag, const PropertyMap& rProperties ) sal_uInt64 nWritten = 0; for( int i = 0; i < nIndent; i++ ) pStream->write( " ", 4, nWritten ); - + rtl::OStringBuffer aBuf( 1024 ); aBuf.append( '<' ); aBuf.append( pTag ); @@ -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 ) @@ -206,7 +175,7 @@ void SaxEmitter::endTag( const char* pTag ) sal_uInt64 nWritten = 0; for( int i = 0; i < nIndent; i++ ) pStream->write( " ", 4, nWritten ); - + rtl::OStringBuffer aBuf( 1024 ); aBuf.append( "</" ); aBuf.append( pTag ); diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index 4317fb3..b3be6db 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -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 @@ -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 2fb8d3a..eea0051 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/pdf2xml.cxx b/sdext/source/pdfimport/test/pdf2xml.cxx index f85b18a..3912c44 100644 --- a/sdext/source/pdfimport/test/pdf2xml.cxx +++ b/sdext/source/pdfimport/test/pdf2xml.cxx @@ -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 @@ -37,7 +37,7 @@ #include "pdfihelper.hxx" #include "wrapper.hxx" #include "pdfparse.hxx" -#include "../pdfiadaptor.hxx" +#include "../pdfiadaptor.hxx" #include <sal/main.h> #include <osl/process.h> @@ -56,7 +56,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) return 1; ::rtl::OUString aBaseURL, aTmpURL, aSrcURL, aDstURL, aIniUrl; - + TreeVisitorFactorySharedPtr pTreeFactory; if( rtl_str_compare(argv[1], "-writer") == 0 ) pTreeFactory = createWriterTreeVisitorFactory(); @@ -66,7 +66,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) pTreeFactory = createImpressTreeVisitorFactory(); else return 1; - + osl_getProcessWorkingDir(&aBaseURL.pData); osl_getFileURLFromSystemPath( rtl::OUString::createFromAscii(argv[2]).pData, &aTmpURL.pData ); @@ -76,7 +76,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) &aTmpURL.pData ); osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aDstURL.pData); - osl_getFileURLFromSystemPath( rtl::OUString::createFromAscii(argv[4]).pData, + osl_getFileURLFromSystemPath( rtl::OUString::createFromAscii(argv[4]).pData, &aTmpURL.pData ); osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aIniUrl.pData); @@ -86,7 +86,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) try { xCtx = ::cppu::defaultBootstrap_InitialComponentContext(aIniUrl); - xFactory = uno::Reference< lang::XMultiServiceFactory >( xCtx->getServiceManager(), + xFactory = uno::Reference< lang::XMultiServiceFactory >( xCtx->getServiceManager(), uno::UNO_QUERY ); if( xFactory.is() ) ::comphelper::setProcessServiceFactory( xFactory ); diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index 12d384e..075116e 100755 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -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 @@ -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> @@ -62,7 +62,7 @@ #include <com/sun/star/rendering/BlendMode.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/registry/XSimpleRegistry.hpp> +#include <com/sun/star/registry/XSimpleRegistry.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/tools/canvastools.hxx> @@ -123,7 +123,7 @@ namespace CPPUNIT_ASSERT_MESSAGE( "Imported text is \"This is a testtext New paragraph, new line" " Hyperlink, this is * This is more text outline mode * New paragraph\"", sText == aTmp ); - + CPPUNIT_ASSERT_MESSAGE( "red circle seen in input", m_bRedCircleSeen ); CPPUNIT_ASSERT_MESSAGE( "green stroke seen in input", m_bGreenStrokeSeen ); CPPUNIT_ASSERT_MESSAGE( "dashed line seen in input", m_bDashedLineSeen ); @@ -147,7 +147,7 @@ namespace { m_bPageEnded = true; } - + virtual void hyperLink( const geometry::RealRectangle2D& rBounds, const ::rtl::OUString& rURI ) { @@ -167,7 +167,7 @@ namespace virtual void setTransformation( const geometry::AffineMatrix2D& rMatrix ) { - basegfx::unotools::homMatrixFromAffineMatrix( + basegfx::unotools::homMatrixFromAffineMatrix( getCurrentContext().Transformation, rMatrix ); } @@ -266,7 +266,7 @@ namespace rContext.DashArray[0] == rContext.DashArray[1] && rContext.DashArray[1] == rContext.DashArray[2] && rContext.DashArray[2] == rContext.DashArray[3] ); - + CPPUNIT_ASSERT_MESSAGE( "Line color is black", rContext.LineColor.Alpha == 1.0 && rContext.LineColor.Red == 0.0 && @@ -340,15 +340,15 @@ namespace m_bRedCircleSeen = true; } - + virtual void intersectClip(const uno::Reference<rendering::XPolyPolygon2D>& rPath) { basegfx::B2DPolyPolygon aNewClip = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath); basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip; - + if( aCurClip.count() ) // #i92985# adapted API from (..., false, false) to (..., true, false) aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, true, false ); - + getCurrentContext().Clip = aNewClip; } @@ -356,13 +356,13 @@ namespace { basegfx::B2DPolyPolygon aNewClip = basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D(rPath); basegfx::B2DPolyPolygon aCurClip = getCurrentContext().Clip; - + if( aCurClip.count() ) // #i92985# adapted API from (..., false, false) to (..., true, false) aNewClip = basegfx::tools::clipPolyPolygonOnPolyPolygon( aCurClip, aNewClip, true, false ); - + getCurrentContext().Clip = aNewClip; } - + virtual void drawGlyphs( const rtl::OUString& rGlyphs, const geometry::RealRectangle2D& /*rRect*/, const geometry::Matrix2D& /*rFontMatrix*/ ) @@ -388,9 +388,9 @@ namespace virtual void drawImage(const uno::Sequence<beans::PropertyValue>& xBitmap ) { - CPPUNIT_ASSERT_MESSAGE( "drawImage received two properties", + CPPUNIT_ASSERT_MESSAGE( "drawImage received two properties", xBitmap.getLength()==3 ); - CPPUNIT_ASSERT_MESSAGE( "drawImage got URL param", + CPPUNIT_ASSERT_MESSAGE( "drawImage got URL param", xBitmap[0].Name.compareToAscii( "URL" ) == 0 ); CPPUNIT_ASSERT_MESSAGE( "drawImage got InputStream param", xBitmap[1].Name.compareToAscii( "InputStream" ) == 0 ); @@ -399,7 +399,7 @@ namespace virtual void drawColorMaskedImage(const uno::Sequence<beans::PropertyValue>& xBitmap, const uno::Sequence<uno::Any>& /*xMaskColors*/ ) { - CPPUNIT_ASSERT_MESSAGE( "drawColorMaskedImage received two properties", + CPPUNIT_ASSERT_MESSAGE( "drawColorMaskedImage received two properties", xBitmap.getLength()==3 ); CPPUNIT_ASSERT_MESSAGE( "drawColorMaskedImage got URL param", xBitmap[0].Name.compareToAscii( "URL" ) == 0 ); @@ -411,7 +411,7 @@ namespace const uno::Sequence<beans::PropertyValue>& xMask, bool /*bInvertMask*/) { - CPPUNIT_ASSERT_MESSAGE( "drawMaskedImage received two properties #1", + CPPUNIT_ASSERT_MESSAGE( "drawMaskedImage received two properties #1", xBitmap.getLength()==3 ); CPPUNIT_ASSERT_MESSAGE( "drawMaskedImage got URL param #1", xBitmap[0].Name.compareToAscii( "URL" ) == 0 ); @@ -447,10 +447,10 @@ namespace virtual void setTextRenderMode( sal_Int32 ) { } - + typedef std::hash_map<sal_Int32,FontAttributes> IdToFontMap; typedef std::hash_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap; - + typedef std::hash_map<sal_Int32,GraphicsContext> IdToGCMap; typedef std::hash_map<GraphicsContext,sal_Int32,GraphicsContextHash> GCToIdMap; @@ -459,7 +459,7 @@ namespace sal_Int32 m_nNextFontId; IdToFontMap m_aIdToFont; FontToIdMap m_aFontToId; - + GraphicsContextStack m_aGCStack; geometry::RealSize2D m_aPageSize; geometry::RealRectangle2D m_aHyperlinkBounds; @@ -479,9 +479,9 @@ namespace bool mbUnoInitialized; public: - PDFITest() : mxCtx(),msBaseDir(),mbUnoInitialized(false) + PDFITest() : mxCtx(),msBaseDir(),mbUnoInitialized(false) {} - + void setUp() { if( !mbUnoInitialized ) @@ -495,10 +495,10 @@ namespace try { ::rtl::OUString aIniUrl; - CPPUNIT_ASSERT_MESSAGE( + CPPUNIT_ASSERT_MESSAGE( "Converting ini file to URL", - osl_getFileURLFromSystemPath( - (msBaseDir+rtl::OUString::createFromAscii("pdfi_unittest_test.ini")).pData, + osl_getFileURLFromSystemPath( + (msBaseDir+rtl::OUString::createFromAscii("pdfi_unittest_test.ini")).pData, &aIniUrl.pData ) == osl_File_E_None ); mxCtx = ::cppu::defaultBootstrap_InitialComponentContext(aIniUrl); @@ -520,7 +520,7 @@ namespace { pdfi::ContentSinkSharedPtr pSink( new TestSink() ); pdfi::xpdf_ImportFromFile( msBaseDir + rtl::OUString::createFromAscii("pdfi_unittest_test.pdf"), - pSink, + pSink, uno::Reference< task::XInteractionHandler >(), rtl::OUString(), mxCtx ); @@ -536,11 +536,11 @@ namespace aAdaptor.setTreeVisitorFactory( createDrawTreeVisitorFactory() ); ::rtl::OUString aURL, aAbsURL, aBaseURL; - osl_getFileURLFromSystemPath( (msBaseDir + rtl::OUString::createFromAscii("pdfi_unittest_draw.xml")).pData, + osl_getFileURLFromSystemPath( (msBaseDir + rtl::OUString::createFromAscii("pdfi_unittest_draw.xml")).pData, &aURL.pData ); osl_getProcessWorkingDir(&aBaseURL.pData); osl_getAbsoluteFileURL(aBaseURL.pData,aURL.pData,&aAbsURL.pData); - CPPUNIT_ASSERT_MESSAGE("Exporting to ODF", + CPPUNIT_ASSERT_MESSAGE("Exporting to ODF", aAdaptor.odfConvert( msBaseDir + rtl::OUString::createFromAscii("pdfi_unittest_test.pdf"), new OutputWrap(aAbsURL), NULL )); @@ -552,11 +552,11 @@ namespace aAdaptor.setTreeVisitorFactory( createWriterTreeVisitorFactory() ); ::rtl::OUString aURL, aAbsURL, aBaseURL; - osl_getFileURLFromSystemPath( (msBaseDir + rtl::OUString::createFromAscii("pdfi_unittest_writer.xml")).pData, + osl_getFileURLFromSystemPath( (msBaseDir + rtl::OUString::createFromAscii("pdfi_unittest_writer.xml")).pData, &aURL.pData ); osl_getProcessWorkingDir(&aBaseURL.pData); osl_getAbsoluteFileURL(aBaseURL.pData,aURL.pData,&aAbsURL.pData); - CPPUNIT_ASSERT_MESSAGE("Exporting to ODF", + CPPUNIT_ASSERT_MESSAGE("Exporting to ODF", aAdaptor.odfConvert( msBaseDir + rtl::OUString::createFromAscii("pdfi_unittest_test.pdf"), new OutputWrap(aAbsURL), NULL )); @@ -568,7 +568,7 @@ namespace CPPUNIT_TEST(testOdfDrawExport); CPPUNIT_TEST_SUITE_END(); }; - + } // ======================================================================= diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx index 9b9cc92..2543383 100644 --- a/sdext/source/pdfimport/tree/imagecontainer.cxx +++ b/sdext/source/pdfimport/tree/imagecontainer.cxx @@ -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 @@ -53,7 +53,7 @@ using namespace com::sun::star; namespace pdfi { -namespace +namespace { static const sal_Char aBase64EncodeTable[] = @@ -76,16 +76,16 @@ rtl::OUString encodeBase64( const sal_Int8* i_pBuffer, const sal_uInt32 i_nBuffe ((sal_uInt8)i_pBuffer[i + 2]); aBuf.appendAscii("===="); - + sal_uInt8 nIndex (static_cast<sal_uInt8>((nBinary & 0xFC0000) >> 18)); aBuf.setCharAt(nBufPos, aBase64EncodeTable [nIndex]); - + nIndex = static_cast<sal_uInt8>((nBinary & 0x3F000) >> 12); aBuf.setCharAt(nBufPos+1, aBase64EncodeTable [nIndex]); - + nIndex = static_cast<sal_uInt8>((nBinary & 0xFC0) >> 6); aBuf.setCharAt(nBufPos+2, aBase64EncodeTable [nIndex]); - + nIndex = static_cast<sal_uInt8>((nBinary & 0x3F)); aBuf.setCharAt(nBufPos+3, aBase64EncodeTable [nIndex]); } @@ -104,21 +104,21 @@ rtl::OUString encodeBase64( const sal_Int8* i_pBuffer, const sal_uInt32 i_nBuffe } sal_uInt8 nIndex (static_cast<sal_uInt8>((nBinary & 0xFC0000) >> 18)); aBuf.setCharAt(nBufPos, aBase64EncodeTable [nIndex]); - + nIndex = static_cast<sal_uInt8>((nBinary & 0x3F000) >> 12); aBuf.setCharAt(nBufPos+1, aBase64EncodeTable [nIndex]); - + if( nRemain == 2 ) { nIndex = static_cast<sal_uInt8>((nBinary & 0xFC0) >> 6); aBuf.setCharAt(nBufPos+2, aBase64EncodeTable [nIndex]); } } - + return aBuf.makeStringAndClear(); } -} // namespace +} // namespace ImageContainer::ImageContainer() : m_aImages() diff --git a/sdext/source/presenter/PresenterComponent.hxx b/sdext/source/presenter/PresenterComponent.hxx index 55e71bb..87758b2 100644 --- a/sdext/source/presenter/PresenterComponent.hxx +++ b/sdext/source/presenter/PresenterComponent.hxx @@ -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 |