Kaydet (Commit) 05acd6da authored tarafından Thomas Arnhold's avatar Thomas Arnhold

namespace css

Change-Id: Ie25cc7098cd513a77d78e04564eccacd946c355b
üst 439c9091
...@@ -57,11 +57,11 @@ namespace canvas ...@@ -57,11 +57,11 @@ namespace canvas
<pre> <pre>
Example: Example:
typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::rendering::XGraphicDevice, typedef ::cppu::WeakComponentImplHelper5< css::rendering::XGraphicDevice,
::com::sun::star::rendering::XColorSpace, css::rendering::XColorSpace,
::com::sun::star::rendering::XPropertySet, css::rendering::XPropertySet,
::com::sun::star::lang::XServiceInfo, css::lang::XServiceInfo,
::com::sun::star::lang::XServiceName > GraphicDeviceBase_Base; css::lang::XServiceName > GraphicDeviceBase_Base;
typedef ::canvas::internal::GraphicDeviceBase< GraphicDeviceBase, DeviceHelper > ExampleDevice_Base; typedef ::canvas::internal::GraphicDeviceBase< GraphicDeviceBase, DeviceHelper > ExampleDevice_Base;
class ExampleDevice : public ExampleDevice_Base class ExampleDevice : public ExampleDevice_Base
...@@ -101,7 +101,7 @@ namespace canvas ...@@ -101,7 +101,7 @@ namespace canvas
template< class Base, template< class Base,
class DeviceHelper, class DeviceHelper,
class Mutex=::osl::MutexGuard, class Mutex=::osl::MutexGuard,
class UnambiguousBase=::com::sun::star::uno::XInterface > class GraphicDeviceBase : class UnambiguousBase=css::uno::XInterface > class GraphicDeviceBase :
public Base public Base
{ {
public: public:
...@@ -147,48 +147,48 @@ namespace canvas ...@@ -147,48 +147,48 @@ namespace canvas
} }
// XGraphicDevice // XGraphicDevice
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBufferController > SAL_CALL getBufferController( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE virtual css::uno::Reference< css::rendering::XBufferController > SAL_CALL getBufferController( ) throw (css::uno::RuntimeException) SAL_OVERRIDE
{ {
return ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBufferController >(); return css::uno::Reference< css::rendering::XBufferController >();
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace > SAL_CALL getDeviceColorSpace( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE virtual css::uno::Reference< css::rendering::XColorSpace > SAL_CALL getDeviceColorSpace( ) throw (css::uno::RuntimeException) SAL_OVERRIDE
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
return maDeviceHelper.getColorSpace(); return maDeviceHelper.getColorSpace();
} }
virtual ::com::sun::star::geometry::RealSize2D SAL_CALL getPhysicalResolution( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE virtual css::geometry::RealSize2D SAL_CALL getPhysicalResolution( ) throw (css::uno::RuntimeException) SAL_OVERRIDE
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
return maDeviceHelper.getPhysicalResolution(); return maDeviceHelper.getPhysicalResolution();
} }
virtual ::com::sun::star::geometry::RealSize2D SAL_CALL getPhysicalSize( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE virtual css::geometry::RealSize2D SAL_CALL getPhysicalSize( ) throw (css::uno::RuntimeException) SAL_OVERRIDE
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
return maDeviceHelper.getPhysicalSize(); return maDeviceHelper.getPhysicalSize();
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XLinePolyPolygon2D > SAL_CALL createCompatibleLinePolyPolygon( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& points ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE virtual css::uno::Reference< css::rendering::XLinePolyPolygon2D > SAL_CALL createCompatibleLinePolyPolygon( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealPoint2D > >& points ) throw (css::uno::RuntimeException) SAL_OVERRIDE
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
return maDeviceHelper.createCompatibleLinePolyPolygon( this, points ); return maDeviceHelper.createCompatibleLinePolyPolygon( this, points );
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBezierPolyPolygon2D > SAL_CALL createCompatibleBezierPolyPolygon( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > >& points ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE virtual css::uno::Reference< css::rendering::XBezierPolyPolygon2D > SAL_CALL createCompatibleBezierPolyPolygon( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealBezierSegment2D > >& points ) throw (css::uno::RuntimeException) SAL_OVERRIDE
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
return maDeviceHelper.createCompatibleBezierPolyPolygon( this, points ); return maDeviceHelper.createCompatibleBezierPolyPolygon( this, points );
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL createCompatibleBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException, virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleBitmap( const css::geometry::IntegerSize2D& size ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE css::uno::RuntimeException) SAL_OVERRIDE
{ {
tools::verifyBitmapSize(size, tools::verifyBitmapSize(size,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -199,8 +199,8 @@ namespace canvas ...@@ -199,8 +199,8 @@ namespace canvas
return maDeviceHelper.createCompatibleBitmap( this, size ); return maDeviceHelper.createCompatibleBitmap( this, size );
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > SAL_CALL createVolatileBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException, virtual css::uno::Reference< css::rendering::XVolatileBitmap > SAL_CALL createVolatileBitmap( const css::geometry::IntegerSize2D& size ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE css::uno::RuntimeException) SAL_OVERRIDE
{ {
tools::verifyBitmapSize(size, tools::verifyBitmapSize(size,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -211,8 +211,8 @@ namespace canvas ...@@ -211,8 +211,8 @@ namespace canvas
return maDeviceHelper.createVolatileBitmap( this, size ); return maDeviceHelper.createVolatileBitmap( this, size );
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL createCompatibleAlphaBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException, virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleAlphaBitmap( const css::geometry::IntegerSize2D& size ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE css::uno::RuntimeException) SAL_OVERRIDE
{ {
tools::verifyBitmapSize(size, tools::verifyBitmapSize(size,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -223,8 +223,8 @@ namespace canvas ...@@ -223,8 +223,8 @@ namespace canvas
return maDeviceHelper.createCompatibleAlphaBitmap( this, size ); return maDeviceHelper.createCompatibleAlphaBitmap( this, size );
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > SAL_CALL createVolatileAlphaBitmap( const ::com::sun::star::geometry::IntegerSize2D& size ) throw (::com::sun::star::lang::IllegalArgumentException, virtual css::uno::Reference< css::rendering::XVolatileBitmap > SAL_CALL createVolatileAlphaBitmap( const css::geometry::IntegerSize2D& size ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE css::uno::RuntimeException) SAL_OVERRIDE
{ {
tools::verifyBitmapSize(size, tools::verifyBitmapSize(size,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -235,19 +235,19 @@ namespace canvas ...@@ -235,19 +235,19 @@ namespace canvas
return maDeviceHelper.createVolatileAlphaBitmap( this, size ); return maDeviceHelper.createVolatileAlphaBitmap( this, size );
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > SAL_CALL getParametricPolyPolygonFactory( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE virtual css::uno::Reference< css::lang::XMultiServiceFactory > SAL_CALL getParametricPolyPolygonFactory( ) throw (css::uno::RuntimeException) SAL_OVERRIDE
{ {
return this; return this;
} }
virtual sal_Bool SAL_CALL hasFullScreenMode( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE virtual sal_Bool SAL_CALL hasFullScreenMode( ) throw (css::uno::RuntimeException) SAL_OVERRIDE
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
return maDeviceHelper.hasFullScreenMode(); return maDeviceHelper.hasFullScreenMode();
} }
virtual sal_Bool SAL_CALL enterFullScreenMode( sal_Bool bEnter ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE virtual sal_Bool SAL_CALL enterFullScreenMode( sal_Bool bEnter ) throw (css::uno::RuntimeException) SAL_OVERRIDE
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
...@@ -255,23 +255,23 @@ namespace canvas ...@@ -255,23 +255,23 @@ namespace canvas
} }
// XMultiServiceFactory // XMultiServiceFactory
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) SAL_OVERRIDE virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException) SAL_OVERRIDE
{ {
return ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XParametricPolyPolygon2D >( return css::uno::Reference< css::rendering::XParametricPolyPolygon2D >(
ParametricPolyPolygon::create(this, ParametricPolyPolygon::create(this,
aServiceSpecifier, aServiceSpecifier,
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >())); css::uno::Sequence< css::uno::Any >()));
} }
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) SAL_OVERRIDE virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& aServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException) SAL_OVERRIDE
{ {
return ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XParametricPolyPolygon2D >( return css::uno::Reference< css::rendering::XParametricPolyPolygon2D >(
ParametricPolyPolygon::create(this, ParametricPolyPolygon::create(this,
aServiceSpecifier, aServiceSpecifier,
Arguments)); Arguments));
} }
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE
{ {
return ParametricPolyPolygon::getAvailableServiceNames(); return ParametricPolyPolygon::getAvailableServiceNames();
} }
...@@ -288,35 +288,35 @@ namespace canvas ...@@ -288,35 +288,35 @@ namespace canvas
// XPropertySet // XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException) SAL_OVERRIDE
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
return maPropHelper.getPropertySetInfo(); return maPropHelper.getPropertySetInfo();
} }
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException, css::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException, css::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException, css::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE css::uno::RuntimeException) SAL_OVERRIDE
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
maPropHelper.setPropertyValue( aPropertyName, aValue ); maPropHelper.setPropertyValue( aPropertyName, aValue );
} }
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, css::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE css::uno::RuntimeException) SAL_OVERRIDE
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
return maPropHelper.getPropertyValue( aPropertyName ); return maPropHelper.getPropertyValue( aPropertyName );
} }
virtual void SAL_CALL addPropertyChangeListener( const 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, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, css::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE css::uno::RuntimeException) SAL_OVERRIDE
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
maPropHelper.addPropertyChangeListener( aPropertyName, maPropHelper.addPropertyChangeListener( aPropertyName,
...@@ -324,9 +324,9 @@ namespace canvas ...@@ -324,9 +324,9 @@ namespace canvas
} }
virtual void SAL_CALL removePropertyChangeListener( const 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, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, css::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE css::uno::RuntimeException) SAL_OVERRIDE
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
maPropHelper.removePropertyChangeListener( aPropertyName, maPropHelper.removePropertyChangeListener( aPropertyName,
...@@ -334,9 +334,9 @@ namespace canvas ...@@ -334,9 +334,9 @@ namespace canvas
} }
virtual void SAL_CALL addVetoableChangeListener( const 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, const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener ) throw (css::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, css::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE css::uno::RuntimeException) SAL_OVERRIDE
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
maPropHelper.addVetoableChangeListener( aPropertyName, maPropHelper.addVetoableChangeListener( aPropertyName,
...@@ -344,9 +344,9 @@ namespace canvas ...@@ -344,9 +344,9 @@ namespace canvas
} }
virtual void SAL_CALL removeVetoableChangeListener( const 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, const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener ) throw (css::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, css::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException) SAL_OVERRIDE css::uno::RuntimeException) SAL_OVERRIDE
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
maPropHelper.removeVetoableChangeListener( aPropertyName, maPropHelper.removeVetoableChangeListener( aPropertyName,
...@@ -356,12 +356,12 @@ namespace canvas ...@@ -356,12 +356,12 @@ namespace canvas
protected: protected:
~GraphicDeviceBase() {} // we're a ref-counted UNO class. _We_ destroy ourselves. ~GraphicDeviceBase() {} // we're a ref-counted UNO class. _We_ destroy ourselves.
::com::sun::star::uno::Any getDumpScreenContent() const css::uno::Any getDumpScreenContent() const
{ {
return ::com::sun::star::uno::makeAny( mbDumpScreenContent ); return css::uno::makeAny( mbDumpScreenContent );
} }
void setDumpScreenContent( const ::com::sun::star::uno::Any& rAny ) void setDumpScreenContent( const css::uno::Any& rAny )
{ {
// TODO(Q1): this was mbDumpScreenContent = // TODO(Q1): this was mbDumpScreenContent =
// rAny.get<bool>(), only that gcc3.3 wouldn't eat it // rAny.get<bool>(), only that gcc3.3 wouldn't eat it
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment