diff options
Diffstat (limited to 'sdext/source/pdfimport')
| -rw-r--r-- | sdext/source/pdfimport/filterdet.hxx | 24 | ||||
| -rw-r--r-- | sdext/source/pdfimport/inc/contentsink.hxx | 68 | ||||
| -rw-r--r-- | sdext/source/pdfimport/inc/odfemitter.hxx | 4 | ||||
| -rw-r--r-- | sdext/source/pdfimport/inc/pdfihelper.hxx | 26 | ||||
| -rw-r--r-- | sdext/source/pdfimport/inc/saxemitter.hxx | 4 | ||||
| -rw-r--r-- | sdext/source/pdfimport/inc/wrapper.hxx | 20 | ||||
| -rw-r--r-- | sdext/source/pdfimport/pdfiadaptor.hxx | 58 | ||||
| -rw-r--r-- | sdext/source/pdfimport/sax/emitcontext.hxx | 8 | ||||
| -rw-r--r-- | sdext/source/pdfimport/sax/saxattrlist.hxx | 10 | ||||
| -rw-r--r-- | sdext/source/pdfimport/test/outputwrap.hxx | 8 | ||||
| -rw-r--r-- | sdext/source/pdfimport/tree/drawtreevisiting.hxx | 14 | ||||
| -rw-r--r-- | sdext/source/pdfimport/tree/genericelements.hxx | 14 | ||||
| -rw-r--r-- | sdext/source/pdfimport/tree/imagecontainer.hxx | 8 | ||||
| -rw-r--r-- | sdext/source/pdfimport/tree/pdfiprocessor.hxx | 84 |
14 files changed, 175 insertions, 175 deletions
diff --git a/sdext/source/pdfimport/filterdet.hxx b/sdext/source/pdfimport/filterdet.hxx index 75b580868548..6a5c59f88234 100644 --- a/sdext/source/pdfimport/filterdet.hxx +++ b/sdext/source/pdfimport/filterdet.hxx @@ -34,23 +34,23 @@ namespace pdfi { typedef ::cppu::WeakComponentImplHelper1< - com::sun::star::document::XExtendedFilterDetection > PDFDetectorBase; + css::document::XExtendedFilterDetection > PDFDetectorBase; class PDFDetector : private cppu::BaseMutex, public PDFDetectorBase { private: - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< + css::uno::XComponentContext > m_xContext; public: - explicit PDFDetector( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext ); + explicit PDFDetector( const css::uno::Reference< + css::uno::XComponentContext >& xContext ); // XExtendedFilterDetection - virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< - com::sun::star::beans::PropertyValue >& io_rDescriptor ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL detect( css::uno::Sequence< + css::beans::PropertyValue >& io_rDescriptor ) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -81,12 +81,12 @@ public: When false, no dialog is opened to query user for alternate password */ -com::sun::star::uno::Reference< com::sun::star::io::XStream > +css::uno::Reference< css::io::XStream > getAdditionalStream( const OUString& rPDFFile, OUString& o_rOutMimetype, OUString& io_rOutPwd, - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext, - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rFilterData, + const css::uno::Reference< css::uno::XComponentContext >& xContext, + const css::uno::Sequence< css::beans::PropertyValue >& rFilterData, bool bMayUseUI ); @@ -94,7 +94,7 @@ bool checkDocChecksum( const OUString& rInPDFFileURL, sal_uInt32 nBytes, const OUString& rChkSum ); -bool getPassword( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xHandler, +bool getPassword( const css::uno::Reference< css::task::XInteractionHandler >& xHandler, OUString& o_rPwd, bool bFirstTry, const OUString& i_rDocName diff --git a/sdext/source/pdfimport/inc/contentsink.hxx b/sdext/source/pdfimport/inc/contentsink.hxx index 67e20064897c..93ae5adb19e0 100644 --- a/sdext/source/pdfimport/inc/contentsink.hxx +++ b/sdext/source/pdfimport/inc/contentsink.hxx @@ -99,73 +99,73 @@ namespace pdfi /// Total number of pages for upcoming document virtual void setPageNum( sal_Int32 nNumPages ) = 0; - virtual void startPage( const ::com::sun::star::geometry::RealSize2D& rSize ) = 0; + virtual void startPage( const css::geometry::RealSize2D& rSize ) = 0; virtual void endPage() = 0; - virtual void hyperLink( const ::com::sun::star::geometry::RealRectangle2D& rBounds, + virtual void hyperLink( const css::geometry::RealRectangle2D& rBounds, const OUString& rURI ) = 0; virtual void pushState() = 0; virtual void popState() = 0; virtual void setFlatness( double ) = 0; - virtual void setTransformation( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix ) = 0; - virtual void setLineDash( const ::com::sun::star::uno::Sequence<double>& dashes, + virtual void setTransformation( const css::geometry::AffineMatrix2D& rMatrix ) = 0; + virtual void setLineDash( const css::uno::Sequence<double>& dashes, double start ) = 0; virtual void setLineJoin( sal_Int8 lineJoin ) = 0; virtual void setLineCap( sal_Int8 lineCap ) = 0; virtual void setMiterLimit(double) = 0; virtual void setLineWidth(double) = 0; - virtual void setFillColor( const ::com::sun::star::rendering::ARGBColor& rColor ) = 0; - virtual void setStrokeColor( const ::com::sun::star::rendering::ARGBColor& rColor ) = 0; + virtual void setFillColor( const css::rendering::ARGBColor& rColor ) = 0; + virtual void setStrokeColor( const css::rendering::ARGBColor& rColor ) = 0; virtual void setBlendMode( sal_Int8 blendMode ) = 0; virtual void setFont( const FontAttributes& rFont ) = 0; virtual void setTextRenderMode( sal_Int32 ) = 0; - virtual void strokePath( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) = 0; - virtual void fillPath( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) = 0; - virtual void eoFillPath( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) = 0; + virtual void strokePath( const css::uno::Reference< + css::rendering::XPolyPolygon2D >& rPath ) = 0; + virtual void fillPath( const css::uno::Reference< + css::rendering::XPolyPolygon2D >& rPath ) = 0; + virtual void eoFillPath( const css::uno::Reference< + css::rendering::XPolyPolygon2D >& rPath ) = 0; - virtual void intersectClip(const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D >& rPath) = 0; - virtual void intersectEoClip(const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D >& rPath) = 0; + virtual void intersectClip(const css::uno::Reference< + css::rendering::XPolyPolygon2D >& rPath) = 0; + virtual void intersectEoClip(const css::uno::Reference< + css::rendering::XPolyPolygon2D >& rPath) = 0; virtual void drawGlyphs( const OUString& rGlyphs, - const ::com::sun::star::geometry::RealRectangle2D& rRect, - const ::com::sun::star::geometry::Matrix2D& rFontMatrix ) = 0; + const css::geometry::RealRectangle2D& rRect, + const css::geometry::Matrix2D& rFontMatrix ) = 0; /// issued when a sequence of associated glyphs is drawn virtual void endText() = 0; /// draws given bitmap as a mask (using current fill color) - virtual void drawMask(const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& xBitmap, + virtual void drawMask(const css::uno::Sequence< + css::beans::PropertyValue>& xBitmap, bool bInvert ) = 0; /// Given image must already be color-mapped and normalized to sRGB. - virtual void drawImage(const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& xBitmap ) = 0; + virtual void drawImage(const css::uno::Sequence< + css::beans::PropertyValue>& xBitmap ) = 0; /** Given image must already be color-mapped and normalized to sRGB. maskColors must contain two sequences of color components */ - virtual void drawColorMaskedImage(const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& xBitmap, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any>& xMaskColors ) = 0; - virtual void drawMaskedImage(const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& xBitmap, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& xMask, + virtual void drawColorMaskedImage(const css::uno::Sequence< + css::beans::PropertyValue>& xBitmap, + const css::uno::Sequence< + css::uno::Any>& xMaskColors ) = 0; + virtual void drawMaskedImage(const css::uno::Sequence< + css::beans::PropertyValue>& xBitmap, + const css::uno::Sequence< + css::beans::PropertyValue>& xMask, bool bInvertMask) = 0; - virtual void drawAlphaMaskedImage(const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& xImage, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& xMask) = 0; + virtual void drawAlphaMaskedImage(const css::uno::Sequence< + css::beans::PropertyValue>& xImage, + const css::uno::Sequence< + css::beans::PropertyValue>& xMask) = 0; }; typedef boost::shared_ptr<ContentSink> ContentSinkSharedPtr; diff --git a/sdext/source/pdfimport/inc/odfemitter.hxx b/sdext/source/pdfimport/inc/odfemitter.hxx index 61fb8d2c0d1c..2a18c30cd051 100644 --- a/sdext/source/pdfimport/inc/odfemitter.hxx +++ b/sdext/source/pdfimport/inc/odfemitter.hxx @@ -30,8 +30,8 @@ namespace com { namespace sun { namespace star { namespace io namespace pdfi { - XmlEmitterSharedPtr createOdfEmitter( const com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream>& xOut ); + XmlEmitterSharedPtr createOdfEmitter( const css::uno::Reference< + css::io::XOutputStream>& xOut ); } #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_INC_ODFEMITTER_HXX diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx index b5c9b8c8b7c4..8fe8410648d1 100644 --- a/sdext/source/pdfimport/inc/pdfihelper.hxx +++ b/sdext/source/pdfimport/inc/pdfihelper.hxx @@ -71,7 +71,7 @@ namespace pdfi } /// Convert color to "#FEFEFE" color notation - OUString getColorString( const ::com::sun::star::rendering::ARGBColor& ); + OUString getColorString( const css::rendering::ARGBColor& ); OUString getPercentString(double value); double GetAverageTransformationScale(const basegfx::B2DHomMatrix& matrix); @@ -93,8 +93,8 @@ namespace pdfi struct GraphicsContext { - ::com::sun::star::rendering::ARGBColor LineColor; - ::com::sun::star::rendering::ARGBColor FillColor; + css::rendering::ARGBColor LineColor; + css::rendering::ARGBColor FillColor; sal_Int8 LineJoin; sal_Int8 LineCap; sal_Int8 BlendMode; @@ -151,11 +151,11 @@ namespace pdfi switch (LineJoin) { default: - case ::com::sun::star::rendering::PathJoinType::MITER: + case css::rendering::PathJoinType::MITER: return OUString("miter"); - case ::com::sun::star::rendering::PathJoinType::ROUND: + case css::rendering::PathJoinType::ROUND: return OUString("round"); - case ::com::sun::star::rendering::PathJoinType::BEVEL: + case css::rendering::PathJoinType::BEVEL: return OUString("bevel"); } } @@ -165,11 +165,11 @@ namespace pdfi switch (LineCap) { default: - case ::com::sun::star::rendering::PathCapType::BUTT: + case css::rendering::PathCapType::BUTT: return OUString("butt"); - case ::com::sun::star::rendering::PathCapType::ROUND: + case css::rendering::PathCapType::ROUND: return OUString("round"); - case ::com::sun::star::rendering::PathCapType::SQUARE: + case css::rendering::PathCapType::SQUARE: return OUString("square"); } } @@ -213,16 +213,16 @@ namespace pdfi /** retrieve password from user */ - bool getPassword( const ::com::sun::star::uno::Reference< - ::com::sun::star::task::XInteractionHandler >& xHandler, + bool getPassword( const css::uno::Reference< + css::task::XInteractionHandler >& xHandler, OUString& rOutPwd, bool bFirstTry, const OUString& rDocName ); void reportUnsupportedEncryptionFormat( - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionHandler > const & handler); + css::uno::Reference< + css::task::XInteractionHandler > const & handler); } #endif diff --git a/sdext/source/pdfimport/inc/saxemitter.hxx b/sdext/source/pdfimport/inc/saxemitter.hxx index 6953037ebda3..b0974422220b 100644 --- a/sdext/source/pdfimport/inc/saxemitter.hxx +++ b/sdext/source/pdfimport/inc/saxemitter.hxx @@ -31,8 +31,8 @@ namespace sax namespace pdfi { - XmlEmitterSharedPtr createSaxEmitter( const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XDocumentHandler >& xDocHdl ); + XmlEmitterSharedPtr createSaxEmitter( const css::uno::Reference< + css::xml::sax::XDocumentHandler >& xDocHdl ); } #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_INC_SAXEMITTER_HXX diff --git a/sdext/source/pdfimport/inc/wrapper.hxx b/sdext/source/pdfimport/inc/wrapper.hxx index 59de61f0f986..8f0fc10f5a97 100644 --- a/sdext/source/pdfimport/inc/wrapper.hxx +++ b/sdext/source/pdfimport/inc/wrapper.hxx @@ -36,19 +36,19 @@ namespace pdfi { bool xpdf_ImportFromFile( const OUString& rURL, const ContentSinkSharedPtr& rSink, - const com::sun::star::uno::Reference< - com::sun::star::task::XInteractionHandler >& xIHdl, + const css::uno::Reference< + css::task::XInteractionHandler >& xIHdl, const OUString& rPwd, - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& xContext ); - bool xpdf_ImportFromStream( const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream >& xInput, + const css::uno::Reference< + css::uno::XComponentContext >& xContext ); + bool xpdf_ImportFromStream( const css::uno::Reference< + css::io::XInputStream >& xInput, const ContentSinkSharedPtr& rSink, - const com::sun::star::uno::Reference< - com::sun::star::task::XInteractionHandler >& xIHdl, + const css::uno::Reference< + css::task::XInteractionHandler >& xIHdl, const OUString& rPwd, - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& xContext ); + const css::uno::Reference< + css::uno::XComponentContext >& xContext ); } #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_INC_WRAPPER_HXX diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx index 7276d08e705e..a88f3df44f47 100644 --- a/sdext/source/pdfimport/pdfiadaptor.hxx +++ b/sdext/source/pdfimport/pdfiadaptor.hxx @@ -40,35 +40,35 @@ namespace pdfi { typedef ::cppu::WeakComponentImplHelper2< - com::sun::star::document::XFilter, - com::sun::star::document::XImporter > PDFIHybridAdaptorBase; + css::document::XFilter, + css::document::XImporter > PDFIHybridAdaptorBase; class PDFIHybridAdaptor : private cppu::BaseMutex, public PDFIHybridAdaptorBase { private: - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< - com::sun::star::frame::XModel > m_xModel; + css::uno::Reference< + css::uno::XComponentContext > m_xContext; + css::uno::Reference< + css::frame::XModel > m_xModel; public: - explicit PDFIHybridAdaptor( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext ); + explicit PDFIHybridAdaptor( const css::uno::Reference< + css::uno::XComponentContext >& xContext ); // XFilter - virtual sal_Bool SAL_CALL filter( const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rFilterData ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL filter( const css::uno::Sequence<css::beans::PropertyValue>& rFilterData ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL cancel() throw(std::exception) SAL_OVERRIDE; // XImporter - virtual void SAL_CALL setTargetDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDocument ) - throw( com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDocument ) + throw( css::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; }; typedef ::cppu::WeakComponentImplHelper2< - com::sun::star::xml::XImportFilter, - com::sun::star::document::XImporter > PDFIAdaptorBase; + css::xml::XImportFilter, + css::document::XImporter > PDFIAdaptorBase; /** Adapts raw pdf import to XImportFilter interface */ @@ -76,23 +76,23 @@ namespace pdfi public PDFIAdaptorBase { private: - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< - com::sun::star::frame::XModel > m_xModel; + css::uno::Reference< + css::uno::XComponentContext > m_xContext; + css::uno::Reference< + css::frame::XModel > m_xModel; TreeVisitorFactorySharedPtr m_pVisitorFactory; bool m_bEnableToplevelText; - bool parse( const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInput, - const com::sun::star::uno::Reference<com::sun::star::task::XInteractionHandler>& xIHdl, + bool parse( const css::uno::Reference<css::io::XInputStream>& xInput, + const css::uno::Reference<css::task::XInteractionHandler>& xIHdl, const OUString& rPwd, - const com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator>& xStatus, + const css::uno::Reference<css::task::XStatusIndicator>& xStatus, const XmlEmitterSharedPtr& rEmitter, const OUString& rURL ); public: - explicit PDFIRawAdaptor( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext ); + explicit PDFIRawAdaptor( const css::uno::Reference< + css::uno::XComponentContext >& xContext ); /** Set factory object used to create the tree visitors @@ -113,17 +113,17 @@ namespace pdfi Optional status indicator */ bool odfConvert( const OUString& rURL, - const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>& xOutput, - const com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator>& xStatus ); + const css::uno::Reference<css::io::XOutputStream>& xOutput, + const css::uno::Reference<css::task::XStatusIndicator>& xStatus ); // XImportFilter - virtual sal_Bool SAL_CALL importer( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rSourceData, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& rHdl, - const com::sun::star::uno::Sequence< OUString >& rUserData ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL importer( const css::uno::Sequence< css::beans::PropertyValue >& rSourceData, + const css::uno::Reference< css::xml::sax::XDocumentHandler >& rHdl, + const css::uno::Sequence< OUString >& rUserData ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XImporter - virtual void SAL_CALL setTargetDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDocument ) - throw( com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDocument ) + throw( css::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; }; } diff --git a/sdext/source/pdfimport/sax/emitcontext.hxx b/sdext/source/pdfimport/sax/emitcontext.hxx index 677952c47290..a93d904c467a 100644 --- a/sdext/source/pdfimport/sax/emitcontext.hxx +++ b/sdext/source/pdfimport/sax/emitcontext.hxx @@ -32,12 +32,12 @@ namespace pdfi class SaxEmitter : public XmlEmitter { private: - com::sun::star::uno::Reference< - com::sun::star::xml::sax::XDocumentHandler > m_xDocHdl; + css::uno::Reference< + css::xml::sax::XDocumentHandler > m_xDocHdl; public: - explicit SaxEmitter( const com::sun::star::uno::Reference< - com::sun::star::xml::sax::XDocumentHandler >& xDocHdl ); + explicit SaxEmitter( const css::uno::Reference< + css::xml::sax::XDocumentHandler >& xDocHdl ); virtual ~SaxEmitter(); virtual void beginTag( const char* pTag, const PropertyMap& rProperties ) SAL_OVERRIDE; diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx index 8b8494463fa7..eee4d95543cd 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.hxx +++ b/sdext/source/pdfimport/sax/saxattrlist.hxx @@ -31,8 +31,8 @@ namespace pdfi { class SaxAttrList : public ::cppu::WeakImplHelper2< - com::sun::star::xml::sax::XAttributeList, - com::sun::star::util::XCloneable + css::xml::sax::XAttributeList, + css::util::XCloneable > { struct AttrEntry @@ -52,7 +52,7 @@ namespace pdfi SaxAttrList( const SaxAttrList& ); virtual ~SaxAttrList(); - // ::com::sun::star::xml::sax::XAttributeList + // css::xml::sax::XAttributeList virtual sal_Int16 SAL_CALL getLength() throw(std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw(std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw(std::exception) SAL_OVERRIDE; @@ -60,8 +60,8 @@ namespace pdfi virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw(std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getValueByName(const OUString& aName) throw(std::exception) SAL_OVERRIDE; - // ::com::sun::star::util::XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw(std::exception) SAL_OVERRIDE; + // css::util::XCloneable + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw(std::exception) SAL_OVERRIDE; }; } diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx index 1857c20e3e0b..2f4ccd1e1920 100644 --- a/sdext/source/pdfimport/test/outputwrap.hxx +++ b/sdext/source/pdfimport/test/outputwrap.hxx @@ -30,7 +30,7 @@ namespace pdfi { typedef ::cppu::WeakComponentImplHelper1< - com::sun::star::io::XOutputStream > OutputWrapBase; + css::io::XOutputStream > OutputWrapBase; class OutputWrap : private cppu::BaseMutex, public OutputWrapBase { @@ -43,18 +43,18 @@ typedef ::cppu::WeakComponentImplHelper1< maFile.open(osl_File_OpenFlag_Create|osl_File_OpenFlag_Write); } - virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (com::sun::star::io::NotConnectedException,com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::io::NotConnectedException,css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_uInt64 nBytesWritten(0); maFile.write(aData.getConstArray(),aData.getLength(),nBytesWritten); } - virtual void SAL_CALL flush() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL flush() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { } - virtual void SAL_CALL closeOutput() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL closeOutput() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { maFile.close(); } diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.hxx b/sdext/source/pdfimport/tree/drawtreevisiting.hxx index 2bd8a5aaeafc..78e146f6ed94 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.hxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.hxx @@ -38,8 +38,8 @@ namespace pdfi void optimizeTextElements(Element& rParent); public: - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > mxBreakIter; - const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& GetBreakIterator(); + css::uno::Reference< css::i18n::XBreakIterator > mxBreakIter; + const css::uno::Reference< css::i18n::XBreakIterator >& GetBreakIterator(); explicit DrawXmlOptimizer(PDFIProcessor& rProcessor) : m_rProcessor(rProcessor) {} @@ -80,10 +80,10 @@ namespace pdfi class DrawXmlEmitter : public ElementTreeVisitor { private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > mxBreakIter; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification > mxCharClass; + css::uno::Reference< css::lang::XMultiServiceFactory > xFactory; + css::uno::Reference< css::uno::XComponentContext > xCtx; + css::uno::Reference< css::i18n::XBreakIterator > mxBreakIter; + css::uno::Reference< css::i18n::XCharacterClassification > mxCharClass; PDFIProcessor& m_rProcessor; @@ -98,7 +98,7 @@ namespace pdfi ); public: - const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification >& GetCharacterClassification(); + const css::uno::Reference< css::i18n::XCharacterClassification >& GetCharacterClassification(); enum DocType{ DRAW_DOC, IMPRESS_DOC }; explicit DrawXmlEmitter(EmitContext& rEmitContext, DocType eDocType, PDFIProcessor& rProc ) : m_rProcessor( rProc ), diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx index 1aedb15eb9dc..ae8e5f16e8d4 100644 --- a/sdext/source/pdfimport/tree/genericelements.hxx +++ b/sdext/source/pdfimport/tree/genericelements.hxx @@ -48,9 +48,9 @@ namespace pdfi StyleContainer& _rStyles, ImageContainer& _rImages, PDFIProcessor& _rProcessor, - const com::sun::star::uno::Reference< - com::sun::star::task::XStatusIndicator>& _xStatusIndicator, - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext) + const css::uno::Reference< + css::task::XStatusIndicator>& _xStatusIndicator, + css::uno::Reference< css::uno::XComponentContext > xContext) : rEmitter(_rEmitter), rStyles(_rStyles), @@ -64,10 +64,10 @@ namespace pdfi StyleContainer& rStyles; ImageContainer& rImages; PDFIProcessor& rProcessor; - com::sun::star::uno::Reference< - com::sun::star::task::XStatusIndicator> xStatusIndicator; - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< + css::task::XStatusIndicator> xStatusIndicator; + css::uno::Reference< + css::uno::XComponentContext > m_xContext; }; struct Element : public ElementTreeVisitable diff --git a/sdext/source/pdfimport/tree/imagecontainer.hxx b/sdext/source/pdfimport/tree/imagecontainer.hxx index 45bd553d7f22..5cee8931e27e 100644 --- a/sdext/source/pdfimport/tree/imagecontainer.hxx +++ b/sdext/source/pdfimport/tree/imagecontainer.hxx @@ -36,14 +36,14 @@ namespace pdfi class ImageContainer { private: - std::vector< ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue> > m_aImages; + std::vector< css::uno::Sequence< + css::beans::PropertyValue> > m_aImages; public: ImageContainer(); - ImageId addImage( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& xBitmap ); + ImageId addImage( const css::uno::Sequence< + css::beans::PropertyValue>& xBitmap ); void writeBase64EncodedStream( ImageId nImageId, EmitContext& rContext ); }; } diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx index 81ef37b766e5..6125d1946bb7 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx @@ -64,14 +64,14 @@ namespace pdfi class PDFIProcessor : public ContentSink { public: - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< + css::uno::XComponentContext > m_xContext; basegfx::B2DHomMatrix prevTextMatrix; double prevCharWidth; enum DocumentTextDirecion { LrTb, RlTb, TbLr }; - explicit PDFIProcessor( const com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator >& xStat, - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext) ; + explicit PDFIProcessor( const css::uno::Reference< css::task::XStatusIndicator >& xStat, + css::uno::Reference< css::uno::XComponentContext > xContext) ; /// TEMP - enable writer-like text:p on doc level void enableToplevelText(); @@ -87,9 +87,9 @@ namespace pdfi ImageContainer& getImages() { return m_aImages; } boost::shared_ptr<ElementFactory> getElementFactory() const { return m_pElFactory; } - const com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator >& getStatusIndicator() const + const css::uno::Reference< css::task::XStatusIndicator >& getStatusIndicator() const { return m_xStatusIndicator; } - void setStatusIndicator( const com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator >& xStatus ) + void setStatusIndicator( const css::uno::Reference< css::task::XStatusIndicator >& xStatus ) { m_xStatusIndicator = xStatus; } const FontAttributes& getFont( sal_Int32 nFontId ) const; @@ -105,67 +105,67 @@ namespace pdfi // ContentSink interface implementation virtual void setPageNum( sal_Int32 nNumPages ) SAL_OVERRIDE; - virtual void startPage( const ::com::sun::star::geometry::RealSize2D& rSize ) SAL_OVERRIDE; + virtual void startPage( const css::geometry::RealSize2D& rSize ) SAL_OVERRIDE; virtual void endPage() SAL_OVERRIDE; - virtual void hyperLink( const ::com::sun::star::geometry::RealRectangle2D& rBounds, + virtual void hyperLink( const css::geometry::RealRectangle2D& rBounds, const OUString& rURI ) SAL_OVERRIDE; virtual void pushState() SAL_OVERRIDE; virtual void popState() SAL_OVERRIDE; virtual void setFlatness( double ) SAL_OVERRIDE; - virtual void setTransformation( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix ) SAL_OVERRIDE; - virtual void setLineDash( const ::com::sun::star::uno::Sequence<double>& dashes, + virtual void setTransformation( const css::geometry::AffineMatrix2D& rMatrix ) SAL_OVERRIDE; + virtual void setLineDash( const css::uno::Sequence<double>& dashes, double start ) SAL_OVERRIDE; virtual void setLineJoin(sal_Int8) SAL_OVERRIDE; virtual void setLineCap(sal_Int8) SAL_OVERRIDE; virtual void setMiterLimit(double) SAL_OVERRIDE; virtual void setLineWidth(double) SAL_OVERRIDE; - virtual void setFillColor( const ::com::sun::star::rendering::ARGBColor& rColor ) SAL_OVERRIDE; - virtual void setStrokeColor( const ::com::sun::star::rendering::ARGBColor& rColor ) SAL_OVERRIDE; + virtual void setFillColor( const css::rendering::ARGBColor& rColor ) SAL_OVERRIDE; + virtual void setStrokeColor( const css::rendering::ARGBColor& rColor ) SAL_OVERRIDE; virtual void setBlendMode(sal_Int8) SAL_OVERRIDE; virtual void setFont( const FontAttributes& rFont ) SAL_OVERRIDE; virtual void setTextRenderMode( sal_Int32 ) SAL_OVERRIDE; - virtual void strokePath( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE; - virtual void fillPath( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE; - virtual void eoFillPath( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE; + virtual void strokePath( const css::uno::Reference< + css::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE; + virtual void fillPath( const css::uno::Reference< + css::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE; + virtual void eoFillPath( const css::uno::Reference< + css::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE; - virtual void intersectClip(const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D >& rPath) SAL_OVERRIDE; - virtual void intersectEoClip(const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D >& rPath) SAL_OVERRIDE; + virtual void intersectClip(const css::uno::Reference< + css::rendering::XPolyPolygon2D >& rPath) SAL_OVERRIDE; + virtual void intersectEoClip(const css::uno::Reference< + css::rendering::XPolyPolygon2D >& rPath) SAL_OVERRIDE; virtual void drawGlyphs( const OUString& rGlyphs, - const ::com::sun::star::geometry::RealRectangle2D& rRect, - const ::com::sun::star::geometry::Matrix2D& rFontMatrix ) SAL_OVERRIDE; + const css::geometry::RealRectangle2D& rRect, + const css::geometry::Matrix2D& rFontMatrix ) SAL_OVERRIDE; virtual void endText() SAL_OVERRIDE; - virtual void drawMask(const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& xBitmap, + virtual void drawMask(const css::uno::Sequence< + css::beans::PropertyValue>& xBitmap, bool bInvert ) SAL_OVERRIDE; /// Given image must already be color-mapped and normalized to sRGB. - virtual void drawImage(const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& xBitmap ) SAL_OVERRIDE; + virtual void drawImage(const css::uno::Sequence< + css::beans::PropertyValue>& xBitmap ) SAL_OVERRIDE; /** Given image must already be color-mapped and normalized to sRGB. maskColors must contain two sequences of color components */ - virtual void drawColorMaskedImage(const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& xBitmap, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any>& xMaskColors ) SAL_OVERRIDE; - virtual void drawMaskedImage(const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& xBitmap, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& xMask, + virtual void drawColorMaskedImage(const css::uno::Sequence< + css::beans::PropertyValue>& xBitmap, + const css::uno::Sequence< + css::uno::Any>& xMaskColors ) SAL_OVERRIDE; + virtual void drawMaskedImage(const css::uno::Sequence< + css::beans::PropertyValue>& xBitmap, + const css::uno::Sequence< + css::beans::PropertyValue>& xMask, bool bInvertMask) SAL_OVERRIDE; - virtual void drawAlphaMaskedImage(const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& xImage, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue>& xMask) SAL_OVERRIDE; + virtual void drawAlphaMaskedImage(const css::uno::Sequence< + css::beans::PropertyValue>& xImage, + const css::uno::Sequence< + css::beans::PropertyValue>& xMask) SAL_OVERRIDE; /// nElements == -1 means fill in number of pages void startIndicator( const OUString& rText, sal_Int32 nElements = -1 ); @@ -203,8 +203,8 @@ namespace pdfi sal_Int32 m_nPages; sal_Int32 m_nNextZOrder; - com::sun::star::uno::Reference< - com::sun::star::task::XStatusIndicator > + css::uno::Reference< + css::task::XStatusIndicator > m_xStatusIndicator; bool m_bHaveTextOnDocLevel; |