diff options
author | Ádám Csaba Király <kiraly.adam.csaba@gmail.com> | 2013-02-28 19:28:03 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2013-03-01 13:19:13 +0000 |
commit | b93b23fe10917881e185750d294fc42fe2c92424 (patch) | |
tree | 91f7f756b93825059c7002e1df9f21818a5c74db /canvas/source/tools | |
parent | 4b063c0e5b0e04986c98e7dd005a6223d8d9785a (diff) |
Replace rtl::O(U)String with O(U)String
Other changes include:
in bridges/test/testcomp.cxx duplicate 'using namespace ::test' removed,
'using namespace ::rtl' replaced with 'using ::rtl::OUString' and
'using ::rtl::OUStringToOString'
Change-Id: I67a5952afd305adeb07f728c9074620ecba8e9fc
Reviewed-on: https://gerrit.libreoffice.org/2475
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'canvas/source/tools')
-rw-r--r-- | canvas/source/tools/cachedprimitivebase.cxx | 3 | ||||
-rw-r--r-- | canvas/source/tools/parametricpolypolygon.cxx | 5 | ||||
-rw-r--r-- | canvas/source/tools/propertysethelper.cxx | 14 |
3 files changed, 10 insertions, 12 deletions
diff --git a/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx index 69e92f11af37..63a62b52c2c4 100644 --- a/canvas/source/tools/cachedprimitivebase.cxx +++ b/canvas/source/tools/cachedprimitivebase.cxx @@ -26,7 +26,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/tools/canvastools.hxx> - using namespace ::com::sun::star; #define IMPLEMENTATION_NAME "canvas::CachedPrimitiveBase" @@ -87,7 +86,7 @@ namespace canvas return OUString( IMPLEMENTATION_NAME ); } - sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException) + sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { return ServiceName == SERVICE_NAME; } diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx index afce14a3f6cb..11ca7ed0b59c 100644 --- a/canvas/source/tools/parametricpolypolygon.cxx +++ b/canvas/source/tools/parametricpolypolygon.cxx @@ -35,7 +35,6 @@ #include <canvas/parametricpolypolygon.hxx> - using namespace ::com::sun::star; namespace canvas @@ -52,7 +51,7 @@ namespace canvas ParametricPolyPolygon* ParametricPolyPolygon::create( const uno::Reference< rendering::XGraphicDevice >& rDevice, - const ::rtl::OUString& rServiceName, + const OUString& rServiceName, const uno::Sequence< uno::Any >& rArgs ) { uno::Sequence< uno::Sequence< double > > colorSequence(2); @@ -208,7 +207,7 @@ namespace canvas return OUString( IMPLEMENTATION_NAME ); } - sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException) + sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { return ServiceName == SERVICE_NAME; } diff --git a/canvas/source/tools/propertysethelper.cxx b/canvas/source/tools/propertysethelper.cxx index eabbe89b7670..2cdee08d4d37 100644 --- a/canvas/source/tools/propertysethelper.cxx +++ b/canvas/source/tools/propertysethelper.cxx @@ -85,7 +85,7 @@ namespace canvas initProperties( aMerged ); } - bool PropertySetHelper::isPropertyName( const ::rtl::OUString& aPropertyName ) const + bool PropertySetHelper::isPropertyName( const OUString& aPropertyName ) const { if( !mpMap.get() ) return false; @@ -101,7 +101,7 @@ namespace canvas return uno::Reference< beans::XPropertySetInfo >(); } - void PropertySetHelper::setPropertyValue( const ::rtl::OUString& aPropertyName, + void PropertySetHelper::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) { Callbacks aCallbacks; @@ -118,7 +118,7 @@ namespace canvas aCallbacks.setter(aValue); } - uno::Any PropertySetHelper::getPropertyValue( const ::rtl::OUString& aPropertyName ) const + uno::Any PropertySetHelper::getPropertyValue( const OUString& aPropertyName ) const { Callbacks aCallbacks; if( !mpMap.get() || @@ -136,7 +136,7 @@ namespace canvas return uno::Any(); } - void PropertySetHelper::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + void PropertySetHelper::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) { // check validity of property, but otherwise ignore the @@ -145,13 +145,13 @@ namespace canvas throwUnknown( aPropertyName ); } - void PropertySetHelper::removePropertyChangeListener( const ::rtl::OUString& /*aPropertyName*/, + void PropertySetHelper::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) { // ignore request, no listener added in the first place } - void PropertySetHelper::addVetoableChangeListener( const ::rtl::OUString& aPropertyName, + void PropertySetHelper::addVetoableChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ ) { // check validity of property, but otherwise ignore the @@ -160,7 +160,7 @@ namespace canvas throwUnknown( aPropertyName ); } - void PropertySetHelper::removeVetoableChangeListener( const ::rtl::OUString& /*aPropertyName*/, + void PropertySetHelper::removeVetoableChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ ) { // ignore request, no listener added in the first place |