diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /sdext/source/pdfimport/inc | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'sdext/source/pdfimport/inc')
-rw-r--r-- | sdext/source/pdfimport/inc/contentsink.hxx | 8 | ||||
-rw-r--r-- | sdext/source/pdfimport/inc/pdfihelper.hxx | 12 | ||||
-rw-r--r-- | sdext/source/pdfimport/inc/pdfparse.hxx | 26 | ||||
-rw-r--r-- | sdext/source/pdfimport/inc/wrapper.hxx | 6 | ||||
-rw-r--r-- | sdext/source/pdfimport/inc/xmlemitter.hxx | 2 |
5 files changed, 27 insertions, 27 deletions
diff --git a/sdext/source/pdfimport/inc/contentsink.hxx b/sdext/source/pdfimport/inc/contentsink.hxx index bfa1da5059d8..f7cc7d0b7c0b 100644 --- a/sdext/source/pdfimport/inc/contentsink.hxx +++ b/sdext/source/pdfimport/inc/contentsink.hxx @@ -48,7 +48,7 @@ namespace pdfi { struct FontAttributes { - FontAttributes( const rtl::OUString& familyName_, + FontAttributes( const OUString& familyName_, bool isBold_, bool isItalic_, bool isUnderline_, @@ -71,7 +71,7 @@ namespace pdfi size(0.0) {} - ::rtl::OUString familyName; + OUString familyName; bool isBold; bool isItalic; bool isUnderline; @@ -104,7 +104,7 @@ namespace pdfi virtual void endPage() = 0; virtual void hyperLink( const ::com::sun::star::geometry::RealRectangle2D& rBounds, - const ::rtl::OUString& rURI ) = 0; + const OUString& rURI ) = 0; virtual void pushState() = 0; virtual void popState() = 0; @@ -136,7 +136,7 @@ namespace pdfi virtual void intersectEoClip(const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& rPath) = 0; - virtual void drawGlyphs( const rtl::OUString& rGlyphs, + virtual void drawGlyphs( const OUString& rGlyphs, const ::com::sun::star::geometry::RealRectangle2D& rRect, const ::com::sun::star::geometry::Matrix2D& rFontMatrix ) = 0; diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx index 2db7b555b4cd..d233e134cbfb 100644 --- a/sdext/source/pdfimport/inc/pdfihelper.hxx +++ b/sdext/source/pdfimport/inc/pdfihelper.hxx @@ -40,14 +40,14 @@ namespace com { namespace sun { namespace star { namespace task namespace pdfi { - typedef boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > PropertyMap; + typedef boost::unordered_map< OUString, OUString, OUStringHash > PropertyMap; typedef sal_Int32 ImageId; /// What to do with a polygon. values can be ORed together enum PolygonAction { PATH_STROKE=1, PATH_FILL=2, PATH_EOFILL=4 }; - rtl::OUString unitMMString( double fMM ); - rtl::OUString convertPixelToUnitString( double fPix ); + OUString unitMMString( double fMM ); + OUString convertPixelToUnitString( double fPix ); inline double convPx2mm( double fPix ) { @@ -69,7 +69,7 @@ namespace pdfi } /// Convert color to "#FEFEFE" color notation - rtl::OUString getColorString( const ::com::sun::star::rendering::ARGBColor& ); + OUString getColorString( const ::com::sun::star::rendering::ARGBColor& ); struct FontAttrHash { @@ -181,9 +181,9 @@ namespace pdfi */ bool getPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler, - rtl::OUString& rOutPwd, + OUString& rOutPwd, bool bFirstTry, - const rtl::OUString& rDocName + const OUString& rDocName ); void reportUnsupportedEncryptionFormat( diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx index e2051c573cd9..f1073c71b70a 100644 --- a/sdext/source/pdfimport/inc/pdfparse.hxx +++ b/sdext/source/pdfimport/inc/pdfparse.hxx @@ -68,9 +68,9 @@ struct PDFEntry struct PDFComment : public PDFEntry { - rtl::OString m_aComment; + OString m_aComment; - PDFComment( const rtl::OString& rComment ) + PDFComment( const OString& rComment ) : PDFEntry(), m_aComment( rComment ) {} virtual ~PDFComment(); virtual bool emit( EmitContext& rWriteContext ) const; @@ -86,28 +86,28 @@ struct PDFValue : public PDFEntry struct PDFName : public PDFValue { - rtl::OString m_aName; + OString m_aName; - PDFName( const rtl::OString& rName ) + PDFName( const OString& rName ) : PDFValue(), m_aName( rName ) {} virtual ~PDFName(); virtual bool emit( EmitContext& rWriteContext ) const; virtual PDFEntry* clone() const; - rtl::OUString getFilteredName() const; + OUString getFilteredName() const; }; struct PDFString : public PDFValue { - rtl::OString m_aString; + OString m_aString; - PDFString( const rtl::OString& rString ) + PDFString( const OString& rString ) : PDFValue(), m_aString( rString ) {} virtual ~PDFString(); virtual bool emit( EmitContext& rWriteContext ) const; virtual PDFEntry* clone() const; - rtl::OString getFilteredString() const; + OString getFilteredString() const; }; struct PDFNumber : public PDFValue @@ -180,7 +180,7 @@ struct PDFArray : public PDFContainer struct PDFDict : public PDFContainer { - typedef boost::unordered_map<rtl::OString,PDFEntry*,rtl::OStringHash> Map; + typedef boost::unordered_map<OString,PDFEntry*,OStringHash> Map; Map m_aMap; PDFDict() {} @@ -190,9 +190,9 @@ struct PDFDict : public PDFContainer // inserting a value of NULL will remove rName and the previous value // from the dictionary - void insertValue( const rtl::OString& rName, PDFEntry* pValue ); + void insertValue( const OString& rName, PDFEntry* pValue ); // removes a name/value pair from the dict - void eraseValue( const rtl::OString& rName ); + void eraseValue( const OString& rName ); // builds new map as of sub elements // returns NULL if successful, else the first offending element PDFEntry* buildMap(); @@ -250,13 +250,13 @@ struct PDFFile : public PDFContainer // this method checks whether rPwd is compatible with // either user or owner password and sets up decrypt data in that case // returns true if decryption can be done - bool setupDecryptionData( const rtl::OString& rPwd ) const; + bool setupDecryptionData( const OString& rPwd ) const; bool decrypt( const sal_uInt8* pInBuffer, sal_uInt32 nLen, sal_uInt8* pOutBuffer, unsigned int nObject, unsigned int nGeneration ) const; - rtl::OUString getDecryptionKey() const; + OUString getDecryptionKey() const; }; struct PDFObject : public PDFContainer diff --git a/sdext/source/pdfimport/inc/wrapper.hxx b/sdext/source/pdfimport/inc/wrapper.hxx index 72c8fed8a7d2..1b9c5c3f3e81 100644 --- a/sdext/source/pdfimport/inc/wrapper.hxx +++ b/sdext/source/pdfimport/inc/wrapper.hxx @@ -35,11 +35,11 @@ namespace com { namespace sun { namespace star { namespace pdfi { - bool xpdf_ImportFromFile( const rtl::OUString& rURL, + bool xpdf_ImportFromFile( const OUString& rURL, const ContentSinkSharedPtr& rSink, const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xIHdl, - const rtl::OUString& rPwd, + const OUString& rPwd, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); bool xpdf_ImportFromStream( const com::sun::star::uno::Reference< @@ -47,7 +47,7 @@ namespace pdfi const ContentSinkSharedPtr& rSink, const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xIHdl, - const rtl::OUString& rPwd, + const OUString& rPwd, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); } diff --git a/sdext/source/pdfimport/inc/xmlemitter.hxx b/sdext/source/pdfimport/inc/xmlemitter.hxx index 6beb96c1f990..800196794912 100644 --- a/sdext/source/pdfimport/inc/xmlemitter.hxx +++ b/sdext/source/pdfimport/inc/xmlemitter.hxx @@ -39,7 +39,7 @@ namespace pdfi virtual void beginTag( const char* pTag, const PropertyMap& rProperties ) = 0; /** Write PCTEXT as-is to output */ - virtual void write( const rtl::OUString& rString ) = 0; + virtual void write( const OUString& rString ) = 0; /** Close previously opened tag */ virtual void endTag( const char* pTag ) = 0; |