diff options
| -rw-r--r-- | canvas/inc/canvas/base/cachedprimitivebase.hxx | 6 | ||||
| -rw-r--r-- | canvas/inc/canvas/base/graphicdevicebase.hxx | 18 | ||||
| -rw-r--r-- | canvas/inc/canvas/canvastools.hxx | 6 | ||||
| -rw-r--r-- | canvas/inc/canvas/parametricpolypolygon.hxx | 10 | ||||
| -rw-r--r-- | canvas/inc/canvas/propertysethelper.hxx | 14 |
5 files changed, 27 insertions, 27 deletions
diff --git a/canvas/inc/canvas/base/cachedprimitivebase.hxx b/canvas/inc/canvas/base/cachedprimitivebase.hxx index 32de38ee7af6..8c7e1579f1e2 100644 --- a/canvas/inc/canvas/base/cachedprimitivebase.hxx +++ b/canvas/inc/canvas/base/cachedprimitivebase.hxx @@ -72,9 +72,9 @@ namespace canvas virtual ::sal_Int8 SAL_CALL redraw( const ::com::sun::star::rendering::ViewState& aState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::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 (::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 sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); protected: ~CachedPrimitiveBase(); // we're a ref-counted UNO class. _We_ destroy ourselves. diff --git a/canvas/inc/canvas/base/graphicdevicebase.hxx b/canvas/inc/canvas/base/graphicdevicebase.hxx index e4e5081db580..5c3372e3f76a 100644 --- a/canvas/inc/canvas/base/graphicdevicebase.hxx +++ b/canvas/inc/canvas/base/graphicdevicebase.hxx @@ -254,7 +254,7 @@ namespace canvas } // XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { return ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XParametricPolyPolygon2D >( ParametricPolyPolygon::create(this, @@ -262,7 +262,7 @@ namespace canvas ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >())); } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& aServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& aServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { return ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XParametricPolyPolygon2D >( ParametricPolyPolygon::create(this, @@ -270,7 +270,7 @@ namespace canvas Arguments)); } - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (::com::sun::star::uno::RuntimeException) { return ParametricPolyPolygon::getAvailableServiceNames(); } @@ -293,7 +293,7 @@ namespace canvas return maPropHelper.getPropertySetInfo(); } - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, @@ -304,7 +304,7 @@ namespace canvas maPropHelper.setPropertyValue( aPropertyName, aValue ); } - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -312,7 +312,7 @@ namespace canvas return maPropHelper.getPropertyValue( aPropertyName ); } - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) @@ -322,7 +322,7 @@ namespace canvas xListener ); } - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) @@ -332,7 +332,7 @@ namespace canvas xListener ); } - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL addVetoableChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) @@ -342,7 +342,7 @@ namespace canvas xListener ); } - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& aPropertyName, + virtual void SAL_CALL removeVetoableChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) diff --git a/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx index b2627d49c357..c9de485bb4d0 100644 --- a/canvas/inc/canvas/canvastools.hxx +++ b/canvas/inc/canvas/canvastools.hxx @@ -408,7 +408,7 @@ namespace canvas OSL_TRACE("numeric_cast detected data loss"); #endif throw ::com::sun::star::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "numeric_cast detected data loss" )), + "numeric_cast detected data loss", NULL ); } @@ -533,12 +533,12 @@ namespace canvas @return true, if a matching entry was found. */ - bool lookup( const ::rtl::OUString& rName, + bool lookup( const OUString& rName, ValueType& o_rResult ) const { // rName is required to contain only ASCII characters. // TODO(Q1): Enforce this at upper layers - ::rtl::OString aKey( ::rtl::OUStringToOString( mbCaseSensitive ? rName : rName.toAsciiLowerCase(), + OString aKey( OUStringToOString( mbCaseSensitive ? rName : rName.toAsciiLowerCase(), RTL_TEXTENCODING_ASCII_US ) ); MapEntry aSearchKey = { diff --git a/canvas/inc/canvas/parametricpolypolygon.hxx b/canvas/inc/canvas/parametricpolypolygon.hxx index fa5cb0036b05..2e8cb7af45fb 100644 --- a/canvas/inc/canvas/parametricpolypolygon.hxx +++ b/canvas/inc/canvas/parametricpolypolygon.hxx @@ -92,10 +92,10 @@ namespace canvas const GradientType meType; }; - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getAvailableServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > getAvailableServiceNames(); static ParametricPolyPolygon* create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, - const ::rtl::OUString& rServiceName, + const OUString& rServiceName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs ); /// Dispose all internal references @@ -108,9 +108,9 @@ namespace canvas virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace > SAL_CALL getColorSpace() throw (::com::sun::star::uno::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 (::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 sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); /// Query all defining values of this object atomically Values getValues() const; diff --git a/canvas/inc/canvas/propertysethelper.hxx b/canvas/inc/canvas/propertysethelper.hxx index 1ae139677036..b90d9ef344e5 100644 --- a/canvas/inc/canvas/propertysethelper.hxx +++ b/canvas/inc/canvas/propertysethelper.hxx @@ -121,7 +121,7 @@ namespace canvas @return true, if the given name maps to a known property. */ - bool isPropertyName( const ::rtl::OUString& aPropertyName ) const; + bool isPropertyName( const OUString& aPropertyName ) const; /** Request the currently active map */ @@ -129,16 +129,16 @@ namespace canvas // XPropertySet implementation ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > getPropertySetInfo() const; - void setPropertyValue( const ::rtl::OUString& aPropertyName, + void setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ); - ::com::sun::star::uno::Any getPropertyValue( const ::rtl::OUString& PropertyName ) const; - void addPropertyChangeListener( const ::rtl::OUString& aPropertyName, + ::com::sun::star::uno::Any getPropertyValue( const OUString& PropertyName ) const; + void addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ); - void removePropertyChangeListener( const ::rtl::OUString& aPropertyName, + void removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ); - void addVetoableChangeListener( const ::rtl::OUString& aPropertyName, + void addVetoableChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener ); - void removeVetoableChangeListener( const ::rtl::OUString& aPropertyName, + void removeVetoableChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener ); private: |