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 | |
| 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 'filter')
112 files changed, 989 insertions, 1010 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); } } diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx index 076c4dc08d5a..d69cf3011071 100644 --- a/filter/qa/cppunit/filters-pict-test.cxx +++ b/filter/qa/cppunit/filters-pict-test.cxx @@ -34,8 +34,8 @@ class PictFilterTest public: PictFilterTest() : BootstrapFixture(true, false) {} - virtual bool load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, + virtual bool load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int); /** @@ -48,8 +48,8 @@ public: CPPUNIT_TEST_SUITE_END(); }; -bool PictFilterTest::load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, +bool PictFilterTest::load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int) { SvFileStream aFileStream(rURL, STREAM_READ); @@ -59,9 +59,9 @@ bool PictFilterTest::load(const rtl::OUString &, void PictFilterTest::testCVEs() { - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/filter/qa/cppunit/data/pict/"), - rtl::OUString()); + OUString()); } CPPUNIT_TEST_SUITE_REGISTRATION(PictFilterTest); diff --git a/filter/qa/cppunit/filters-tga-test.cxx b/filter/qa/cppunit/filters-tga-test.cxx index 3551ec6e86c5..cc831b1f003b 100644 --- a/filter/qa/cppunit/filters-tga-test.cxx +++ b/filter/qa/cppunit/filters-tga-test.cxx @@ -54,8 +54,8 @@ class TgaFilterTest public: TgaFilterTest() : BootstrapFixture(true, false) {} - virtual bool load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, + virtual bool load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int); /** @@ -68,8 +68,8 @@ public: CPPUNIT_TEST_SUITE_END(); }; -bool TgaFilterTest::load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, +bool TgaFilterTest::load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int) { SvFileStream aFileStream(rURL, STREAM_READ); @@ -79,9 +79,9 @@ bool TgaFilterTest::load(const rtl::OUString &, void TgaFilterTest::testCVEs() { - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/filter/qa/cppunit/data/tga/"), - rtl::OUString()); + OUString()); } CPPUNIT_TEST_SUITE_REGISTRATION(TgaFilterTest); diff --git a/filter/qa/cppunit/filters-tiff-test.cxx b/filter/qa/cppunit/filters-tiff-test.cxx index aac646f39dff..542522b97a5c 100644 --- a/filter/qa/cppunit/filters-tiff-test.cxx +++ b/filter/qa/cppunit/filters-tiff-test.cxx @@ -54,8 +54,8 @@ class TiffFilterTest public: TiffFilterTest() : BootstrapFixture(true, false) {} - virtual bool load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, + virtual bool load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int); /** @@ -68,8 +68,8 @@ public: CPPUNIT_TEST_SUITE_END(); }; -bool TiffFilterTest::load(const rtl::OUString &, - const rtl::OUString &rURL, const rtl::OUString &, +bool TiffFilterTest::load(const OUString &, + const OUString &rURL, const OUString &, unsigned int, unsigned int, unsigned int) { SvFileStream aFileStream(rURL, STREAM_READ); @@ -79,9 +79,9 @@ bool TiffFilterTest::load(const rtl::OUString &, void TiffFilterTest::testCVEs() { - testDir(rtl::OUString(), + testDir(OUString(), getURLFromSrc("/filter/qa/cppunit/data/tiff/"), - rtl::OUString()); + OUString()); } CPPUNIT_TEST_SUITE_REGISTRATION(TiffFilterTest); diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index 92491f883ef9..ebbb7f2b38d8 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -67,8 +67,8 @@ BaseContainer::~BaseContainer() void BaseContainer::init(const css::uno::Reference< css::uno::XComponentContext >& rxContext , - const ::rtl::OUString& sImplementationName, - const css::uno::Sequence< ::rtl::OUString >& lServiceNames , + const OUString& sImplementationName, + const css::uno::Sequence< OUString >& lServiceNames , FilterCache::EItemType eType ) { // SAFE -> @@ -152,7 +152,7 @@ FilterCache* BaseContainer::impl_getWorkingCache() const -::rtl::OUString SAL_CALL BaseContainer::getImplementationName() +OUString SAL_CALL BaseContainer::getImplementationName() throw (css::uno::RuntimeException) { // SAFE -> @@ -163,14 +163,14 @@ FilterCache* BaseContainer::impl_getWorkingCache() const -sal_Bool SAL_CALL BaseContainer::supportsService(const ::rtl::OUString& sServiceName) +sal_Bool SAL_CALL BaseContainer::supportsService(const OUString& sServiceName) throw (css::uno::RuntimeException) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); sal_Int32 c = m_lServiceNames.getLength(); - const ::rtl::OUString* pNames = m_lServiceNames.getConstArray(); + const OUString* pNames = m_lServiceNames.getConstArray(); for (sal_Int32 i=0; i<c; ++i) { if (pNames[i].equals(sServiceName)) @@ -182,7 +182,7 @@ sal_Bool SAL_CALL BaseContainer::supportsService(const ::rtl::OUString& sService -css::uno::Sequence< ::rtl::OUString > SAL_CALL BaseContainer::getSupportedServiceNames() +css::uno::Sequence< OUString > SAL_CALL BaseContainer::getSupportedServiceNames() throw (css::uno::RuntimeException) { // SAFE -> @@ -193,7 +193,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL BaseContainer::getSupportedServic -void SAL_CALL BaseContainer::insertByName(const ::rtl::OUString& sItem , +void SAL_CALL BaseContainer::insertByName(const OUString& sItem , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , css::container::ElementExistException, @@ -225,7 +225,7 @@ void SAL_CALL BaseContainer::insertByName(const ::rtl::OUString& sItem , FilterCache* pCache = impl_getWorkingCache(); if (pCache->hasItem(m_eType, sItem)) - throw css::container::ElementExistException(::rtl::OUString(), static_cast< css::container::XNameContainer* >(this)); + throw css::container::ElementExistException(OUString(), static_cast< css::container::XNameContainer* >(this)); pCache->setItem(m_eType, sItem, aItem); aLock.clear(); @@ -234,7 +234,7 @@ void SAL_CALL BaseContainer::insertByName(const ::rtl::OUString& sItem , -void SAL_CALL BaseContainer::removeByName(const ::rtl::OUString& sItem) +void SAL_CALL BaseContainer::removeByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , css::uno::RuntimeException ) @@ -256,7 +256,7 @@ void SAL_CALL BaseContainer::removeByName(const ::rtl::OUString& sItem) -void SAL_CALL BaseContainer::replaceByName(const ::rtl::OUString& sItem , +void SAL_CALL BaseContainer::replaceByName(const OUString& sItem , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -288,7 +288,7 @@ void SAL_CALL BaseContainer::replaceByName(const ::rtl::OUString& sItem , FilterCache* pCache = impl_getWorkingCache(); if (!pCache->hasItem(m_eType, sItem)) - throw css::container::NoSuchElementException(::rtl::OUString(), static_cast< css::container::XNameContainer* >(this)); + throw css::container::NoSuchElementException(OUString(), static_cast< css::container::XNameContainer* >(this)); pCache->setItem(m_eType, sItem, aItem); aLock.clear(); @@ -297,7 +297,7 @@ void SAL_CALL BaseContainer::replaceByName(const ::rtl::OUString& sItem , -css::uno::Any SAL_CALL BaseContainer::getByName(const ::rtl::OUString& sItem) +css::uno::Any SAL_CALL BaseContainer::getByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , css::uno::RuntimeException ) @@ -338,10 +338,10 @@ css::uno::Any SAL_CALL BaseContainer::getByName(const ::rtl::OUString& sItem) -css::uno::Sequence< ::rtl::OUString > SAL_CALL BaseContainer::getElementNames() +css::uno::Sequence< OUString > SAL_CALL BaseContainer::getElementNames() throw (css::uno::RuntimeException) { - css::uno::Sequence< ::rtl::OUString > lNames; + css::uno::Sequence< OUString > lNames; impl_loadOnDemand(); @@ -367,7 +367,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL BaseContainer::getElementNames() -sal_Bool SAL_CALL BaseContainer::hasByName(const ::rtl::OUString& sItem) +sal_Bool SAL_CALL BaseContainer::hasByName(const OUString& sItem) throw (css::uno::RuntimeException) { sal_Bool bHasOne = sal_False; @@ -433,12 +433,12 @@ sal_Bool SAL_CALL BaseContainer::hasElements() -css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByQuery(const ::rtl::OUString& /* sQuery */ ) +css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByQuery(const OUString& /* sQuery */ ) throw (css::uno::RuntimeException) { OSL_FAIL("not pure virtual ... but not realy implemented .-)"); - ::comphelper::OEnumerationByName* pEnum = new ::comphelper::OEnumerationByName(this, css::uno::Sequence< ::rtl::OUString >()); + ::comphelper::OEnumerationByName* pEnum = new ::comphelper::OEnumerationByName(this, css::uno::Sequence< OUString >()); return css::uno::Reference< css::container::XEnumeration >(static_cast< css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY); } @@ -485,7 +485,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::crea Further its easiear to work directly with the return value instaed of checking of NULL returns! */ - css::uno::Sequence< ::rtl::OUString > lSubSet; + css::uno::Sequence< OUString > lSubSet; lKeys >> lSubSet; ::comphelper::OEnumerationByName* pEnum = new ::comphelper::OEnumerationByName(this, lSubSet); return css::uno::Reference< css::container::XEnumeration >(static_cast< css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY); diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index 61fb4e90c861..a2259a5df1d7 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -69,11 +69,11 @@ class BaseContainer : public BaseLock /** @short the implementation name of our derived class, which we provide at the interface XServiceInfo of our class ... */ - ::rtl::OUString m_sImplementationName; + OUString m_sImplementationName; /** @short the list of supported uno service names of our derived class, which we provide at the interface XServiceInfo of our class ... */ - css::uno::Sequence< ::rtl::OUString > m_lServiceNames; + css::uno::Sequence< OUString > m_lServiceNames; /** @short reference(!) to a singleton filter cache implementation, which is used to work with the underlying configuration. */ @@ -156,8 +156,8 @@ class BaseContainer : public BaseLock must be wrapped by this container interface. */ virtual void init(const css::uno::Reference< css::uno::XComponentContext >& rxContext , - const ::rtl::OUString& sImplementationName, - const css::uno::Sequence< ::rtl::OUString >& lServiceNames , + const OUString& sImplementationName, + const css::uno::Sequence< OUString >& lServiceNames , FilterCache::EItemType eType ); //------------------------------------------- @@ -214,26 +214,26 @@ class BaseContainer : public BaseLock //--------------------------------------- // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& sServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); //--------------------------------------- // XNameContainer - virtual void SAL_CALL insertByName(const ::rtl::OUString& sItem , + virtual void SAL_CALL insertByName(const OUString& sItem , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , css::container::ElementExistException, css::lang::WrappedTargetException , css::uno::RuntimeException ); - virtual void SAL_CALL removeByName(const ::rtl::OUString& sItem) + virtual void SAL_CALL removeByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , css::uno::RuntimeException ); @@ -241,7 +241,7 @@ class BaseContainer : public BaseLock //--------------------------------------- // XNameReplace - virtual void SAL_CALL replaceByName(const ::rtl::OUString& sItem , + virtual void SAL_CALL replaceByName(const OUString& sItem , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -251,15 +251,15 @@ class BaseContainer : public BaseLock //--------------------------------------- // XElementAccess - virtual css::uno::Any SAL_CALL getByName(const ::rtl::OUString& sItem) + virtual css::uno::Any SAL_CALL getByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& sItem) + virtual sal_Bool SAL_CALL hasByName(const OUString& sItem) throw (css::uno::RuntimeException); virtual css::uno::Type SAL_CALL getElementType() @@ -274,7 +274,7 @@ class BaseContainer : public BaseLock // must be implemented realy by derived class ... // We implement return of an empty result here only! // But we show an assertion :-) - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const ::rtl::OUString& sQuery) + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties) diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx index d33c3fb9e364..8f91437fce30 100644 --- a/filter/source/config/cache/cacheitem.cxx +++ b/filter/source/config/cache/cacheitem.cxx @@ -53,7 +53,7 @@ void CacheItem::update(const CacheItem& rUpdateItem) -void CacheItem::validateUINames(const ::rtl::OUString& sActLocale) +void CacheItem::validateUINames(const OUString& sActLocale) { if (sActLocale.isEmpty()) return; @@ -66,7 +66,7 @@ void CacheItem::validateUINames(const ::rtl::OUString& sActLocale) if (pUINames != end()) lUINames << pUINames->second; - ::rtl::OUString sUIName; + OUString sUIName; if (pUIName != end()) pUIName->second >>= sUIName; @@ -99,7 +99,7 @@ css::uno::Sequence< css::beans::PropertyValue > CacheItem::getAsPackedPropertyVa pProp != end() ; ++pProp ) { - const ::rtl::OUString& rName = pProp->first; + const OUString& rName = pProp->first; const css::uno::Any& rValue = pProp->second; if (!rValue.hasValue()) @@ -151,8 +151,8 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet, //--------------------------------------- case css::uno::TypeClass_STRING : { - ::rtl::OUString v1; - ::rtl::OUString v2; + OUString v1; + OUString v2; if ( (aSubSet >>= v1) && @@ -224,8 +224,8 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet, //--------------------------------------- case css::uno::TypeClass_SEQUENCE : { - css::uno::Sequence< ::rtl::OUString > uno_s1; - css::uno::Sequence< ::rtl::OUString > uno_s2; + css::uno::Sequence< OUString > uno_s1; + css::uno::Sequence< OUString > uno_s2; if ( (aSubSet >>= uno_s1) && diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index d20981ebe71a..8285644df326 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -49,7 +49,7 @@ struct BaseLock }; -typedef ::comphelper::SequenceAsVector< ::rtl::OUString > OUStringList; +typedef ::comphelper::SequenceAsVector< OUString > OUStringList; //_______________________________________________ @@ -148,7 +148,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap Its needed to address the UIName property inside the list of possible ones. */ - void validateUINames(const ::rtl::OUString& sActLocale); + void validateUINames(const OUString& sActLocale); //--------------------------------------- @@ -172,10 +172,10 @@ class CacheItem : public ::comphelper::SequenceAsHashMap /** @short represent an item list of a FilterCache instance. */ -typedef ::boost::unordered_map< ::rtl::OUString , +typedef ::boost::unordered_map< OUString , CacheItem , - ::rtl::OUStringHash , - ::std::equal_to< ::rtl::OUString > > CacheItemList; + OUStringHash , + ::std::equal_to< OUString > > CacheItemList; //_______________________________________________ @@ -191,10 +191,10 @@ typedef ::boost::unordered_map< ::rtl::OUString , there we need key-value pairs too, which cant be provided by a pure vector! */ -typedef ::boost::unordered_map< ::rtl::OUString , +typedef ::boost::unordered_map< OUString , OUStringList , - ::rtl::OUStringHash , - ::std::equal_to< ::rtl::OUString > > CacheItemRegistration; + OUStringHash , + ::std::equal_to< OUString > > CacheItemRegistration; //_______________________________________________ @@ -209,7 +209,7 @@ typedef ::boost::unordered_map< ::rtl::OUString , struct FlatDetectionInfo { // the internal type name - ::rtl::OUString sType; + OUString sType; // this type was found by a matching the URL extension bool bMatchByExtension; diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx index 0455c88259d3..e32704739533 100644 --- a/filter/source/config/cache/cacheupdatelistener.cxx +++ b/filter/source/config/cache/cacheupdatelistener.cxx @@ -104,12 +104,12 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven { const css::util::ElementChange& aChange = aEvent.Changes[i]; - ::rtl::OUString sOrgPath ; - ::rtl::OUString sTempPath; + OUString sOrgPath ; + OUString sTempPath; - ::rtl::OUString sProperty; - ::rtl::OUString sNode ; - ::rtl::OUString sLocale ; + OUString sProperty; + OUString sNode ; + OUString sLocale ; /* at least we must be able to retrieve 2 path elements But sometimes the original path can contain 3 of them ... in case @@ -126,8 +126,8 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven if ( ! ::utl::splitLastFromConfigurationPath(sOrgPath, sTempPath, sProperty)) { sNode = sLocale; - sProperty = ::rtl::OUString(); - sLocale = ::rtl::OUString(); + sProperty = OUString(); + sLocale = OUString(); } else { @@ -136,7 +136,7 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven { sNode = sProperty; sProperty = sLocale; - sLocale = ::rtl::OUString(); + sLocale = OUString(); } } @@ -154,7 +154,7 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven pIt != lChangedItems.end() ; ++pIt ) { - const ::rtl::OUString& sItem = *pIt; + const OUString& sItem = *pIt; try { m_rCache.refreshItem(eType, sItem); diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx index 881d71a99226..4ccdb10c13e6 100644 --- a/filter/source/config/cache/configflush.cxx +++ b/filter/source/config/cache/configflush.cxx @@ -42,7 +42,7 @@ ConfigFlush::~ConfigFlush() } //----------------------------------------------- -::rtl::OUString SAL_CALL ConfigFlush::getImplementationName() +OUString SAL_CALL ConfigFlush::getImplementationName() throw (css::uno::RuntimeException) { return impl_getImplementationName(); @@ -50,12 +50,12 @@ ConfigFlush::~ConfigFlush() } //----------------------------------------------- -sal_Bool SAL_CALL ConfigFlush::supportsService(const ::rtl::OUString& sServiceName) +sal_Bool SAL_CALL ConfigFlush::supportsService(const OUString& sServiceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< ::rtl::OUString > lServiceNames = impl_getSupportedServiceNames(); + css::uno::Sequence< OUString > lServiceNames = impl_getSupportedServiceNames(); sal_Int32 c = lServiceNames.getLength(); - const ::rtl::OUString* pNames = lServiceNames.getConstArray(); + const OUString* pNames = lServiceNames.getConstArray(); for (sal_Int32 i=0; i<c; ++i) { if (pNames[i].equals(sServiceName)) @@ -65,7 +65,7 @@ sal_Bool SAL_CALL ConfigFlush::supportsService(const ::rtl::OUString& sServiceNa } //----------------------------------------------- -css::uno::Sequence< ::rtl::OUString > SAL_CALL ConfigFlush::getSupportedServiceNames() +css::uno::Sequence< OUString > SAL_CALL ConfigFlush::getSupportedServiceNames() throw (css::uno::RuntimeException) { return impl_getSupportedServiceNames(); @@ -125,15 +125,15 @@ void SAL_CALL ConfigFlush::removeRefreshListener(const css::uno::Reference< css: } //----------------------------------------------- -::rtl::OUString ConfigFlush::impl_getImplementationName() +OUString ConfigFlush::impl_getImplementationName() { - return ::rtl::OUString("com.sun.star.comp.filter.config.ConfigFlush"); + return OUString("com.sun.star.comp.filter.config.ConfigFlush"); } //----------------------------------------------- -css::uno::Sequence< ::rtl::OUString > ConfigFlush::impl_getSupportedServiceNames() +css::uno::Sequence< OUString > ConfigFlush::impl_getSupportedServiceNames() { - css::uno::Sequence< ::rtl::OUString > lServiceNames(1); + css::uno::Sequence< OUString > lServiceNames(1); lServiceNames[0] = "com.sun.star.document.FilterConfigRefresh"; return lServiceNames; } diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx index df1c3b12740a..a7381493ba85 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -79,13 +79,13 @@ class ConfigFlush : public BaseLock //--------------------------------------- // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& sServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); //--------------------------------------- @@ -102,8 +102,8 @@ class ConfigFlush : public BaseLock //--------------------------------------- // interface to register/create this instance as an UNO service - static ::rtl::OUString impl_getImplementationName(); - static css::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames(); + static OUString impl_getImplementationName(); + static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); }; diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index 4c7ccfa5e918..a2b251bed7d8 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -49,7 +49,7 @@ ContentHandlerFactory::~ContentHandlerFactory() -css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstance(const ::rtl::OUString& sHandler) +css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstance(const OUString& sHandler) throw(css::uno::Exception , css::uno::RuntimeException) { @@ -58,7 +58,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea -css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstanceWithArguments(const ::rtl::OUString& sHandler , +css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstanceWithArguments(const OUString& sHandler , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException) @@ -68,7 +68,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); - ::rtl::OUString sRealHandler = sHandler; + OUString sRealHandler = sHandler; #ifdef _FILTER_CONFIG_MIGRATION_Q_ @@ -82,7 +82,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea { _FILTER_CONFIG_LOG_("ContentHandlerFactory::createInstanceWithArguments() ... simulate old type search functionality!\n"); - css::uno::Sequence< ::rtl::OUString > lTypes(1); + css::uno::Sequence< OUString > lTypes(1); lTypes[0] = sHandler; css::uno::Sequence< css::beans::NamedValue > lQuery(1); @@ -139,7 +139,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea -css::uno::Sequence< ::rtl::OUString > SAL_CALL ContentHandlerFactory::getAvailableServiceNames() +css::uno::Sequence< OUString > SAL_CALL ContentHandlerFactory::getAvailableServiceNames() throw(css::uno::RuntimeException) { // must be the same list as ((XNameAccess*)this)->getElementNames() return! diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx index 936b9dcb9db8..d2c0f9a2a7f4 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -69,16 +69,16 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContain //--------------------------------------- // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const ::rtl::OUString& sHandler) + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sHandler) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const ::rtl::OUString& sHandler , + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& sHandler , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(css::uno::RuntimeException); //------------------------------------------- @@ -96,7 +96,7 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContain @return The fix uno implementation name of this class. */ - static ::rtl::OUString impl_getImplementationName(); + static OUString impl_getImplementationName(); //--------------------------------------- @@ -108,7 +108,7 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContain @return The fix list of uno services supported by this class. */ - static css::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); //--------------------------------------- diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 9551329ee875..84703a3d92cf 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -339,7 +339,7 @@ OUStringList FilterCache::getItemNames(EItemType eType) const sal_Bool FilterCache::hasItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { // SAFE -> @@ -373,7 +373,7 @@ sal_Bool FilterCache::hasItem( EItemType eType, CacheItem FilterCache::getItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { // SAFE -> @@ -403,7 +403,7 @@ CacheItem FilterCache::getItem( EItemType eType, if (eType == E_FILTER) { CacheItem& rFilter = pIt->second; - ::rtl::OUString sDocService; + OUString sDocService; rFilter[PROPNAME_DOCUMENTSERVICE] >>= sDocService; // In Standalone-Impress the module WriterWeb is not installed @@ -425,7 +425,7 @@ CacheItem FilterCache::getItem( EItemType eType, void FilterCache::removeItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { // SAFE -> @@ -447,7 +447,7 @@ void FilterCache::removeItem( EItemType eType, void FilterCache::setItem( EItemType eType , - const ::rtl::OUString& sItem , + const OUString& sItem , const CacheItem& aValue) throw(css::uno::Exception) { @@ -476,7 +476,7 @@ void FilterCache::setItem( EItemType eType , //----------------------------------------------- void FilterCache::refreshItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { // SAFE -> @@ -487,7 +487,7 @@ void FilterCache::refreshItem( EItemType eType, void FilterCache::addStatePropsToItem( EItemType eType, - const ::rtl::OUString& sItem, + const OUString& sItem, CacheItem& rItem) throw(css::uno::Exception) { @@ -524,7 +524,7 @@ void FilterCache::addStatePropsToItem( EItemType eType, => set it to readonly/required everytimes :-) */ css::uno::Any aDirectValue = impl_getDirectCFGValue(CFGDIRECTKEY_DEFAULTFRAMELOADER); - ::rtl::OUString sDefaultFrameLoader; + OUString sDefaultFrameLoader; if ( (aDirectValue >>= sDefaultFrameLoader) && (!sDefaultFrameLoader.isEmpty() ) && @@ -649,7 +649,7 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN pIt != lItems.end() ; ++pIt ) { - const ::rtl::OUString& sItem = *pIt; + const OUString& sItem = *pIt; EItemFlushState eState = impl_specifyFlushOperation(xSet, rCache, sItem); switch(eState) { @@ -705,7 +705,7 @@ void FilterCache::detectFlatForURL(const css::util::URL& aURL , // Note further: It must be converted to lower case, because the optimize hash // (which maps extensions to types) work with lower case key strings! INetURLObject aParser (aURL.Main); - ::rtl::OUString sExtension = aParser.getExtension(INetURLObject::LAST_SEGMENT , + OUString sExtension = aParser.getExtension(INetURLObject::LAST_SEGMENT , sal_True , INetURLObject::DECODE_WITH_CHARSET); sExtension = sExtension.toAsciiLowerCase(); @@ -807,10 +807,10 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig { ::osl::ResettableMutexGuard aLock(m_aLock); - ::rtl::OUString sPath ; + OUString sPath ; css::uno::Reference< css::uno::XInterface >* pConfig = 0; css::uno::Reference< css::uno::XInterface > xOld ; - ::rtl::OString sRtlLog ; + OString sRtlLog ; switch(eProvider) { @@ -889,10 +889,10 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig -css::uno::Any FilterCache::impl_getDirectCFGValue(const ::rtl::OUString& sDirectKey) +css::uno::Any FilterCache::impl_getDirectCFGValue(const OUString& sDirectKey) { - ::rtl::OUString sRoot; - ::rtl::OUString sKey ; + OUString sRoot; + OUString sKey ; if ( (!::utl::splitLastFromConfigurationPath(sDirectKey, sRoot, sKey)) || @@ -925,7 +925,7 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const ::rtl::OUString& sDirect #endif { #if OSL_DEBUG_LEVEL > 0 - OSL_FAIL(::rtl::OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); + OSL_FAIL(OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); #endif aValue.clear(); } @@ -935,7 +935,7 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const ::rtl::OUString& sDirect -css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess(const ::rtl::OUString& sRoot , +css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess(const OUString& sRoot , sal_Bool bReadOnly , sal_Bool bLocalesMode) { @@ -1043,12 +1043,12 @@ void FilterCache::impl_validateAndOptimize() for (pIt = m_lTypes.begin(); pIt != m_lTypes.end(); ++pIt) { - ::rtl::OUString sType = pIt->first; + OUString sType = pIt->first; CacheItem aType = pIt->second; // create list of all known detect services / frame loader / content handler on demand // Because these information are available as type properties! - ::rtl::OUString sDetectService; + OUString sDetectService; aType[PROPNAME_DETECTSERVICE ] >>= sDetectService; if (!sDetectService.isEmpty()) impl_resolveItem4TypeRegistration(&m_lDetectServices, sDetectService, sType); @@ -1059,8 +1059,8 @@ void FilterCache::impl_validateAndOptimize() // only in case there is no filled set of Extensions AND // no filled set of URLPattern -> we must try to remove this invalid item // from this cache! - css::uno::Sequence< ::rtl::OUString > lExtensions; - css::uno::Sequence< ::rtl::OUString > lURLPattern; + css::uno::Sequence< OUString > lExtensions; + css::uno::Sequence< OUString > lURLPattern; aType[PROPNAME_EXTENSIONS] >>= lExtensions; aType[PROPNAME_URLPATTERN] >>= lURLPattern; sal_Int32 ce = lExtensions.getLength(); @@ -1068,7 +1068,7 @@ void FilterCache::impl_validateAndOptimize() #if OSL_DEBUG_LEVEL > 0 - ::rtl::OUString sInternalTypeNameCheck; + OUString sInternalTypeNameCheck; aType[PROPNAME_NAME] >>= sInternalTypeNameCheck; if (!sInternalTypeNameCheck.equals(sType)) { @@ -1094,12 +1094,12 @@ void FilterCache::impl_validateAndOptimize() sal_Bool bPreferred = sal_False; aType[PROPNAME_PREFERRED] >>= bPreferred; - const ::rtl::OUString* pExtensions = lExtensions.getConstArray(); + const OUString* pExtensions = lExtensions.getConstArray(); for (sal_Int32 e=0; e<ce; ++e) { // Note: We must be sure that address the right hash entry // does not depend from any upper/lower case problems ... - ::rtl::OUString sNormalizedExtension = pExtensions[e].toAsciiLowerCase(); + OUString sNormalizedExtension = pExtensions[e].toAsciiLowerCase(); OUStringList& lTypesForExtension = m_lExtensions2Types[sNormalizedExtension]; if (::std::find(lTypesForExtension.begin(), lTypesForExtension.end(), sType) != lTypesForExtension.end()) @@ -1111,7 +1111,7 @@ void FilterCache::impl_validateAndOptimize() lTypesForExtension.push_back(sType); } - const ::rtl::OUString* pURLPattern = lURLPattern.getConstArray(); + const OUString* pURLPattern = lURLPattern.getConstArray(); for (sal_Int32 u=0; u<cu; ++u) { OUStringList& lTypesForURLPattern = m_lURLPattern2Types[pURLPattern[u]]; @@ -1133,7 +1133,7 @@ void FilterCache::impl_validateAndOptimize() if (!bAllFiltersShouldExist) continue; - ::rtl::OUString sPrefFilter; + OUString sPrefFilter; aType[PROPNAME_PREFERREDFILTER] >>= sPrefFilter; if (sPrefFilter.isEmpty()) { @@ -1180,7 +1180,7 @@ void FilterCache::impl_validateAndOptimize() } CacheItem aPrefFilter = pIt2->second; - ::rtl::OUString sFilterTypeReg; + OUString sFilterTypeReg; aPrefFilter[PROPNAME_TYPE] >>= sFilterTypeReg; if (sFilterTypeReg != sType) { @@ -1198,7 +1198,7 @@ void FilterCache::impl_validateAndOptimize() ++nErrors; } - ::rtl::OUString sInternalFilterNameCheck; + OUString sInternalFilterNameCheck; aPrefFilter[PROPNAME_NAME] >>= sInternalFilterNameCheck; if (!sInternalFilterNameCheck.equals(sPrefFilter)) { @@ -1214,7 +1214,7 @@ void FilterCache::impl_validateAndOptimize() // and all types (and of course if registered filters), which // does not registered for any other loader. css::uno::Any aDirectValue = impl_getDirectCFGValue(CFGDIRECTKEY_DEFAULTFRAMELOADER); - ::rtl::OUString sDefaultFrameLoader; + OUString sDefaultFrameLoader; if ( (!(aDirectValue >>= sDefaultFrameLoader)) || @@ -1238,7 +1238,7 @@ void FilterCache::impl_validateAndOptimize() // Because we replace its registration later completely with all // types, which are not referenced by any other loader. // So we can avaoid our code against the complexity of a diff! - ::rtl::OUString sLoader = pIt->first; + OUString sLoader = pIt->first; if (sLoader.equals(sDefaultFrameLoader)) continue; @@ -1260,14 +1260,14 @@ void FilterCache::impl_validateAndOptimize() rDefaultLoader[PROPNAME_NAME ] <<= sDefaultFrameLoader; rDefaultLoader[PROPNAME_TYPES] <<= lTypes.getAsConstList(); - ::rtl::OUString sLogOut = sLog.makeStringAndClear(); - OSL_ENSURE(!nErrors, ::rtl::OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); + OUString sLogOut = sLog.makeStringAndClear(); + OSL_ENSURE(!nErrors, OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); if (nErrors>0) throw css::document::CorruptedFilterConfigurationException( "filter configuration: " + sLogOut, css::uno::Reference< css::uno::XInterface >(), sLogOut); - OSL_ENSURE(!nWarnings, ::rtl::OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); + OSL_ENSURE(!nWarnings, OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); // <- SAFE } @@ -1275,7 +1275,7 @@ void FilterCache::impl_validateAndOptimize() void FilterCache::impl_addItem2FlushList( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { OUStringList* pList = 0; @@ -1313,7 +1313,7 @@ void FilterCache::impl_addItem2FlushList( EItemType eType, FilterCache::EItemFlushState FilterCache::impl_specifyFlushOperation(const css::uno::Reference< css::container::XNameAccess >& xSet , const CacheItemList& rList, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { sal_Bool bExistsInConfigLayer = xSet->hasByName(sItem); @@ -1337,8 +1337,8 @@ FilterCache::EItemFlushState FilterCache::impl_specifyFlushOperation(const css:: void FilterCache::impl_resolveItem4TypeRegistration( CacheItemList* pList, - const ::rtl::OUString& sItem, - const ::rtl::OUString& sType) + const OUString& sItem, + const OUString& sType) throw(css::uno::Exception) { CacheItem& rItem = (*pList)[sItem]; @@ -1470,7 +1470,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA throw(css::uno::Exception) { // get access to the right configuration set - ::rtl::OUString sSetName; + OUString sSetName; switch(eType) { case E_TYPE : @@ -1492,7 +1492,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA } css::uno::Reference< css::container::XNameAccess > xSet; - css::uno::Sequence< ::rtl::OUString > lItems; + css::uno::Sequence< OUString > lItems; try { @@ -1518,7 +1518,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA // But dont update optimized structures like e.g. hash // for mapping extensions to its types! - const ::rtl::OUString* pItems = lItems.getConstArray(); + const OUString* pItems = lItems.getConstArray(); sal_Int32 c = lItems.getLength(); for (sal_Int32 i=0; i<c; ++i) { @@ -1581,9 +1581,9 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); - ::rtl::OUString sFormatName = m_sFormatName ; - ::rtl::OUString sFormatVersion = m_sFormatVersion; - ::rtl::OUString sActLocale = m_sActLocale ; + OUString sFormatName = m_sFormatName ; + OUString sFormatVersion = m_sFormatVersion; + OUString sActLocale = m_sActLocale ; aLock.clear(); // <- SAFE ---------------------------------- @@ -1592,8 +1592,8 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe if (!(aVal >>= xUIName) && !xUIName.is()) return; - const ::comphelper::SequenceAsVector< ::rtl::OUString > lLocales(xUIName->getElementNames()); - ::comphelper::SequenceAsVector< ::rtl::OUString >::const_iterator pLocale ; + const ::comphelper::SequenceAsVector< OUString > lLocales(xUIName->getElementNames()); + ::comphelper::SequenceAsVector< OUString >::const_iterator pLocale ; ::comphelper::SequenceAsHashMap lUINames; const char FORMATNAME_VAR[] = "%productname%"; @@ -1603,9 +1603,9 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe pLocale != lLocales.end() ; ++pLocale ) { - const ::rtl::OUString& sLocale = *pLocale; + const OUString& sLocale = *pLocale; - ::rtl::OUString sValue; + OUString sValue; xUIName->getByName(sLocale) >>= sValue; // replace %productname% @@ -1637,7 +1637,7 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe #if OSL_DEBUG_LEVEL > 0 if ( sActLocale == "en-US" ) return; - ::rtl::OUString sName = rItem.getUnpackedValueOrDefault(PROPNAME_NAME, ::rtl::OUString()); + OUString sName = rItem.getUnpackedValueOrDefault(PROPNAME_NAME, OUString()); OUString sMsg("Fallback scenario for filter or type '" + sName + "' and locale '" + sActLocale + "' failed. Please check your filter configuration."); @@ -1647,7 +1647,7 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe return; } - const ::rtl::OUString& sLocale = *pLocale; + const OUString& sLocale = *pLocale; ::comphelper::SequenceAsHashMap::const_iterator pUIName = lUINames.find(sLocale); if (pUIName != lUINames.end()) rItem[PROPNAME_UINAME] = pUIName->second; @@ -1684,7 +1684,7 @@ void FilterCache::impl_savePatchUINames(const css::uno::Reference< css::containe -----------------------------------------------*/ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType , - const ::rtl::OUString& sItem , + const OUString& sItem , EReadOption eOption) throw(css::uno::Exception) { @@ -1767,7 +1767,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: // special handling for flags! Convert it from a list of names to its // int representation ... - css::uno::Sequence< ::rtl::OUString > lFlagNames; + css::uno::Sequence< OUString > lFlagNames; if (xItem->getByName(PROPNAME_FLAGS) >>= lFlagNames) aItem[PROPNAME_FLAGS] <<= FilterCache::impl_convertFlagNames2FlagField(lFlagNames); } @@ -1805,12 +1805,12 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { CacheItemList* pList = 0; css::uno::Reference< css::uno::XInterface > xConfig ; - ::rtl::OUString sSet ; + OUString sSet ; switch(eType) { @@ -1986,7 +1986,7 @@ void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XName /*----------------------------------------------- static! => no locks neccessary -----------------------------------------------*/ -css::uno::Sequence< ::rtl::OUString > FilterCache::impl_convertFlagField2FlagNames(sal_Int32 nFlags) +css::uno::Sequence< OUString > FilterCache::impl_convertFlagField2FlagNames(sal_Int32 nFlags) { OUStringList lFlagNames; @@ -2021,11 +2021,11 @@ css::uno::Sequence< ::rtl::OUString > FilterCache::impl_convertFlagField2FlagNam /*----------------------------------------------- static! => no locks neccessary -----------------------------------------------*/ -sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence< ::rtl::OUString >& lNames) +sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence< OUString >& lNames) { sal_Int32 nField = 0; - const ::rtl::OUString* pNames = lNames.getConstArray(); + const OUString* pNames = lNames.getConstArray(); sal_Int32 c = lNames.getLength(); for (sal_Int32 i=0; i<c; ++i) { @@ -2156,7 +2156,7 @@ sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence< -void FilterCache::impl_interpretDataVal4Type(const ::rtl::OUString& sValue, +void FilterCache::impl_interpretDataVal4Type(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ) { @@ -2187,7 +2187,7 @@ void FilterCache::impl_interpretDataVal4Type(const ::rtl::OUString& sValue, -void FilterCache::impl_interpretDataVal4Filter(const ::rtl::OUString& sValue, +void FilterCache::impl_interpretDataVal4Filter(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ) { @@ -2254,27 +2254,27 @@ void FilterCache::impl_readOldFormat() catch(const css::uno::Exception&) { return; } - ::rtl::OUString TYPES_SET("Types"); + OUString TYPES_SET("Types"); // May be there is no type set ... if (xCfg->hasByName(TYPES_SET)) { css::uno::Reference< css::container::XNameAccess > xSet; xCfg->getByName(TYPES_SET) >>= xSet; - const css::uno::Sequence< ::rtl::OUString > lItems = xSet->getElementNames(); - const ::rtl::OUString* pItems = lItems.getConstArray(); + const css::uno::Sequence< OUString > lItems = xSet->getElementNames(); + const OUString* pItems = lItems.getConstArray(); for (sal_Int32 i=0; i<lItems.getLength(); ++i) m_lTypes[pItems[i]] = impl_readOldItem(xSet, E_TYPE, pItems[i]); } - ::rtl::OUString FILTER_SET("Filters"); + OUString FILTER_SET("Filters"); // May be there is no filter set ... if (xCfg->hasByName(FILTER_SET)) { css::uno::Reference< css::container::XNameAccess > xSet; xCfg->getByName(FILTER_SET) >>= xSet; - const css::uno::Sequence< ::rtl::OUString > lItems = xSet->getElementNames(); - const ::rtl::OUString* pItems = lItems.getConstArray(); + const css::uno::Sequence< OUString > lItems = xSet->getElementNames(); + const OUString* pItems = lItems.getConstArray(); for (sal_Int32 i=0; i<lItems.getLength(); ++i) m_lFilters[pItems[i]] = impl_readOldItem(xSet, E_FILTER, pItems[i]); } @@ -2284,7 +2284,7 @@ void FilterCache::impl_readOldFormat() CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { css::uno::Reference< css::container::XNameAccess > xItem; @@ -2302,7 +2302,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe impl_readPatchUINames(xItem, aItem); // Data - ::rtl::OUString sData; + OUString sData; OUStringList lData; xItem->getByName( "Data" ) >>= sData; lData = impl_tokenizeString(sData, (sal_Unicode)','); @@ -2319,7 +2319,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe pProp != lData.end() ; ++pProp ) { - const ::rtl::OUString& sProp = *pProp; + const OUString& sProp = *pProp; switch(eType) { case E_TYPE : @@ -2339,14 +2339,14 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe -OUStringList FilterCache::impl_tokenizeString(const ::rtl::OUString& sData , +OUStringList FilterCache::impl_tokenizeString(const OUString& sData , sal_Unicode cSeperator) { OUStringList lData ; sal_Int32 nToken = 0; do { - ::rtl::OUString sToken = sData.getToken(0, cSeperator, nToken); + OUString sToken = sData.getToken(0, cSeperator, nToken); lData.push_back(sToken); } while(nToken >= 0); @@ -2356,14 +2356,14 @@ OUStringList FilterCache::impl_tokenizeString(const ::rtl::OUString& sData , #if OSL_DEBUG_LEVEL > 0 -::rtl::OUString FilterCache::impl_searchFrameLoaderForType(const ::rtl::OUString& sType) const +OUString FilterCache::impl_searchFrameLoaderForType(const OUString& sType) const { CacheItemList::const_iterator pIt; for ( pIt = m_lFrameLoaders.begin(); pIt != m_lFrameLoaders.end() ; ++pIt ) { - const ::rtl::OUString& sItem = pIt->first; + const OUString& sItem = pIt->first; ::comphelper::SequenceAsHashMap lProps(pIt->second); OUStringList lTypes(lProps[PROPNAME_TYPES]); @@ -2371,19 +2371,19 @@ OUStringList FilterCache::impl_tokenizeString(const ::rtl::OUString& sData , return sItem; } - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString FilterCache::impl_searchContentHandlerForType(const ::rtl::OUString& sType) const +OUString FilterCache::impl_searchContentHandlerForType(const OUString& sType) const { CacheItemList::const_iterator pIt; for ( pIt = m_lContentHandlers.begin(); pIt != m_lContentHandlers.end() ; ++pIt ) { - const ::rtl::OUString& sItem = pIt->first; + const OUString& sItem = pIt->first; ::comphelper::SequenceAsHashMap lProps(pIt->second); OUStringList lTypes(lProps[PROPNAME_TYPES]); @@ -2391,13 +2391,13 @@ OUStringList FilterCache::impl_tokenizeString(const ::rtl::OUString& sData , return sItem; } - return ::rtl::OUString(); + return OUString(); } #endif -sal_Bool FilterCache::impl_isModuleInstalled(const ::rtl::OUString& sModule) +sal_Bool FilterCache::impl_isModuleInstalled(const OUString& sModule) { css::uno::Reference< css::container::XNameAccess > xCfg; diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index 3ea66610c0dc..8a44eea06cce 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -220,15 +220,15 @@ class FilterCache : public BaseLock //--------------------------------------- /** @short contains the current locale of the office and will be used to work with localized configuration values. */ - ::rtl::OUString m_sActLocale; + OUString m_sActLocale; //--------------------------------------- /** TODO */ - ::rtl::OUString m_sFormatName; + OUString m_sFormatName; //--------------------------------------- /** TODO */ - ::rtl::OUString m_sFormatVersion; + OUString m_sFormatVersion; //--------------------------------------- /** @short contains status, which cache items/properties @@ -484,7 +484,7 @@ class FilterCache : public BaseLock any longer, because any operation before damage it. */ virtual sal_Bool hasItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -514,7 +514,7 @@ class FilterCache : public BaseLock any longer, because any operation before damage it. */ virtual CacheItem getItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -522,7 +522,7 @@ class FilterCache : public BaseLock /** TODO document me ... */ virtual void removeItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -530,7 +530,7 @@ class FilterCache : public BaseLock /** TODO document me ... */ virtual void setItem( EItemType eType , - const ::rtl::OUString& sItem , + const OUString& sItem , const CacheItem& aValue) throw(css::uno::Exception); @@ -539,7 +539,7 @@ class FilterCache : public BaseLock /** TODO document me ... */ virtual void refreshItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -580,7 +580,7 @@ class FilterCache : public BaseLock to such items ... */ virtual void addStatePropsToItem( EItemType eType, - const ::rtl::OUString& sItem, + const OUString& sItem, CacheItem& rItem) throw(css::uno::Exception); @@ -703,7 +703,7 @@ class FilterCache : public BaseLock and initialized within the requested modes successfully; a NULL reference otherwise. */ - css::uno::Reference< css::uno::XInterface > impl_createConfigAccess(const ::rtl::OUString& sRoot , + css::uno::Reference< css::uno::XInterface > impl_createConfigAccess(const OUString& sRoot , sal_Bool bReadOnly , sal_Bool bLocalesMode); @@ -728,7 +728,7 @@ class FilterCache : public BaseLock Can be empty if an internal error occurred or if the requested key does not exists! */ - css::uno::Any impl_getDirectCFGValue(const ::rtl::OUString& sDirectKey); + css::uno::Any impl_getDirectCFGValue(const OUString& sDirectKey); //--------------------------------------- @@ -793,8 +793,8 @@ class FilterCache : public BaseLock That does not include double registrations! */ void impl_resolveItem4TypeRegistration( CacheItemList* pList, - const ::rtl::OUString& sItem, - const ::rtl::OUString& sType) + const OUString& sItem, + const OUString& sType) throw(css::uno::Exception); //------------------------------------------- @@ -861,7 +861,7 @@ class FilterCache : public BaseLock */ CacheItem impl_loadItem(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType , - const ::rtl::OUString& sItem , + const OUString& sItem , EReadOption eOption) throw(css::uno::Exception); @@ -893,7 +893,7 @@ class FilterCache : public BaseLock if an unrecoverable error occurs inside this operation. */ CacheItemList::iterator impl_loadItemOnDemand( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -908,7 +908,7 @@ class FilterCache : public BaseLock /** TODO */ void impl_addItem2FlushList( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); @@ -952,7 +952,7 @@ class FilterCache : public BaseLock */ EItemFlushState impl_specifyFlushOperation(const css::uno::Reference< css::container::XNameAccess >& xSet , const CacheItemList& rList, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -980,35 +980,35 @@ class FilterCache : public BaseLock /** TODO */ CacheItem impl_readOldItem(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- /** TODO */ - void impl_interpretDataVal4Type(const ::rtl::OUString& sValue, + void impl_interpretDataVal4Type(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ); //--------------------------------------- /** TODO */ - void impl_interpretDataVal4Filter(const ::rtl::OUString& sValue, + void impl_interpretDataVal4Filter(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ); //--------------------------------------- /** TODO */ - OUStringList impl_tokenizeString(const ::rtl::OUString& sData , + OUStringList impl_tokenizeString(const OUString& sData , sal_Unicode cSeperator); //--------------------------------------- #if OSL_DEBUG_LEVEL > 0 /** TODO */ - ::rtl::OUString impl_searchFrameLoaderForType(const ::rtl::OUString& sType) const; - ::rtl::OUString impl_searchContentHandlerForType(const ::rtl::OUString& sType) const; + OUString impl_searchFrameLoaderForType(const OUString& sType) const; + OUString impl_searchContentHandlerForType(const OUString& sType) const; #endif //--------------------------------------- @@ -1019,7 +1019,7 @@ class FilterCache : public BaseLock @return sal_True if the requested module is installed; sal_False otherwise. */ - sal_Bool impl_isModuleInstalled(const ::rtl::OUString& sModule); + sal_Bool impl_isModuleInstalled(const OUString& sModule); //--------------------------------------- @@ -1031,7 +1031,7 @@ class FilterCache : public BaseLock @return [sal_Int32] the converted flag field. */ - static sal_Int32 impl_convertFlagNames2FlagField(const css::uno::Sequence< ::rtl::OUString >& lNames); + static sal_Int32 impl_convertFlagNames2FlagField(const css::uno::Sequence< OUString >& lNames); //--------------------------------------- @@ -1043,7 +1043,7 @@ class FilterCache : public BaseLock @return [seq< string >] the converted flag name list. */ - static css::uno::Sequence< ::rtl::OUString > impl_convertFlagField2FlagNames(sal_Int32 nFlags); + static css::uno::Sequence< OUString > impl_convertFlagField2FlagNames(sal_Int32 nFlags); }; } // namespace config diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index 9270a166bc2d..ac0d5ad827cc 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -66,7 +66,7 @@ FilterFactory::~FilterFactory() -css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstance(const ::rtl::OUString& sFilter) +css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstance(const OUString& sFilter) throw(css::uno::Exception , css::uno::RuntimeException) { @@ -75,7 +75,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan -css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstanceWithArguments(const ::rtl::OUString& sFilter , +css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstanceWithArguments(const OUString& sFilter , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException) @@ -83,7 +83,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); - ::rtl::OUString sRealFilter = sFilter; + OUString sRealFilter = sFilter; #ifdef _FILTER_CONFIG_MIGRATION_Q_ @@ -122,7 +122,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan // search filter on cache CacheItem aFilter = m_rCache->getItem(FilterCache::E_FILTER, sRealFilter); - ::rtl::OUString sFilterService; + OUString sFilterService; aFilter[PROPNAME_FILTERSERVICE] >>= sFilterService; // create service instance @@ -156,7 +156,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan -css::uno::Sequence< ::rtl::OUString > SAL_CALL FilterFactory::getAvailableServiceNames() +css::uno::Sequence< OUString > SAL_CALL FilterFactory::getAvailableServiceNames() throw(css::uno::RuntimeException) { /* Attention: Instead of getElementNames() this method have to return only filter names, @@ -167,7 +167,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FilterFactory::getAvailableServic */ CacheItem lIProps; CacheItem lEProps; - lEProps[PROPNAME_FILTERSERVICE] <<= ::rtl::OUString(); + lEProps[PROPNAME_FILTERSERVICE] <<= OUString(); OUStringList lUNOFilters; try @@ -184,7 +184,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FilterFactory::getAvailableServic -css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::createSubSetEnumerationByQuery(const ::rtl::OUString& sQuery) +css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::createSubSetEnumerationByQuery(const OUString& sQuery) throw (css::uno::RuntimeException) { // reject old deprecated queries ... @@ -194,7 +194,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea static_cast< css::container::XContainerQuery* >(this)); // convert "_query_xxx:..." to "getByDocService=xxx:..." - ::rtl::OUString sNewQuery(sQuery); + OUString sNewQuery(sQuery); sal_Int32 pos = sNewQuery.indexOf("_query_"); if (pos != -1) { @@ -233,7 +233,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea // pack list of item names as an enum list // Attention: Do not return empty reference for empty list! // The outside check "hasMoreElements()" should be enough, to detect this state :-) - css::uno::Sequence< ::rtl::OUString > lSet = lEnumSet.getAsConstList(); + css::uno::Sequence< OUString > lSet = lEnumSet.getAsConstList(); ::comphelper::OEnumerationByName* pEnum = new ::comphelper::OEnumerationByName(this, lSet); return css::uno::Reference< css::container::XEnumeration >(static_cast< css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY); } @@ -245,7 +245,7 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize // analyze query QueryTokenizer::const_iterator pIt; - ::rtl::OUString sDocumentService; + OUString sDocumentService; sal_Int32 nIFlags = 0; sal_Int32 nEFlags = 0; @@ -258,47 +258,47 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize if ( sDocumentService == "writer" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.text.TextDocument" ); + sDocumentService = OUString( "com.sun.star.text.TextDocument" ); } else if ( sDocumentService == "web" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.text.WebDocument" ); + sDocumentService = OUString( "com.sun.star.text.WebDocument" ); } else if ( sDocumentService == "global" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.text.GlobalDocument" ); + sDocumentService = OUString( "com.sun.star.text.GlobalDocument" ); } else if ( sDocumentService == "calc" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ); + sDocumentService = OUString( "com.sun.star.sheet.SpreadsheetDocument" ); } else if ( sDocumentService == "draw" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.drawing.DrawingDocument" ); + sDocumentService = OUString( "com.sun.star.drawing.DrawingDocument" ); } else if ( sDocumentService == "impress" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.presentation.PresentationDocument" ); + sDocumentService = OUString( "com.sun.star.presentation.PresentationDocument" ); } else if ( sDocumentService == "math" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.formula.FormulaProperties" ); + sDocumentService = OUString( "com.sun.star.formula.FormulaProperties" ); } #endif pIt = lTokens.find(QUERY_PARAM_IFLAGS); if (pIt != lTokens.end()) - nIFlags = ::rtl::OUString(pIt->second).toInt32(); + nIFlags = OUString(pIt->second).toInt32(); pIt = lTokens.find(QUERY_PARAM_EFLAGS); if (pIt != lTokens.end()) - nEFlags = ::rtl::OUString(pIt->second).toInt32(); + nEFlags = OUString(pIt->second).toInt32(); // SAFE -> ---------------------- ::osl::ResettableMutexGuard aLock(m_aLock); @@ -314,14 +314,14 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize { try { - const ::rtl::OUString& sName = *pName; + const OUString& sName = *pName; const CacheItem aFilter = pCache->getItem(FilterCache::E_FILTER, sName); CacheItem::const_iterator pProp ; // "matchByDocumentService=" => any filter will be addressed here // "matchByDocumentService=all" => any filter will be addressed here // "matchByDocumentService=com.sun.star..." => only filter matching this document service will be addressed - ::rtl::OUString sCheckValue = aFilter.getUnpackedValueOrDefault(PROPNAME_DOCUMENTSERVICE, ::rtl::OUString()); + OUString sCheckValue = aFilter.getUnpackedValueOrDefault(PROPNAME_DOCUMENTSERVICE, OUString()); if ( (!sDocumentService.isEmpty() ) && (!sDocumentService.equals(QUERY_CONSTVALUE_ALL)) && @@ -390,7 +390,7 @@ class stlcomp_removeIfMatchFlags , m_bIFlags(bIFlags) {} - bool operator() (const ::rtl::OUString& sFilter) const + bool operator() (const OUString& sFilter) const { try { @@ -421,7 +421,7 @@ OUStringList FilterFactory::impl_getSortedFilterList(const QueryTokenizer& lToke // analyze the given query parameter QueryTokenizer::const_iterator pIt1; - ::rtl::OUString sModule; + OUString sModule; sal_Int32 nIFlags = -1; sal_Int32 nEFlags = -1; @@ -430,10 +430,10 @@ OUStringList FilterFactory::impl_getSortedFilterList(const QueryTokenizer& lToke sModule = pIt1->second; pIt1 = lTokens.find(QUERY_PARAM_IFLAGS); if (pIt1 != lTokens.end()) - nIFlags = ::rtl::OUString(pIt1->second).toInt32(); + nIFlags = OUString(pIt1->second).toInt32(); pIt1 = lTokens.find(QUERY_PARAM_EFLAGS); if (pIt1 != lTokens.end()) - nEFlags = ::rtl::OUString(pIt1->second).toInt32(); + nEFlags = OUString(pIt1->second).toInt32(); // simple search for filters of one specific module. OUStringList lFilterList; @@ -456,7 +456,7 @@ OUStringList FilterFactory::impl_getSortedFilterList(const QueryTokenizer& lToke pIt3 != lFilters4Module.end() ; ++pIt3 ) { - const ::rtl::OUString& sFilter = *pIt3; + const OUString& sFilter = *pIt3; lFilterList.push_back(sFilter); } } @@ -495,7 +495,7 @@ OUStringList FilterFactory::impl_getListOfInstalledModules() const -OUStringList FilterFactory::impl_getSortedFilterListForModule(const ::rtl::OUString& sModule, +OUStringList FilterFactory::impl_getSortedFilterListForModule(const OUString& sModule, sal_Int32 nIFlags, sal_Int32 nEFlags) const { @@ -524,7 +524,7 @@ OUStringList FilterFactory::impl_getSortedFilterListForModule(const ::rtl::OUStr pIt2 != lOtherFilters.end() ; ++pIt2 ) { - const ::rtl::OUString& rFilter = *pIt2; + const OUString& rFilter = *pIt2; pIt3 = ::std::find(lSortedFilters.begin(), lSortedFilters.end(), rFilter); if (pIt3 == lSortedFilters.end()) lMergedFilters.push_back(rFilter); @@ -550,7 +550,7 @@ OUStringList FilterFactory::impl_getSortedFilterListForModule(const ::rtl::OUStr -OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUString& sModule) const +OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const OUString& sModule) const { // SAFE -> ---------------------- ::osl::ResettableMutexGuard aLock(m_aLock); @@ -589,17 +589,17 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS -::rtl::OUString FilterFactory::impl_getImplementationName() +OUString FilterFactory::impl_getImplementationName() { - return ::rtl::OUString( "com.sun.star.comp.filter.config.FilterFactory" ); + return OUString( "com.sun.star.comp.filter.config.FilterFactory" ); } -css::uno::Sequence< ::rtl::OUString > FilterFactory::impl_getSupportedServiceNames() +css::uno::Sequence< OUString > FilterFactory::impl_getSupportedServiceNames() { - css::uno::Sequence< ::rtl::OUString > lServiceNames(1); - lServiceNames[0] = ::rtl::OUString( "com.sun.star.document.FilterFactory" ); + css::uno::Sequence< OUString > lServiceNames(1); + lServiceNames[0] = OUString( "com.sun.star.document.FilterFactory" ); return lServiceNames; } diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx index 02ffc825a3f0..9d4697732ae9 100644 --- a/filter/source/config/cache/filterfactory.hxx +++ b/filter/source/config/cache/filterfactory.hxx @@ -70,22 +70,22 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer //--------------------------------------- // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const ::rtl::OUString& sFilter) + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sFilter) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const ::rtl::OUString& sFilter , + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& sFilter , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(css::uno::RuntimeException); //--------------------------------------- // XContainerQuery - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const ::rtl::OUString& sQuery) + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) throw (css::uno::RuntimeException); //------------------------------------------- @@ -128,7 +128,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer /** TODO document me */ - OUStringList impl_getSortedFilterListForModule(const ::rtl::OUString& sModule, + OUStringList impl_getSortedFilterListForModule(const OUString& sModule, sal_Int32 nIFlags, sal_Int32 nEFlags) const; @@ -143,7 +143,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer @return A string list of internal filter names. Can be empty. */ - OUStringList impl_readSortedFilterListFromConfig(const ::rtl::OUString& sModule) const; + OUStringList impl_readSortedFilterListFromConfig(const OUString& sModule) const; //------------------------------------------- // static uno helper! @@ -160,7 +160,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer @return The fix uno implementation name of this class. */ - static ::rtl::OUString impl_getImplementationName(); + static OUString impl_getImplementationName(); //--------------------------------------- @@ -172,7 +172,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer @return The fix list of uno services supported by this class. */ - static css::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); //--------------------------------------- diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index fa65dcc57b19..7ded4936dc3b 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -48,7 +48,7 @@ FrameLoaderFactory::~FrameLoaderFactory() -css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstance(const ::rtl::OUString& sLoader) +css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstance(const OUString& sLoader) throw(css::uno::Exception , css::uno::RuntimeException) { @@ -57,7 +57,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI -css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstanceWithArguments(const ::rtl::OUString& sLoader , +css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstanceWithArguments(const OUString& sLoader , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException) @@ -65,7 +65,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); - ::rtl::OUString sRealLoader = sLoader; + OUString sRealLoader = sLoader; #ifdef _FILTER_CONFIG_MIGRATION_Q_ @@ -79,7 +79,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI { _FILTER_CONFIG_LOG_("FrameLoaderFactory::createInstanceWithArguments() ... simulate old type search functionality!\n"); - css::uno::Sequence< ::rtl::OUString > lTypes(1); + css::uno::Sequence< OUString > lTypes(1); lTypes[0] = sLoader; css::uno::Sequence< css::beans::NamedValue > lQuery(1); @@ -136,7 +136,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI -css::uno::Sequence< ::rtl::OUString > SAL_CALL FrameLoaderFactory::getAvailableServiceNames() +css::uno::Sequence< OUString > SAL_CALL FrameLoaderFactory::getAvailableServiceNames() throw(css::uno::RuntimeException) { // must be the same list as ((XNameAccess*)this)->getElementNames() return! diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx index 38acef126b62..fb2e32f21214 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -69,16 +69,16 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer //--------------------------------------- // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const ::rtl::OUString& sLoader) + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sLoader) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const ::rtl::OUString& sLoader , + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& sLoader , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(css::uno::RuntimeException); //------------------------------------------- @@ -96,7 +96,7 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer @return The fix uno implementation name of this class. */ - static ::rtl::OUString impl_getImplementationName(); + static OUString impl_getImplementationName(); //--------------------------------------- @@ -108,7 +108,7 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer @return The fix list of uno services supported by this class. */ - static css::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); //--------------------------------------- diff --git a/filter/source/config/cache/querytokenizer.cxx b/filter/source/config/cache/querytokenizer.cxx index a75d1290e873..8a28f1e2cf60 100644 --- a/filter/source/config/cache/querytokenizer.cxx +++ b/filter/source/config/cache/querytokenizer.cxx @@ -27,13 +27,13 @@ namespace filter{ -QueryTokenizer::QueryTokenizer(const ::rtl::OUString& sQuery) +QueryTokenizer::QueryTokenizer(const OUString& sQuery) : m_bValid(sal_True) { sal_Int32 token = 0; while(token != -1) { - ::rtl::OUString sToken = sQuery.getToken(0, ':', token); + OUString sToken = sQuery.getToken(0, ':', token); if (!sToken.isEmpty()) { sal_Int32 equal = sToken.indexOf('='); @@ -42,8 +42,8 @@ QueryTokenizer::QueryTokenizer(const ::rtl::OUString& sQuery) m_bValid = sal_False; OSL_ENSURE(m_bValid, "QueryTokenizer::QueryTokenizer()\nFound non boolean query parameter ... but its key is empty. Will be ignored!\n"); - ::rtl::OUString sKey; - ::rtl::OUString sVal; + OUString sKey; + OUString sVal; sKey = sToken; if (equal > 0) diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index c7e45eb724b9..3b9ab22c4622 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -45,10 +45,10 @@ namespace filter{ @attention This class is not threadsafe implemented. Because its not neccessary. But you have to make shure, that ist not used as such :-) */ -class QueryTokenizer : public ::boost::unordered_map< ::rtl::OUString , - ::rtl::OUString , - ::rtl::OUStringHash , - ::std::equal_to< ::rtl::OUString > > +class QueryTokenizer : public ::boost::unordered_map< OUString , + OUString , + OUStringHash , + ::std::equal_to< OUString > > { //------------------------------------------- // member @@ -78,7 +78,7 @@ class QueryTokenizer : public ::boost::unordered_map< ::rtl::OUString @param sQuery the query string. */ - QueryTokenizer(const ::rtl::OUString& sQuery); + QueryTokenizer(const OUString& sQuery); //--------------------------------------- diff --git a/filter/source/config/cache/registration.cxx b/filter/source/config/cache/registration.cxx index e4a7baea55d2..952f5d746e55 100644 --- a/filter/source/config/cache/registration.cxx +++ b/filter/source/config/cache/registration.cxx @@ -43,7 +43,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xSMGR = reinterpret_cast< com::sun::star::lang::XMultiServiceFactory* >(pServiceManager); com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory; - rtl::OUString sImplName = rtl::OUString::createFromAscii(pImplementationName); + OUString sImplName = OUString::createFromAscii(pImplementationName); if (TypeDetection::impl_getImplementationName() == sImplName) xFactory = cppu::createSingleFactory( xSMGR, diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 3e4c224b2a11..5e3697c0474f 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -64,10 +64,10 @@ TypeDetection::~TypeDetection() -::rtl::OUString SAL_CALL TypeDetection::queryTypeByURL(const ::rtl::OUString& sURL) +OUString SAL_CALL TypeDetection::queryTypeByURL(const OUString& sURL) throw (css::uno::RuntimeException) { - ::rtl::OUString sType; + OUString sType; // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -122,7 +122,7 @@ namespace { * In each category, rank them from strictly-structured to * loosely-structured. */ -int getFlatTypeRank(const rtl::OUString& rType) +int getFlatTypeRank(const OUString& rType) { // List formats from more complex to less complex. // TODO: Add more. @@ -365,7 +365,7 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) } -::rtl::OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, +OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, sal_Bool bAllowDeep ) throw (css::uno::RuntimeException) { @@ -377,7 +377,7 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) //******************************************* // parse given URL to split it into e.g. main and jump marks ... - ::rtl::OUString sURL = stlDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString()); + OUString sURL = stlDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), OUString()); #if OSL_DEBUG_LEVEL > 0 if (stlDescriptor.find( "FileName" ) != stlDescriptor.end()) @@ -389,14 +389,14 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(m_xContext)); xParser->parseStrict(aURL); - rtl::OUString aSelectedFilter = stlDescriptor.getUnpackedValueOrDefault( - comphelper::MediaDescriptor::PROP_FILTERNAME(), rtl::OUString()); + OUString aSelectedFilter = stlDescriptor.getUnpackedValueOrDefault( + comphelper::MediaDescriptor::PROP_FILTERNAME(), OUString()); if (!aSelectedFilter.isEmpty()) { // Caller specified the filter type. Honor it. Just get the default // type for that filter, and bail out. if (impl_validateAndSetFilterOnDescriptor(stlDescriptor, aSelectedFilter)) - return stlDescriptor[comphelper::MediaDescriptor::PROP_TYPENAME()].get<rtl::OUString>(); + return stlDescriptor[comphelper::MediaDescriptor::PROP_TYPENAME()].get<OUString>(); } FlatDetection lFlatTypes; @@ -409,8 +409,8 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) lFlatTypes.sort(SortByPriority()); lFlatTypes.unique(EqualByType()); - ::rtl::OUString sType ; - ::rtl::OUString sLastChance; + OUString sType ; + OUString sLastChance; try { @@ -446,7 +446,7 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) catch(const css::uno::RuntimeException&) { throw; } catch(const css::uno::Exception&) - { sType = ::rtl::OUString(); } + { sType = OUString(); } //******************************************* // adapt media descriptor, so it contains the right values @@ -461,27 +461,27 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescriptor& rDescriptor, - ::rtl::OUString& sType ) + OUString& sType ) { // a) // Dont overwrite a might preselected filter! - ::rtl::OUString sFilter = rDescriptor.getUnpackedValueOrDefault( + OUString sFilter = rDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_FILTERNAME(), - ::rtl::OUString()); + OUString()); if (!sFilter.isEmpty()) return; // b) // check a preselected document service too. // Then we have to search a suitable filter witin this module. - ::rtl::OUString sDocumentService = rDescriptor.getUnpackedValueOrDefault( + OUString sDocumentService = rDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_DOCUMENTSERVICE(), - ::rtl::OUString()); + OUString()); if (!sDocumentService.isEmpty()) { try { - ::rtl::OUString sRealType = sType; + OUString sRealType = sType; // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -539,7 +539,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip // - or to any other filter if no preferred filter was set. // Note: It's an optimization only! // It's not guaranteed, that such preferred filter exists. - sFilter = ::rtl::OUString(); + sFilter = OUString(); try { // SAFE -> @@ -562,7 +562,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip // d) // Search for any import(!) filter, which is registered for this type. - sFilter = ::rtl::OUString(); + sFilter = OUString(); try { // SAFE -> @@ -603,7 +603,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip aLock.clear(); // <- SAFE - sFilter = ::rtl::OUString(); + sFilter = OUString(); } if (!sFilter.isEmpty()) @@ -637,7 +637,7 @@ bool TypeDetection::impl_getPreselectionForType( bool bMatchByExtension = false; // validate type - ::rtl::OUString sType(sPreSelType); + OUString sType(sPreSelType); CacheItem aType; try { @@ -649,7 +649,7 @@ bool TypeDetection::impl_getPreselectionForType( } catch(const css::container::NoSuchElementException&) { - sType = ::rtl::OUString(); + sType = OUString(); bBreakDetection = true; } @@ -665,7 +665,7 @@ bool TypeDetection::impl_getPreselectionForType( { // extract extension from URL .. to check it case-insensitive ! INetURLObject aParser (aParsedURL.Main); - ::rtl::OUString sExtension = aParser.getExtension(INetURLObject::LAST_SEGMENT , + OUString sExtension = aParser.getExtension(INetURLObject::LAST_SEGMENT , sal_True , INetURLObject::DECODE_WITH_CHARSET); sExtension = sExtension.toAsciiLowerCase(); @@ -679,7 +679,7 @@ bool TypeDetection::impl_getPreselectionForType( pIt != lExtensions.end() ; ++pIt ) { - ::rtl::OUString sCheckExtension(pIt->toAsciiLowerCase()); + OUString sCheckExtension(pIt->toAsciiLowerCase()); if (sCheckExtension.equals(sExtension)) { bBreakDetection = true; @@ -864,15 +864,15 @@ void TypeDetection::impl_getAllFormatTypes( -::rtl::OUString TypeDetection::impl_detectTypeFlatAndDeep( ::comphelper::MediaDescriptor& rDescriptor , +OUString TypeDetection::impl_detectTypeFlatAndDeep( ::comphelper::MediaDescriptor& rDescriptor , const FlatDetection& lFlatTypes , sal_Bool bAllowDeep , OUStringList& rUsedDetectors, - ::rtl::OUString& rLastChance ) + OUString& rLastChance ) { // reset it everytimes, so the outside code can distinguish between // a set and a not set value. - rLastChance = ::rtl::OUString(); + rLastChance = OUString(); rUsedDetectors.clear(); // step over all possible types for this URL. @@ -916,7 +916,7 @@ void TypeDetection::impl_getAllFormatTypes( CacheItem aType = m_rCache->getItem(FilterCache::E_TYPE, sFlatType); aLock.clear(); - ::rtl::OUString sDetectService; + OUString sDetectService; aType[PROPNAME_DETECTSERVICE] >>= sDetectService; // c) @@ -936,7 +936,7 @@ void TypeDetection::impl_getAllFormatTypes( // Such detectors will be ignored if may be "impl_detectTypeDeepOnly()" // must be called later! rUsedDetectors.push_back(sDetectService); - ::rtl::OUString sDeepType = impl_askDetectService(sDetectService, rDescriptor); + OUString sDeepType = impl_askDetectService(sDetectService, rDescriptor); // d) if (!sDeepType.isEmpty()) @@ -947,7 +947,7 @@ void TypeDetection::impl_getAllFormatTypes( // e) } - return ::rtl::OUString(); + return OUString(); // <- SAFE ---------------------------------- } @@ -975,7 +975,7 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript } } -::rtl::OUString TypeDetection::impl_askDetectService(const ::rtl::OUString& sDetectService, +OUString TypeDetection::impl_askDetectService(const OUString& sDetectService, ::comphelper::MediaDescriptor& rDescriptor ) { // Open the stream and add it to the media descriptor if this method is called for the first time. @@ -1015,9 +1015,9 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript } if ( ! xDetector.is()) - return ::rtl::OUString(); + return OUString(); - ::rtl::OUString sDeepType; + OUString sDeepType; try { // start deep detection @@ -1039,7 +1039,7 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript // Thrown exceptions mostly will end in crash recovery ... // But might be we find another deep detection service which can detect the same // document without a problem .-) - sDeepType = ::rtl::OUString(); + sDeepType = OUString(); } // seek to 0 is an optional feature to be more robust against @@ -1057,23 +1057,23 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript if (bValidType) return sDeepType; - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString TypeDetection::impl_askUserForTypeAndFilterIfAllowed(::comphelper::MediaDescriptor& rDescriptor) +OUString TypeDetection::impl_askUserForTypeAndFilterIfAllowed(::comphelper::MediaDescriptor& rDescriptor) { css::uno::Reference< css::task::XInteractionHandler > xInteraction = rDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_INTERACTIONHANDLER(), css::uno::Reference< css::task::XInteractionHandler >()); if (!xInteraction.is()) - return ::rtl::OUString(); + return OUString(); - ::rtl::OUString sURL = + OUString sURL = rDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), - ::rtl::OUString()); + OUString()); css::uno::Reference< css::io::XInputStream > xStream = rDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_INPUTSTREAM(), @@ -1089,7 +1089,7 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript (!xStream.is() ) || // non existing file ! (sURL.equalsIgnoreAsciiCase("private:stream")) // not a good idea .-) ) - return ::rtl::OUString(); + return OUString(); try { @@ -1099,7 +1099,7 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript // "Cancel" pressed? => return with error if (aRequest.isAbort()) - return ::rtl::OUString(); + return OUString(); // "OK" pressed => verify the selected filter, get it's coressponding // type and return it. (BTW: We must update the media descriptor here ...) @@ -1107,18 +1107,18 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript // a type here only. But we must be shure, that the selected filter is used // too and no ambigous filter registration disturb us .-) - ::rtl::OUString sFilter = aRequest.getFilter(); + OUString sFilter = aRequest.getFilter(); if (!impl_validateAndSetFilterOnDescriptor(rDescriptor, sFilter)) - return ::rtl::OUString(); + return OUString(); - ::rtl::OUString sType; + OUString sType; rDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] >>= sType; return sType; } catch(const css::uno::Exception&) {} - return ::rtl::OUString(); + return OUString(); } @@ -1127,7 +1127,7 @@ void TypeDetection::impl_openStream(::comphelper::MediaDescriptor& rDescriptor) throw (css::uno::Exception) { sal_Bool bSuccess = sal_False; - ::rtl::OUString sURL = rDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString() ); + OUString sURL = rDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_URL(), OUString() ); sal_Bool bRequestedReadOnly = rDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_READONLY(), sal_False ); if ( !sURL.isEmpty() && ::utl::LocalFileHelper::IsLocalFile( INetURLObject( sURL ).GetMainURL( INetURLObject::NO_DECODE ) ) ) { @@ -1165,7 +1165,7 @@ void TypeDetection::impl_removeTypeFilterFromDescriptor(::comphelper::MediaDescr sal_Bool TypeDetection::impl_validateAndSetTypeOnDescriptor( ::comphelper::MediaDescriptor& rDescriptor, - const ::rtl::OUString& sType ) + const OUString& sType ) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -1185,7 +1185,7 @@ sal_Bool TypeDetection::impl_validateAndSetTypeOnDescriptor( ::comphelper:: sal_Bool TypeDetection::impl_validateAndSetFilterOnDescriptor( ::comphelper::MediaDescriptor& rDescriptor, - const ::rtl::OUString& sFilter ) + const OUString& sFilter ) { try { @@ -1193,7 +1193,7 @@ sal_Bool TypeDetection::impl_validateAndSetFilterOnDescriptor( ::comphelper ::osl::ResettableMutexGuard aLock(m_aLock); CacheItem aFilter = m_rCache->getItem(FilterCache::E_FILTER, sFilter); - ::rtl::OUString sType; + OUString sType; aFilter[PROPNAME_TYPE] >>= sType; CacheItem aType = m_rCache->getItem(FilterCache::E_TYPE, sType); diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index f1dc34886fc8..e58042c58d89 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -126,11 +126,11 @@ private: An empty value if detection failed. .... but see rLastChance for additional returns! */ - ::rtl::OUString impl_detectTypeFlatAndDeep( ::comphelper::MediaDescriptor& rDescriptor , + OUString impl_detectTypeFlatAndDeep( ::comphelper::MediaDescriptor& rDescriptor , const FlatDetection& lFlatTypes , sal_Bool bAllowDeep , OUStringList& rUsedDetectors, - ::rtl::OUString& rLastChance ); + OUString& rLastChance ); //--------------------------------------- @@ -165,7 +165,7 @@ private: @param rDescriptor a stl representation of the MediaDescriptor as in/out parameter. */ - ::rtl::OUString impl_askDetectService(const ::rtl::OUString& sDetectService, + OUString impl_askDetectService(const OUString& sDetectService, ::comphelper::MediaDescriptor& rDescriptor ); //--------------------------------------- @@ -183,7 +183,7 @@ private: @return [string] a valid type name or an empty string if user canceled interaction. */ - ::rtl::OUString impl_askUserForTypeAndFilterIfAllowed(::comphelper::MediaDescriptor& rDescriptor); + OUString impl_askUserForTypeAndFilterIfAllowed(::comphelper::MediaDescriptor& rDescriptor); //--------------------------------------- @@ -244,7 +244,7 @@ private: could be set on the descriptor. */ sal_Bool impl_validateAndSetTypeOnDescriptor( ::comphelper::MediaDescriptor& rDescriptor, - const ::rtl::OUString& sType ); + const OUString& sType ); //--------------------------------------- @@ -266,7 +266,7 @@ private: could be set on the descriptor. */ sal_Bool impl_validateAndSetFilterOnDescriptor( ::comphelper::MediaDescriptor& rDescriptor, - const ::rtl::OUString& sFilter ); + const OUString& sFilter ); //--------------------------------------- @@ -316,7 +316,7 @@ private: (see code) */ void impl_checkResultsAndAddBestFilter(::comphelper::MediaDescriptor& rDescriptor, - ::rtl::OUString& sType ); + OUString& sType ); //------------------------------------------- // uno interface @@ -326,10 +326,10 @@ public: //--------------------------------------- // XTypeDetection - virtual ::rtl::OUString SAL_CALL queryTypeByURL(const ::rtl::OUString& sURL) + virtual OUString SAL_CALL queryTypeByURL(const OUString& sURL) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, + virtual OUString SAL_CALL queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, sal_Bool bAllowDeep ) throw (css::uno::RuntimeException); @@ -348,7 +348,7 @@ public: @return The fix uno implementation name of this class. */ - static ::rtl::OUString impl_getImplementationName(); + static OUString impl_getImplementationName(); //--------------------------------------- @@ -360,7 +360,7 @@ public: @return The fix list of uno services supported by this class. */ - static css::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); //--------------------------------------- diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx index 18f74ec5c054..5a4ab63470e7 100644 --- a/filter/source/flash/impswfdialog.cxx +++ b/filter/source/flash/impswfdialog.cxx @@ -24,7 +24,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::beans; -using ::rtl::OUString; // ---------------- // - ImpPDFDialog - diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index 382a1027a4cc..86c08642d229 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -53,8 +53,8 @@ protected: // OGenericUnoDialog virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); virtual Dialog* createDialog( Window* pParent ); virtual void executedDialog( sal_Int16 nExecutionResult ); virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException); diff --git a/filter/source/flash/swfexporter.hxx b/filter/source/flash/swfexporter.hxx index de8e87b4ed0e..8e95687fb22c 100644 --- a/filter/source/flash/swfexporter.hxx +++ b/filter/source/flash/swfexporter.hxx @@ -39,14 +39,14 @@ typedef ::std::map<sal_uInt32, sal_uInt16> ChecksumCache; class GDIMetaFile; -inline ::rtl::OUString STR(const sal_Char * in) +inline OUString STR(const sal_Char * in) { - return ::rtl::OUString::createFromAscii(in); + return OUString::createFromAscii(in); } -inline ::rtl::OUString VAL(sal_Int32 in) +inline OUString VAL(sal_Int32 in) { - return ::rtl::OUString::valueOf(in); + return OUString::valueOf(in); } namespace swf { @@ -72,7 +72,7 @@ public: sal_Int32 mnPresOrder; ::com::sun::star::presentation::ClickAction meClickAction; - ::rtl::OUString maBookmark; + OUString maBookmark; sal_Int32 mnDimColor; sal_Bool mbDimHide; @@ -80,7 +80,7 @@ public: sal_Bool mbSoundOn; sal_Bool mbPlayFull; - ::rtl::OUString maSoundURL; + OUString maSoundURL; sal_Int32 mnBlueScreenColor; diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index d3d530677405..e08667e0c84b 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -45,8 +45,6 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::presentation; using namespace ::com::sun::star::task; -using ::rtl::OUString; -using ::rtl::OString; using ::com::sun::star::lang::XComponent; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::io::XOutputStream; diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx index 0ddc437d6006..ec9352023691 100644 --- a/filter/source/flash/swfuno.cxx +++ b/filter/source/flash/swfuno.cxx @@ -37,8 +37,8 @@ extern Sequence< OUString > SAL_CALL FlashExportFilter_getSupportedServiceNames( extern Reference< XInterface > SAL_CALL FlashExportFilter_createInstance( const Reference< XMultiServiceFactory > & rSMgr) throw ( Exception ); } -extern rtl::OUString SWFDialog_getImplementationName () throw (com::sun::star::uno::RuntimeException); -extern com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL SWFDialog_getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); +extern OUString SWFDialog_getImplementationName () throw (com::sun::star::uno::RuntimeException); +extern com::sun::star::uno::Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); extern com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SWFDialog_createInstance( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( com::sun::star::uno::Exception ); using namespace ::swf; diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index d6dcd9654984..a4ab343098e4 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -553,7 +553,7 @@ void Writer::Impl_writeText( const Point& rPos, const String& rText, const sal_I if( nLen > 1 ) { - aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( rtl::OUString(rText.GetChar((sal_uInt16) nLen - 1)) ); + aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( OUString(rText.GetChar((sal_uInt16) nLen - 1)) ); if( nWidth && aNormSize.Width() && ( nWidth != aNormSize.Width() ) ) { diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx index b951064dfbcd..766b02a34025 100644 --- a/filter/source/flash/swfwriter2.cxx +++ b/filter/source/flash/swfwriter2.cxx @@ -27,8 +27,6 @@ using namespace ::swf; using namespace ::std; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; -using ::rtl::OUString; -using ::rtl::OString; // ----------------------------------------------------------------------------- @@ -462,7 +460,7 @@ sal_uInt16 FlashFont::getGlyph( sal_uInt16 nChar, VirtualDevice* pVDev ) // let the virtual device convert the character to polygons PolyPolygon aPolyPoly; - pVDev->GetTextOutline( aPolyPoly, rtl::OUString(nChar) ); + pVDev->GetTextOutline( aPolyPoly, OUString(nChar) ); maGlyphOffsets.push_back( _uInt16( maGlyphData.getOffset() ) ); diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index a774534292b7..08628202837f 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -90,7 +90,7 @@ sal_Bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterC xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index 8cdf07c0d872..1fe92ac9806d 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -477,7 +477,7 @@ void METWriter::WriteChrSets() *pMET << (sal_uInt8)0x03 << (sal_uInt8)0x52; *pMET << (sal_uInt8)0x24 << (sal_uInt8)0x02 << (sal_uInt8)0x08 << (sal_uInt8)0x00; - rtl::OString n(rtl::OUStringToOString(pCS->aName, + OString n(OUStringToOString(pCS->aName, osl_getThreadTextEncoding())); for (i=0; i<32; i++) { @@ -1358,7 +1358,7 @@ void METWriter::METPartialArcAtCurPos(Point aCenter, double fMultiplier, void METWriter::METChrStr( Point aPt, String aUniStr ) { - rtl::OString aStr(rtl::OUStringToOString(aUniStr, + OString aStr(OUStringToOString(aUniStr, osl_getThreadTextEncoding())); sal_uInt16 nLen = aStr.getLength(); WillWriteOrder( 11 + nLen ); @@ -1901,7 +1901,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) aPt2 = aPolyDummy.GetPoint( 0 ); } } - METChrStr( aPt2, rtl::OUString( aStr.GetChar( i ) ) ); + METChrStr( aPt2, OUString( aStr.GetChar( i ) ) ); } } else @@ -1955,7 +1955,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) aPt2 = aPolyDummy.GetPoint( 0 ); } } - METChrStr( aPt2, rtl::OUString( aStr.GetChar( i ) ) ); + METChrStr( aPt2, OUString( aStr.GetChar( i ) ) ); } delete[] pDXAry; @@ -2487,7 +2487,7 @@ sal_Bool METWriter::WriteMET( const GDIMetaFile& rMTF, SvStream& rTargetStream, xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx index 36de78d077ab..19f6b43319e2 100644 --- a/filter/source/graphicfilter/epbm/epbm.cxx +++ b/filter/source/graphicfilter/epbm/epbm.cxx @@ -79,7 +79,7 @@ sal_Bool PBMWriter::WritePBM( const Graphic& rGraphic, FilterConfigItem* pFilter xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } @@ -179,7 +179,7 @@ void PBMWriter::ImplWriteBody() void PBMWriter::ImplWriteNumber(sal_Int32 nNumber) { - const rtl::OString aNum(rtl::OString::valueOf(nNumber)); + const OString aNum(OString::valueOf(nNumber)); m_rOStm << aNum.getStr(); } diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx index 4dd2e42902b1..5c7738bca8f9 100644 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ b/filter/source/graphicfilter/epgm/epgm.cxx @@ -79,7 +79,7 @@ sal_Bool PGMWriter::WritePGM( const Graphic& rGraphic, FilterConfigItem* pFilter xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } @@ -203,7 +203,7 @@ void PGMWriter::ImplWriteBody() // write a decimal number in ascii format into the stream void PGMWriter::ImplWriteNumber(sal_Int32 nNumber) { - const rtl::OString aNum(rtl::OString::valueOf(nNumber)); + const OString aNum(OString::valueOf(nNumber)); m_rOStm << aNum.getStr(); } diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index 765b4f74544d..c68d400ffa2c 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -310,7 +310,7 @@ void PictWriter::WriteRGBColor(const Color & rColor) void PictWriter::WriteString( const String & rString ) { - rtl::OString aString(rtl::OUStringToOString(rString, osl_getThreadTextEncoding())); + OString aString(OUStringToOString(rString, osl_getThreadTextEncoding())); sal_Int32 nLen = aString.getLength(); if ( nLen > 255 ) nLen = 255; @@ -695,7 +695,7 @@ void PictWriter::WriteOpcode_FontName(const Font & rFont) if (bDstFontNameValid==sal_False || nDstFontNameId!=nFontId || aDstFontName!=rFont.GetName()) { - rtl::OString aString(rtl::OUStringToOString(rFont.GetName(), osl_getThreadTextEncoding())); + OString aString(OUStringToOString(rFont.GetName(), osl_getThreadTextEncoding())); sal_uInt16 nFontNameLen = aString.getLength(); if ( nFontNameLen ) { @@ -1337,7 +1337,7 @@ void PictWriter::WriteTextArray(Point & rPoint, const String& rString, const sal if ( i > 0 ) aPt.X() += pDXAry[ i - 1 ]; - WriteOpcode_Text( aPt, rtl::OUString( c ), bDelta ); + WriteOpcode_Text( aPt, OUString( c ), bDelta ); bDelta = sal_True; } } @@ -2205,7 +2205,7 @@ sal_Bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStrea xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx index 2ad2798c20ce..e23bbbc8f2e0 100644 --- a/filter/source/graphicfilter/eppm/eppm.cxx +++ b/filter/source/graphicfilter/eppm/eppm.cxx @@ -79,7 +79,7 @@ sal_Bool PPMWriter::WritePPM( const Graphic& rGraphic, FilterConfigItem* pFilter xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } @@ -212,7 +212,7 @@ void PPMWriter::ImplWriteBody() void PPMWriter::ImplWriteNumber(sal_Int32 nNumber) { - const rtl::OString aNum(rtl::OString::valueOf(nNumber)); + const OString aNum(OString::valueOf(nNumber)); m_rOStm << aNum.getStr(); } diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index cbd9faa540cb..4d9cd3ec2266 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -211,7 +211,7 @@ private: void ImplText( const String& rUniString, const Point& rPos, const sal_Int32* pDXArry, sal_Int32 nWidth, VirtualDevice& rVDev ); void ImplSetAttrForText( const Point & rPoint ); void ImplWriteCharacter( sal_Char ); - void ImplWriteString( const rtl::OString&, VirtualDevice& rVDev, const sal_Int32* pDXArry = NULL, sal_Bool bStretch = sal_False ); + void ImplWriteString( const OString&, VirtualDevice& rVDev, const sal_Int32* pDXArry = NULL, sal_Bool bStretch = sal_False ); void ImplDefineFont( const char*, const char* ); void ImplClosePathDraw( sal_uLong nMode = PS_RET ); @@ -271,7 +271,7 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } @@ -1246,7 +1246,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) { SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), STREAM_READ ); sal_Bool bSkipSequence = sal_False; - rtl::OString sSeqEnd; + OString sSeqEnd; if( pA->GetComment().equals( "XPATHSTROKE_SEQ_BEGIN" ) ) { @@ -1396,7 +1396,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) pMA = rMtf.GetAction( nCurAction ); if ( pMA->GetType() == META_COMMENT_ACTION ) { - rtl::OString sComment( ((MetaCommentAction*)pMA)->GetComment() ); + OString sComment( ((MetaCommentAction*)pMA)->GetComment() ); if ( sComment.equals( sSeqEnd ) ) break; } @@ -1996,7 +1996,7 @@ void PSWriter::ImplWriteCharacter( sal_Char nChar ) //--------------------------------------------------------------------------------- -void PSWriter::ImplWriteString( const rtl::OString& rString, VirtualDevice& rVDev, const sal_Int32* pDXArry, sal_Bool bStretch ) +void PSWriter::ImplWriteString( const OString& rString, VirtualDevice& rVDev, const sal_Int32* pDXArry, sal_Bool bStretch ) { sal_Int32 nLen = rString.getLength(); if ( nLen ) @@ -2009,7 +2009,7 @@ void PSWriter::ImplWriteString( const rtl::OString& rString, VirtualDevice& rVDe { if ( i > 0 ) nx = pDXArry[ i - 1 ]; - ImplWriteDouble( ( bStretch ) ? nx : rVDev.GetTextWidth( rtl::OUString(rString[i]) ) ); + ImplWriteDouble( ( bStretch ) ? nx : rVDev.GetTextWidth( OUString(rString[i]) ) ); ImplWriteDouble( nx ); ImplWriteLine( "(", PS_NONE ); ImplWriteCharacter( rString[i] ); @@ -2080,7 +2080,7 @@ void PSWriter::ImplText( const String& rUniString, const Point& rPos, const sal_ if ( mnTextMode == 2 ) // forcing output one complete text packet, by pDXArry = NULL; // ignoring the kerning array ImplSetAttrForText( rPos ); - rtl::OString aStr(rtl::OUStringToOString(rUniString, + OString aStr(OUStringToOString(rUniString, maFont.GetCharSet())); ImplWriteString( aStr, rVDev, pDXArry, nWidth != 0 ); if ( maFont.GetOrientation() ) @@ -2426,7 +2426,7 @@ void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo ) void PSWriter::ImplWriteLong(sal_Int32 nNumber, sal_uLong nMode) { - const rtl::OString aNumber(rtl::OString::valueOf(nNumber)); + const OString aNumber(OString::valueOf(nNumber)); mnCursorPos += aNumber.getLength(); *mpPS << aNumber.getStr(); ImplExecMode(nMode); @@ -2442,7 +2442,7 @@ void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode ) if ( !nPTemp && nATemp && ( fNumber < 0.0 ) ) *mpPS << (sal_Char)'-'; - const rtl::OString aNumber1(rtl::OString::valueOf(nPTemp)); + const OString aNumber1(OString::valueOf(nPTemp)); *mpPS << aNumber1.getStr(); mnCursorPos += aNumber1.getLength(); @@ -2451,7 +2451,7 @@ void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode ) int zCount = 0; *mpPS << (sal_uInt8)'.'; mnCursorPos++; - const rtl::OString aNumber2(rtl::OString::valueOf(nATemp)); + const OString aNumber2(OString::valueOf(nATemp)); sal_Int16 n, nLen = aNumber2.getLength(); if ( nLen < 8 ) @@ -2488,7 +2488,7 @@ void PSWriter::ImplWriteF( sal_Int32 nNumber, sal_uLong nCount, sal_uLong nMode nNumber = -nNumber; mnCursorPos++; } - const rtl::OString aScaleFactor(rtl::OString::valueOf(nNumber)); + const OString aScaleFactor(OString::valueOf(nNumber)); sal_uLong nLen = aScaleFactor.getLength(); long nStSize = ( nCount + 1 ) - nLen; if ( nStSize >= 1 ) diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx index fca5570b467f..44506c4228e5 100644 --- a/filter/source/graphicfilter/eras/eras.cxx +++ b/filter/source/graphicfilter/eras/eras.cxx @@ -90,7 +90,7 @@ sal_Bool RASWriter::WriteRAS( const Graphic& rGraphic, FilterConfigItem* pFilter xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index ba665bcaac74..9949974bd27c 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -148,7 +148,7 @@ sal_Bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilt xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx index 14ff2547c1d5..43fe370ea2f3 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -91,7 +91,7 @@ sal_Bool XPMWriter::WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilter xStatusIndicator = pFilterConfigItem->GetStatusIndicator(); if ( xStatusIndicator.is() ) { - rtl::OUString aMsg; + OUString aMsg; xStatusIndicator->start( aMsg, 100 ); } } @@ -207,7 +207,7 @@ void XPMWriter::ImplWriteBody() void XPMWriter::ImplWriteNumber(sal_Int32 nNumber) { - const rtl::OString aNum(rtl::OString::valueOf(nNumber)); + const OString aNum(OString::valueOf(nNumber)); m_rOStm << aNum.getStr(); } diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index 2e83c45af985..12d8f9867bc5 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -94,7 +94,7 @@ sal_Bool CGMImpressOutAct::ImplInitPage() // --------------------------------------------------------------- -sal_Bool CGMImpressOutAct::ImplCreateShape( const ::rtl::OUString& rType ) +sal_Bool CGMImpressOutAct::ImplCreateShape( const OUString& rType ) { uno::Reference< uno::XInterface > xNewShape( maXMultiServiceFactory->createInstance( rType ) ); maXShape = uno::Reference< drawing::XShape >( xNewShape, uno::UNO_QUERY ); @@ -374,7 +374,7 @@ void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XProperty if ( pFontEntry ) { nFontType = pFontEntry->nFontType; - aFontDescriptor.Name = rtl::OUString::createFromAscii( (const char*)pFontEntry->pFontName ); + aFontDescriptor.Name = OUString::createFromAscii( (const char*)pFontEntry->pFontName ); } aFontDescriptor.Height = ( sal_Int16 )( ( mpCGM->pElement->nCharacterHeight * (double)1.50 ) ); if ( nFontType & 1 ) @@ -860,7 +860,7 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha uno::Any aFirstQuery( maXShape->queryInterface( ::getCppuType((const uno::Reference< text::XText >*)0) )); if( aFirstQuery >>= xText ) { - String aStr( rtl::OUString::createFromAscii( pString ) ); + String aStr( OUString::createFromAscii( pString ) ); uno::Reference< text::XTextCursor > aXTextCursor( xText->createTextCursor() ); { @@ -925,7 +925,7 @@ void CGMImpressOutAct::AppendText( char* pString, sal_uInt32 /*nSize*/, FinalFla uno::Any aFirstQuery( aShape->queryInterface( ::getCppuType((const uno::Reference< text::XText >*)0)) ); if( aFirstQuery >>= xText ) { - String aStr( rtl::OUString::createFromAscii( pString ) ); + String aStr( OUString::createFromAscii( pString ) ); uno::Reference< text::XTextCursor > aXTextCursor( xText->createTextCursor() ); if ( aXTextCursor.is() ) diff --git a/filter/source/graphicfilter/icgm/outact.hxx b/filter/source/graphicfilter/icgm/outact.hxx index 0190934aea14..d6a67da176fb 100644 --- a/filter/source/graphicfilter/icgm/outact.hxx +++ b/filter/source/graphicfilter/icgm/outact.hxx @@ -99,7 +99,7 @@ class CGMImpressOutAct : public CGMOutAct ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > maXMultiServiceFactory; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > maXShape; - sal_Bool ImplCreateShape( const ::rtl::OUString& rType ); + sal_Bool ImplCreateShape( const OUString& rType ); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > maXPropSet; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > maXShapes; diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx index 369736a61b6b..9635ed32a9a2 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx @@ -414,7 +414,7 @@ void DXF2GDIMetaFile::DrawTextEntity(const DXFTextEntity & rE, const DXFTransfor double fA; sal_uInt16 nHeight; short nAng; - rtl::OString aStr( rE.sText ); + OString aStr( rE.sText ); DXFTransform aT( DXFTransform(rE.fXScale,rE.fHeight,1.0,rE.fRotAngle,rE.aP0), rTransform ); aT.TransDir(DXFVector(0,1,0),aV); nHeight=(sal_uInt16)(aV.Abs()+0.5); @@ -423,7 +423,7 @@ void DXF2GDIMetaFile::DrawTextEntity(const DXFTextEntity & rE, const DXFTransfor aT.TransDir(DXFVector(1,0,0),aV); if ( SetFontAttribute( rE,nAng, nHeight, aV. Abs() ) ) { - rtl::OUString aUString(rtl::OStringToOUString(aStr, pDXF->getTextEncoding())); + OUString aUString(OStringToOUString(aStr, pDXF->getTextEncoding())); aT.Transform( DXFVector( 0, 0, 0 ), aPt ); pVirDev->DrawText( aPt, aUString ); } @@ -473,7 +473,7 @@ void DXF2GDIMetaFile::DrawAttribEntity(const DXFAttribEntity & rE, const DXFTran double fA; sal_uInt16 nHeight; short nAng; - rtl::OString aStr( rE.sText ); + OString aStr( rE.sText ); DXFTransform aT( DXFTransform( rE.fXScale, rE.fHeight, 1.0, rE.fRotAngle, rE.aP0 ), rTransform ); aT.TransDir(DXFVector(0,1,0),aV); nHeight=(sal_uInt16)(aV.Abs()+0.5); @@ -482,7 +482,7 @@ void DXF2GDIMetaFile::DrawAttribEntity(const DXFAttribEntity & rE, const DXFTran aT.TransDir(DXFVector(1,0,0),aV); if (SetFontAttribute(rE,nAng,nHeight,aV.Abs())) { - rtl::OUString aUString(rtl::OStringToOUString(aStr, pDXF->getTextEncoding())); + OUString aUString(OStringToOUString(aStr, pDXF->getTextEncoding())); aT.Transform( DXFVector( 0, 0, 0 ), aPt ); pVirDev->DrawText( aPt, aUString ); } diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.cxx b/filter/source/graphicfilter/idxf/dxfgrprd.cxx index f6d21bfa0911..e6a741d181cd 100644 --- a/filter/source/graphicfilter/idxf/dxfgrprd.cxx +++ b/filter/source/graphicfilter/idxf/dxfgrprd.cxx @@ -30,14 +30,14 @@ // a 0-sign occurs; this functions converts 0-signs to blanks and reads // a complete line until a cr/lf is found -rtl::OString DXFReadLine(SvStream& rIStm) +OString DXFReadLine(SvStream& rIStm) { char buf[256 + 1]; sal_Bool bEnd = sal_False; sal_uLong nOldFilePos = rIStm.Tell(); char c = 0; - rtl::OStringBuffer aBuf; + OStringBuffer aBuf; while( !bEnd && !rIStm.GetError() ) // !!! do not check for EOF // !!! because we read blockwise @@ -46,7 +46,7 @@ rtl::OString DXFReadLine(SvStream& rIStm) if( !nLen ) { if( aBuf.isEmpty() ) - return rtl::OString(); + return OString(); else break; } @@ -263,7 +263,7 @@ void DXFGroupReader::SetS(sal_uInt16 nG, const char * sS) void DXFGroupReader::ReadLine(char * ptgt) { - rtl::OString aStr = DXFReadLine(rIS); + OString aStr = DXFReadLine(rIS); size_t nLen = aStr.getLength(); if ( nLen > DXF_MAX_STRING_LEN ) diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 4aced68f6a85..b5634498716d 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2242,7 +2242,7 @@ void OS2METReader::ReadFont(sal_uInt16 nFieldSize) str[ 32 ] = 0; String aStr( (const sal_Char*)str, osl_getThreadTextEncoding() ); if ( aStr.CompareIgnoreCaseToAscii( "Helv" ) == COMPARE_EQUAL ) - aStr = rtl::OUString("Helvetica"); + aStr = OUString("Helvetica"); pF->aFont.SetName( aStr ); break; } diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index 2dacdb4ea879..a463aa6e9ade 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -177,7 +177,7 @@ void PCDReader::CheckPCDImagePacFile() m_rPCD.Seek( 2048 ); m_rPCD.Read( Buf, 7 ); Buf[ 7 ] = 0; - if (rtl::OString(Buf) != "PCD_IPI") + if (OString(Buf) != "PCD_IPI") bStatus = sal_False; } diff --git a/filter/source/msfilter/dffpropset.cxx b/filter/source/msfilter/dffpropset.cxx index a17cf1e44e6d..dbc3316c79c1 100644 --- a/filter/source/msfilter/dffpropset.cxx +++ b/filter/source/msfilter/dffpropset.cxx @@ -1291,10 +1291,10 @@ bool DffPropSet::GetPropertyBool( sal_uInt32 nId, bool bDefault ) const return (nPropValue & nMask) != 0; } -::rtl::OUString DffPropSet::GetPropertyString( sal_uInt32 nId, SvStream& rStrm ) const +OUString DffPropSet::GetPropertyString( sal_uInt32 nId, SvStream& rStrm ) const { sal_Size nOldPos = rStrm.Tell(); - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; sal_uInt32 nBufferSize = GetPropertyValue( nId ); if( (nBufferSize > 0) && SeekToContent( nId, rStrm ) ) { diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index cb5c64a001d8..2a6d7f499d2b 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -45,7 +45,6 @@ #include <vcl/fltcall.hxx> #include <vcl/cvtgrf.hxx> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; @@ -167,7 +166,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, break; // #i51348# get shape name - rtl::OUString aShapeName; + OUString aShapeName; if( const SdrObject* pSdrObj = rObj.GetSdrObject() ) if (!pSdrObj->GetName().isEmpty()) aShapeName = pSdrObj->GetName(); @@ -195,9 +194,9 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, } break; } - rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString( "RotateAngle" ) )); + rObj.SetAngle( rObj.ImplGetInt32PropertyValue( OUString( "RotateAngle" ) )); - if( ( rObj.ImplGetPropertyValue( ::rtl::OUString( "IsFontwork" ) ) && + if( ( rObj.ImplGetPropertyValue( OUString( "IsFontwork" ) ) && ::cppu::any2bool( rObj.GetUsrAny() ) ) || rObj.GetType().EqualsAscii( "drawing.Measure" ) ) { @@ -235,7 +234,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, mpEscherEx->OpenContainer( ESCHER_SpContainer ); sal_uInt32 nMirrorFlags; - rtl::OUString sCustomShapeType; + OUString sCustomShapeType; MSO_SPT eShapeType = aPropOpt.GetCustomShapeType( rObj.GetShapeRef(), nMirrorFlags, sCustomShapeType ); if ( sCustomShapeType == "col-502ad400" || sCustomShapeType == "col-60da8460" ) { @@ -276,7 +275,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, { mpEscherEx->OpenContainer( ESCHER_SpContainer ); sal_Int32 nRadius = (sal_Int32)rObj.ImplGetInt32PropertyValue( - ::rtl::OUString( "CornerRadius" )); + OUString( "CornerRadius" )); if( nRadius ) { nRadius = ImplMapSize( Size( nRadius, 0 )).Width(); @@ -305,7 +304,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, { CircleKind eCircleKind = CircleKind_FULL; PolyStyle ePolyKind = PolyStyle(); - if ( rObj.ImplGetPropertyValue( ::rtl::OUString( "CircleKind" ) ) ) + if ( rObj.ImplGetPropertyValue( OUString( "CircleKind" ) ) ) { eCircleKind = *( (CircleKind*)rObj.GetUsrAny().getValue() ); switch ( eCircleKind ) @@ -340,10 +339,10 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, else { sal_Int32 nStartAngle, nEndAngle; - if ( !rObj.ImplGetPropertyValue( ::rtl::OUString( "CircleStartAngle" ) ) ) + if ( !rObj.ImplGetPropertyValue( OUString( "CircleStartAngle" ) ) ) break; nStartAngle = *( (sal_Int32*)rObj.GetUsrAny().getValue() ); - if( !rObj.ImplGetPropertyValue( ::rtl::OUString( "CircleEndAngle" ) ) ) + if( !rObj.ImplGetPropertyValue( OUString( "CircleEndAngle" ) ) ) break; nEndAngle = *( (sal_Int32*)rObj.GetUsrAny().getValue() ); @@ -594,7 +593,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, 'D' == rObj.GetType().GetChar( 9 ) ) // drawing.3D { // SceneObject, CubeObject, SphereObject, LatheObject, ExtrudeObject, PolygonObject - if ( !rObj.ImplGetPropertyValue( ::rtl::OUString( "Bitmap" ) ) ) + if ( !rObj.ImplGetPropertyValue( OUString( "Bitmap" ) ) ) break; mpEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -626,7 +625,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, aPropOpt.CreateShadowProperties( rObj.mXPropSet ); if( USHRT_MAX != mpEscherEx->GetHellLayerId() && - rObj.ImplGetPropertyValue( ::rtl::OUString( "LayerID" ) ) && + rObj.ImplGetPropertyValue( OUString( "LayerID" ) ) && (*((sal_uInt16*)rObj.GetUsrAny().getValue()) ) == mpEscherEx->GetHellLayerId() ) { aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x200020 ); @@ -687,7 +686,7 @@ void ImplEESdrWriter::ImplWriteAdditionalText( ImplEESdrObject& rObj, if ( !mpPicStrm ) mpPicStrm = mpEscherEx->QueryPictureStream(); EscherPropertyContainer aPropOpt( mpEscherEx->GetGraphicProvider(), mpPicStrm, aRect100thmm ); - rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString( "RotateAngle" ))); + rObj.SetAngle( rObj.ImplGetInt32PropertyValue( OUString( "RotateAngle" ))); sal_Int32 nAngle = rObj.GetAngle(); if( rObj.GetType().EqualsAscii( "drawing.Line" )) { diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx index 7612c1dbb594..78fb28a43a7c 100644 --- a/filter/source/msfilter/eschesdo.hxx +++ b/filter/source/msfilter/eschesdo.hxx @@ -53,11 +53,11 @@ public: ~ImplEESdrObject(); sal_Bool ImplGetPropertyValue( const sal_Unicode* pString ); - sal_Bool ImplGetPropertyValue( const rtl::OUString& rString ) { return ImplGetPropertyValue(rString.getStr()); } + sal_Bool ImplGetPropertyValue( const OUString& rString ) { return ImplGetPropertyValue(rString.getStr()); } sal_Int32 ImplGetInt32PropertyValue( const sal_Unicode* pStr, sal_uInt32 nDef = 0 ) { return ImplGetPropertyValue( pStr ) ? *(sal_Int32*)mAny.getValue() : nDef; } - sal_Int32 ImplGetInt32PropertyValue( const rtl::OUString& rStr, sal_uInt32 nDef = 0 ) + sal_Int32 ImplGetInt32PropertyValue( const OUString& rStr, sal_uInt32 nDef = 0 ) { return ImplGetInt32PropertyValue(rStr.getStr(), nDef); } const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& GetShapeRef() const { return mXShape; } diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx index 5d15a3ff1ad8..4eb15f7d081b 100644 --- a/filter/source/msfilter/mscodec.cxx +++ b/filter/source/msfilter/mscodec.cxx @@ -168,15 +168,15 @@ sal_Bool MSCodec_Xor95::InitCodec( const uno::Sequence< beans::NamedValue >& aDa sal_Bool bResult = sal_False; ::comphelper::SequenceAsHashMap aHashData( aData ); - uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "XOR95EncryptionKey" ), uno::Sequence< sal_Int8 >() ); + uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( OUString( "XOR95EncryptionKey" ), uno::Sequence< sal_Int8 >() ); if ( aKey.getLength() == 16 ) { (void)memcpy( mpnKey, aKey.getConstArray(), 16 ); bResult = sal_True; - mnKey = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "XOR95BaseKey" ), (sal_Int16)0 ); - mnHash = (sal_uInt16)aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "XOR95PasswordHash" ), (sal_Int16)0 ); + mnKey = (sal_uInt16)aHashData.getUnpackedValueOrDefault( OUString( "XOR95BaseKey" ), (sal_Int16)0 ); + mnHash = (sal_uInt16)aHashData.getUnpackedValueOrDefault( OUString( "XOR95PasswordHash" ), (sal_Int16)0 ); } else OSL_FAIL( "Unexpected key size!\n" ); @@ -187,9 +187,9 @@ sal_Bool MSCodec_Xor95::InitCodec( const uno::Sequence< beans::NamedValue >& aDa uno::Sequence< beans::NamedValue > MSCodec_Xor95::GetEncryptionData() { ::comphelper::SequenceAsHashMap aHashData; - aHashData[ ::rtl::OUString( "XOR95EncryptionKey" ) ] <<= uno::Sequence<sal_Int8>( (sal_Int8*)mpnKey, 16 ); - aHashData[ ::rtl::OUString( "XOR95BaseKey" ) ] <<= (sal_Int16)mnKey; - aHashData[ ::rtl::OUString( "XOR95PasswordHash" ) ] <<= (sal_Int16)mnHash; + aHashData[ OUString( "XOR95EncryptionKey" ) ] <<= uno::Sequence<sal_Int8>( (sal_Int8*)mpnKey, 16 ); + aHashData[ OUString( "XOR95BaseKey" ) ] <<= (sal_Int16)mnKey; + aHashData[ OUString( "XOR95PasswordHash" ) ] <<= (sal_Int16)mnHash; return aHashData.getAsConstNamedValueList(); } @@ -293,12 +293,12 @@ sal_Bool MSCodec_Std97::InitCodec( const uno::Sequence< beans::NamedValue >& aDa sal_Bool bResult = sal_False; ::comphelper::SequenceAsHashMap aHashData( aData ); - uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "STD97EncryptionKey" ), uno::Sequence< sal_Int8 >() ); + uno::Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( OUString( "STD97EncryptionKey" ), uno::Sequence< sal_Int8 >() ); if ( aKey.getLength() == RTL_DIGEST_LENGTH_MD5 ) { (void)memcpy( m_pDigestValue, aKey.getConstArray(), RTL_DIGEST_LENGTH_MD5 ); - uno::Sequence< sal_Int8 > aUniqueID = aHashData.getUnpackedValueOrDefault( ::rtl::OUString( "STD97UniqueID" ), uno::Sequence< sal_Int8 >() ); + uno::Sequence< sal_Int8 > aUniqueID = aHashData.getUnpackedValueOrDefault( OUString( "STD97UniqueID" ), uno::Sequence< sal_Int8 >() ); if ( aUniqueID.getLength() == 16 ) { (void)memcpy( m_pDocId, aUniqueID.getConstArray(), 16 ); @@ -318,8 +318,8 @@ sal_Bool MSCodec_Std97::InitCodec( const uno::Sequence< beans::NamedValue >& aDa uno::Sequence< beans::NamedValue > MSCodec_Std97::GetEncryptionData() { ::comphelper::SequenceAsHashMap aHashData; - aHashData[ ::rtl::OUString( "STD97EncryptionKey" ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDigestValue, RTL_DIGEST_LENGTH_MD5 ); - aHashData[ ::rtl::OUString( "STD97UniqueID" ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDocId, 16 ); + aHashData[ OUString( "STD97EncryptionKey" ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDigestValue, RTL_DIGEST_LENGTH_MD5 ); + aHashData[ OUString( "STD97UniqueID" ) ] <<= uno::Sequence< sal_Int8 >( (sal_Int8*)m_pDocId, 16 ); return aHashData.getAsConstNamedValueList(); } diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index bc659c4be509..b7759ab58b63 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -73,12 +73,12 @@ void CustomToolBarImportHelper::applyIcons() { for ( std::vector< iconcontrolitem >::iterator it = iconcommands.begin(); it != iconcommands.end(); ++it ) { - uno::Sequence< rtl::OUString > commands(1); + uno::Sequence< OUString > commands(1); commands[ 0 ] = it->sCommand; uno::Sequence< uno::Reference< graphic::XGraphic > > images(1); images[ 0 ] = it->image; - OSL_TRACE("About to applyIcons for command %s, have image ? %s", rtl::OUStringToOString( commands[ 0 ], RTL_TEXTENCODING_UTF8 ).getStr(), images[ 0 ].is() ? "yes" : "no" ); + OSL_TRACE("About to applyIcons for command %s, have image ? %s", OUStringToOString( commands[ 0 ], RTL_TEXTENCODING_UTF8 ).getStr(), images[ 0 ].is() ? "yes" : "no" ); uno::Reference< ui::XImageManager > xImageManager( getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW ); sal_uInt16 nColor = ui::ImageType::COLOR_NORMAL; @@ -93,7 +93,7 @@ void CustomToolBarImportHelper::applyIcons() } } -void CustomToolBarImportHelper::addIcon( const uno::Reference< graphic::XGraphic >& xImage, const rtl::OUString& sString ) +void CustomToolBarImportHelper::addIcon( const uno::Reference< graphic::XGraphic >& xImage, const OUString& sString ) { iconcontrolitem item; item.sCommand = sString; @@ -120,55 +120,55 @@ CustomToolBarImportHelper::getAppCfgManager() } uno::Any -CustomToolBarImportHelper::createCommandFromMacro( const rtl::OUString& sCmd ) +CustomToolBarImportHelper::createCommandFromMacro( const OUString& sCmd ) { //"vnd.sun.star.script:Standard.Module1.Main?language=Basic&location=document" - static rtl::OUString scheme( "vnd.sun.star.script:" ); - static rtl::OUString part2( "?language=Basic&location=document" ); + static OUString scheme( "vnd.sun.star.script:" ); + static OUString part2( "?language=Basic&location=document" ); // create script url - rtl::OUString scriptURL = scheme + sCmd + part2; + OUString scriptURL = scheme + sCmd + part2; return uno::makeAny( scriptURL ); } -rtl::OUString CustomToolBarImportHelper::MSOCommandToOOCommand( sal_Int16 msoCmd ) +OUString CustomToolBarImportHelper::MSOCommandToOOCommand( sal_Int16 msoCmd ) { - rtl::OUString result; + OUString result; if ( pMSOCmdConvertor.get() ) result = pMSOCmdConvertor->MSOCommandToOOCommand( msoCmd ); return result; } -rtl::OUString CustomToolBarImportHelper::MSOTCIDToOOCommand( sal_Int16 msoTCID ) +OUString CustomToolBarImportHelper::MSOTCIDToOOCommand( sal_Int16 msoTCID ) { - rtl::OUString result; + OUString result; if ( pMSOCmdConvertor.get() ) result = pMSOCmdConvertor->MSOTCIDToOOCommand( msoTCID ); return result; } bool -CustomToolBarImportHelper::createMenu( const rtl::OUString& rName, const uno::Reference< container::XIndexAccess >& xMenuDesc, bool bPersist ) +CustomToolBarImportHelper::createMenu( const OUString& rName, const uno::Reference< container::XIndexAccess >& xMenuDesc, bool bPersist ) { bool bRes = true; try { uno::Reference< ui::XUIConfigurationManager > xCfgManager( getCfgManager() ); - rtl::OUString sMenuBar("private:resource/menubar/"); + OUString sMenuBar("private:resource/menubar/"); sMenuBar += rName; uno::Reference< container::XIndexContainer > xPopup( xCfgManager->createSettings(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xProps( xPopup, uno::UNO_QUERY_THROW ); // set name for menubar - xProps->setPropertyValue( rtl::OUString("UIName"), uno::makeAny( rName ) ); + xProps->setPropertyValue( OUString("UIName"), uno::makeAny( rName ) ); if ( xPopup.is() ) { uno::Sequence< beans::PropertyValue > aPopupMenu( 4 ); - aPopupMenu[0].Name = rtl::OUString("CommandURL"); - aPopupMenu[0].Value = uno::makeAny( rtl::OUString("vnd.openoffice.org:") + rName ); - aPopupMenu[1].Name = rtl::OUString("Label"); + aPopupMenu[0].Name = OUString("CommandURL"); + aPopupMenu[0].Value = uno::makeAny( OUString("vnd.openoffice.org:") + rName ); + aPopupMenu[1].Name = OUString("Label"); aPopupMenu[1].Value <<= rName; - aPopupMenu[2].Name = rtl::OUString("ItemDescriptorContainer"); + aPopupMenu[2].Name = OUString("ItemDescriptorContainer"); aPopupMenu[2].Value = uno::makeAny( xMenuDesc ); - aPopupMenu[3].Name = rtl::OUString("Type" ); + aPopupMenu[3].Name = OUString("Type" ); aPopupMenu[3].Value <<= sal_Int32( 0 ); xPopup->insertByIndex( xPopup->getCount(), uno::makeAny( aPopupMenu ) ); @@ -297,7 +297,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect bBeginGroup = rHeader.isBeginGroup(); controlGeneralInfo.ImportToolBarControlData( helper, props ); beans::PropertyValue aProp; - aProp.Name = rtl::OUString("Visible") ; + aProp.Name = OUString("Visible") ; aProp.Value = uno::makeAny( rHeader.isVisible() ); // where is the visible attribute stored props.push_back( aProp ); if ( rHeader.getTct() == 0x01 @@ -307,7 +307,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect if ( pSpecificInfo ) { // if we have a icon then lets set it for the command - rtl::OUString sCommand; + OUString sCommand; for ( std::vector< css::beans::PropertyValue >::iterator it = props.begin(); it != props.end(); ++it ) { if ( it->Name == "CommandURL" ) @@ -332,10 +332,10 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect else if ( pSpecificInfo->getBtnFace() ) { - rtl::OUString sBuiltInCmd = helper.MSOTCIDToOOCommand( *pSpecificInfo->getBtnFace() ); + OUString sBuiltInCmd = helper.MSOTCIDToOOCommand( *pSpecificInfo->getBtnFace() ); if ( !sBuiltInCmd.isEmpty() ) { - uno::Sequence< rtl::OUString> sCmds(1); + uno::Sequence< OUString> sCmds(1); sCmds[ 0 ] = sBuiltInCmd; uno::Reference< ui::XImageManager > xImageManager( helper.getAppCfgManager()->getImageManager(), uno::UNO_QUERY_THROW ); // 0 = default image size @@ -348,8 +348,8 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect } else if ( rHeader.getTct() == 0x0a ) { - aProp.Name = rtl::OUString("CommandURL") ; - rtl::OUString sMenuBar("private:resource/menubar/"); + aProp.Name = OUString("CommandURL") ; + OUString sMenuBar("private:resource/menubar/"); TBCMenuSpecific* pMenu = getMenuSpecific(); if ( pMenu ) @@ -359,7 +359,7 @@ bool TBCData::ImportToolBarControl( CustomToolBarImportHelper& helper, std::vect } short icontext = ( rHeader.getTbct() & 0x03 ); - aProp.Name = rtl::OUString("Style") ; + aProp.Name = OUString("Style") ; if ( bIsMenuBar ) { nStyle |= ui::ItemStyle::TEXT; @@ -431,20 +431,20 @@ TBCExtraInfo::Print( FILE* fp ) Indent a; indent_printf( fp, "[ 0x%x ] TBCExtraInfo -- dump\n", nOffSet ); indent_printf( fp, " wstrHelpFile %s\n", - rtl::OUStringToOString( wstrHelpFile.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( wstrHelpFile.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); indent_printf( fp, " idHelpContext 0x%x\n", static_cast< unsigned int >( idHelpContext ) ); indent_printf( fp, " wstrTag %s\n", - rtl::OUStringToOString( wstrTag.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( wstrTag.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); indent_printf( fp, " wstrOnAction %s\n", - rtl::OUStringToOString( wstrOnAction.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( wstrOnAction.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); indent_printf( fp, " wstrParam %s\n", - rtl::OUStringToOString( wstrParam.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( wstrParam.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); indent_printf( fp, " tbcu 0x%x\n", tbcu ); indent_printf( fp, " tbmg 0x%x\n", tbmg ); } -rtl::OUString +OUString TBCExtraInfo::getOnAction() { return wstrOnAction.getString(); @@ -476,11 +476,11 @@ TBCGeneralInfo::Print( FILE* fp ) indent_printf( fp, "[ 0x%x ] TBCGeneralInfo -- dump\n", nOffSet ); indent_printf( fp, " bFlags 0x%x\n", bFlags ); indent_printf( fp, " customText %s\n", - rtl::OUStringToOString( customText.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( customText.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); indent_printf( fp, " description %s\n", - rtl::OUStringToOString( descriptionText.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( descriptionText.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); indent_printf( fp, " tooltip %s\n", - rtl::OUStringToOString( tooltip.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( tooltip.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); if ( bFlags & 0x4 ) extraInfo.Print( fp ); } @@ -495,24 +495,24 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std // if ( rHeader.getTct() == 0x01 && rHeader.getTcID() == 0x01 ) // not defined, probably this is a command if ( !extraInfo.getOnAction().isEmpty() ) { - aProp.Name = rtl::OUString("CommandURL"); + aProp.Name = OUString("CommandURL"); ooo::vba::MacroResolvedInfo aMacroInf = ooo::vba::resolveVBAMacro( &helper.GetDocShell(), extraInfo.getOnAction(), true ); if ( aMacroInf.mbFound ) aProp.Value = helper.createCommandFromMacro( aMacroInf.msResolvedMacro ); else - aProp.Value <<= rtl::OUString( "UnResolvedMacro[" ).concat( extraInfo.getOnAction() ).concat( rtl::OUString( "]" ) ); + aProp.Value <<= OUString( "UnResolvedMacro[" ).concat( extraInfo.getOnAction() ).concat( OUString( "]" ) ); sControlData.push_back( aProp ); } - aProp.Name = rtl::OUString("Label"); + aProp.Name = OUString("Label"); aProp.Value = uno::makeAny( customText.getString().replace('&','~') ); sControlData.push_back( aProp ); - aProp.Name = rtl::OUString("Type"); + aProp.Name = OUString("Type"); aProp.Value = uno::makeAny( ui::ItemType::DEFAULT ); sControlData.push_back( aProp ); - aProp.Name = rtl::OUString("Tooltip"); + aProp.Name = OUString("Tooltip"); aProp.Value = uno::makeAny( tooltip.getString() ); sControlData.push_back( aProp ); /* @@ -554,13 +554,13 @@ TBCMenuSpecific::Print( FILE* fp ) indent_printf( fp, "[ 0x%x ] TBCMenuSpecific -- dump\n", nOffSet ); indent_printf( fp, " tbid 0x%x\n", static_cast< unsigned int >( tbid ) ); if ( tbid == 1 ) - indent_printf( fp, " name %s\n", rtl::OUStringToOString( name->getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + indent_printf( fp, " name %s\n", OUStringToOString( name->getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); } -rtl::OUString TBCMenuSpecific::Name() +OUString TBCMenuSpecific::Name() { - rtl::OUString aName; + OUString aName; if ( name.get() ) aName = name->getString(); return aName; @@ -627,7 +627,7 @@ void TBCBSpecific::Print( FILE* fp ) indent_printf( fp, " iBtnFace 0x%x\n", *(iBtnFace.get()) ); } bResult = ( wstrAcc.get() != NULL ); - indent_printf( fp, " option string present? %s ->%s<-\n", bResult ? "true" : "false", bResult ? rtl::OUStringToOString( wstrAcc->getString(), RTL_TEXTENCODING_UTF8 ).getStr() : "N/A" ); + indent_printf( fp, " option string present? %s ->%s<-\n", bResult ? "true" : "false", bResult ? OUStringToOString( wstrAcc->getString(), RTL_TEXTENCODING_UTF8 ).getStr() : "N/A" ); } TBCBitMap* @@ -704,13 +704,13 @@ void TBCCDData::Print( FILE* fp) for ( sal_Int32 index=0; index < cwstrItems; ++index ) { Indent b; - indent_printf(fp, " wstrList[%d] %s", static_cast< int >( index ), rtl::OUStringToOString( wstrList[index].getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + indent_printf(fp, " wstrList[%d] %s", static_cast< int >( index ), OUStringToOString( wstrList[index].getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); } indent_printf(fp," cwstrMRU num most recently used string 0x%d item\n", cwstrMRU); indent_printf(fp," iSel index of selected item 0x%d item\n", iSel); indent_printf(fp," cLines num of suggested lines to display 0x%d", cLines); indent_printf(fp," dxWidth width in pixels 0x%d", dxWidth); - indent_printf(fp," wstrEdit %s", rtl::OUStringToOString( wstrEdit.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + indent_printf(fp," wstrEdit %s", OUStringToOString( wstrEdit.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); } TBCBitMap::TBCBitMap() : cbDIB( 0 ) @@ -780,7 +780,7 @@ void TB::Print( FILE* fp ) indent_printf(fp," ltbtr 0x%x\n", ltbtr ); indent_printf(fp," cRowsDefault 0x%x\n", cRowsDefault ); indent_printf(fp," bFlags 0x%x\n", bFlags ); - indent_printf(fp, " name %s\n", rtl::OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + indent_printf(fp, " name %s\n", OUStringToOString( name.getString(), RTL_TEXTENCODING_UTF8 ).getStr() ); } TBVisualData::TBVisualData() : tbds(0), tbv(0), tbdsDock(0), iRow(0) diff --git a/filter/source/msfilter/services.cxx b/filter/source/msfilter/services.cxx index e1723a31db1d..53725874c394 100644 --- a/filter/source/msfilter/services.cxx +++ b/filter/source/msfilter/services.cxx @@ -19,7 +19,6 @@ #include <cppuhelper/implementationentry.hxx> -using ::rtl::OUString; using namespace ::com::sun::star::uno; // Declare static functions providing service information ===================== diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 28892499e14e..cb8cce6d7b30 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7194,7 +7194,7 @@ void CreateTableRows( Reference< XTableRows > xTableRows, const std::set< sal_In else nHeight = nTableBottom - nLastPosition; - static const rtl::OUString sWidth( "Height" ); + static const OUString sWidth( "Height" ); Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ), UNO_QUERY_THROW ); xPropSet->setPropertyValue( sWidth, Any( nHeight ) ); } @@ -7219,7 +7219,7 @@ void CreateTableColumns( Reference< XTableColumns > xTableColumns, const std::se else nWidth = nTableRight - nLastPosition; - static const rtl::OUString sWidth( "Width" ); + static const OUString sWidth( "Width" ); Reference< XPropertySet > xPropSet( xIndexAccess->getByIndex( n ), UNO_QUERY_THROW ); xPropSet->setPropertyValue( sWidth, Any( nWidth ) ); } @@ -7254,16 +7254,16 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) const sal_Int32 nRightDist(((const SdrTextRightDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_RIGHTDIST)).GetValue()); const sal_Int32 nUpperDist(((const SdrTextUpperDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_UPPERDIST)).GetValue()); const sal_Int32 nLowerDist(((const SdrTextLowerDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_LOWERDIST)).GetValue()); - static const rtl::OUString sTopBorder( "TextUpperDistance" ); - static const rtl::OUString sBottomBorder( "TextLowerDistance" ); - static const rtl::OUString sLeftBorder( "TextLeftDistance" ); - static const rtl::OUString sRightBorder( "TextRightDistance" ); + static const OUString sTopBorder( "TextUpperDistance" ); + static const OUString sBottomBorder( "TextLowerDistance" ); + static const OUString sLeftBorder( "TextLeftDistance" ); + static const OUString sRightBorder( "TextRightDistance" ); xPropSet->setPropertyValue( sTopBorder, Any( nUpperDist ) ); xPropSet->setPropertyValue( sRightBorder, Any( nRightDist ) ); xPropSet->setPropertyValue( sLeftBorder, Any( nLeftDist ) ); xPropSet->setPropertyValue( sBottomBorder, Any( nLowerDist ) ); - static const rtl::OUString sTextVerticalAdjust( "TextVerticalAdjust" ); + static const OUString sTextVerticalAdjust( "TextVerticalAdjust" ); const SdrTextVertAdjust eTextVertAdjust(((const SdrTextVertAdjustItem&)pObj->GetMergedItem(SDRATTR_TEXT_VERTADJUST)).GetValue()); drawing::TextVerticalAdjust eVA( drawing::TextVerticalAdjust_TOP ); if ( eTextVertAdjust == SDRTEXTVERTADJUST_CENTER ) @@ -7275,8 +7275,8 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) //set textHorizontalAdjust and TextWritingMode attr const sal_Int32 eHA(((const SdrTextLeftDistItem&)pObj->GetMergedItem(SDRATTR_TEXT_HORZADJUST)).GetValue()); const SvxFrameDirection eDirection = (const SvxFrameDirection)((( const SvxFrameDirectionItem&)pObj->GetMergedItem(EE_PARA_WRITINGDIR)).GetValue()); - static const rtl::OUString sHorizontalAdjust( "TextHorizontalAdjust" ); - static const rtl::OUString sWritingMode( "TextWritingMode" ); + static const OUString sHorizontalAdjust( "TextHorizontalAdjust" ); + static const OUString sWritingMode( "TextWritingMode" ); xPropSet->setPropertyValue( sHorizontalAdjust , Any( eHA ) ); if ( eDirection == FRMDIR_VERT_TOP_RIGHT ) {//vertical writing @@ -7289,7 +7289,7 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) { case XFILL_SOLID : { - static const rtl::OUString sFillColor( String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ) ); + static const OUString sFillColor( String( RTL_CONSTASCII_USTRINGPARAM( "FillColor" ) ) ); eFS = com::sun::star::drawing::FillStyle_SOLID; Color aFillColor( ((XFillColorItem&)pObj->GetMergedItem( XATTR_FILLCOLOR )).GetColorValue() ); sal_Int32 nFillColor( aFillColor.GetColor() ); @@ -7313,7 +7313,7 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) aGradient.EndIntensity = aXGradient.GetEndIntens(); aGradient.StepCount = aXGradient.GetSteps(); - static const rtl::OUString sFillGradient( String( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" ) ) ); + static const OUString sFillGradient( String( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" ) ) ); xPropSet->setPropertyValue( sFillGradient, Any( aGradient ) ); } break; @@ -7325,7 +7325,7 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) eFS = com::sun::star::drawing::FillStyle_BITMAP; const XFillBitmapItem aXFillBitmapItem((const XFillBitmapItem&)pObj->GetMergedItem( XATTR_FILLBITMAP )); - rtl::OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); + OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); aURL += OStringToOUString( aXFillBitmapItem.GetGraphicObject().GetUniqueID(), RTL_TEXTENCODING_ASCII_US); @@ -7338,12 +7338,12 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell ) break; } - static const rtl::OUString sFillStyle( String( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ) ) ); + static const OUString sFillStyle( String( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ) ) ); xPropSet->setPropertyValue( sFillStyle, Any( eFS ) ); if ( eFillStyle != XFILL_NONE ) { sal_Int16 nFillTransparence( ( (const XFillTransparenceItem&)pObj->GetMergedItem( XATTR_FILLTRANSPARENCE ) ).GetValue() ); - static const rtl::OUString sFillTransparence( String( RTL_CONSTASCII_USTRINGPARAM( "FillTransparence" ) ) ); + static const OUString sFillTransparence( String( RTL_CONSTASCII_USTRINGPARAM( "FillTransparence" ) ) ); xPropSet->setPropertyValue( sFillTransparence, Any( nFillTransparence ) ); } } @@ -7381,12 +7381,12 @@ void ApplyCellLineAttributes( const SdrObject* pLine, Reference< XTable >& xTabl std::vector< sal_Int32 >::const_iterator aIter( vPositions.begin() ); while( aIter != vPositions.end() ) { - static const rtl::OUString sTopBorder( String( RTL_CONSTASCII_USTRINGPARAM( "TopBorder" ) ) ); - static const rtl::OUString sBottomBorder( String( RTL_CONSTASCII_USTRINGPARAM( "BottomBorder" ) ) ); - static const rtl::OUString sLeftBorder( String( RTL_CONSTASCII_USTRINGPARAM( "LeftBorder" ) ) ); - static const rtl::OUString sRightBorder( String( RTL_CONSTASCII_USTRINGPARAM( "RightBorder" ) ) ); - static const rtl::OUString sDiagonalTLBR( "DiagonalTLBR" ); - static const rtl::OUString sDiagonalBLTR( "DiagonalBLTR" ); + static const OUString sTopBorder( String( RTL_CONSTASCII_USTRINGPARAM( "TopBorder" ) ) ); + static const OUString sBottomBorder( String( RTL_CONSTASCII_USTRINGPARAM( "BottomBorder" ) ) ); + static const OUString sLeftBorder( String( RTL_CONSTASCII_USTRINGPARAM( "LeftBorder" ) ) ); + static const OUString sRightBorder( String( RTL_CONSTASCII_USTRINGPARAM( "RightBorder" ) ) ); + static const OUString sDiagonalTLBR( "DiagonalTLBR" ); + static const OUString sDiagonalBLTR( "DiagonalBLTR" ); sal_Int32 nPosition = *aIter & 0xffffff; sal_Int32 nFlags = *aIter &~0xffffff; diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index d3144fc3ca71..ca111203543e 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -40,7 +40,7 @@ rtl_TextEncoding getBestTextEncodingFromLocale(const ::com::sun::star::lang::Loc { //Obviously not comprehensive, feel free to expand these, they're for ultimate fallbacks //in last-ditch broken-file-format cases to guess the right 8bit encodings - const rtl::OUString &rLanguage = rLocale.Language; + const OUString &rLanguage = rLocale.Language; if (rLanguage == "cs" || rLanguage == "hu" || rLanguage == "pl") return RTL_TEXTENCODING_MS_1250; if (rLanguage == "ru" || rLanguage == "uk") @@ -99,7 +99,7 @@ DateTime DTTM2DateTime( long lDTTM ) } /// Append the number as 2-digit when less than 10. -static void lcl_AppendTwoDigits( rtl::OStringBuffer &rBuffer, sal_Int32 nNum ) +static void lcl_AppendTwoDigits( OStringBuffer &rBuffer, sal_Int32 nNum ) { if ( nNum < 0 || nNum > 99 ) { @@ -113,14 +113,14 @@ static void lcl_AppendTwoDigits( rtl::OStringBuffer &rBuffer, sal_Int32 nNum ) rBuffer.append( nNum ); } -rtl::OString DateTimeToOString( const DateTime& rDateTime ) +OString DateTimeToOString( const DateTime& rDateTime ) { DateTime aInUTC( rDateTime ); // HACK: this is correct according to the spec, but MSOffice believes everybody lives // in UTC+0 when reading it back // aInUTC.ConvertToUTC(); - rtl::OStringBuffer aBuffer( 25 ); + OStringBuffer aBuffer( 25 ); aBuffer.append( sal_Int32( aInUTC.GetYear() ) ); aBuffer.append( '-' ); @@ -143,10 +143,10 @@ rtl::OString DateTimeToOString( const DateTime& rDateTime ) } sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar, - rtl_TextEncoding& rChrSet, rtl::OUString& rFontName, bool bDisableUnicodeSupport) + rtl_TextEncoding& rChrSet, OUString& rFontName, bool bDisableUnicodeSupport) { StarSymbolToMSMultiFont *pConvert = CreateStarSymbolToMSMultiFont(); - rtl::OUString sFont = pConvert->ConvertChar(cChar); + OUString sFont = pConvert->ConvertChar(cChar); delete pConvert; if (!sFont.isEmpty()) { @@ -224,7 +224,7 @@ sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar, U+FE50–U+FE6F Use latin font Otherwise Use ea font */ -TextCategory categorizeCodePoint(sal_uInt32 codePoint, const rtl::OUString &rBcp47LanguageTag) +TextCategory categorizeCodePoint(sal_uInt32 codePoint, const OUString &rBcp47LanguageTag) { TextCategory eRet = ea; if (codePoint <= 0x007F) diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index 649b83ad94f0..b31b7bd1cee9 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -232,7 +232,7 @@ component_getFactory( const sal_Char* pImplementationName, com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xSMGR = reinterpret_cast< com::sun::star::lang::XMultiServiceFactory* >(pServiceManager); com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory; - rtl::OUString sImplName = rtl::OUString::createFromAscii(pImplementationName); + OUString sImplName = OUString::createFromAscii(pImplementationName); if (OdfFlatXml::impl_getImplementationName() == sImplName) xFactory = cppu::createOneInstanceFactory( xSMGR, diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index a826db3e51c7..9ddf0520bb9b 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1294,8 +1294,8 @@ IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl) aPwdDialog.AllowAsciiOnly(); if( aPwdDialog.Execute() == RET_OK ) //OK issued get password and set it { - rtl::OUString aUserPW( aPwdDialog.GetPassword() ); - rtl::OUString aOwnerPW( aPwdDialog.GetPassword2() ); + OUString aUserPW( aPwdDialog.GetPassword() ); + OUString aOwnerPW( aPwdDialog.GetPassword2() ); mbHaveUserPassword = !aUserPW.isEmpty(); mbHaveOwnerPassword = !aOwnerPW.isEmpty(); diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index d289ca021c1e..11a3f3869a21 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -132,7 +132,7 @@ protected: com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > mxPreparedPasswords; sal_Bool mbIsRangeChecked; - rtl::OUString msPageRange; + OUString msPageRange; sal_Bool mbSelectionIsChecked; sal_Bool mbExportRelativeFsysLinks; @@ -141,13 +141,13 @@ protected: sal_Bool mbExportBmkToPDFDestination; sal_Bool mbSignPDF; - ::rtl::OUString msSignPassword; - ::rtl::OUString msSignLocation; - ::rtl::OUString msSignContact; - ::rtl::OUString msSignReason; + OUString msSignPassword; + OUString msSignLocation; + OUString msSignContact; + OUString msSignReason; com::sun::star::uno::Reference< com::sun::star::security::XCertificate > maSignCertificate; - ::rtl::OUString maWatermarkText; + OUString maWatermarkText; public: diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 75e698391a3b..c6e26487dbad 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -378,7 +378,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue if( aURL.GetProtocol() != INET_PROT_FILE ) { - rtl::OUString aTmp; + OUString aTmp; if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFile, aTmp ) ) aURL = INetURLObject(aTmp); @@ -394,7 +394,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue OUString aPageRange; Any aSelection; PDFWriter::PDFWriterContext aContext; - rtl::OUString aOpenPassword, aPermissionPassword; + OUString aOpenPassword, aPermissionPassword; Reference< beans::XMaterialHolder > xEnc; Sequence< beans::NamedValue > aPreparedPermissionPassword; @@ -715,8 +715,8 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue // after this point we don't need the legacy clear passwords anymore // however they are still inside the passed filter data sequence // which is sadly out out our control - aPermissionPassword = rtl::OUString(); - aOpenPassword = rtl::OUString(); + aPermissionPassword = OUString(); + aOpenPassword = OUString(); /* * FIXME: the entries are only implicitly defined by the resource file. Should there diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx index 651c9d94a261..2219a3acae92 100644 --- a/filter/source/placeware/exporter.cxx +++ b/filter/source/placeware/exporter.cxx @@ -40,8 +40,6 @@ #include "zip.hxx" #include "tempfile.hxx" -using rtl::OUString; -using rtl::OString; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::container; @@ -74,10 +72,10 @@ class PageEntry { private: TempFile maTempFile; - rtl::OUString maName; - rtl::OUString maTitle; - rtl::OUString maNotes; - rtl::OUString maURL; + OUString maName; + OUString maTitle; + OUString maNotes; + OUString maURL; public: PageEntry(); @@ -85,17 +83,17 @@ public: OUString getTempURL() { return maTempFile.getFileURL(); } - void setName( const rtl::OUString& rName ) { maName = rName; } - const rtl::OUString& getName() const { return maName; } + void setName( const OUString& rName ) { maName = rName; } + const OUString& getName() const { return maName; } - void setTitle( const rtl::OUString& rTitle ) { maTitle = rTitle; } - const rtl::OUString& getTitle() const { return maTitle; } + void setTitle( const OUString& rTitle ) { maTitle = rTitle; } + const OUString& getTitle() const { return maTitle; } - void setNotes( const rtl::OUString& rNotes ) { maNotes = rNotes; } - const rtl::OUString& getNotes() const { return maNotes; } + void setNotes( const OUString& rNotes ) { maNotes = rNotes; } + const OUString& getNotes() const { return maNotes; } - void setURL( const rtl::OUString& rURL ) { maURL = rURL; } - const rtl::OUString& getURL() const { return maURL; } + void setURL( const OUString& rURL ) { maURL = rURL; } + const OUString& getURL() const { return maURL; } }; PageEntry::PageEntry() @@ -152,7 +150,7 @@ static void encodeFile( osl::File& rSourceFile, Reference< XOutputStream >& xOut nLen -= nRead; - rtl::OUStringBuffer aStrBuffer; + OUStringBuffer aStrBuffer; ::sax::Converter::encodeBase64(aStrBuffer, aInBuffer); sal_Int32 nCount = aStrBuffer.getLength(); @@ -183,7 +181,7 @@ static OString convertString( OUString aInput ) return aRet; } -static void createSlideFile( Reference< XComponent > xDoc, ZipFile& rZipFile, const rtl::OUString& rURL, vector< PageEntry* >& rPageEntries ) throw( ::com::sun::star::uno::Exception ) +static void createSlideFile( Reference< XComponent > xDoc, ZipFile& rZipFile, const OUString& rURL, vector< PageEntry* >& rPageEntries ) throw( ::com::sun::star::uno::Exception ) { OString aInfo; @@ -287,7 +285,7 @@ static void createSlideFile( Reference< XComponent > xDoc, ZipFile& rZipFile, co //#define PLACEWARE_DEBUG 1 sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference < XOutputStream > xOutputStream, - const rtl::OUString& rURL, Reference < XInterface > /* xHandler */, Reference < XStatusIndicator >& xStatusIndicator ) + const OUString& rURL, Reference < XInterface > /* xHandler */, Reference < XStatusIndicator >& xStatusIndicator ) { sal_Bool bRet = sal_False; diff --git a/filter/source/placeware/exporter.hxx b/filter/source/placeware/exporter.hxx index d9405f6d9e6a..20c49303ca21 100644 --- a/filter/source/placeware/exporter.hxx +++ b/filter/source/placeware/exporter.hxx @@ -37,7 +37,7 @@ public: sal_Bool doExport( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xDoc, ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xOutputStream, - const rtl::OUString& rURL, + const OUString& rURL, ::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface > xHandler, ::com::sun::star::uno::Reference < ::com::sun::star::task::XStatusIndicator >& rxStatusIndicator ); diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx index 7e860b481830..52c48c23e95e 100644 --- a/filter/source/placeware/filter.cxx +++ b/filter/source/placeware/filter.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using ::rtl::OUString; using ::com::sun::star::lang::XComponent; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::io::XOutputStream; diff --git a/filter/source/placeware/tempfile.cxx b/filter/source/placeware/tempfile.cxx index b3bd97f51317..e680e451b020 100644 --- a/filter/source/placeware/tempfile.cxx +++ b/filter/source/placeware/tempfile.cxx @@ -118,7 +118,6 @@ oslFileError SAL_CALL my_getTempDirURL( rtl_uString** pustrTempDir ) #include "tempfile.hxx" -using ::rtl::OUString; TempFile::TempFile( const OUString& rTempFileURL ) :osl::File( rTempFileURL ), maURL( rTempFileURL ) { diff --git a/filter/source/placeware/tempfile.hxx b/filter/source/placeware/tempfile.hxx index db57a2672da7..0712017c81d8 100644 --- a/filter/source/placeware/tempfile.hxx +++ b/filter/source/placeware/tempfile.hxx @@ -26,14 +26,14 @@ class TempFile : public osl::File { public: - TempFile( const rtl::OUString& aURL ); + TempFile( const OUString& aURL ); ~TempFile(); - static rtl::OUString createTempFileURL(); - rtl::OUString getFileURL(); + static OUString createTempFileURL(); + OUString getFileURL(); private: - rtl::OUString maURL; + OUString maURL; }; diff --git a/filter/source/placeware/zip.cxx b/filter/source/placeware/zip.cxx index a1cb56127a95..57a86fa0f6d2 100644 --- a/filter/source/placeware/zip.cxx +++ b/filter/source/placeware/zip.cxx @@ -23,7 +23,6 @@ #include "zip.hxx" #include "zipfile.hxx" -using ::rtl::OString; /** this struct describes one entry in a zip file */ struct ZipEntry { diff --git a/filter/source/placeware/zip.hxx b/filter/source/placeware/zip.hxx index 2f8e0d9c9c57..909400f3f95a 100644 --- a/filter/source/placeware/zip.hxx +++ b/filter/source/placeware/zip.hxx @@ -31,7 +31,7 @@ public: ZipFile( osl::File& rFile ); ~ZipFile(); - bool addFile( osl::File& rFile, const rtl::OString& rName ); + bool addFile( osl::File& rFile, const OString& rName ); bool close(); private: diff --git a/filter/source/svg/gfxtypes.hxx b/filter/source/svg/gfxtypes.hxx index 7cebe1ab3b67..3a025f69a93c 100644 --- a/filter/source/svg/gfxtypes.hxx +++ b/filter/source/svg/gfxtypes.hxx @@ -214,7 +214,7 @@ struct State basegfx::B2DRange maViewBox; bool mbIsText; - rtl::OUString maFontFamily; + OUString maFontFamily; /** Absolute: xx-small=6.94 | x-small=8.33 | small=10 | medium=12 | large=14.4 | x-large=17.28 | xx-large=20.736 Relative(to parent): larger (enlarge by 1.2) @@ -222,8 +222,8 @@ struct State */ double mnFontSize; - rtl::OUString maFontStyle; - rtl::OUString maFontVariant; + OUString maFontStyle; + OUString maFontVariant; double mnFontWeight; TextAlign meTextAnchor; // text-anchor diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 02a61b55f166..b2ba26baffd5 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -53,8 +53,8 @@ protected: // OGenericUnoDialog virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); virtual Dialog* createDialog( Window* pParent ); virtual void executedDialog( sal_Int16 nExecutionResult ); virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException); @@ -78,17 +78,17 @@ public: // ----------------------------------------------------------------------------- -::rtl::OUString SVGDialog_getImplementationName () +OUString SVGDialog_getImplementationName () throw ( ::com::sun::star::uno::RuntimeException ); // ----------------------------------------------------------------------------- -sal_Bool SAL_CALL SVGDialog_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SVGDialog_supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); // ----------------------------------------------------------------------------- -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL SVGDialog_getSupportedServiceNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames( ) throw ( ::com::sun::star::uno::RuntimeException ); // ----------------------------------------------------------------------------- diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index f26f1f80b3fa..918ef4830e58 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -45,7 +45,6 @@ #include <boost/preprocessor/repetition/repeat.hpp> -using ::rtl::OUString; using namespace ::com::sun::star; // ------------------------------- @@ -97,7 +96,7 @@ static const char aOOOAttrTextAdjust[] = NSPREFIX "text-adjust"; * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #define TEXT_FIELD_GET_CLASS_NAME_METHOD( class_name ) \ -virtual ::rtl::OUString getClassName() const \ +virtual OUString getClassName() const \ { \ static const char className[] = #class_name; \ return OUString( className ); \ @@ -123,7 +122,7 @@ public: } virtual ~TextField() {} protected: - void implGrowCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets, ::rtl::OUString sText, ::rtl::OUString sTextFieldId ) const + void implGrowCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets, OUString sText, OUString sTextFieldId ) const { const sal_Unicode * ustr = sText.getStr(); sal_Int32 nLength = sText.getLength(); @@ -142,7 +141,7 @@ protected: class FixedTextField : public TextField { public: - ::rtl::OUString text; + OUString text; TEXT_FIELD_GET_CLASS_NAME_METHOD( FixedTextField ) virtual sal_Bool equalTo( const TextField & aTextField ) const @@ -563,7 +562,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) pValue[ i ].Value >>= xOStm; else if ( pValue[ i ].Name == "FileName" ) { - ::rtl::OUString aFileName; + OUString aFileName; pValue[ i ].Value >>= aFileName; pOStm = ::utl::UcbStreamHelper::CreateStream( aFileName, STREAM_WRITE | STREAM_TRUNC ); @@ -587,7 +586,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) // font embedding const char* pSVGDisableFontEmbedding = getenv( "SVG_DISABLE_FONT_EMBEDDING" ); - rtl::OUString aEmbedFontEnv("${SVG_DISABLE_FONT_EMBEDDING}"); + OUString aEmbedFontEnv("${SVG_DISABLE_FONT_EMBEDDING}"); rtl::Bootstrap::expandMacros(aEmbedFontEnv); const bool bEmbedFonts=pSVGDisableFontEmbedding ? false : ( aEmbedFontEnv.getLength() ? false : true); @@ -605,7 +604,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) maFilterData[ 3 ].Name = SVG_PROP_GLYPHPLACEMENT; if( pSVGGlyphPlacement ) - maFilterData[ 3 ].Value <<= ::rtl::OUString::createFromAscii( pSVGGlyphPlacement ); + maFilterData[ 3 ].Value <<= OUString::createFromAscii( pSVGGlyphPlacement ); else maFilterData[ 3 ].Value <<= OUString("xlist"); @@ -1258,7 +1257,7 @@ void SVGFilter::implEmbedBulletGlyphs() // ----------------------------------------------------------------------------- -void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const ::rtl::OUString & sPathData ) +void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPathData ) { OUString sId = "bullet-char-template(" + OUString::number( (sal_Int32)cBullet ) + ")"; mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", sId ); @@ -1534,7 +1533,7 @@ sal_Bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rx } // ----------------------------------------------------------------------------- -sal_Bool SVGFilter::implExportPage( const ::rtl::OUString & sPageId, +sal_Bool SVGFilter::implExportPage( const OUString & sPageId, const Reference< XDrawPage > & rxPage, const Reference< XShapes > & xShapes, sal_Bool bMaster ) @@ -1663,7 +1662,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape ) if( xShapePropSet.is() ) { - const ::rtl::OUString aShapeType( rxShape->getShapeType() ); + const OUString aShapeType( rxShape->getShapeType() ); sal_Bool bHideObj = sal_False; if( mbPresentation ) @@ -1688,7 +1687,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape ) if( !bRet && mpObjects->find( rxShape ) != mpObjects->end() ) { - const ::rtl::OUString* pElementId = NULL; + const OUString* pElementId = NULL; ::com::sun::star::awt::Rectangle aBoundRect; const GDIMetaFile& rMtf = (*mpObjects)[ rxShape ].GetRepresentation(); @@ -2086,7 +2085,7 @@ void SVGFilter::implRegisterInterface( const Reference< XInterface >& rxIf ) // ----------------------------------------------------------------------------- -const ::rtl::OUString & SVGFilter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf ) +const OUString & SVGFilter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf ) { return (mpSVGExport->getInterfaceToIdentifierMapper()).getIdentifier( rxIf ); } diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index 6b7245192d16..eb22854abca8 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -44,7 +44,6 @@ #include "svgfilter.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; // ------------- @@ -266,7 +265,7 @@ void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc // ----------------------------------------------------------------------------- -rtl::OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException) +OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException) { uno::Reference< io::XInputStream > xInput; @@ -279,7 +278,7 @@ rtl::OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescrip } if( !xInput.is() ) - return rtl::OUString(); + return OUString(); uno::Reference< io::XSeekable > xSeek( xInput, uno::UNO_QUERY ); if( xSeek.is() ) @@ -295,14 +294,14 @@ rtl::OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescrip sal_Int8 aMagic1[] = {'<', 's', 'v', 'g'}; if( std::search(pBuf, pBuf+nBytes, aMagic1, aMagic1+sizeof(aMagic1)/sizeof(*aMagic1)) != pBuf+nBytes ) - return rtl::OUString("svg_Scalable_Vector_Graphics"); + return OUString("svg_Scalable_Vector_Graphics"); sal_Int8 aMagic2[] = {'D', 'O', 'C', 'T', 'Y', 'P', 'E', ' ', 's', 'v', 'g'}; if( std::search(pBuf, pBuf+nBytes, aMagic2, aMagic2+sizeof(aMagic2)/sizeof(*aMagic2)) != pBuf+nBytes ) - return rtl::OUString("svg_Scalable_Vector_Graphics"); + return OUString("svg_Scalable_Vector_Graphics"); - return rtl::OUString(); + return OUString(); } // ----------------------------------------------------------------------------- diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index ce315b55db59..3c8e5a88156a 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -99,7 +99,7 @@ using namespace ::std; // Placeholder tag used into the ImplWriteActions method to filter text placeholder fields -static const ::rtl::OUString sPlaceholderTag = ::rtl::OUString::createFromAscii( "<[:isPlaceholder:]>" ); +static const OUString sPlaceholderTag = OUString::createFromAscii( "<[:isPlaceholder:]>" ); class SVGExport : public SvXMLExport { @@ -169,9 +169,9 @@ struct PagePropertySet sal_Bool bIsDateTimeFieldFixed; sal_Int16 nPageNumber; sal_Int32 nDateTimeFormat; - ::rtl::OUString sDateTimeText; - ::rtl::OUString sFooterText; - ::rtl::OUString sHeaderText; + OUString sDateTimeText; + OUString sFooterText; + OUString sHeaderText; }; struct HashReferenceXInterface @@ -184,7 +184,7 @@ struct HashReferenceXInterface struct HashOUString { - size_t operator()( const ::rtl::OUString& oustr ) const { return static_cast< size_t >( oustr.hashCode() ); } + size_t operator()( const OUString& oustr ) const { return static_cast< size_t >( oustr.hashCode() ); } }; struct HashUChar @@ -219,10 +219,10 @@ public: typedef Sequence< Reference< XDrawPage > > XDrawPageSequence; typedef ::boost::unordered_set< sal_Unicode, HashUChar > UCharSet; - typedef ::boost::unordered_map< ::rtl::OUString, UCharSet, HashOUString > UCharSetMap; + typedef ::boost::unordered_map< OUString, UCharSet, HashOUString > UCharSetMap; typedef ::boost::unordered_map< Reference< XInterface >, UCharSetMap, HashReferenceXInterface > UCharSetMapMap; - typedef ::boost::unordered_map< Reference< XInterface >, ::rtl::OUString, HashReferenceXInterface > UOStringMap; + typedef ::boost::unordered_map< Reference< XInterface >, OUString, HashReferenceXInterface > UOStringMap; typedef ::boost::unordered_set< ObjectRepresentation, HashBitmap, EqualityBitmap > MetaBitmapActionSet; @@ -240,7 +240,7 @@ private: sal_Bool mbSinglePage; sal_Int32 mnVisiblePage; PagePropertySet mVisiblePagePropSet; - ::rtl::OUString msClipPathId; + OUString msClipPathId; UCharSetMapMap mTextFieldCharSets; Reference< XInterface > mCreateOjectsCurrentMasterPage; UOStringMap mTextShapeIdListMap; @@ -267,7 +267,7 @@ private: sal_Bool implGenerateMetaData(); void implExportTextShapeIndex(); void implEmbedBulletGlyphs(); - void implEmbedBulletGlyph( sal_Unicode cBullet, const ::rtl::OUString & sPathData ); + void implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPathData ); sal_Bool implExportTextEmbeddedBitmaps(); sal_Bool implGenerateScript(); @@ -278,7 +278,7 @@ private: sal_Int32 nFirstPage, sal_Int32 nLastPage ); sal_Bool implExportDrawPages( const XDrawPageSequence& rxPages, sal_Int32 nFirstPage, sal_Int32 nLastPage ); - sal_Bool implExportPage( const ::rtl::OUString & sPageId, + sal_Bool implExportPage( const OUString & sPageId, const Reference< XDrawPage > & rxPage, const Reference< XShapes > & xShapes, sal_Bool bMaster ); @@ -291,12 +291,12 @@ private: sal_Bool implCreateObjectsFromShape( const Reference< XDrawPage > & rxPage, const Reference< XShape >& rxShape ); sal_Bool implCreateObjectsFromBackground( const Reference< XDrawPage >& rxMasterPage ); - ::rtl::OUString implGetClassFromShape( const Reference< XShape >& rxShape ); + OUString implGetClassFromShape( const Reference< XShape >& rxShape ); void implRegisterInterface( const Reference< XInterface >& rxIf ); - const ::rtl::OUString & implGetValidIDFromInterface( const Reference< XInterface >& rxIf ); - ::rtl::OUString implGetInterfaceName( const Reference< XInterface >& rxIf ); + const OUString & implGetValidIDFromInterface( const Reference< XInterface >& rxIf ); + OUString implGetInterfaceName( const Reference< XInterface >& rxIf ); sal_Bool implLookForFirstVisiblePage(); - Any implSafeGetPagePropSet( const ::rtl::OUString & sPropertyName, + Any implSafeGetPagePropSet( const OUString & sPropertyName, const Reference< XPropertySet > & rxPropSet, const Reference< XPropertySetInfo > & rxPropSetInfo ); DECL_LINK( CalcFieldHdl, EditFieldInfo* ); @@ -314,7 +314,7 @@ protected: virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException); // XExtendedFilterDetection - virtual rtl::OUString SAL_CALL detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException); + virtual OUString SAL_CALL detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException); public: diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index 46b038f2d191..d7cb1c2ebc3c 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -52,7 +52,7 @@ SVGFontExport::GlyphSet& SVGFontExport::implGetGlyphSet( const Font& rFont ) { FontWeight eWeight( WEIGHT_NORMAL ); FontItalic eItalic( ITALIC_NONE ); - ::rtl::OUString aFontName( rFont.GetName() ); + OUString aFontName( rFont.GetName() ); sal_Int32 nNextTokenPos( 0 ); switch( rFont.GetWeight() ) @@ -92,7 +92,7 @@ void SVGFontExport::implCollectGlyphs() for( size_t i = 0, nCount = rMtf.GetActionSize(); i < nCount; ++i ) { - ::rtl::OUString aText; + OUString aText; MetaAction* pAction = rMtf.GetAction( i ); const sal_uInt16 nType = pAction->GetType(); @@ -159,7 +159,7 @@ void SVGFontExport::implCollectGlyphs() const sal_Unicode* pStr = aText.getStr(); for( sal_uInt32 k = 0, nLen = aText.getLength(); k < nLen; ++k ) - rGlyphSet.insert( rtl::OUString( pStr[ k ] ) ); + rGlyphSet.insert( OUString( pStr[ k ] ) ); } } } @@ -186,8 +186,8 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) { SvXMLElementExport aExp( mrExport, XML_NAMESPACE_NONE, "defs", sal_True, sal_True ); - ::rtl::OUString aCurIdStr( aEmbeddedFontStr ); - ::rtl::OUString aUnitsPerEM( ::rtl::OUString::valueOf( nFontEM ) ); + OUString aCurIdStr( aEmbeddedFontStr ); + OUString aUnitsPerEM( OUString::valueOf( nFontEM ) ); VirtualDevice aVDev; Font aFont( rFont ); @@ -197,13 +197,13 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) aVDev.SetMapMode( MAP_100TH_MM ); aVDev.SetFont( aFont ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", aCurIdStr += ::rtl::OUString::valueOf( ++mnCurFontId ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "id", aCurIdStr += OUString::valueOf( ++mnCurFontId ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", aUnitsPerEM ); { SvXMLElementExport aExp2( mrExport, XML_NAMESPACE_NONE, "font", sal_True, sal_True ); - ::rtl::OUString aFontWeight; - ::rtl::OUString aFontStyle; + OUString aFontWeight; + OUString aFontStyle; const Size aSize( nFontEM, nFontEM ); // Font Weight @@ -222,14 +222,14 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) mrExport.AddAttribute( XML_NAMESPACE_NONE, "units-per-em", aUnitsPerEM ); mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-weight", aFontWeight ); mrExport.AddAttribute( XML_NAMESPACE_NONE, "font-style", aFontStyle ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, "ascent", ::rtl::OUString::valueOf( aVDev.GetFontMetric().GetAscent() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, "descent", ::rtl::OUString::valueOf( aVDev.GetFontMetric().GetDescent() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "ascent", OUString::valueOf( aVDev.GetFontMetric().GetAscent() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "descent", OUString::valueOf( aVDev.GetFontMetric().GetDescent() ) ); { SvXMLElementExport aExp3( mrExport, XML_NAMESPACE_NONE, "font-face", sal_True, sal_True ); } - mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", ::rtl::OUString::valueOf( aSize.Width() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", OUString::valueOf( aSize.Width() ) ); { const Point aPos; @@ -255,7 +255,7 @@ void SVGFontExport::implEmbedFont( const Font& rFont ) // ----------------------------------------------------------------------------- -void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const ::rtl::OUString& rCellStr ) +void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const OUString& rCellStr ) { PolyPolygon aPolyPoly; const sal_Unicode nSpace = ' '; @@ -272,11 +272,11 @@ void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const ::rtl::OUString& r mrExport.AddAttribute( XML_NAMESPACE_NONE, "unicode", rCellStr ); if( rCellStr[ 0 ] == nSpace && rCellStr.getLength() == 1 ) - aBoundRect = Rectangle( Point( 0, 0 ), Size( rOut.GetTextWidth( rtl::OUString(' ') ), 0 ) ); + aBoundRect = Rectangle( Point( 0, 0 ), Size( rOut.GetTextWidth( OUString(' ') ), 0 ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", ::rtl::OUString::valueOf( aBoundRect.GetWidth() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x", OUString::valueOf( aBoundRect.GetWidth() ) ); - const ::rtl::OUString aPathString( SVGActionWriter::GetPathString( aPolyPoly, sal_False ) ); + const OUString aPathString( SVGActionWriter::GetPathString( aPolyPoly, sal_False ) ); if( !aPathString.isEmpty() ) { mrExport.AddAttribute( XML_NAMESPACE_NONE, "d", aPathString ); @@ -328,10 +328,10 @@ void SVGFontExport::EmbedFonts() // ----------------------------------------------------------------------------- -::rtl::OUString SVGFontExport::GetMappedFontName( const ::rtl::OUString& rFontName ) const +OUString SVGFontExport::GetMappedFontName( const OUString& rFontName ) const { sal_Int32 nNextTokenPos( 0 ); - ::rtl::OUString aRet( rFontName.getToken( 0, ';', nNextTokenPos ) ); + OUString aRet( rFontName.getToken( 0, ';', nNextTokenPos ) ); if( mnCurFontId ) aRet += " embedded"; diff --git a/filter/source/svg/svgfontexport.hxx b/filter/source/svg/svgfontexport.hxx index 1a6face4a16a..364af363ecb1 100644 --- a/filter/source/svg/svgfontexport.hxx +++ b/filter/source/svg/svgfontexport.hxx @@ -38,10 +38,10 @@ class OutputDevice; class SVGFontExport { typedef ::std::vector< ObjectRepresentation > ObjectVector; - typedef ::std::set< ::rtl::OUString, ::std::greater< ::rtl::OUString > > GlyphSet; + typedef ::std::set< OUString, ::std::greater< OUString > > GlyphSet; typedef ::std::map< FontItalic, GlyphSet > FontItalicMap; typedef ::std::map< FontWeight, FontItalicMap > FontWeightMap; - typedef ::std::map< ::rtl::OUString, FontWeightMap > FontNameMap; + typedef ::std::map< OUString, FontWeightMap > FontNameMap; typedef FontNameMap GlyphTree; private: @@ -54,7 +54,7 @@ private: GlyphSet& implGetGlyphSet( const Font& rFont ); void implCollectGlyphs(); void implEmbedFont( const Font& rFont ); - void implEmbedGlyph( OutputDevice& rOut, const ::rtl::OUString& rCellStr ); + void implEmbedGlyph( OutputDevice& rOut, const OUString& rCellStr ); public: @@ -62,7 +62,7 @@ public: ~SVGFontExport(); void EmbedFonts(); - ::rtl::OUString GetMappedFontName( const ::rtl::OUString& rFontName ) const; + OUString GetMappedFontName( const OUString& rFontName ) const; }; #endif diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx index a44b231f599d..8ec38eef3471 100644 --- a/filter/source/svg/svgimport.cxx +++ b/filter/source/svg/svgimport.cxx @@ -63,7 +63,7 @@ sal_Bool SVGFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) if(!xInputStream.is()) return sal_False; - rtl::OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" ); + OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" ); Reference < XDocumentHandler > xInternalHandler( mxContext->getServiceManager()->createInstanceWithContext( sXMLImportService, mxContext ), UNO_QUERY ); // The XImporter sets up an empty target document for XDocumentHandler to write to.. diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index af3d6aec61b6..a1612dc0f945 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -136,7 +136,7 @@ double colorDiffSquared(const ARGBColor& rCol1, const ARGBColor& rCol2) + square(rCol1.b-rCol2.b); } -typedef std::map<rtl::OUString,sal_Size> ElementRefMapType; +typedef std::map<OUString,sal_Size> ElementRefMapType; struct AnnotatingVisitor { @@ -187,7 +187,7 @@ struct AnnotatingVisitor uno::Reference<xml::dom::XNode> xNode(xAttributes->getNamedItem("href")); if(xNode.is()) { - const rtl::OUString sValue(xNode->getNodeValue()); + const OUString sValue(xNode->getNodeValue()); ElementRefMapType::iterator aFound=maGradientIdMap.end(); if ( sValue.copy(0,1) == "#" ) aFound = maGradientIdMap.find(sValue.copy(1)); @@ -224,7 +224,7 @@ struct AnnotatingVisitor uno::Reference<xml::dom::XNode> xNode(xAttributes->getNamedItem("href")); if(xNode.is()) { - const rtl::OUString sValue(xNode->getNodeValue()); + const OUString sValue(xNode->getNodeValue()); ElementRefMapType::iterator aFound=maGradientIdMap.end(); if ( sValue.copy(0,1) == "#" ) aFound = maGradientIdMap.find(sValue.copy(1)); @@ -272,7 +272,7 @@ struct AnnotatingVisitor // scan for style info const sal_Int32 nNumAttrs( xAttributes->getLength() ); - rtl::OUString sAttributeValue; + OUString sAttributeValue; for( sal_Int32 i=0; i<nNumAttrs; ++i ) { sAttributeValue = xAttributes->item(i)->getNodeValue(); @@ -315,9 +315,9 @@ struct AnnotatingVisitor } } - rtl::OUString getStyleName( const char* sPrefix, sal_Int32 nId ) + OUString getStyleName( const char* sPrefix, sal_Int32 nId ) { - return rtl::OUString::createFromAscii(sPrefix)+rtl::OUString::valueOf(nId); + return OUString::createFromAscii(sPrefix)+OUString::valueOf(nId); } bool hasGradientOpacity( const Gradient& rGradient ) @@ -411,10 +411,10 @@ struct AnnotatingVisitor basegfx::fround(val*255.0)); } - rtl::OUString getOdfColor( const ARGBColor& rColor ) + OUString getOdfColor( const ARGBColor& rColor ) { // TODO(Q3): duplicated from pdfimport - rtl::OUStringBuffer aBuf( 7 ); + OUStringBuffer aBuf( 7 ); const sal_uInt8 nRed ( toByteColor(rColor.r) ); const sal_uInt8 nGreen( toByteColor(rColor.g) ); const sal_uInt8 nBlue ( toByteColor(rColor.b) ); @@ -435,12 +435,12 @@ struct AnnotatingVisitor return aBuf.makeStringAndClear(); } - rtl::OUString getOdfAlign( TextAlign eAlign ) + OUString getOdfAlign( TextAlign eAlign ) { - static ::rtl::OUString aStart("start"); - static ::rtl::OUString aEnd("end"); - // static ::rtl::OUString aJustify("justify"); - static ::rtl::OUString aCenter("center"); + static OUString aStart("start"); + static OUString aEnd("end"); + // static OUString aJustify("justify"); + static OUString aCenter("center"); switch(eAlign) { default: @@ -518,7 +518,7 @@ struct AnnotatingVisitor double rRotate, rShearX; if( rState.maFillGradient.maTransform.decompose(rScale, rTranslate, rRotate, rShearX) ) xAttrs->AddAttribute( "draw:angle", - rtl::OUString::valueOf(rRotate*1800.0/M_PI ) ); + OUString::valueOf(rRotate*1800.0/M_PI ) ); xAttrs->AddAttribute( "draw:start-color", getOdfColor( maGradientStopVector[ @@ -549,12 +549,12 @@ struct AnnotatingVisitor // modulate gradient opacity with overall fill opacity xAttrs->AddAttribute( "draw:end", - rtl::OUString::valueOf( + OUString::valueOf( maGradientStopVector[ rState.maFillGradient.maStops[0]].maStopColor.a* maCurrState.mnFillOpacity*maCurrState.mnOpacity*100.0)+"%" ); xAttrs->AddAttribute( "draw:start", - rtl::OUString::valueOf( + OUString::valueOf( maGradientStopVector[ rState.maFillGradient.maStops[1]].maStopColor.a* maCurrState.mnFillOpacity*maCurrState.mnOpacity*100.0)+"%" ); @@ -590,11 +590,11 @@ struct AnnotatingVisitor xAttrs->Clear(); xAttrs->AddAttribute( "fo:font-family", rState.maFontFamily); xAttrs->AddAttribute( "fo:font-size", - rtl::OUString::valueOf(pt2mm(rState.mnFontSize))+"mm"); + OUString::valueOf(pt2mm(rState.mnFontSize))+"mm"); xAttrs->AddAttribute( "fo:font-style", rState.maFontStyle); xAttrs->AddAttribute( "fo:font-variant", rState.maFontVariant); xAttrs->AddAttribute( "fo:font-weight", - rtl::OUString::valueOf(rState.mnFontWeight)); + OUString::valueOf(rState.mnFontWeight)); xAttrs->AddAttribute( "fo:color", getOdfColor(rState.maFillColor)); mxDocumentHandler->startElement( "style:text-properties", xUnoAttrs ); @@ -645,7 +645,7 @@ struct AnnotatingVisitor } else if( maCurrState.mnFillOpacity*maCurrState.mnOpacity != 1.0 ) xAttrs->AddAttribute( "draw:opacity", - rtl::OUString::valueOf(100.0*maCurrState.mnFillOpacity*maCurrState.mnOpacity)+"%" ); + OUString::valueOf(100.0*maCurrState.mnFillOpacity*maCurrState.mnOpacity)+"%" ); } else { @@ -653,7 +653,7 @@ struct AnnotatingVisitor xAttrs->AddAttribute( "draw:fill-color", getOdfColor(rState.maFillColor)); if( maCurrState.mnFillOpacity*maCurrState.mnOpacity != 1.0 ) xAttrs->AddAttribute( "draw:opacity", - rtl::OUString::valueOf(100.0*maCurrState.mnFillOpacity*maCurrState.mnOpacity)+"%" ); + OUString::valueOf(100.0*maCurrState.mnFillOpacity*maCurrState.mnOpacity)+"%" ); } } else @@ -667,7 +667,7 @@ struct AnnotatingVisitor else if( rState.meStrokeType == DASH ) { xAttrs->AddAttribute( "draw:stroke", "dash"); - xAttrs->AddAttribute( "draw:stroke-dash", "dash"+rtl::OUString::valueOf(mnCurrStateId)); + xAttrs->AddAttribute( "draw:stroke-dash", "dash"+OUString::valueOf(mnCurrStateId)); xAttrs->AddAttribute( "svg:stroke-color", getOdfColor(rState.maStrokeColor)); } else @@ -677,7 +677,7 @@ struct AnnotatingVisitor { ::basegfx::B2DVector aVec(maCurrState.mnStrokeWidth,0); aVec *= maCurrState.maCTM; - xAttrs->AddAttribute( "svg:stroke-width", rtl::OUString::valueOf( pt2mm(aVec.getLength()) )+"mm"); + xAttrs->AddAttribute( "svg:stroke-width", OUString::valueOf( pt2mm(aVec.getLength()) )+"mm"); } if( maCurrState.meLineJoin == basegfx::B2DLINEJOIN_MITER ) xAttrs->AddAttribute( "draw:stroke-linejoin", "miter"); @@ -687,7 +687,7 @@ struct AnnotatingVisitor xAttrs->AddAttribute( "draw:stroke-linejoin", "bevel"); if( maCurrState.mnStrokeOpacity*maCurrState.mnOpacity != 1.0 ) xAttrs->AddAttribute( "svg:stroke-opacity", - rtl::OUString::valueOf(100.0*maCurrState.mnStrokeOpacity*maCurrState.mnOpacity)+"%"); + OUString::valueOf(100.0*maCurrState.mnStrokeOpacity*maCurrState.mnOpacity)+"%"); } mxDocumentHandler->startElement( "style:graphic-properties", xUnoAttrs ); @@ -708,7 +708,7 @@ struct AnnotatingVisitor nStyleId = mrStates.find(maCurrState)->mnStyleId; xElem->setAttribute("internal-style-ref", - rtl::OUString::valueOf( + OUString::valueOf( nStyleId) +"$0"); } @@ -726,13 +726,13 @@ struct AnnotatingVisitor void parseLinearGradientData( Gradient& io_rCurrGradient, const sal_Int32 nGradientNumber, const sal_Int32 nTokenId, - const rtl::OUString& sValue ) + const OUString& sValue ) { switch(nTokenId) { case XML_GRADIENTTRANSFORM: { - rtl::OString aValueUtf8( sValue.getStr(), + OString aValueUtf8( sValue.getStr(), sValue.getLength(), RTL_TEXTENCODING_UTF8 ); parseTransform(aValueUtf8.getStr(),io_rCurrGradient.maTransform); @@ -767,13 +767,13 @@ struct AnnotatingVisitor void parseRadialGradientData( Gradient& io_rCurrGradient, const sal_Int32 nGradientNumber, const sal_Int32 nTokenId, - const rtl::OUString& sValue ) + const OUString& sValue ) { switch(nTokenId) { case XML_GRADIENTTRANSFORM: { - rtl::OString aValueUtf8( sValue.getStr(), + OString aValueUtf8( sValue.getStr(), sValue.getLength(), RTL_TEXTENCODING_UTF8 ); parseTransform(aValueUtf8.getStr(),io_rCurrGradient.maTransform); @@ -811,7 +811,7 @@ struct AnnotatingVisitor void parseGradientStop( GradientStop& io_rGradientStop, const sal_Int32 nStopNumber, const sal_Int32 nTokenId, - const rtl::OUString& sValue ) + const OUString& sValue ) { switch(nTokenId) { @@ -842,9 +842,9 @@ struct AnnotatingVisitor } void parseAttribute( const sal_Int32 nTokenId, - const rtl::OUString& sValue ) + const OUString& sValue ) { - rtl::OString aValueUtf8( sValue.getStr(), + OString aValueUtf8( sValue.getStr(), sValue.getLength(), RTL_TEXTENCODING_UTF8 ); switch(nTokenId) @@ -1052,11 +1052,11 @@ struct AnnotatingVisitor } } - void parseStyle( const rtl::OUString& sValue ) + void parseStyle( const OUString& sValue ) { // split individual style attributes sal_Int32 nIndex=0, nDummyIndex=0; - rtl::OUString aCurrToken; + OUString aCurrToken; do { aCurrToken=sValue.getToken(0,';',nIndex); @@ -1065,11 +1065,11 @@ struct AnnotatingVisitor { // split attrib & value nDummyIndex=0; - rtl::OUString aCurrAttrib( + OUString aCurrAttrib( aCurrToken.getToken(0,':',nDummyIndex).trim()); OSL_ASSERT(nDummyIndex!=-1); nDummyIndex=0; - rtl::OUString aCurrValue( + OUString aCurrValue( aCurrToken.getToken(1,':',nDummyIndex).trim()); OSL_ASSERT(nDummyIndex==-1); @@ -1082,7 +1082,7 @@ struct AnnotatingVisitor } void parseFontStyle( State& io_rInitialState, - const rtl::OUString& rValue, + const OUString& rValue, const char* sValue ) { if( strcmp(sValue,"inherit") != 0 ) @@ -1090,7 +1090,7 @@ struct AnnotatingVisitor } void parseFontVariant( State& io_rInitialState, - const rtl::OUString& rValue, + const OUString& rValue, const char* sValue ) { if( strcmp(sValue,"inherit") != 0 ) @@ -1109,7 +1109,7 @@ struct AnnotatingVisitor // keep current val for sValue == "inherit" } - void parsePaint( const rtl::OUString& rValue, + void parsePaint( const OUString& rValue, const char* sValue, PaintType& rType, ARGBColor& rColor, @@ -1212,7 +1212,7 @@ struct ShapeWritingVisitor uno::Reference<xml::sax::XAttributeList> xUnoAttrs( xAttrs.get() ); sal_Int32 nDummyIndex(0); - rtl::OUString sStyleId( + OUString sStyleId( xElem->getAttribute("internal-style-ref").getToken( 0,'$',nDummyIndex)); StateMap::iterator pOrigState=mrStateMap.find( @@ -1230,7 +1230,7 @@ struct ShapeWritingVisitor { // collect attributes const sal_Int32 nNumAttrs( xAttributes->getLength() ); - rtl::OUString sAttributeValue; + OUString sAttributeValue; double x1=0.0,y1=0.0,x2=0.0,y2=0.0; for( sal_Int32 i=0; i<nNumAttrs; ++i ) { @@ -1258,9 +1258,9 @@ struct ShapeWritingVisitor } if ( x1 != x2 || y1 != y2 ) { - rtl::OUString sLinePath = "M"+rtl::OUString::valueOf(x1)+"," - +rtl::OUString::valueOf(y1)+"L"+rtl::OUString::valueOf(x2)+"," - +rtl::OUString::valueOf(y2); + OUString sLinePath = "M"+OUString::valueOf(x1)+"," + +OUString::valueOf(y1)+"L"+OUString::valueOf(x2)+"," + +OUString::valueOf(y2); basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD(aPoly, sLinePath); @@ -1276,7 +1276,7 @@ struct ShapeWritingVisitor case XML_POLYGON: case XML_POLYLINE: { - rtl::OUString sPoints = xElem->hasAttribute("points") ? xElem->getAttribute("points") : ""; + OUString sPoints = xElem->hasAttribute("points") ? xElem->getAttribute("points") : ""; basegfx::B2DPolygon aPoly; basegfx::tools::importFromSvgPoints(aPoly, sPoints); if( nTokenId == XML_POLYGON || maCurrState.meFillType != NONE ) @@ -1293,7 +1293,7 @@ struct ShapeWritingVisitor { // collect attributes const sal_Int32 nNumAttrs( xAttributes->getLength() ); - rtl::OUString sAttributeValue; + OUString sAttributeValue; bool bRxSeen=false, bRySeen=false; double x=0.0,y=0.0,width=0.0,height=0.0,rx=0.0,ry=0.0; for( sal_Int32 i=0; i<nNumAttrs; ++i ) @@ -1350,7 +1350,7 @@ struct ShapeWritingVisitor } case XML_PATH: { - rtl::OUString sPath = xElem->hasAttribute("d") ? xElem->getAttribute("d") : ""; + OUString sPath = xElem->hasAttribute("d") ? xElem->getAttribute("d") : ""; basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD(aPoly, sPath); @@ -1365,7 +1365,7 @@ struct ShapeWritingVisitor { // collect attributes const sal_Int32 nNumAttrs( xAttributes->getLength() ); - rtl::OUString sAttributeValue; + OUString sAttributeValue; double cx=0.0,cy=0.0,r=0.0; for( sal_Int32 i=0; i<nNumAttrs; ++i ) { @@ -1400,7 +1400,7 @@ struct ShapeWritingVisitor { // collect attributes const sal_Int32 nNumAttrs( xAttributes->getLength() ); - rtl::OUString sAttributeValue; + OUString sAttributeValue; double cx=0.0,cy=0.0,rx=0.0, ry=0.0; for( sal_Int32 i=0; i<nNumAttrs; ++i ) { @@ -1438,7 +1438,7 @@ struct ShapeWritingVisitor { // collect attributes const sal_Int32 nNumAttrs( xAttributes->getLength() ); - rtl::OUString sAttributeValue; + OUString sAttributeValue; double x=0.0,y=0.0,width=0.0,height=0.0; for( sal_Int32 i=0; i<nNumAttrs; ++i ) { @@ -1465,8 +1465,8 @@ struct ShapeWritingVisitor } } - rtl::OUString sValue = xElem->hasAttribute("href") ? xElem->getAttribute("href") : ""; - rtl::OString aValueUtf8( sValue.getStr(), sValue.getLength(), RTL_TEXTENCODING_UTF8 ); + OUString sValue = xElem->hasAttribute("href") ? xElem->getAttribute("href") : ""; + OString aValueUtf8( sValue.getStr(), sValue.getLength(), RTL_TEXTENCODING_UTF8 ); std::string sLinkValue; parseXlinkHref(aValueUtf8.getStr(), sLinkValue); @@ -1477,9 +1477,9 @@ struct ShapeWritingVisitor case XML_TEXT: { // collect text from all TEXT_NODE children into sText - rtl::OUStringBuffer sText; + OUStringBuffer sText; visitChildren(boost::bind( - (rtl::OUStringBuffer& (rtl::OUStringBuffer::*)(const rtl::OUString& str))&rtl::OUStringBuffer::append, + (OUStringBuffer& (OUStringBuffer::*)(const OUString& str))&OUStringBuffer::append, boost::ref(sText), boost::bind(&xml::dom::XNode::getNodeValue, _1)), @@ -1488,7 +1488,7 @@ struct ShapeWritingVisitor // collect attributes const sal_Int32 nNumAttrs( xAttributes->getLength() ); - rtl::OUString sAttributeValue; + OUString sAttributeValue; double x=0.0,y=0.0; for( sal_Int32 i=0; i<nNumAttrs; ++i ) { @@ -1533,8 +1533,8 @@ struct ShapeWritingVisitor y -= 2.0*maCurrState.mnFontSize/3.0; } - xAttrs->AddAttribute( "svg:x", rtl::OUString::valueOf(pt2mm(x))+"mm"); - xAttrs->AddAttribute( "svg:y", rtl::OUString::valueOf(pt2mm(y))+"mm"); + xAttrs->AddAttribute( "svg:x", OUString::valueOf(pt2mm(x))+"mm"); + xAttrs->AddAttribute( "svg:y", OUString::valueOf(pt2mm(y))+"mm"); xAttrs->AddAttribute( "draw:style-name", "svggraphicstyle"+sStyleId ); mxDocumentHandler->startElement("draw:frame", xUnoAttrs); @@ -1572,10 +1572,10 @@ struct ShapeWritingVisitor const std::string& data) { xAttrs->Clear(); - xAttrs->AddAttribute( "svg:x", rtl::OUString::valueOf(pt2mm(rShapeBounds.getMinX()))+"mm"); - xAttrs->AddAttribute( "svg:y", rtl::OUString::valueOf(pt2mm(rShapeBounds.getMinY()))+"mm"); - xAttrs->AddAttribute( "svg:width", rtl::OUString::valueOf(pt2mm(rShapeBounds.getWidth()))+"mm"); - xAttrs->AddAttribute( "svg:height", rtl::OUString::valueOf(pt2mm(rShapeBounds.getHeight()))+"mm"); + xAttrs->AddAttribute( "svg:x", OUString::valueOf(pt2mm(rShapeBounds.getMinX()))+"mm"); + xAttrs->AddAttribute( "svg:y", OUString::valueOf(pt2mm(rShapeBounds.getMinY()))+"mm"); + xAttrs->AddAttribute( "svg:width", OUString::valueOf(pt2mm(rShapeBounds.getWidth()))+"mm"); + xAttrs->AddAttribute( "svg:height", OUString::valueOf(pt2mm(rShapeBounds.getHeight()))+"mm"); mxDocumentHandler->startElement("draw:frame", xUnoAttrs); @@ -1584,7 +1584,7 @@ struct ShapeWritingVisitor mxDocumentHandler->startElement("office:binary-data", xUnoAttrs); - mxDocumentHandler->characters(rtl::OUString::createFromAscii(data.c_str())); + mxDocumentHandler->characters(OUString::createFromAscii(data.c_str())); mxDocumentHandler->endElement("office:binary-data"); @@ -1598,20 +1598,20 @@ struct ShapeWritingVisitor { basegfx::B2DTuple rScale, rTranslate; double rRotate, rShearX; - ::rtl::OUString sTransformValue; + OUString sTransformValue; if (!rMatrix.decompose(rScale, rTranslate, rRotate, rShearX)) return; if (rScale.getX() != 1.0 || rScale.getY() != 1.0) - sTransformValue += "scale("+::rtl::OUString::valueOf(rScale.getX())+" " - +::rtl::OUString::valueOf(rScale.getY())+") "; + sTransformValue += "scale("+OUString::valueOf(rScale.getX())+" " + +OUString::valueOf(rScale.getY())+") "; if (rTranslate.getX() != 0.0f || rTranslate.getY() != 0.0f) - sTransformValue += "translate("+::rtl::OUString::valueOf(rTranslate.getX()/100.0f)+"mm " - +::rtl::OUString::valueOf(rTranslate.getY()/100.0f)+"mm) "; + sTransformValue += "translate("+OUString::valueOf(rTranslate.getX()/100.0f)+"mm " + +OUString::valueOf(rTranslate.getY()/100.0f)+"mm) "; if (rRotate != 0.0f) - sTransformValue += "rotate("+::rtl::OUString::valueOf(rRotate)+") "; + sTransformValue += "rotate("+OUString::valueOf(rRotate)+") "; if (rShearX != 0.0f) - sTransformValue += "skewX("+::rtl::OUString::valueOf(rShearX)+") "; + sTransformValue += "skewX("+OUString::valueOf(rShearX)+") "; if (sTransformValue.isEmpty()) return; xAttrs->AddAttribute( "draw:transform", sTransformValue); @@ -1620,7 +1620,7 @@ struct ShapeWritingVisitor void writeEllipseShape( rtl::Reference<SvXMLAttributeList>& xAttrs, const uno::Reference<xml::sax::XAttributeList>& xUnoAttrs, const uno::Reference<xml::dom::XElement>& xElem, - const rtl::OUString& rStyleId, + const OUString& rStyleId, const basegfx::B2DEllipse& rEllipse) { State aState = maCurrState; @@ -1636,14 +1636,14 @@ struct ShapeWritingVisitor void writePathShape( rtl::Reference<SvXMLAttributeList>& xAttrs, const uno::Reference<xml::sax::XAttributeList>& xUnoAttrs, const uno::Reference<xml::dom::XElement>& xElem, - const rtl::OUString& rStyleId, + const OUString& rStyleId, const basegfx::B2DPolyPolygon& rPoly ) { // we might need to split up polypolygon into multiple path // shapes (e.g. when emulating line stroking) std::vector<basegfx::B2DPolyPolygon> aPolys(1,rPoly); State aState = maCurrState; - rtl::OUString aStyleId(rStyleId); + OUString aStyleId(rStyleId); xAttrs->Clear(); @@ -1695,27 +1695,27 @@ struct ShapeWritingVisitor void fillShapeProperties( rtl::Reference<SvXMLAttributeList>& xAttrs, const uno::Reference<xml::dom::XElement>& /* xElem */, const basegfx::B2DRange& rShapeBounds, - const rtl::OUString& rStyleName ) + const OUString& rStyleName ) { - xAttrs->AddAttribute( "draw:z-index", rtl::OUString::valueOf( mnShapeNum++ )); + xAttrs->AddAttribute( "draw:z-index", OUString::valueOf( mnShapeNum++ )); xAttrs->AddAttribute( "draw:style-name", rStyleName); - xAttrs->AddAttribute( "svg:width", rtl::OUString::valueOf(pt2mm(rShapeBounds.getWidth()))+"mm"); - xAttrs->AddAttribute( "svg:height", rtl::OUString::valueOf(pt2mm(rShapeBounds.getHeight()))+"mm"); + xAttrs->AddAttribute( "svg:width", OUString::valueOf(pt2mm(rShapeBounds.getWidth()))+"mm"); + xAttrs->AddAttribute( "svg:height", OUString::valueOf(pt2mm(rShapeBounds.getHeight()))+"mm"); // OOo expects the viewbox to be in 100th of mm xAttrs->AddAttribute( "svg:viewBox", "0 0 " - + rtl::OUString::valueOf( + + OUString::valueOf( basegfx::fround(pt100thmm(rShapeBounds.getWidth())) ) + " " - + rtl::OUString::valueOf( + + OUString::valueOf( basegfx::fround(pt100thmm(rShapeBounds.getHeight())) )); // TODO(F1): decompose transformation in calling code, and use // transform attribute here // writeTranslate(maCurrState.maCTM, xAttrs); - xAttrs->AddAttribute( "svg:x", rtl::OUString::valueOf(pt2mm(rShapeBounds.getMinX()))+"mm"); - xAttrs->AddAttribute( "svg:y", rtl::OUString::valueOf(pt2mm(rShapeBounds.getMinY()))+"mm"); + xAttrs->AddAttribute( "svg:x", OUString::valueOf(pt2mm(rShapeBounds.getMinX()))+"mm"); + xAttrs->AddAttribute( "svg:y", OUString::valueOf(pt2mm(rShapeBounds.getMinY()))+"mm"); } State maCurrState; @@ -1753,7 +1753,7 @@ struct OfficeStylesWritingVisitor uno::Reference<xml::sax::XAttributeList> xUnoAttrs( xAttrs.get() ); sal_Int32 nDummyIndex(0); - rtl::OUString sStyleId( + OUString sStyleId( xElem->getAttribute("internal-style-ref").getToken( 0,'$',nDummyIndex)); StateMap::iterator pOrigState=mrStateMap.find( @@ -1775,13 +1775,13 @@ struct OfficeStylesWritingVisitor xAttrs->AddAttribute( "draw:display-name", "dash"+sStyleId ); xAttrs->AddAttribute( "draw:style", "rect" ); if ( dots1>0 ) { - xAttrs->AddAttribute( "draw:dots1", rtl::OUString::valueOf(dots1) ); - xAttrs->AddAttribute( "draw:dots1-length", rtl::OUString::valueOf(pt2mm(convLength( rtl::OUString::valueOf(dots1_length), maCurrState, 'h' )))+"mm" ); + xAttrs->AddAttribute( "draw:dots1", OUString::valueOf(dots1) ); + xAttrs->AddAttribute( "draw:dots1-length", OUString::valueOf(pt2mm(convLength( OUString::valueOf(dots1_length), maCurrState, 'h' )))+"mm" ); } - xAttrs->AddAttribute( "draw:distance", rtl::OUString::valueOf(pt2mm(convLength( rtl::OUString::valueOf(dash_distance), maCurrState, 'h' )))+"mm" ); + xAttrs->AddAttribute( "draw:distance", OUString::valueOf(pt2mm(convLength( OUString::valueOf(dash_distance), maCurrState, 'h' )))+"mm" ); if ( dots2>0 ) { - xAttrs->AddAttribute( "draw:dots2", rtl::OUString::valueOf(dots2) ); - xAttrs->AddAttribute( "draw:dots2-length", rtl::OUString::valueOf(pt2mm(convLength( rtl::OUString::valueOf(dots2_length), maCurrState, 'h' )))+"mm" ); + xAttrs->AddAttribute( "draw:dots2", OUString::valueOf(dots2) ); + xAttrs->AddAttribute( "draw:dots2-length", OUString::valueOf(pt2mm(convLength( OUString::valueOf(dots2_length), maCurrState, 'h' )))+"mm" ); } mxDocumentHandler->startElement( "draw:stroke-dash", xUnoAttrs); @@ -1856,7 +1856,7 @@ struct DumpingVisitor void operator()( const uno::Reference<xml::dom::XElement>& xElem ) { OSL_TRACE("name: %s", - rtl::OUStringToOString( + OUStringToOString( xElem->getTagName(), RTL_TEXTENCODING_UTF8 ).getStr()); } @@ -1865,17 +1865,17 @@ struct DumpingVisitor const uno::Reference<xml::dom::XNamedNodeMap>& xAttributes ) { OSL_TRACE("name: %s", - rtl::OUStringToOString( + OUStringToOString( xElem->getTagName(), RTL_TEXTENCODING_UTF8 ).getStr()); const sal_Int32 nNumAttrs( xAttributes->getLength() ); for( sal_Int32 i=0; i<nNumAttrs; ++i ) { OSL_TRACE(" %s=%s", - rtl::OUStringToOString( + OUStringToOString( xAttributes->item(i)->getNodeName(), RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( + OUStringToOString( xAttributes->item(i)->getNodeValue(), RTL_TEXTENCODING_UTF8 ).getStr()); } @@ -1995,7 +1995,7 @@ sal_Bool SVGReader::parseAndConvert() m_xDocumentHandler->startElement( "config:config-item" , xUnoAttrs); sal_Int64 iWidth = sal_Int64(fViewPortWidth); - m_xDocumentHandler->characters( ::rtl::OUString::valueOf(iWidth) ); + m_xDocumentHandler->characters( OUString::valueOf(iWidth) ); m_xDocumentHandler->endElement( "config:config-item" ); @@ -2006,7 +2006,7 @@ sal_Bool SVGReader::parseAndConvert() m_xDocumentHandler->startElement( "config:config-item", xUnoAttrs); sal_Int64 iHeight = sal_Int64(fViewPortHeight); - m_xDocumentHandler->characters( ::rtl::OUString::valueOf(iHeight) ); + m_xDocumentHandler->characters( OUString::valueOf(iHeight) ); m_xDocumentHandler->endElement( "config:config-item" ); @@ -2030,8 +2030,8 @@ sal_Bool SVGReader::parseAndConvert() xAttrs->AddAttribute( "fo:margin-bottom", "0mm"); xAttrs->AddAttribute( "fo:margin-left", "0mm"); xAttrs->AddAttribute( "fo:margin-right", "0mm"); - xAttrs->AddAttribute( "fo:page-width", rtl::OUString::valueOf(fViewPortWidth)+"mm"); - xAttrs->AddAttribute( "fo:page-height", rtl::OUString::valueOf(fViewPortHeight)+"mm"); + xAttrs->AddAttribute( "fo:page-width", OUString::valueOf(fViewPortWidth)+"mm"); + xAttrs->AddAttribute( "fo:page-height", OUString::valueOf(fViewPortHeight)+"mm"); xAttrs->AddAttribute( "style:print-orientation", fViewPortWidth > fViewPortHeight ? OUString("landscape") : OUString("portrait") ); m_xDocumentHandler->startElement( "style:page-layout-properties", xUnoAttrs ); diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index e36e1901375d..c79b6ccd096c 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -29,7 +29,6 @@ #include <boost/shared_array.hpp> -using ::rtl::OUString; static const char aXMLElemG[] = "g"; static const char aXMLElemA[] = "a"; @@ -115,7 +114,7 @@ double SVGAttributeWriter::ImplRound( double fValue, sal_Int32 nDecs ) return( floor( fValue * pow( 10.0, (int)nDecs ) + 0.5 ) / pow( 10.0, (int)nDecs ) ); } -void SVGAttributeWriter::ImplGetColorStr( const Color& rColor, ::rtl::OUString& rColorStr ) +void SVGAttributeWriter::ImplGetColorStr( const Color& rColor, OUString& rColorStr ) { if( rColor.GetTransparency() == 255 ) rColorStr = "none"; @@ -130,12 +129,12 @@ void SVGAttributeWriter::AddColorAttr( const char* pColorAttrName, const char* pColorOpacityAttrName, const Color& rColor ) { - ::rtl::OUString aColor, aColorOpacity; + OUString aColor, aColorOpacity; ImplGetColorStr( rColor, aColor ); if( rColor.GetTransparency() > 0 && rColor.GetTransparency() < 255 ) - aColorOpacity = ::rtl::OUString::valueOf( ImplRound( ( 255.0 - rColor.GetTransparency() ) / 255.0 ) ); + aColorOpacity = OUString::valueOf( ImplRound( ( 255.0 - rColor.GetTransparency() ) / 255.0 ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, pColorAttrName, aColor ); @@ -149,7 +148,7 @@ void SVGAttributeWriter::AddPaintAttr( const Color& rLineColor, const Color& rFi // Fill if( pObjBoundRect && pFillGradient ) { - ::rtl::OUString aGradientId; + OUString aGradientId; AddGradientDef( *pObjBoundRect, *pFillGradient, aGradientId ); @@ -166,7 +165,7 @@ void SVGAttributeWriter::AddPaintAttr( const Color& rLineColor, const Color& rFi AddColorAttr( aXMLAttrStroke, aXMLAttrStrokeOpacity, rLineColor ); } -void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradient& rGradient, ::rtl::OUString& rGradientId ) +void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradient& rGradient, OUString& rGradientId ) { if( rObjRect.GetWidth() && rObjRect.GetHeight() && ( rGradient.GetStyle() == GradientStyle_LINEAR || rGradient.GetStyle() == GradientStyle_AXIAL || @@ -196,7 +195,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie { ::std::auto_ptr< SvXMLElementExport > apGradient; - ::rtl::OUString aColorStr; + OUString aColorStr; if( rGradient.GetStyle() == GradientStyle_LINEAR || rGradient.GetStyle() == GradientStyle_AXIAL ) { @@ -208,10 +207,10 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie aLinePoly.Rotate( aObjRectCenter, nAngle ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits, "userSpaceOnUse" ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, ::rtl::OUString::valueOf( aLinePoly[ 0 ].X() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, ::rtl::OUString::valueOf( aLinePoly[ 0 ].Y() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, ::rtl::OUString::valueOf( aLinePoly[ 1 ].X() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, ::rtl::OUString::valueOf( aLinePoly[ 1 ].Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, OUString::valueOf( aLinePoly[ 0 ].X() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, OUString::valueOf( aLinePoly[ 0 ].Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, OUString::valueOf( aLinePoly[ 1 ].X() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, OUString::valueOf( aLinePoly[ 1 ].Y() ) ); apGradient.reset( new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemLinearGradient, sal_True, sal_True ) ); @@ -220,7 +219,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie ( ( rGradient.GetStyle() == GradientStyle_AXIAL ) ? 0.005 : 0.01 ); ImplGetColorStr( ( rGradient.GetStyle() == GradientStyle_AXIAL ) ? aEndColor : aStartColor, aColorStr ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, ::rtl::OUString::valueOf( fBorder ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::valueOf( fBorder ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr ); { @@ -230,7 +229,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie if( rGradient.GetStyle() == GradientStyle_AXIAL ) { ImplGetColorStr( aStartColor, aColorStr ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, ::rtl::OUString::valueOf( 0.5 ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::valueOf( 0.5 ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr ); { @@ -242,7 +241,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie fBorder = 0.0; ImplGetColorStr( aEndColor, aColorStr ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, ::rtl::OUString::valueOf( ImplRound( 1.0 - fBorder ) ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::valueOf( ImplRound( 1.0 - fBorder ) ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr ); { @@ -257,15 +256,15 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie rObjRect.GetHeight() * rObjRect.GetHeight() ) * 0.5; mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits, "userSpaceOnUse" ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCX, ::rtl::OUString::valueOf( ImplRound( fCenterX ) ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, ::rtl::OUString::valueOf( ImplRound( fCenterY ) ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrR, ::rtl::OUString::valueOf( ImplRound( fRadius ) ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCX, OUString::valueOf( ImplRound( fCenterX ) ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, OUString::valueOf( ImplRound( fCenterY ) ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrR, OUString::valueOf( ImplRound( fRadius ) ) ); apGradient.reset( new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemRadialGradient, sal_True, sal_True ) ); // write stop values ImplGetColorStr( aEndColor, aColorStr ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, ::rtl::OUString::valueOf( 0.0 ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::valueOf( 0.0 ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr ); { @@ -274,7 +273,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie ImplGetColorStr( aStartColor, aColorStr ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, - ::rtl::OUString::valueOf( ImplRound( 1.0 - rGradient.GetBorder() * 0.01 ) ) ); + OUString::valueOf( ImplRound( 1.0 - rGradient.GetBorder() * 0.01 ) ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStopColor, aColorStr ); { @@ -284,14 +283,14 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie } } else - rGradientId = ::rtl::OUString(); + rGradientId = OUString(); } void SVGAttributeWriter::SetFontAttr( const Font& rFont ) { if( rFont != maCurFont ) { - ::rtl::OUString aFontStyle, aTextDecoration; + OUString aFontStyle, aTextDecoration; sal_Int32 nFontWeight; maCurFont = rFont; @@ -332,7 +331,7 @@ void SVGAttributeWriter::SetFontAttr( const Font& rFont ) default: nFontWeight = 400; break; } - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontWeight, ::rtl::OUString::valueOf( nFontWeight ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontWeight, OUString::valueOf( nFontWeight ) ); if( mrExport.IsUseNativeTextDecoration() ) { @@ -385,8 +384,8 @@ void SVGAttributeWriter::setFontFamily() else { sal_Int32 nNextTokenPos( 0 ); - const ::rtl::OUString& rsFontName = maCurFont.GetName(); - ::rtl::OUString sFontFamily( rsFontName.getToken( 0, ';', nNextTokenPos ) ); + const OUString& rsFontName = maCurFont.GetName(); + OUString sFontFamily( rsFontName.getToken( 0, ';', nNextTokenPos ) ); FontPitch ePitch = maCurFont.GetPitch(); if( ePitch == PITCH_FIXED ) { @@ -448,7 +447,7 @@ void SVGTextWriter::implRegisterInterface( const Reference< XInterface >& rxIf ) (mrExport.getInterfaceToIdentifierMapper()).registerReference( rxIf ); } -const ::rtl::OUString & SVGTextWriter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf ) +const OUString & SVGTextWriter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf ) { return (mrExport.getInterfaceToIdentifierMapper()).getIdentifier( rxIf ); } @@ -593,7 +592,7 @@ sal_Int32 SVGTextWriter::setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nC case( META_COMMENT_ACTION ): { const MetaCommentAction* pA = (const MetaCommentAction*) pAction; - const ::rtl::OString& rsComment = pA->GetComment(); + const OString& rsComment = pA->GetComment(); if( rsComment.equalsIgnoreAsciiCaseL( RTL_CONSTASCII_STRINGPARAM( "XTEXT_EOL" ) ) ) { bEOL = true; @@ -602,7 +601,7 @@ sal_Int32 SVGTextWriter::setTextPosition( const GDIMetaFile& rMtf, sal_uLong& nC { bEOP = true; - ::rtl::OUString sContent; + OUString sContent; while( nextTextPortion() ) { sContent = mrCurrentTextPortion->getString(); @@ -710,7 +709,7 @@ void SVGTextWriter::setTextProperties( const GDIMetaFile& rMtf, sal_uLong nCurAc case( META_COMMENT_ACTION ): { const MetaCommentAction* pA = (const MetaCommentAction*) pAction; - const ::rtl::OString& rsComment = pA->GetComment(); + const OString& rsComment = pA->GetComment(); if( rsComment.equalsIgnoreAsciiCaseL( RTL_CONSTASCII_STRINGPARAM( "XTEXT_EOP" ) ) ) { bEOP = true; @@ -755,7 +754,7 @@ void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer ) // Font Style if( eCurFontItalic != eParFontItalic ) { - ::rtl::OUString sFontStyle; + OUString sFontStyle; if( eCurFontItalic != ITALIC_NONE ) { if( eCurFontItalic == ITALIC_OBLIQUE ) @@ -788,7 +787,7 @@ void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer ) case WEIGHT_BLACK: nFontWeight = 900; break; default: nFontWeight = 400; break; } - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontWeight, ::rtl::OUString::valueOf( nFontWeight ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrFontWeight, OUString::valueOf( nFontWeight ) ); } if( bIsTextContainer ) @@ -803,7 +802,7 @@ void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer ) FontUnderline eParFontUnderline = maParentFont.GetUnderline(); FontStrikeout eParFontStrikeout = maParentFont.GetStrikeout(); - ::rtl::OUString sTextDecoration; + OUString sTextDecoration; if( eCurFontUnderline != eParFontUnderline ) { @@ -823,8 +822,8 @@ void SVGTextWriter::addFontAttributes( sal_Bool bIsTextContainer ) void SVGTextWriter::implSetFontFamily() { sal_Int32 nNextTokenPos( 0 ); - const ::rtl::OUString& rsFontName = maCurrentFont.GetName(); - ::rtl::OUString sFontFamily( rsFontName.getToken( 0, ';', nNextTokenPos ) ); + const OUString& rsFontName = maCurrentFont.GetName(); + OUString sFontFamily( rsFontName.getToken( 0, ';', nNextTokenPos ) ); FontPitch ePitch = maCurrentFont.GetPitch(); if( ePitch == PITCH_FIXED ) { @@ -1145,7 +1144,7 @@ sal_Bool SVGTextWriter::nextTextPortion() if( xPortionPropSet.is() && xPortionPropInfo.is() && xPortionPropInfo->hasPropertyByName( "TextPortionType" ) ) { - ::rtl::OUString sPortionType; + OUString sPortionType; if( xPortionPropSet->getPropertyValue( "TextPortionType" ) >>= sPortionType ) { sInfo = "type: " + sPortionType + "; "; @@ -1162,8 +1161,8 @@ sal_Bool SVGTextWriter::nextTextPortion() Reference < XTextField > xTextField( xRangePropSet->getPropertyValue( "TextField" ), UNO_QUERY ); if( xTextField.is() ) { - const ::rtl::OUString sServicePrefix("com.sun.star.text.textfield."); - const ::rtl::OUString sPresentationServicePrefix("com.sun.star.presentation.TextField."); + const OUString sServicePrefix("com.sun.star.text.textfield."); + const OUString sPresentationServicePrefix("com.sun.star.presentation.TextField."); Reference< XServiceInfo > xService( xTextField, UNO_QUERY ); const Sequence< OUString > aServices = xService->getSupportedServiceNames(); @@ -1261,8 +1260,8 @@ sal_Bool SVGTextWriter::nextTextPortion() Reference < XTextField > xTextField( xRangePropSet->getPropertyValue( "TextField" ), UNO_QUERY ); if( xTextField.is() ) { - const ::rtl::OUString sServicePrefix("com.sun.star.text.textfield."); - const ::rtl::OUString sPresentationServicePrefix("com.sun.star.presentation.TextField."); + const OUString sServicePrefix("com.sun.star.text.textfield."); + const OUString sPresentationServicePrefix("com.sun.star.presentation.TextField."); Reference< XServiceInfo > xService( xTextField, UNO_QUERY ); const Sequence< OUString > aServices = xService->getSupportedServiceNames(); @@ -1429,9 +1428,9 @@ void SVGTextWriter::startTextPosition( sal_Bool bExportX, sal_Bool bExportY ) mnTextWidth = 0; mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "TextPosition" ); if( bExportX ) - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, ::rtl::OUString::valueOf( maTextPos.X() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( maTextPos.X() ) ); if( bExportY ) - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, ::rtl::OUString::valueOf( maTextPos.Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( maTextPos.Y() ) ); // if text is rotated, set transform matrix at new tspan element const Font& rFont = mpVDev->GetFont(); @@ -1899,7 +1898,7 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon return( rDstPolyPoly ); } -::rtl::OUString SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly, sal_Bool bLine ) +OUString SVGActionWriter::GetPathString( const PolyPolygon& rPolyPoly, sal_Bool bLine ) { OUString aPathData; const OUString aBlank( " " ); @@ -1914,9 +1913,9 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon if( nSize > 1 ) { aPathData += "M "; - aPathData += ::rtl::OUString::valueOf( ( aPolyPoint = rPoly[ 0 ] ).X() ); + aPathData += OUString::valueOf( ( aPolyPoint = rPoly[ 0 ] ).X() ); aPathData += aComma; - aPathData += ::rtl::OUString::valueOf( aPolyPoint.Y() ); + aPathData += OUString::valueOf( aPolyPoint.Y() ); sal_Char nCurrentMode = 0; const bool bClose(!bLine || rPoly[0] == rPoly[nSize - 1]); @@ -1935,9 +1934,9 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon { if ( j ) aPathData += aBlank; - aPathData += ::rtl::OUString::valueOf( ( aPolyPoint = rPoly[ n++ ] ).X() ); + aPathData += OUString::valueOf( ( aPolyPoint = rPoly[ n++ ] ).X() ); aPathData += aComma; - aPathData += ::rtl::OUString::valueOf( aPolyPoint.Y() ); + aPathData += OUString::valueOf( aPolyPoint.Y() ); } } else @@ -1947,9 +1946,9 @@ PolyPolygon& SVGActionWriter::ImplMap( const PolyPolygon& rPolyPoly, PolyPolygon nCurrentMode = 'L'; aPathData += "L "; } - aPathData += ::rtl::OUString::valueOf( ( aPolyPoint = rPoly[ n++ ] ).X() ); + aPathData += OUString::valueOf( ( aPolyPoint = rPoly[ n++ ] ).X() ); aPathData += aComma; - aPathData += ::rtl::OUString::valueOf( aPolyPoint.Y() ); + aPathData += OUString::valueOf( aPolyPoint.Y() ); } } @@ -1989,10 +1988,10 @@ void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2, aPt2 = rPt2; } - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, ::rtl::OUString::valueOf( aPt1.X() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, ::rtl::OUString::valueOf( aPt1.Y() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, ::rtl::OUString::valueOf( aPt2.X() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, ::rtl::OUString::valueOf( aPt2.Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, OUString::valueOf( aPt1.X() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, OUString::valueOf( aPt1.Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX2, OUString::valueOf( aPt2.X() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, OUString::valueOf( aPt2.Y() ) ); if( pLineColor ) { @@ -2015,16 +2014,16 @@ void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nR else aRect = rRect; - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, ::rtl::OUString::valueOf( aRect.Left() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, ::rtl::OUString::valueOf( aRect.Top() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, ::rtl::OUString::valueOf( aRect.GetWidth() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, ::rtl::OUString::valueOf( aRect.GetHeight() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( aRect.Left() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( aRect.Top() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, OUString::valueOf( aRect.GetWidth() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::valueOf( aRect.GetHeight() ) ); if( nRadX ) - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, ::rtl::OUString::valueOf( bApplyMapping ? ImplMap( nRadX ) : nRadX ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, OUString::valueOf( bApplyMapping ? ImplMap( nRadX ) : nRadX ) ); if( nRadY ) - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, ::rtl::OUString::valueOf( bApplyMapping ? ImplMap( nRadY ) : nRadY ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, OUString::valueOf( bApplyMapping ? ImplMap( nRadY ) : nRadY ) ); { SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemRect, sal_True, sal_True ); @@ -2041,10 +2040,10 @@ void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long n else aCenter = rCenter; - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCX, ::rtl::OUString::valueOf( aCenter.X() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, ::rtl::OUString::valueOf( aCenter.Y() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, ::rtl::OUString::valueOf( bApplyMapping ? ImplMap( nRadX ) : nRadX ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, ::rtl::OUString::valueOf( bApplyMapping ? ImplMap( nRadY ) : nRadY ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCX, OUString::valueOf( aCenter.X() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrCY, OUString::valueOf( aCenter.Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, OUString::valueOf( bApplyMapping ? ImplMap( nRadX ) : nRadX ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, OUString::valueOf( bApplyMapping ? ImplMap( nRadY ) : nRadY ) ); { SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemEllipse, sal_True, sal_True ); @@ -2101,7 +2100,7 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool if( rShape.mnStrokeWidth ) { sal_Int32 nStrokeWidth = ( bApplyMapping ? ImplMap( rShape.mnStrokeWidth ) : rShape.mnStrokeWidth ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth, ::rtl::OUString::valueOf( nStrokeWidth ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth, OUString::valueOf( nStrokeWidth ) ); } // support for LineJoin @@ -2112,17 +2111,17 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool { // miter is Svg default, so no need to write until the exporter might write styles. // If this happens, activate here - // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, ::rtl::OUString::createFromAscii("miter")); + // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, OUString::createFromAscii("miter")); break; } case basegfx::B2DLINEJOIN_BEVEL: { - mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, ::rtl::OUString::createFromAscii("bevel")); + mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, OUString::createFromAscii("bevel")); break; } case basegfx::B2DLINEJOIN_ROUND: { - mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, ::rtl::OUString::createFromAscii("round")); + mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, OUString::createFromAscii("round")); break; } } @@ -2134,17 +2133,17 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool { // butt is Svg default, so no need to write until the exporter might write styles. // If this happens, activate here - // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, ::rtl::OUString::createFromAscii("butt")); + // mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, OUString::createFromAscii("butt")); break; } case com::sun::star::drawing::LineCap_ROUND: { - mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, ::rtl::OUString::createFromAscii("round")); + mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, OUString::createFromAscii("round")); break; } case com::sun::star::drawing::LineCap_SQUARE: { - mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, ::rtl::OUString::createFromAscii("square")); + mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, OUString::createFromAscii("square")); break; } } @@ -2163,7 +2162,7 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool if( k ) aDashArrayStr += aComma; - aDashArrayStr += ::rtl::OUString::valueOf( nDash ); + aDashArrayStr += OUString::valueOf( nDash ); } mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeDashArray, aDashArrayStr ); @@ -2196,7 +2195,7 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly, mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, OUString::valueOf( aRect.GetWidth() ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::valueOf( aRect.GetHeight() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPatternUnits, rtl::OUString( "userSpaceOnUse") ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPatternUnits, OUString( "userSpaceOnUse") ); { SvXMLElementExport aElemPattern( mrExport, XML_NAMESPACE_NONE, aXMLElemPattern, sal_True, sal_True ); @@ -2287,7 +2286,7 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly, mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, OUString::valueOf( aPoly[ 1 ].Y() ) ); mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits, - rtl::OUString( "userSpaceOnUse" ) ); + OUString( "userSpaceOnUse" ) ); } { @@ -2359,9 +2358,9 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly, void SVGActionWriter::ImplWriteGradientStop( const Color& rColor, double fOffset ) { - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, rtl::OUString::valueOf( fOffset ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, OUString::valueOf( fOffset ) ); - ::rtl::OUString aStyle, aColor; + OUString aStyle, aColor; aStyle += "stop-color:"; SVGAttributeWriter::ImplGetColorStr ( rColor, aColor ); aStyle += aColor; @@ -2622,8 +2621,8 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, sCleanTextContent = sTextContent.copy( nFrom ); } mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "PlaceholderText" ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, ::rtl::OUString::valueOf( aPos.X() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, ::rtl::OUString::valueOf( aPos.Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( aPos.X() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( aPos.Y() ) ); { SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_False ); // At least for the single slide case we need really to export placeholder text @@ -2636,7 +2635,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, { if( nLen > 1 ) { - aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( rtl::OUString(rText.GetChar(nLen - 1)) ); + aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( OUString(rText.GetChar(nLen - 1)) ); if( nWidth && aNormSize.Width() && ( nWidth != aNormSize.Width() ) ) { @@ -2667,10 +2666,10 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, if( nCount ) { - const ::rtl::OUString aGlyph( rText.Copy( nLastPos, nCount ) ); + const OUString aGlyph( rText.Copy( nLastPos, nCount ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, ::rtl::OUString::valueOf( nX ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, ::rtl::OUString::valueOf( aPos.Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( nX ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( aPos.Y() ) ); { SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_False ); @@ -2688,8 +2687,8 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, } else { - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, ::rtl::OUString::valueOf( aPos.X() ) ); - mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, ::rtl::OUString::valueOf( aPos.Y() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::valueOf( aPos.X() ) ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::valueOf( aPos.Y() ) ); { SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_False ); @@ -2786,7 +2785,7 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx, void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, sal_uInt32 nWriteFlags, - const ::rtl::OUString* pElementId, + const OUString* pElementId, const Reference< XShape >* pxShape, const GDIMetaFile* pTextEmbeddedBitmapMtf ) { @@ -2831,7 +2830,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, { sType.append(": "); const MetaCommentAction* pA = (const MetaCommentAction*) pAction; - rtl::OString sComment = pA->GetComment(); + OString sComment = pA->GetComment(); if (!sComment.isEmpty()) { sType.append(OStringToOUString( @@ -3692,7 +3691,7 @@ void SVGActionWriter::WriteMetaFile( const Point& rPos100thmm, const Size& rSize100thmm, const GDIMetaFile& rMtf, sal_uInt32 nWriteFlags, - const ::rtl::OUString* pElementId, + const OUString* pElementId, const Reference< XShape >* pXShape, const GDIMetaFile* pTextEmbeddedBitmapMtf ) { diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index e1acd35fb3e0..dbce63487b74 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -112,7 +112,7 @@ public: virtual ~SVGAttributeWriter(); void AddColorAttr( const char* pColorAttrName, const char* pColorOpacityAttrName, const Color& rColor ); - void AddGradientDef( const Rectangle& rObjRect,const Gradient& rGradient, ::rtl::OUString& rGradientId ); + void AddGradientDef( const Rectangle& rObjRect,const Gradient& rGradient, OUString& rGradientId ); void AddPaintAttr( const Color& rLineColor, const Color& rFillColor, const Rectangle* pObjBoundRect = NULL, const Gradient* pFillGradient = NULL ); @@ -121,7 +121,7 @@ public: void endFontSettings(); void setFontFamily(); - static void ImplGetColorStr( const Color& rColor, ::rtl::OUString& rColorStr ); + static void ImplGetColorStr( const Color& rColor, OUString& rColorStr ); }; struct SVGShapeDescriptor @@ -132,7 +132,7 @@ struct SVGShapeDescriptor sal_Int32 mnStrokeWidth; SvtGraphicStroke::DashArray maDashArray; ::std::auto_ptr< Gradient > mapShapeGradient; - ::rtl::OUString maId; + OUString maId; basegfx::B2DLineJoin maLineJoin; com::sun::star::drawing::LineCap maLineCap; @@ -172,7 +172,7 @@ struct BulletListItemInfo struct OUStringHasher { - size_t operator()( const ::rtl::OUString& oustr ) const { return static_cast< size_t >( oustr.hashCode() ); } + size_t operator()( const OUString& oustr ) const { return static_cast< size_t >( oustr.hashCode() ); } }; @@ -182,7 +182,7 @@ struct OUStringHasher class SVGTextWriter { public: - typedef ::boost::unordered_map< ::rtl::OUString, BulletListItemInfo, OUStringHasher > BulletListItemInfoMap; + typedef ::boost::unordered_map< OUString, BulletListItemInfo, OUStringHasher > BulletListItemInfoMap; private: SVGExport& mrExport; @@ -190,7 +190,7 @@ class SVGTextWriter VirtualDevice* mpVDev; sal_Bool mbIsTextShapeStarted; Reference<XText> mrTextShape; - ::rtl::OUString msShapeId; + OUString msShapeId; Reference<XEnumeration> mrParagraphEnumeration; Reference<XTextContent> mrCurrentTextParagraph; Reference<XEnumeration> mrTextPortionEnumeration; @@ -211,8 +211,8 @@ class SVGTextWriter sal_Bool mbIsListLevelStyleImage; sal_Bool mbLineBreak; sal_Bool mbIsURLField; - ::rtl::OUString msUrl; - ::rtl::OUString msHyperlinkIdList; + OUString msUrl; + OUString msHyperlinkIdList; sal_Bool mbIsPlacehlolderShape; sal_Bool mbIWS; Font maCurrentFont; @@ -290,7 +290,7 @@ class SVGTextWriter sal_Bool implGetTextPositionFromBitmap( const MetaAction* pAction, Point& raPos, sal_Bool& rbEmpty ); void implRegisterInterface( const Reference< XInterface >& rxIf ); - const ::rtl::OUString & implGetValidIDFromInterface( const Reference< XInterface >& rxIf ); + const OUString & implGetValidIDFromInterface( const Reference< XInterface >& rxIf ); }; @@ -375,7 +375,7 @@ private: void ImplWriteActions( const GDIMetaFile& rMtf, sal_uInt32 nWriteFlags, - const ::rtl::OUString* pElementId, + const OUString* pElementId, const Reference< XShape >* pXShape = NULL, const GDIMetaFile* pTextEmbeddedBitmapMtf = NULL ); @@ -383,7 +383,7 @@ private: public: - static ::rtl::OUString GetPathString( const PolyPolygon& rPolyPoly, sal_Bool bLine ); + static OUString GetPathString( const PolyPolygon& rPolyPoly, sal_Bool bLine ); static sal_uLong GetChecksum( const MetaAction* pAction ); public: @@ -395,7 +395,7 @@ public: const Size& rSize100thmm, const GDIMetaFile& rMtf, sal_uInt32 nWriteFlags, - const ::rtl::OUString* pElementId = NULL, + const OUString* pElementId = NULL, const Reference< XShape >* pXShape = NULL, const GDIMetaFile* pTextEmbeddedBitmapMtf = NULL ); }; diff --git a/filter/source/svg/test/odfserializer.cxx b/filter/source/svg/test/odfserializer.cxx index fbba0173880a..03068b74144d 100644 --- a/filter/source/svg/test/odfserializer.cxx +++ b/filter/source/svg/test/odfserializer.cxx @@ -48,11 +48,11 @@ public: virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException); virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException); private: @@ -65,7 +65,7 @@ void SAL_CALL ODFSerializer::startDocument( ) throw (xml::sax::SAXException, un { OSL_PRECOND(m_xOutStream.is(), "ODFSerializer(): invalid output stream"); - rtl::OUStringBuffer aElement; + OUStringBuffer aElement; aElement.appendAscii("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); characters(aElement.makeStringAndClear()); } @@ -73,7 +73,7 @@ void SAL_CALL ODFSerializer::startDocument( ) throw (xml::sax::SAXException, un void SAL_CALL ODFSerializer::endDocument() throw (xml::sax::SAXException, uno::RuntimeException) {} -void SAL_CALL ODFSerializer::startElement( const ::rtl::OUString& aName, +void SAL_CALL ODFSerializer::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) { OUStringBuffer aElement("<" + aName + " "); @@ -86,14 +86,14 @@ void SAL_CALL ODFSerializer::startElement( const ::rtl::OUString& aName, characters(aElement.makeStringAndClear() + ">"); } -void SAL_CALL ODFSerializer::endElement( const ::rtl::OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) +void SAL_CALL ODFSerializer::endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) { characters("</" + aName + ">"); } -void SAL_CALL ODFSerializer::characters( const ::rtl::OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) +void SAL_CALL ODFSerializer::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) { - const rtl::OString aStr = rtl::OUStringToOString(aChars, + const OString aStr = OUStringToOString(aChars, RTL_TEXTENCODING_UTF8); const sal_Int32 nLen( aStr.getLength() ); m_aBuf.realloc( nLen ); @@ -105,14 +105,14 @@ void SAL_CALL ODFSerializer::characters( const ::rtl::OUString& aChars ) throw ( m_xOutStream->writeBytes(m_aLineFeed); } -void SAL_CALL ODFSerializer::ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException) +void SAL_CALL ODFSerializer::ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException) { // TODO(F1): Make pretty printing configurable characters(aWhitespaces); } -void SAL_CALL ODFSerializer::processingInstruction( const ::rtl::OUString&, - const ::rtl::OUString& ) throw (xml::sax::SAXException, uno::RuntimeException) +void SAL_CALL ODFSerializer::processingInstruction( const OUString&, + const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException) {} void SAL_CALL ODFSerializer::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& ) throw (xml::sax::SAXException, uno::RuntimeException) diff --git a/filter/source/svg/test/svg2odf.cxx b/filter/source/svg/test/svg2odf.cxx index 5e3946f59d80..73cf3769108a 100644 --- a/filter/source/svg/test/svg2odf.cxx +++ b/filter/source/svg/test/svg2odf.cxx @@ -40,7 +40,7 @@ namespace public: - explicit OutputWrap( const rtl::OUString& rURL ) : maFile(rURL) + explicit OutputWrap( const OUString& rURL ) : maFile(rURL) { maFile.open( osl_File_OpenFlag_Create|osl_File_OpenFlag_Write ); } @@ -71,18 +71,18 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) return 1; } - ::rtl::OUString aBaseURL, aTmpURL, aSrcURL, aDstURL, aIniUrl; + OUString aBaseURL, aTmpURL, aSrcURL, aDstURL, aIniUrl; osl_getProcessWorkingDir(&aBaseURL.pData); - osl_getFileURLFromSystemPath( rtl::OUString::createFromAscii(argv[1]).pData, + osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[1]).pData, &aTmpURL.pData ); osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aSrcURL.pData); - osl_getFileURLFromSystemPath( rtl::OUString::createFromAscii(argv[2]).pData, + osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[2]).pData, &aTmpURL.pData ); osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aDstURL.pData); - osl_getFileURLFromSystemPath( rtl::OUString::createFromAscii(argv[3]).pData, + osl_getFileURLFromSystemPath( OUString::createFromAscii(argv[3]).pData, &aTmpURL.pData ); osl_getAbsoluteFileURL(aBaseURL.pData,aTmpURL.pData,&aIniUrl.pData); diff --git a/filter/source/svg/tokenmap.cxx b/filter/source/svg/tokenmap.cxx index 7bf6fd1c885e..2c9132f70451 100644 --- a/filter/source/svg/tokenmap.cxx +++ b/filter/source/svg/tokenmap.cxx @@ -34,9 +34,9 @@ sal_Int32 getTokenId( const char* sIdent, sal_Int32 nLen ) return XML_TOKEN_INVALID; } -sal_Int32 getTokenId( const rtl::OUString& sIdent ) +sal_Int32 getTokenId( const OUString& sIdent ) { - rtl::OString aUTF8( sIdent.getStr(), + OString aUTF8( sIdent.getStr(), sIdent.getLength(), RTL_TEXTENCODING_UTF8 ); return getTokenId( aUTF8.getStr(), aUTF8.getLength() ); diff --git a/filter/source/svg/tokenmap.hxx b/filter/source/svg/tokenmap.hxx index 20a25d96a4be..7b6246962966 100644 --- a/filter/source/svg/tokenmap.hxx +++ b/filter/source/svg/tokenmap.hxx @@ -35,7 +35,7 @@ namespace svgi { sal_Int32 getTokenId( const char* sIdent, sal_Int32 nLen ); - sal_Int32 getTokenId( const rtl::OUString& sIdent ); + sal_Int32 getTokenId( const OUString& sIdent ); const char* getTokenName( sal_Int32 nTokenId ); } // namespace svgi diff --git a/filter/source/svg/units.cxx b/filter/source/svg/units.cxx index 2e2fc5684320..c3b218949358 100644 --- a/filter/source/svg/units.cxx +++ b/filter/source/svg/units.cxx @@ -81,12 +81,12 @@ double convLength( double value, SvgUnit unit, const State& rState, char dir ) return fRet; } -double convLength( const rtl::OUString& sValue, const State& rState, char dir ) +double convLength( const OUString& sValue, const State& rState, char dir ) { //FIXME: convert deprecated spirit::classic to use spirit::qi using namespace ::boost::spirit::classic; - rtl::OString aUTF8 = rtl::OUStringToOString( sValue, + OString aUTF8 = OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ); double nVal=0.0; diff --git a/filter/source/svg/units.hxx b/filter/source/svg/units.hxx index 9e6cd81014bb..3f1ed5da3aec 100644 --- a/filter/source/svg/units.hxx +++ b/filter/source/svg/units.hxx @@ -29,8 +29,8 @@ #define INCLUDED_UNITS_HXX #include <sal/config.h> +#include <rtl/ustring.hxx> -namespace rtl{ class OUString; } namespace svgi { struct State; @@ -61,7 +61,7 @@ namespace svgi @param rState current state (needed for viewport dimensions etc.) @param dir direction - either 'h' or 'v' for horizonal or vertical, resp. */ - double convLength( const rtl::OUString& sValue, const State& rState, char dir ); + double convLength( const OUString& sValue, const State& rState, char dir ); inline double pt2mm(double fVal) { return fVal*25.4/72.0; } inline double pt100thmm(double fVal) { return fVal*2540.0/72.0; } diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index d72401f73cbb..63218a12dc93 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -1120,8 +1120,8 @@ sal_Bool T602ImportFilterDialog::OptionsDlg() void T602ImportFilterDialog::initLocale() { - rtl::OString aModName( "t602filter" ); - aModName += rtl::OString::valueOf( sal_Int32( SUPD ) ); + OString aModName( "t602filter" ); + aModName += OString::valueOf( sal_Int32( SUPD ) ); mpResMgr = ResMgr::CreateResMgr( aModName.getStr(), LanguageTag( meLocale) ); } diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index c19d949bf315..a583b40cb70d 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -53,10 +53,10 @@ typedef enum { typedef enum {START,READCH,EOL,POCMD,EXPCMD,SETCMD,SETCH,WRITE,EEND,QUIT} tnode; -::rtl::OUString getImplementationName() +OUString getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -::com::sun::star::uno::Sequence < ::rtl::OUString > getSupportedServiceNames() +::com::sun::star::uno::Sequence < OUString > getSupportedServiceNames() throw ( ::com::sun::star::uno::RuntimeException ); @@ -101,13 +101,13 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper4 < ResMgr *mpResMgr; sal_Bool OptionsDlg(); ResMgr* getResMgr(); - rtl::OUString getResStr( sal_Int16 resid ); + OUString getResStr( sal_Int16 resid ); void initLocale(); ~T602ImportFilterDialog(); // XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute() throw (::com::sun::star::uno::RuntimeException); @@ -119,11 +119,11 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper4 < throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XPropertyAccess @@ -157,7 +157,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc; ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > mxInputStream; - ::rtl::OUString msFilterName; + OUString msFilterName; SvXMLAttributeList *mpAttrList; @@ -230,7 +230,7 @@ private: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // XExtendedTypeDetection - virtual ::rtl::OUString SAL_CALL detect( + virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor ) throw( com::sun::star::uno::RuntimeException ); @@ -239,34 +239,34 @@ private: throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; -::rtl::OUString T602ImportFilter_getImplementationName() +OUString T602ImportFilter_getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL T602ImportFilter_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL T602ImportFilter_supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL T602ImportFilter_getSupportedServiceNames( ) throw ( ::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL T602ImportFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw ( ::com::sun::star::uno::Exception ); -::rtl::OUString T602ImportFilterDialog_getImplementationName() +OUString T602ImportFilterDialog_getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL T602ImportFilterDialog_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL T602ImportFilterDialog_supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL T602ImportFilterDialog_getSupportedServiceNames( ) throw ( ::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx index e4bce81087c3..c77751dc3663 100644 --- a/filter/source/textfilterdetect/filterdetect.cxx +++ b/filter/source/textfilterdetect/filterdetect.cxx @@ -62,7 +62,7 @@ PlainTextFilterDetect::PlainTextFilterDetect(const uno::Reference<uno::XComponen PlainTextFilterDetect::~PlainTextFilterDetect() {} -rtl::OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequence<beans::PropertyValue>& lDescriptor) throw (uno::RuntimeException) +OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequence<beans::PropertyValue>& lDescriptor) throw (uno::RuntimeException) { OUString aType; OUString aDocService; @@ -126,21 +126,21 @@ void SAL_CALL PlainTextFilterDetect::initialize(const uno::Sequence<uno::Any>& / { } -rtl::OUString PlainTextFilterDetect_getImplementationName() +OUString PlainTextFilterDetect_getImplementationName() { - return rtl::OUString("com.sun.star.comp.filters.PlainTextFilterDetect"); + return OUString("com.sun.star.comp.filters.PlainTextFilterDetect"); } -sal_Bool PlainTextFilterDetect_supportsService(const rtl::OUString& ServiceName) +sal_Bool PlainTextFilterDetect_supportsService(const OUString& ServiceName) { return ServiceName == "com.sun.star.document.ExtendedTypeDetection" || ServiceName == "com.sun.star.comp.filters.PlainTextFilterDetect"; } -uno::Sequence<rtl::OUString> PlainTextFilterDetect_getSupportedServiceNames() +uno::Sequence<OUString> PlainTextFilterDetect_getSupportedServiceNames() { - uno::Sequence<rtl::OUString> aRet(2); - rtl::OUString* pArray = aRet.getArray(); + uno::Sequence<OUString> aRet(2); + OUString* pArray = aRet.getArray(); pArray[0] = "com.sun.star.document.ExtendedTypeDetection"; pArray[1] = "com.sun.star.comp.filters.PlainTextFilterDetect"; return aRet; @@ -153,19 +153,19 @@ uno::Reference<uno::XInterface> PlainTextFilterDetect_createInstance( } // XServiceInfo -rtl::OUString SAL_CALL PlainTextFilterDetect::getImplementationName() +OUString SAL_CALL PlainTextFilterDetect::getImplementationName() throw (uno::RuntimeException) { return PlainTextFilterDetect_getImplementationName(); } -sal_Bool SAL_CALL PlainTextFilterDetect::supportsService(const rtl::OUString& rServiceName) +sal_Bool SAL_CALL PlainTextFilterDetect::supportsService(const OUString& rServiceName) throw (uno::RuntimeException) { return PlainTextFilterDetect_supportsService(rServiceName); } -uno::Sequence<rtl::OUString> SAL_CALL PlainTextFilterDetect::getSupportedServiceNames() +uno::Sequence<OUString> SAL_CALL PlainTextFilterDetect::getSupportedServiceNames() throw (uno::RuntimeException) { return PlainTextFilterDetect_getSupportedServiceNames(); diff --git a/filter/source/textfilterdetect/filterdetect.hxx b/filter/source/textfilterdetect/filterdetect.hxx index dd4aa639b8e1..c01398409213 100644 --- a/filter/source/textfilterdetect/filterdetect.hxx +++ b/filter/source/textfilterdetect/filterdetect.hxx @@ -41,7 +41,7 @@ public: // XExtendedFilterDetection - virtual ::rtl::OUString SAL_CALL detect(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor) + virtual OUString SAL_CALL detect(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor) throw( com::sun::star::uno::RuntimeException ); // XInitialization @@ -51,21 +51,21 @@ public: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() + virtual com::sun::star::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); }; -rtl::OUString PlainTextFilterDetect_getImplementationName(); +OUString PlainTextFilterDetect_getImplementationName(); -sal_Bool PlainTextFilterDetect_supportsService(const rtl::OUString& ServiceName); +sal_Bool PlainTextFilterDetect_supportsService(const OUString& ServiceName); -com::sun::star::uno::Sequence<rtl::OUString> PlainTextFilterDetect_getSupportedServiceNames(); +com::sun::star::uno::Sequence<OUString> PlainTextFilterDetect_getSupportedServiceNames(); com::sun::star::uno::Reference<com::sun::star::uno::XInterface> PlainTextFilterDetect_createInstance(const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& rCxt); diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index 7065dce019f2..a11fcffadc17 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -63,7 +63,6 @@ using namespace com::sun::star::xml::sax; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::task; -using ::rtl::OUString; #define MAP_LEN(x) x, sizeof(x) - 1 @@ -196,7 +195,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star if (xStatusIndicator.is()) xStatusIndicator->end(); - OSL_FAIL( ::rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US).getStr()); + OSL_FAIL( OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US).getStr()); return sal_False; } if (xStatusIndicator.is()) { @@ -315,7 +314,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< ::com::sun::star catch( const Exception& ) #endif { - OSL_FAIL( ::rtl::OUStringToOString( exE.Message, RTL_TEXTENCODING_ASCII_US).getStr()); + OSL_FAIL( OUStringToOString( exE.Message, RTL_TEXTENCODING_ASCII_US).getStr()); if (xStatusIndicator.is()) xStatusIndicator->end(); return sal_False; diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx index f68722f8f120..68df79320d91 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx @@ -64,11 +64,11 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc; - ::rtl::OUString msFilterName; + OUString msFilterName; - ::com::sun::star::uno::Sequence< ::rtl::OUString > msUserData; + ::com::sun::star::uno::Sequence< OUString > msUserData; - ::rtl::OUString msTemplateName; + OUString msTemplateName; FilterType meType; @@ -130,15 +130,15 @@ public: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); @@ -146,19 +146,19 @@ public: -::rtl::OUString XmlFilterAdaptor_getImplementationName() +OUString XmlFilterAdaptor_getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); -sal_Bool SAL_CALL XmlFilterAdaptor_supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL XmlFilterAdaptor_supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( ) throw ( ::com::sun::star::uno::RuntimeException ); diff --git a/filter/source/xmlfilteradaptor/streamwrap.cxx b/filter/source/xmlfilteradaptor/streamwrap.cxx index 66778325ddf0..d3115ca5cd2f 100644 --- a/filter/source/xmlfilteradaptor/streamwrap.cxx +++ b/filter/source/xmlfilteradaptor/streamwrap.cxx @@ -39,7 +39,7 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 rStream.write(aData.getConstArray(),aData.getLength(),nWritten); if (nWritten != (sal_uInt64)aData.getLength()) { - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this)); } } diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx index 953a3dc7c7f8..e665f9d738b9 100644 --- a/filter/source/xmlfilterdetect/filterdetect.cxx +++ b/filter/source/xmlfilterdetect/filterdetect.cxx @@ -43,7 +43,6 @@ #include <com/sun/star/beans/PropertyState.hpp> #include <ucbhelper/content.hxx> -using rtl::OUString; using com::sun::star::uno::Sequence; using com::sun::star::uno::Reference; using com::sun::star::uno::Any; @@ -73,7 +72,7 @@ using namespace com::sun::star::beans; namespace { -bool isXMLStream(const ::rtl::OString& aHeaderStrm) +bool isXMLStream(const OString& aHeaderStrm) { const char* p = aHeaderStrm.getStr(); size_t n = aHeaderStrm.getLength(); @@ -104,12 +103,12 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm) return true; } -::rtl::OUString supportedByType( const ::rtl::OUString clipBoardFormat , const ::rtl::OString resultString, const ::rtl::OUString checkType) +OUString supportedByType( const OUString clipBoardFormat , const OString resultString, const OUString checkType) { - ::rtl::OUString sTypeName; + OUString sTypeName; if ( clipBoardFormat.match(OUString("doctype:")) ) { - ::rtl::OString tryStr = ::rtl::OUStringToOString(clipBoardFormat.copy(8),RTL_TEXTENCODING_ASCII_US).getStr(); + OString tryStr = OUStringToOString(clipBoardFormat.copy(8),RTL_TEXTENCODING_ASCII_US).getStr(); if (resultString.indexOf(tryStr) >= 0) { sTypeName = checkType; @@ -120,16 +119,16 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm) } -::rtl::OUString SAL_CALL FilterDetect::detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aArguments ) throw( com::sun::star::uno::RuntimeException ) +OUString SAL_CALL FilterDetect::detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aArguments ) throw( com::sun::star::uno::RuntimeException ) { - ::rtl::OUString sTypeName; - ::rtl::OUString sUrl; + OUString sTypeName; + OUString sUrl; Sequence<PropertyValue > lProps ; com::sun::star::uno::Reference< com::sun::star::io::XInputStream > xInStream; const PropertyValue * pValue = aArguments.getConstArray(); sal_Int32 nLength; - ::rtl::OString resultString; + OString resultString; nLength = aArguments.getLength(); sal_Int32 location=nLength; @@ -165,16 +164,16 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm) /* long nBytesToRead= */ xInStream->available(); xInStream->skipBytes (0); long bytestRead =xInStream->readBytes (aData, 4000); - resultString=::rtl::OString((const sal_Char *)aData.getConstArray(),bytestRead) ; + resultString=OString((const sal_Char *)aData.getConstArray(),bytestRead) ; if (!isXMLStream(resultString)) // This is not an XML stream. It makes no sense to try to detect // a non-XML file type here. - return ::rtl::OUString(); + return OUString(); // test typedetect code Reference <XNameAccess> xTypeCont(mxCtx->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", mxCtx), UNO_QUERY); - Sequence < ::rtl::OUString > myTypes= xTypeCont->getElementNames(); + Sequence < OUString > myTypes= xTypeCont->getElementNames(); nLength = myTypes.getLength(); sal_Int32 new_nlength=0; @@ -187,7 +186,7 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm) sal_Int32 j =0; while (j < new_nlength && (sTypeName.isEmpty())) { - ::rtl::OUString tmpStr; + OUString tmpStr; lProps[j].Value >>=tmpStr; if ( lProps[j].Name == "ClipboardFormat" && !tmpStr.isEmpty() ) { @@ -208,7 +207,7 @@ bool isXMLStream(const ::rtl::OString& aHeaderStrm) if (location == aArguments.getLength()) { aArguments.realloc(nLength+1); - aArguments[location].Name = ::rtl::OUString( "TypeName" ); + aArguments[location].Name = OUString( "TypeName" ); } aArguments[location].Value <<=sTypeName; } diff --git a/filter/source/xmlfilterdetect/filterdetect.hxx b/filter/source/xmlfilterdetect/filterdetect.hxx index 8c2dba8b82dc..0672ff24c726 100644 --- a/filter/source/xmlfilterdetect/filterdetect.hxx +++ b/filter/source/xmlfilterdetect/filterdetect.hxx @@ -66,11 +66,11 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc; - ::rtl::OUString msFilterName; + OUString msFilterName; - ::com::sun::star::uno::Sequence< ::rtl::OUString > msUserData; + ::com::sun::star::uno::Sequence< OUString > msUserData; - ::rtl::OUString msTemplateName; + OUString msTemplateName; @@ -100,7 +100,7 @@ public: //XExtendedFilterDetection - virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& lDescriptor ) + virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& lDescriptor ) throw( com::sun::star::uno::RuntimeException ); @@ -114,15 +114,15 @@ public: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx index 4a66506c96c6..a7593c2ff918 100644 --- a/filter/source/xsltdialog/typedetectionexport.cxx +++ b/filter/source/xsltdialog/typedetectionexport.cxx @@ -35,7 +35,6 @@ using namespace com::sun::star::io; using namespace com::sun::star::lang; using namespace com::sun::star::xml::sax; -using ::rtl::OUString; TypeDetectionExporter::TypeDetectionExporter( Reference< XComponentContext >& xContext ) : mxContext( xContext ) diff --git a/filter/source/xsltdialog/typedetectionexport.hxx b/filter/source/xsltdialog/typedetectionexport.hxx index 05d702aee494..fe9435da8123 100644 --- a/filter/source/xsltdialog/typedetectionexport.hxx +++ b/filter/source/xsltdialog/typedetectionexport.hxx @@ -33,8 +33,8 @@ public: void doExport(com::sun::star::uno::Reference < com::sun::star::io::XOutputStream > xOS, const XMLFilterVector& rFilters ); private: - void addProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const rtl::OUString& rName, const rtl::OUString& rValue ); - void addLocaleProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const rtl::OUString& rName, const rtl::OUString& rValue ); + void addProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const OUString& rName, const OUString& rValue ); + void addLocaleProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const OUString& rName, const OUString& rValue ); com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; }; diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx index ffce4d9c8702..c9127d54dbc4 100644 --- a/filter/source/xsltdialog/typedetectionimport.cxx +++ b/filter/source/xsltdialog/typedetectionimport.cxx @@ -34,7 +34,6 @@ using namespace com::sun::star::xml::sax; using namespace com::sun::star; using namespace std; -using ::rtl::OUString; TypeDetectionImporter::TypeDetectionImporter( Reference< XMultiServiceFactory >& xMSF ) : mxMSF(xMSF), diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx index ef27c43f695b..73d1077946e2 100644 --- a/filter/source/xsltdialog/typedetectionimport.hxx +++ b/filter/source/xsltdialog/typedetectionimport.hxx @@ -48,11 +48,11 @@ enum ImportState e_Unknown }; -DECLARE_STL_USTRINGACCESS_MAP( ::rtl::OUString, PropertyMap ); +DECLARE_STL_USTRINGACCESS_MAP( OUString, PropertyMap ); struct Node { - ::rtl::OUString maName; + OUString maName; PropertyMap maPropertyMap; }; @@ -70,15 +70,15 @@ public: throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endDocument( ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) + virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) + virtual void SAL_CALL endElement( const OUString& aName ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) + virtual void SAL_CALL characters( const OUString& aChars ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); @@ -86,7 +86,7 @@ public: private: void fillFilterVector( XMLFilterVector& rFilters ); filter_info_impl* createFilterForNode( Node * pNode ); - Node* findTypeNode( const ::rtl::OUString& rType ); + Node* findTypeNode( const OUString& rType ); com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF; @@ -96,24 +96,24 @@ private: NodeVector maFilterNodes; NodeVector maTypeNodes; - ::rtl::OUString maValue; - ::rtl::OUString maNodeName; - ::rtl::OUString maPropertyName; - - const ::rtl::OUString sRootNode; - const ::rtl::OUString sNode; - const ::rtl::OUString sName; - const ::rtl::OUString sProp; - const ::rtl::OUString sValue; - const ::rtl::OUString sUIName; - const ::rtl::OUString sData; - const ::rtl::OUString sFilters; - const ::rtl::OUString sTypes; - const ::rtl::OUString sFilterAdaptorService; - const ::rtl::OUString sXSLTFilterService; - - const ::rtl::OUString sCdataAttribute; - const ::rtl::OUString sWhiteSpace; + OUString maValue; + OUString maNodeName; + OUString maPropertyName; + + const OUString sRootNode; + const OUString sNode; + const OUString sName; + const OUString sProp; + const OUString sValue; + const OUString sUIName; + const OUString sData; + const OUString sFilters; + const OUString sTypes; + const OUString sFilterAdaptorService; + const OUString sXSLTFilterService; + + const OUString sCdataAttribute; + const OUString sWhiteSpace; }; #endif diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx b/filter/source/xsltdialog/xmlfiltercommon.hxx index 3ea05b0a4f6e..00a354befbae 100644 --- a/filter/source/xsltdialog/xmlfiltercommon.hxx +++ b/filter/source/xsltdialog/xmlfiltercommon.hxx @@ -30,36 +30,36 @@ // -------------------------------------------------------------------- -extern ::rtl::OUString string_encode( const ::rtl::OUString & rText ); -extern ::rtl::OUString string_decode( const ::rtl::OUString & rText ); +extern OUString string_encode( const OUString & rText ); +extern OUString string_decode( const OUString & rText ); // -------------------------------------------------------------------- -extern bool isFileURL( const ::rtl::OUString & rURL ); +extern bool isFileURL( const OUString & rURL ); // -------------------------------------------------------------------- bool copyStreams( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xIS, ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xOS ); -bool createDirectory( ::rtl::OUString& rURL ); +bool createDirectory( OUString& rURL ); // -------------------------------------------------------------------- class filter_info_impl { public: - rtl::OUString maFilterName; - rtl::OUString maType; - rtl::OUString maDocumentService; - rtl::OUString maFilterService; - rtl::OUString maInterfaceName; - rtl::OUString maComment; - rtl::OUString maExtension; - rtl::OUString maExportXSLT; - rtl::OUString maImportXSLT; - rtl::OUString maImportTemplate; - rtl::OUString maDocType; - rtl::OUString maImportService; - rtl::OUString maExportService; + OUString maFilterName; + OUString maType; + OUString maDocumentService; + OUString maFilterService; + OUString maInterfaceName; + OUString maComment; + OUString maExtension; + OUString maExportXSLT; + OUString maImportXSLT; + OUString maImportTemplate; + OUString maDocType; + OUString maImportService; + OUString maExportService; sal_Int32 maFlags; sal_Int32 maFileFormatVersion; @@ -73,17 +73,17 @@ public: filter_info_impl( const filter_info_impl& rInfo ); int operator==( const filter_info_impl& ) const; - com::sun::star::uno::Sequence< rtl::OUString > getFilterUserData() const; + com::sun::star::uno::Sequence< OUString > getFilterUserData() const; }; // -------------------------------------------------------------------- struct application_info_impl { - rtl::OUString maDocumentService; - rtl::OUString maDocumentUIName; - rtl::OUString maXMLImporter; - rtl::OUString maXMLExporter; + OUString maDocumentService; + OUString maDocumentUIName; + OUString maXMLImporter; + OUString maXMLExporter; application_info_impl( const sal_Char * pDocumentService, ResId& rUINameRes, const sal_Char * mpXMLImporter, const sal_Char * mpXMLExporter ); }; @@ -91,8 +91,8 @@ struct application_info_impl // -------------------------------------------------------------------- extern std::vector< application_info_impl* >& getApplicationInfos(); -extern rtl::OUString getApplicationUIName( const rtl::OUString& rServiceName ); -extern const application_info_impl* getApplicationInfo( const rtl::OUString& rServiceName ); +extern OUString getApplicationUIName( const OUString& rServiceName ); +extern const application_info_impl* getApplicationInfo( const OUString& rServiceName ); extern ResMgr* getXSLTDialogResMgr(); diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 229e4cf26c15..7c692405ce37 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -82,12 +82,12 @@ protected: virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); // XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw(RuntimeException); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(RuntimeException); virtual sal_Int16 SAL_CALL execute( ) throw(RuntimeException); // XInitialization @@ -206,8 +206,8 @@ Sequence< OUString > SAL_CALL XMLFilterDialogComponent_getSupportedServiceNames( sal_Bool SAL_CALL XMLFilterDialogComponent_supportsService( const OUString& ServiceName ) throw ( RuntimeException ) { - Sequence< ::rtl::OUString > aSupported(XMLFilterDialogComponent_getSupportedServiceNames()); - const ::rtl::OUString* pArray = aSupported.getConstArray(); + Sequence< OUString > aSupported(XMLFilterDialogComponent_getSupportedServiceNames()); + const OUString* pArray = aSupported.getConstArray(); for (sal_Int32 i = 0; i < aSupported.getLength(); ++i, ++pArray) if (pArray->equals(ServiceName)) return sal_True; @@ -222,7 +222,7 @@ Reference< XInterface > SAL_CALL XMLFilterDialogComponent_createInstance( const } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL XMLFilterDialogComponent::getImplementationName() throw(com::sun::star::uno::RuntimeException) +OUString SAL_CALL XMLFilterDialogComponent::getImplementationName() throw(com::sun::star::uno::RuntimeException) { return XMLFilterDialogComponent_getImplementationName(); } @@ -271,13 +271,13 @@ Sequence< Type > XMLFilterDialogComponent::getTypes() throw (RuntimeException) //------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL XMLFilterDialogComponent::getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException) +Sequence< OUString > SAL_CALL XMLFilterDialogComponent::getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException) { return XMLFilterDialogComponent_getSupportedServiceNames(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL XMLFilterDialogComponent::supportsService(const ::rtl::OUString& ServiceName) throw(RuntimeException) +sal_Bool SAL_CALL XMLFilterDialogComponent::supportsService(const OUString& ServiceName) throw(RuntimeException) { return XMLFilterDialogComponent_supportsService( ServiceName ); } @@ -338,7 +338,7 @@ void SAL_CALL XMLFilterDialogComponent::disposing( const EventObject& /* Source } //------------------------------------------------------------------------- -void SAL_CALL XMLFilterDialogComponent::setTitle( const ::rtl::OUString& /* _rTitle */ ) throw(RuntimeException) +void SAL_CALL XMLFilterDialogComponent::setTitle( const OUString& /* _rTitle */ ) throw(RuntimeException) { } diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index 66f7198a5fdb..9d2eee03a2c5 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -58,7 +58,6 @@ using namespace com::sun::star::container; using namespace com::sun::star::beans; using namespace com::sun::star::io; -using ::rtl::OUString; using ::rtl::Uri; XMLFilterJarHelper::XMLFilterJarHelper( Reference< XMultiServiceFactory >& xMSF ) @@ -162,13 +161,13 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt // let ZipPackage be used ( no manifest.xml is required ) beans::NamedValue aArg; - aArg.Name = ::rtl::OUString( "StorageFormat" ); + aArg.Name = OUString( "StorageFormat" ); aArg.Value <<= ZIP_STORAGE_FORMAT_STRING; aArguments[ 1 ] <<= aArg; Reference< XHierarchicalNameAccess > xIfc( mxMSF->createInstanceWithArguments( - rtl::OUString( "com.sun.star.packages.comp.ZipPackage" ), + OUString( "com.sun.star.packages.comp.ZipPackage" ), aArguments ), UNO_QUERY ); if( xIfc.is() ) @@ -262,13 +261,13 @@ void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVect // let ZipPackage be used ( no manifest.xml is required ) beans::NamedValue aArg; - aArg.Name = ::rtl::OUString( "StorageFormat" ); + aArg.Name = OUString( "StorageFormat" ); aArg.Value <<= ZIP_STORAGE_FORMAT_STRING; aArguments[ 1 ] <<= aArg; Reference< XHierarchicalNameAccess > xIfc( mxMSF->createInstanceWithArguments( - rtl::OUString( "com.sun.star.packages.comp.ZipPackage" ), + OUString( "com.sun.star.packages.comp.ZipPackage" ), aArguments ), UNO_QUERY ); if( xIfc.is() ) diff --git a/filter/source/xsltdialog/xmlfilterjar.hxx b/filter/source/xsltdialog/xmlfilterjar.hxx index 5c4005d0b2b0..8aea9d5c7cbd 100644 --- a/filter/source/xsltdialog/xmlfilterjar.hxx +++ b/filter/source/xsltdialog/xmlfilterjar.hxx @@ -34,23 +34,23 @@ class XMLFilterJarHelper public: XMLFilterJarHelper( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMSF ); - bool savePackage( const rtl::OUString& rPackageURL, const XMLFilterVector& rFilters ); - void openPackage( const rtl::OUString& rPackageURL, XMLFilterVector& rFilters ); + bool savePackage( const OUString& rPackageURL, const XMLFilterVector& rFilters ); + void openPackage( const OUString& rPackageURL, XMLFilterVector& rFilters ); private: - void addFile( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xRootFolder, com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory, const ::rtl::OUString& rSourceFile ) throw( com::sun::star::uno::Exception ); + void addFile( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xRootFolder, com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory, const OUString& rSourceFile ) throw( com::sun::star::uno::Exception ); - bool copyFile( com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xIfc, ::rtl::OUString& rURL, const ::rtl::OUString& rTargetURL ); + bool copyFile( com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xIfc, OUString& rURL, const OUString& rTargetURL ); bool copyFiles( com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xIfc, filter_info_impl* pFilter ); com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF; - ::rtl::OUString sVndSunStarPackage; - ::rtl::OUString sXSLTPath; - ::rtl::OUString sTemplatePath; - ::rtl::OUString sSpecialConfigManager; - ::rtl::OUString sPump; - ::rtl::OUString sProgPath; + OUString sVndSunStarPackage; + OUString sXSLTPath; + OUString sTemplatePath; + OUString sSpecialConfigManager; + OUString sPump; + OUString sProgPath; }; #endif diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 473123a1d073..6356298cf881 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1657,7 +1657,7 @@ OUString string_decode( const OUString & rText ) // ----------------------------------------------------------------------- -bool isFileURL( const ::rtl::OUString & rURL ) +bool isFileURL( const OUString & rURL ) { return rURL.startsWith("file:"); } diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 7ebc3fca0513..80176e02128c 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -114,9 +114,9 @@ private: bool insertOrEdit( filter_info_impl* pNewInfo, const filter_info_impl* pOldInfo = NULL ); - rtl::OUString createUniqueFilterName( const rtl::OUString& rUIName ); - rtl::OUString createUniqueTypeName( const rtl::OUString& rTypeName ); - rtl::OUString createUniqueInterfaceName( const rtl::OUString& rInterfaceName ); + OUString createUniqueFilterName( const OUString& rUIName ); + OUString createUniqueTypeName( const OUString& rTypeName ); + OUString createUniqueInterfaceName( const OUString& rInterfaceName ); private: diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx index a7db7ac23a37..857bb0a9adef 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx @@ -38,8 +38,8 @@ public: bool FillInfo( filter_info_impl* pInfo ); void SetInfo(const filter_info_impl* pInfo); - static rtl::OUString decodeComment( const rtl::OUString& rComment ); - static rtl::OUString encodeComment( const rtl::OUString& rComment ); + static OUString decodeComment( const OUString& rComment ); + static OUString encodeComment( const OUString& rComment ); FixedText maFTFilterName; Edit maEDFilterName; diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx index 980647ed9caa..062637e1f02b 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx @@ -60,14 +60,14 @@ public: CheckBox maCBNeedsXSLT2; private: - void SetURL( SvtURLBox& rURLBox, const rtl::OUString& rURL ); - rtl::OUString GetURL( SvtURLBox& rURLBox ); + void SetURL( SvtURLBox& rURLBox, const OUString& rURL ); + OUString GetURL( SvtURLBox& rURLBox ); - ::rtl::OUString sHTTPSchema; - ::rtl::OUString sSHTTPSchema; - ::rtl::OUString sFILESchema; - ::rtl::OUString sFTPSchema; - ::rtl::OUString sInstPath; + OUString sHTTPSchema; + OUString sSHTTPSchema; + OUString sFILESchema; + OUString sFTPSchema; + OUString sInstPath; }; #endif diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 74c08daf0d20..099aec7933d6 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -67,7 +67,6 @@ using namespace com::sun::star::system; using namespace com::sun::star::xml; using namespace com::sun::star::xml::sax; -using ::rtl::OUString; class GlobalEventListenerImpl : public ::cppu::WeakImplHelper1< com::sun::star::document::XEventListener > { @@ -526,7 +525,7 @@ void XMLFilterTestDialog::displayXMLFile( const OUString& rURL ) { Reference< XSystemShellExecute > xSystemShellExecute( SystemShellExecute::create(comphelper::getProcessComponentContext()) ); - xSystemShellExecute->execute( rURL, rtl::OUString(), SystemShellExecuteFlags::URIS_ONLY ); + xSystemShellExecute->execute( rURL, OUString(), SystemShellExecuteFlags::URIS_ONLY ); } void XMLFilterTestDialog::onImportBrowse() diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx index 7fccd4ed406d..51732137cda0 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx @@ -51,9 +51,9 @@ private: void onImportRecentDocument(); void initDialog(); - com::sun::star::uno::Reference< com::sun::star::lang::XComponent > getFrontMostDocument( const rtl::OUString& rServiceName ); - void import( const rtl::OUString& rURL ); - void displayXMLFile( const rtl::OUString& rURL ); + com::sun::star::uno::Reference< com::sun::star::lang::XComponent > getFrontMostDocument( const OUString& rServiceName ); + void import( const OUString& rURL ); + void displayXMLFile( const OUString& rURL ); void doExport( com::sun::star::uno::Reference< com::sun::star::lang::XComponent > xComp ); private: diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index 85eaf7b1caea..29b0faf25a67 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -179,7 +179,7 @@ namespace XSLT xmlXPathObjectPtr streamName = valuePop(ctxt); streamName = ensureStringValue(streamName, ctxt); - oh->insertByName(::rtl::OUString::createFromAscii((sal_Char*) streamName->stringval), ::rtl::OString((sal_Char*) value->stringval)); + oh->insertByName(OUString::createFromAscii((sal_Char*) streamName->stringval), OString((sal_Char*) value->stringval)); valuePush(ctxt, xmlXPathNewCString("")); } @@ -220,7 +220,7 @@ namespace XSLT OleHandler * oh = static_cast<OleHandler*> (data); xmlXPathObjectPtr streamName = valuePop(ctxt); streamName = ensureStringValue(streamName, ctxt); - const OString content = oh->getByName(::rtl::OUString::createFromAscii((sal_Char*) streamName->stringval)); + const OString content = oh->getByName(OUString::createFromAscii((sal_Char*) streamName->stringval)); valuePush(ctxt, xmlXPathNewCString(content.getStr())); xmlXPathFreeObject(streamName); } diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index f109011a38b1..151777ce6345 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -95,7 +95,7 @@ namespace XSLT void SAL_CALL OleHandler::initRootStorageFromBase64(const OString& content) { Sequence<sal_Int8> oleData; - ::sax::Converter::decodeBase64(oleData, ::rtl::OStringToOUString( + ::sax::Converter::decodeBase64(oleData, OStringToOUString( content, RTL_TEXTENCODING_UTF8, OSTRING_TO_OUSTRING_CVTFLAGS)); m_rootStream = createTempFile(); Reference<XOutputStream> xOutput = m_rootStream->getOutputStream(); @@ -155,7 +155,7 @@ namespace XSLT //return the base64 string of the uncompressed data OUStringBuffer buf(oleLength); ::sax::Converter::encodeBase64(buf, result); - return ::rtl::OUStringToOString(buf.toString(), RTL_TEXTENCODING_UTF8); + return OUStringToOString(buf.toString(), RTL_TEXTENCODING_UTF8); } void SAL_CALL @@ -188,7 +188,7 @@ namespace XSLT //return the base64 encoded string OUStringBuffer buf(oleLength); ::sax::Converter::encodeBase64(buf, oledata); - return ::rtl::OUStringToOString(buf.toString(), RTL_TEXTENCODING_UTF8); + return OUStringToOString(buf.toString(), RTL_TEXTENCODING_UTF8); } return encodeSubStorage(streamName); } @@ -199,7 +199,7 @@ namespace XSLT //decode the base64 string Sequence<sal_Int8> oledata; ::sax::Converter::decodeBase64(oledata, - rtl::OStringToOUString(content, RTL_TEXTENCODING_ASCII_US)); + OStringToOUString(content, RTL_TEXTENCODING_ASCII_US)); //create a temp stream to write data to Reference<XStream> subStream = createTempFile(); Reference<XInputStream> xInput = subStream->getInputStream(); diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index 6feebdd08460..9eea215f9f2d 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -124,7 +124,7 @@ namespace XSLT OUString expandUrl(const OUString&); - css::uno::Reference<xslt::XXSLTTransformer> impl_createTransformer(const rtl::OUString& rTransformer, const Sequence<Any>& rArgs); + css::uno::Reference<xslt::XXSLTTransformer> impl_createTransformer(const OUString& rTransformer, const Sequence<Any>& rArgs); public: @@ -179,10 +179,10 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) { } - ::rtl::OUString - XSLTFilter::expandUrl(const ::rtl::OUString& sUrl) + OUString + XSLTFilter::expandUrl(const OUString& sUrl) { - ::rtl::OUString sExpandedUrl; + OUString sExpandedUrl; try { css::uno::Reference<XComponentContext> xContext( @@ -201,7 +201,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) } css::uno::Reference<xslt::XXSLTTransformer> - XSLTFilter::impl_createTransformer(const rtl::OUString& rTransformer, const Sequence<Any>& rArgs) + XSLTFilter::impl_createTransformer(const OUString& rTransformer, const Sequence<Any>& rArgs) { css::uno::Reference<xslt::XXSLTTransformer> xTransformer; @@ -379,7 +379,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) if (xInterActionHandler.is()) { Sequence<Any> excArgs(0); ::com::sun::star::ucb::InteractiveAugmentedIOException exc( - rtl::OUString("Timeout!"), + OUString("Timeout!"), static_cast< OWeakObject * >( this ), InteractionClassification_ERROR, ::com::sun::star::ucb::IOErrorCode_GENERAL, |