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 /filter/inc | |
parent | Typo in comment in resmgr.hxx (diff) | |
download | core-1946794ae09ba732022fe6a74ea45e304ab70b84.tar.gz core-1946794ae09ba732022fe6a74ea45e304ab70b84.zip |
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 'filter/inc')
-rw-r--r-- | filter/inc/filter/msfilter/dffpropset.hxx | 2 | ||||
-rw-r--r-- | filter/inc/filter/msfilter/escherex.hxx | 18 | ||||
-rw-r--r-- | filter/inc/filter/msfilter/mstoolbar.hxx | 30 | ||||
-rw-r--r-- | filter/inc/filter/msfilter/util.hxx | 6 |
4 files changed, 28 insertions, 28 deletions
diff --git a/filter/inc/filter/msfilter/dffpropset.hxx b/filter/inc/filter/msfilter/dffpropset.hxx index ae838c3d7ee5..e4e9e90a5a6e 100644 --- a/filter/inc/filter/msfilter/dffpropset.hxx +++ b/filter/inc/filter/msfilter/dffpropset.hxx @@ -58,7 +58,7 @@ class MSFILTER_DLLPUBLIC DffPropSet /** Returns a boolean property by its real identifier. */ bool GetPropertyBool( sal_uInt32 nId, bool bDefault = false ) const; /** Returns a string property. */ - ::rtl::OUString GetPropertyString( sal_uInt32 nId, SvStream& rStrm ) const; + OUString GetPropertyString( sal_uInt32 nId, SvStream& rStrm ) const; sal_Bool SeekToContent( sal_uInt32 nRecType, SvStream& rSt ) const; void InitializePropSet( sal_uInt16 nPropSetType ) const; diff --git a/filter/inc/filter/msfilter/escherex.hxx b/filter/inc/filter/msfilter/escherex.hxx index e09303d490da..b57d269d30b0 100644 --- a/filter/inc/filter/msfilter/escherex.hxx +++ b/filter/inc/filter/msfilter/escherex.hxx @@ -1052,7 +1052,7 @@ public: EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject& rObj, - const rtl::OString& rId, + const OString& rId, const GraphicAttr* pAttr = NULL ); @@ -1077,7 +1077,7 @@ class MSFILTER_DLLPUBLIC EscherGraphicProvider sal_uInt32 mnBlibBufSize; sal_uInt32 mnBlibEntrys; - rtl::OUString maBaseURI; + OUString maBaseURI; protected: @@ -1091,7 +1091,7 @@ public: sal_Bool bWritePictureOffset, sal_uInt32 nResize = 0); sal_uInt32 GetBlibID( SvStream& rPicOutStream, - const rtl::OString& rGraphicId, + const OString& rGraphicId, const Rectangle& rBoundRect, const com::sun::star::awt::Rectangle* pVisArea = NULL, const GraphicAttr* pGrafikAttr = NULL @@ -1102,8 +1102,8 @@ public: sal_Bool GetPrefSize( const sal_uInt32 nBlibId, Size& rSize, MapMode& rMapMode ); - void SetBaseURI( const rtl::OUString& rBaseURI ) { maBaseURI = rBaseURI; }; - const rtl::OUString& GetBaseURI() { return maBaseURI; }; + void SetBaseURI( const OUString& rBaseURI ) { maBaseURI = rBaseURI; }; + const OUString& GetBaseURI() { return maBaseURI; }; EscherGraphicProvider( sal_uInt32 nFlags = _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES ); ~EscherGraphicProvider(); @@ -1186,7 +1186,7 @@ class MSFILTER_DLLPUBLIC EscherPropertyContainer sal_uInt32 nBlibId, sal_Bool bCreateCroppingAttributes ); - sal_Bool ImplCreateEmbeddedBmp( const rtl::OString& rUniqueId ); + sal_Bool ImplCreateEmbeddedBmp( const OString& rUniqueId ); void ImplInit(); public: @@ -1201,7 +1201,7 @@ public: // GraphicObjects are saved to PowerPoint ~EscherPropertyContainer(); - void AddOpt( sal_uInt16 nPropertyID, const rtl::OUString& rString ); + void AddOpt( sal_uInt16 nPropertyID, const OUString& rString ); void AddOpt( sal_uInt16 nPropertyID, @@ -1234,7 +1234,7 @@ public: /** Creates a complex ESCHER_Prop_fillBlip containing the BLIP directly (for Excel charts). */ sal_Bool CreateEmbeddedBitmapProperties( - const ::rtl::OUString& rBitmapUrl, + const OUString& rBitmapUrl, ::com::sun::star::drawing::BitmapMode eBitmapMode ); /** Creates a complex ESCHER_Prop_fillBlip containing a hatch style (for Excel charts). */ @@ -1317,7 +1317,7 @@ public: static MSO_SPT GetCustomShapeType( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, sal_uInt32& nMirrorFlags, - rtl::OUString& rShapeType + OUString& rShapeType ); // helper functions which are also used in ooxml export diff --git a/filter/inc/filter/msfilter/mstoolbar.hxx b/filter/inc/filter/msfilter/mstoolbar.hxx index db479002fa6f..fc80f3115177 100644 --- a/filter/inc/filter/msfilter/mstoolbar.hxx +++ b/filter/inc/filter/msfilter/mstoolbar.hxx @@ -52,8 +52,8 @@ class MSOCommandConvertor { public: virtual ~MSOCommandConvertor() {} - virtual rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd ) = 0; - virtual rtl::OUString MSOTCIDToOOCommand( sal_Int16 msoTCID ) = 0; + virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ) = 0; + virtual OUString MSOTCIDToOOCommand( sal_Int16 msoTCID ) = 0; }; class SfxObjectShell; @@ -62,7 +62,7 @@ class MSFILTER_DLLPUBLIC CustomToolBarImportHelper { struct iconcontrolitem { - rtl::OUString sCommand; + OUString sCommand; css::uno::Reference< css::graphic::XGraphic > image; }; std::vector< iconcontrolitem > iconcommands; @@ -79,14 +79,14 @@ public: css::uno::Reference< css::ui::XUIConfigurationManager > getAppCfgManager(); - css::uno::Any createCommandFromMacro( const rtl::OUString& sCmd ); + css::uno::Any createCommandFromMacro( const OUString& sCmd ); - void addIcon( const css::uno::Reference< css::graphic::XGraphic >& xImage, const rtl::OUString& sString ); + void addIcon( const css::uno::Reference< css::graphic::XGraphic >& xImage, const OUString& sString ); void applyIcons(); - rtl::OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); - rtl::OUString MSOTCIDToOOCommand( sal_Int16 msoTCID ); + OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); + OUString MSOTCIDToOOCommand( sal_Int16 msoTCID ); SfxObjectShell& GetDocShell() { return mrDocSh; } - bool createMenu( const rtl::OUString& rName, const css::uno::Reference< css::container::XIndexAccess >& xMenuDesc, bool bPersist ); + bool createMenu( const OUString& rName, const css::uno::Reference< css::container::XIndexAccess >& xMenuDesc, bool bPersist ); }; class MSFILTER_DLLPUBLIC TBBase @@ -122,13 +122,13 @@ public: class MSFILTER_DLLPUBLIC WString : public TBBase { - rtl::OUString sString; + OUString sString; public: WString(){}; ~WString(){}; bool Read(SvStream &rS); - rtl::OUString getString(){ return sString; } + OUString getString(){ return sString; } }; class MSFILTER_DLLPUBLIC TBCExtraInfo : public TBBase @@ -148,7 +148,7 @@ public: ~TBCExtraInfo(){} bool Read(SvStream &rS); void Print( FILE* ); - rtl::OUString getOnAction(); + OUString getOnAction(); }; class MSFILTER_DLLPUBLIC TBCGeneralInfo : public TBBase @@ -165,9 +165,9 @@ public: bool Read(SvStream &rS); void Print( FILE* ); bool ImportToolBarControlData( CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >& ); - rtl::OUString CustomText() { return customText.getString(); } - rtl::OUString DescriptionText() { return descriptionText.getString(); } - rtl::OUString Tooltip() { return tooltip.getString(); } + OUString CustomText() { return customText.getString(); } + OUString DescriptionText() { return descriptionText.getString(); } + OUString Tooltip() { return tooltip.getString(); } }; class MSFILTER_DLLPUBLIC TBCBitMap : public TBBase @@ -192,7 +192,7 @@ public: ~TBCMenuSpecific(){} bool Read(SvStream &rS); void Print( FILE* ); - rtl::OUString Name(); + OUString Name(); }; class MSFILTER_DLLPUBLIC TBCCDData : public TBBase diff --git a/filter/inc/filter/msfilter/util.hxx b/filter/inc/filter/msfilter/util.hxx index 607566a13b49..110429551bba 100644 --- a/filter/inc/filter/msfilter/util.hxx +++ b/filter/inc/filter/msfilter/util.hxx @@ -57,7 +57,7 @@ MSFILTER_DLLPUBLIC DateTime DTTM2DateTime( long lDTTM ); I guess there must be an implementation of this somewhere in LO, but I failed to find it, unfortunately :-( */ -MSFILTER_DLLPUBLIC rtl::OString DateTimeToOString( const DateTime& rDateTime ); +MSFILTER_DLLPUBLIC OString DateTimeToOString( const DateTime& rDateTime ); /// Given a cBullet in encoding r_ioChrSet and fontname r_ioFontName return a /// suitable new Bullet and change r_ioChrSet and r_ioFontName to form the @@ -68,7 +68,7 @@ MSFILTER_DLLPUBLIC rtl::OString DateTimeToOString( const DateTime& rDateTime ); /// /// Used to map from [Open|Star]Symbol to some Windows font or other. MSFILTER_DLLPUBLIC sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cBullet, - rtl_TextEncoding& r_ioChrSet, rtl::OUString& r_ioFontName, bool bDisableUnicodeSupport = false); + rtl_TextEncoding& r_ioChrSet, OUString& r_ioFontName, bool bDisableUnicodeSupport = false); enum TextCategory @@ -86,7 +86,7 @@ enum TextCategory and indicating its been submitting to the standards working group as a proposed resolution. */ -MSFILTER_DLLPUBLIC TextCategory categorizeCodePoint(sal_uInt32 codePoint, const rtl::OUString &rBcp47LanguageTag); +MSFILTER_DLLPUBLIC TextCategory categorizeCodePoint(sal_uInt32 codePoint, const OUString &rBcp47LanguageTag); } } |