Skip to content

C
core
Kaydet (Commit) b1659c95 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin
Dosyalara gözat
Seçenekler

com::sun::star->css in include/canvas 

Change-Id: Iacf28606e41f0b1345864762612cbb009066bfeb
Reviewed-on: https://gerrit.libreoffice.org/19458Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst baffe9bd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 137 deletions
include/canvas/base/bitmapcanvasbase.hxx
Dosyayı görüntüle @ b1659c95
...@@ -61,26 +61,26 @@ namespace canvas ...@@ -61,26 +61,26 @@ namespace canvas
template< class Base, template< class Base,
class CanvasHelper, class CanvasHelper,
class Mutex=::osl::MutexGuard, class Mutex=::osl::MutexGuard,
class UnambiguousBase=::com::sun::star::uno::XInterface > class BitmapCanvasBase : class UnambiguousBase=css::uno::XInterface > class BitmapCanvasBase :
public CanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > public CanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >
{ {
public: public:
typedef CanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType; typedef CanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType;
// XBitmap // XBitmap
virtual ::com::sun::star::geometry::IntegerSize2D SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException) override virtual css::geometry::IntegerSize2D SAL_CALL getSize( ) throw (css::uno::RuntimeException) override
{ {
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
return BaseType::maCanvasHelper.getSize(); return BaseType::maCanvasHelper.getSize();
} }
virtual sal_Bool SAL_CALL hasAlpha( ) throw (::com::sun::star::uno::RuntimeException) override virtual sal_Bool SAL_CALL hasAlpha( ) throw (css::uno::RuntimeException) override
{ {
return sal_True; return sal_True;
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& newSize, virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& newSize,
sal_Bool beFast ) throw (css::uno::RuntimeException, std::exception) override sal_Bool beFast ) throw (css::uno::RuntimeException, std::exception) override
{ {
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
...@@ -93,7 +93,7 @@ namespace canvas ...@@ -93,7 +93,7 @@ namespace canvas
template< class Base, template< class Base,
class CanvasHelper, class CanvasHelper,
class Mutex=::osl::MutexGuard, class Mutex=::osl::MutexGuard,
class UnambiguousBase=::com::sun::star::uno::XInterface > class BitmapCanvasBase2 : class UnambiguousBase = css::uno::XInterface > class BitmapCanvasBase2 :
public BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > public BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >
{ {
typedef BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > typedef BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >
...@@ -101,14 +101,14 @@ namespace canvas ...@@ -101,14 +101,14 @@ namespace canvas
public: public:
// XBitmapCanvas // XBitmapCanvas
virtual void SAL_CALL copyRect( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& sourceCanvas, virtual void SAL_CALL copyRect( const css::uno::Reference< css::rendering::XBitmapCanvas >& sourceCanvas,
const ::com::sun::star::geometry::RealRectangle2D& sourceRect, const css::geometry::RealRectangle2D& sourceRect,
const ::com::sun::star::rendering::ViewState& sourceViewState, const css::rendering::ViewState& sourceViewState,
const ::com::sun::star::rendering::RenderState& sourceRenderState, const css::rendering::RenderState& sourceRenderState,
const ::com::sun::star::geometry::RealRectangle2D& destRect, const css::geometry::RealRectangle2D& destRect,
const ::com::sun::star::rendering::ViewState& destViewState, const css::rendering::ViewState& destViewState,
const ::com::sun::star::rendering::RenderState& destRenderState ) throw (::com::sun::star::lang::IllegalArgumentException, const css::rendering::RenderState& destRenderState ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(sourceCanvas, sourceRect, sourceViewState, sourceRenderState, tools::verifyArgs(sourceCanvas, sourceRect, sourceViewState, sourceRenderState,
destRect, destViewState, destRenderState, destRect, destViewState, destRenderState,
......
include/canvas/base/bufferedgraphicdevicebase.hxx
Dosyayı görüntüle @ b1659c95
...@@ -73,7 +73,7 @@ namespace canvas ...@@ -73,7 +73,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 BufferedGraphicDeviceBase : class UnambiguousBase = css::uno::XInterface > class BufferedGraphicDeviceBase :
public GraphicDeviceBase< Base, DeviceHelper, Mutex, UnambiguousBase > public GraphicDeviceBase< Base, DeviceHelper, Mutex, UnambiguousBase >
{ {
public: public:
...@@ -93,26 +93,26 @@ namespace canvas ...@@ -93,26 +93,26 @@ namespace canvas
} }
// XGraphicDevice // XGraphicDevice
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBufferController > SAL_CALL getBufferController( ) throw (::com::sun::star::uno::RuntimeException) override virtual css::uno::Reference< css::rendering::XBufferController > SAL_CALL getBufferController( ) throw (css::uno::RuntimeException) override
{ {
return this; return this;
} }
// XBufferController // XBufferController
virtual ::sal_Int32 SAL_CALL createBuffers( ::sal_Int32 nBuffers ) throw (::com::sun::star::lang::IllegalArgumentException, virtual ::sal_Int32 SAL_CALL createBuffers( ::sal_Int32 nBuffers ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyRange( nBuffers, (sal_Int32)1 ); tools::verifyRange( nBuffers, (sal_Int32)1 );
return 1; return 1;
} }
virtual void SAL_CALL destroyBuffers( ) throw (::com::sun::star::uno::RuntimeException) override virtual void SAL_CALL destroyBuffers( ) throw (css::uno::RuntimeException) override
{ {
} }
virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll )
throw (::com::sun::star::uno::RuntimeException, throw (css::uno::RuntimeException,
std::exception) override std::exception) override
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
...@@ -120,7 +120,7 @@ namespace canvas ...@@ -120,7 +120,7 @@ namespace canvas
return BaseType::maDeviceHelper.showBuffer( mbIsVisible, bUpdateAll ); return BaseType::maDeviceHelper.showBuffer( mbIsVisible, bUpdateAll );
} }
virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception) override virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
...@@ -139,8 +139,7 @@ namespace canvas ...@@ -139,8 +139,7 @@ namespace canvas
is called, with rBounds the window bound rect relative to is called, with rBounds the window bound rect relative to
the frame window. the frame window.
*/ */
void setWindow( const ::com::sun::star::uno::Reference< void setWindow( const css::uno::Reference< css::awt::XWindow2 >& rWindow )
::com::sun::star::awt::XWindow2 >& rWindow )
{ {
if( mxWindow.is() ) if( mxWindow.is() )
mxWindow->removeWindowListener( this ); mxWindow->removeWindowListener( this );
...@@ -151,23 +150,23 @@ namespace canvas ...@@ -151,23 +150,23 @@ namespace canvas
{ {
mbIsVisible = mxWindow->isVisible(); mbIsVisible = mxWindow->isVisible();
mbIsTopLevel = mbIsTopLevel =
::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindow >( css::uno::Reference< css::awt::XTopWindow >(
mxWindow, mxWindow,
::com::sun::star::uno::UNO_QUERY ).is(); css::uno::UNO_QUERY ).is();
maBounds = transformBounds( mxWindow->getPosSize() ); maBounds = transformBounds( mxWindow->getPosSize() );
mxWindow->addWindowListener( this ); mxWindow->addWindowListener( this );
} }
} }
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2 > getWindow() const css::uno::Reference< css::awt::XWindow2 > getWindow() const
{ {
return mxWindow; return mxWindow;
} }
::com::sun::star::uno::Any getXWindow() const css::uno::Any getXWindow() const
{ {
return ::com::sun::star::uno::makeAny(mxWindow); return css::uno::makeAny(mxWindow);
} }
virtual void disposeThis() override virtual void disposeThis() override
...@@ -184,7 +183,7 @@ namespace canvas ...@@ -184,7 +183,7 @@ namespace canvas
BaseType::disposeThis(); BaseType::disposeThis();
} }
::com::sun::star::awt::Rectangle transformBounds( const ::com::sun::star::awt::Rectangle& rBounds ) css::awt::Rectangle transformBounds( const css::awt::Rectangle& rBounds )
{ {
// notifySizeUpdate's bounds are relative to the toplevel // notifySizeUpdate's bounds are relative to the toplevel
// window // window
...@@ -193,16 +192,15 @@ namespace canvas ...@@ -193,16 +192,15 @@ namespace canvas
rBounds, rBounds,
mxWindow ); mxWindow );
else else
return ::com::sun::star::awt::Rectangle( 0,0,rBounds.Width,rBounds.Height ); return css::awt::Rectangle( 0,0,rBounds.Width,rBounds.Height );
} }
void boundsChanged( const ::com::sun::star::awt::WindowEvent& e ) void boundsChanged( const css::awt::WindowEvent& e )
{ {
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
const ::com::sun::star::awt::Rectangle& rNewBounds( const css::awt::Rectangle& rNewBounds(
transformBounds( transformBounds( css::awt::Rectangle( e.X,
::com::sun::star::awt::Rectangle( e.X,
e.Y, e.Y,
e.Width, e.Width,
e.Height ))); e.Height )));
...@@ -218,7 +216,7 @@ namespace canvas ...@@ -218,7 +216,7 @@ namespace canvas
} }
// XWindowListener // XWindowListener
virtual void disposeEventSource( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) override virtual void disposeEventSource( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) override
{ {
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
...@@ -228,24 +226,24 @@ namespace canvas ...@@ -228,24 +226,24 @@ namespace canvas
BaseType::disposeEventSource(Source); BaseType::disposeEventSource(Source);
} }
virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException) override virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException) override
{ {
boundsChanged( e ); boundsChanged( e );
} }
virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException) override virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException) override
{ {
boundsChanged( e ); boundsChanged( e );
} }
virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) override virtual void SAL_CALL windowShown( const css::lang::EventObject& ) throw (css::uno::RuntimeException) override
{ {
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
mbIsVisible = true; mbIsVisible = true;
} }
virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) override virtual void SAL_CALL windowHidden( const css::lang::EventObject& ) throw (css::uno::RuntimeException) override
{ {
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
...@@ -253,17 +251,17 @@ namespace canvas ...@@ -253,17 +251,17 @@ namespace canvas
} }
protected: protected:
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2 > mxWindow; css::uno::Reference< css::awt::XWindow2 > mxWindow;
/// Current bounds of the owning Window /// Current bounds of the owning Window
::com::sun::star::awt::Rectangle maBounds; css::awt::Rectangle maBounds;
/// True, if the window this canvas is contained in, is visible /// True, if the window this canvas is contained in, is visible
bool mbIsVisible; bool mbIsVisible;
private: private:
/// True, if the window this canvas is contained in, is a toplevel window /// True, if the window this canvas is contained in, is a toplevel window
bool mbIsTopLevel; bool mbIsTopLevel;
}; };
} }
......
include/canvas/base/cachedprimitivebase.hxx
Dosyayı görüntüle @ b1659c95
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
namespace canvas namespace canvas
{ {
typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XCachedPrimitive, typedef ::cppu::WeakComponentImplHelper2< css::rendering::XCachedPrimitive,
::com::sun::star::lang::XServiceInfo > CachedPrimitiveBase_Base; css::lang::XServiceInfo > CachedPrimitiveBase_Base;
/** Base class, providing common functionality for implementers of /** Base class, providing common functionality for implementers of
the XCachedPrimitive interface. the XCachedPrimitive interface.
...@@ -60,21 +60,20 @@ namespace canvas ...@@ -60,21 +60,20 @@ namespace canvas
objects where re-transforming the generated output is not objects where re-transforming the generated output is not
desirable, e.g. for hinted font output. desirable, e.g. for hinted font output.
*/ */
CachedPrimitiveBase( const ::com::sun::star::rendering::ViewState& rUsedViewState, CachedPrimitiveBase( const css::rendering::ViewState& rUsedViewState,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::rendering::XCanvas >& rTarget,
::com::sun::star::rendering::XCanvas >& rTarget, bool bFailForChangedViewTransform );
bool bFailForChangedViewTransform );
/// Dispose all internal references /// Dispose all internal references
virtual void SAL_CALL disposing() override; virtual void SAL_CALL disposing() override;
// XCachedPrimitive // XCachedPrimitive
virtual ::sal_Int8 SAL_CALL redraw( const ::com::sun::star::rendering::ViewState& aState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::sal_Int8 SAL_CALL redraw( const css::rendering::ViewState& aState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
protected: protected:
virtual ~CachedPrimitiveBase(); // we're a ref-counted UNO class. _We_ destroy ourselves. virtual ~CachedPrimitiveBase(); // we're a ref-counted UNO class. _We_ destroy ourselves.
...@@ -100,15 +99,14 @@ namespace canvas ...@@ -100,15 +99,14 @@ namespace canvas
@param bSameViewTransform @param bSameViewTransform
When true, rNewState and rOldState have the same transformation. When true, rNewState and rOldState have the same transformation.
*/ */
virtual ::sal_Int8 doRedraw( const ::com::sun::star::rendering::ViewState& rNewState, virtual ::sal_Int8 doRedraw( const css::rendering::ViewState& rNewState,
const ::com::sun::star::rendering::ViewState& rOldState, const css::rendering::ViewState& rOldState,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::rendering::XCanvas >& rTargetCanvas,
::com::sun::star::rendering::XCanvas >& rTargetCanvas, bool bSameViewTransform ) = 0;
bool bSameViewTransform ) = 0;
css::rendering::ViewState maUsedViewState;
::com::sun::star::rendering::ViewState maUsedViewState; css::uno::Reference< css::rendering::XCanvas > mxTarget;
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxTarget; const bool mbFailForChangedViewTransform;
const bool mbFailForChangedViewTransform;
}; };
} }
......
include/canvas/base/canvascustomspritebase.hxx
Dosyayı görüntüle @ b1659c95
...@@ -74,7 +74,7 @@ namespace canvas ...@@ -74,7 +74,7 @@ namespace canvas
class SpriteHelper, class SpriteHelper,
class CanvasHelper, class CanvasHelper,
class Mutex=::osl::MutexGuard, class Mutex=::osl::MutexGuard,
class UnambiguousBase=::com::sun::star::uno::XInterface > class CanvasCustomSpriteBase : class UnambiguousBase = css::uno::XInterface > class CanvasCustomSpriteBase :
public IntegerBitmapBase< BitmapCanvasBase2<Base, CanvasHelper, Mutex, UnambiguousBase> > public IntegerBitmapBase< BitmapCanvasBase2<Base, CanvasHelper, Mutex, UnambiguousBase> >
{ {
public: public:
...@@ -105,7 +105,7 @@ namespace canvas ...@@ -105,7 +105,7 @@ namespace canvas
} }
// XCanvas: selectively override base's methods here, for opacity tracking // XCanvas: selectively override base's methods here, for opacity tracking
virtual void SAL_CALL clear() throw (::com::sun::star::uno::RuntimeException, std::exception) override virtual void SAL_CALL clear() throw (css::uno::RuntimeException, std::exception) override
{ {
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
...@@ -115,11 +115,11 @@ namespace canvas ...@@ -115,11 +115,11 @@ namespace canvas
return BaseType::clear(); return BaseType::clear();
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
drawBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap, drawBitmap( const css::uno::Reference< css::rendering::XBitmap >& xBitmap,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(xBitmap, viewState, renderState, tools::verifyArgs(xBitmap, viewState, renderState,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -143,8 +143,8 @@ namespace canvas ...@@ -143,8 +143,8 @@ namespace canvas
// functionality provided at the baseclass. // functionality provided at the baseclass.
// XSprite // XSprite
virtual void SAL_CALL setAlpha( double alpha ) throw (::com::sun::star::lang::IllegalArgumentException, virtual void SAL_CALL setAlpha( double alpha ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyRange( alpha, 0.0, 1.0 ); tools::verifyRange( alpha, 0.0, 1.0 );
...@@ -153,10 +153,10 @@ namespace canvas ...@@ -153,10 +153,10 @@ namespace canvas
maSpriteHelper.setAlpha( this, alpha ); maSpriteHelper.setAlpha( this, alpha );
} }
virtual void SAL_CALL move( const ::com::sun::star::geometry::RealPoint2D& aNewPos, virtual void SAL_CALL move( const css::geometry::RealPoint2D& aNewPos,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(aNewPos, viewState, renderState, tools::verifyArgs(aNewPos, viewState, renderState,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -167,8 +167,8 @@ namespace canvas ...@@ -167,8 +167,8 @@ namespace canvas
maSpriteHelper.move( this, aNewPos, viewState, renderState ); maSpriteHelper.move( this, aNewPos, viewState, renderState );
} }
virtual void SAL_CALL transform( const ::com::sun::star::geometry::AffineMatrix2D& aTransformation ) throw (::com::sun::star::lang::IllegalArgumentException, virtual void SAL_CALL transform( const css::geometry::AffineMatrix2D& aTransformation ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(aTransformation, tools::verifyArgs(aTransformation,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -179,7 +179,7 @@ namespace canvas ...@@ -179,7 +179,7 @@ namespace canvas
maSpriteHelper.transform( this, aTransformation ); maSpriteHelper.transform( this, aTransformation );
} }
virtual void SAL_CALL clip( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& aClip ) throw (::com::sun::star::uno::RuntimeException) override virtual void SAL_CALL clip( const css::uno::Reference< css::rendering::XPolyPolygon2D >& aClip ) throw (css::uno::RuntimeException) override
{ {
// NULL xClip explicitly allowed here (to clear clipping) // NULL xClip explicitly allowed here (to clear clipping)
...@@ -188,21 +188,21 @@ namespace canvas ...@@ -188,21 +188,21 @@ namespace canvas
maSpriteHelper.clip( this, aClip ); maSpriteHelper.clip( this, aClip );
} }
virtual void SAL_CALL setPriority( double nPriority ) throw (::com::sun::star::uno::RuntimeException) override virtual void SAL_CALL setPriority( double nPriority ) throw (css::uno::RuntimeException) override
{ {
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
maSpriteHelper.setPriority( this, nPriority ); maSpriteHelper.setPriority( this, nPriority );
} }
virtual void SAL_CALL show() throw (::com::sun::star::uno::RuntimeException) override virtual void SAL_CALL show() throw (css::uno::RuntimeException) override
{ {
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
maSpriteHelper.show( this ); maSpriteHelper.show( this );
} }
virtual void SAL_CALL hide() throw (::com::sun::star::uno::RuntimeException) override virtual void SAL_CALL hide() throw (css::uno::RuntimeException) override
{ {
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
...@@ -210,8 +210,8 @@ namespace canvas ...@@ -210,8 +210,8 @@ namespace canvas
} }
// XCustomSprite // XCustomSprite
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > SAL_CALL virtual css::uno::Reference< css::rendering::XCanvas > SAL_CALL
getContentCanvas() throw (::com::sun::star::uno::RuntimeException) override getContentCanvas() throw (css::uno::RuntimeException) override
{ {
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
......
include/canvas/base/canvascustomspritehelper.hxx
Dosyayı görüntüle @ b1659c95
...@@ -51,7 +51,7 @@ namespace canvas ...@@ -51,7 +51,7 @@ namespace canvas
@param rOwningSpriteCanvas @param rOwningSpriteCanvas
The XSpriteCanvas this sprite is displayed on The XSpriteCanvas this sprite is displayed on
*/ */
void init( const ::com::sun::star::geometry::RealSize2D& rSpriteSize, void init( const css::geometry::RealSize2D& rSpriteSize,
const SpriteSurface::Reference& rOwningSpriteCanvas ); const SpriteSurface::Reference& rOwningSpriteCanvas );
/** Object is being disposed, release all internal references /** Object is being disposed, release all internal references
...@@ -66,22 +66,22 @@ namespace canvas ...@@ -66,22 +66,22 @@ namespace canvas
void clearingContent( const Sprite::Reference& rSprite ); void clearingContent( const Sprite::Reference& rSprite );
/// need to call this method for XCanvas::drawBitmap(), for opacity tracking /// need to call this method for XCanvas::drawBitmap(), for opacity tracking
void checkDrawBitmap( const Sprite::Reference& rSprite, void checkDrawBitmap( const Sprite::Reference& rSprite,
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap, const css::uno::Reference< css::rendering::XBitmap >& xBitmap,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ); const css::rendering::RenderState& renderState );
// XSprite // XSprite
void setAlpha( const Sprite::Reference& rSprite, void setAlpha( const Sprite::Reference& rSprite,
double alpha ); double alpha );
void move( const Sprite::Reference& rSprite, void move( const Sprite::Reference& rSprite,
const ::com::sun::star::geometry::RealPoint2D& aNewPos, const css::geometry::RealPoint2D& aNewPos,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ); const css::rendering::RenderState& renderState );
void transform( const Sprite::Reference& rSprite, void transform( const Sprite::Reference& rSprite,
const ::com::sun::star::geometry::AffineMatrix2D& aTransformation ); const css::geometry::AffineMatrix2D& aTransformation );
void clip( const Sprite::Reference& rSprite, void clip( const Sprite::Reference& rSprite,
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& aClip ); const css::uno::Reference< css::rendering::XPolyPolygon2D >& aClip );
void setPriority( const Sprite::Reference& rSprite, void setPriority( const Sprite::Reference& rSprite,
double nPriority ); double nPriority );
void show( const Sprite::Reference& rSprite ); void show( const Sprite::Reference& rSprite );
...@@ -138,8 +138,8 @@ namespace canvas ...@@ -138,8 +138,8 @@ namespace canvas
double getAlpha() const { return mfAlpha; } double getAlpha() const { return mfAlpha; }
/// Retrieve current clip /// Retrieve current clip
const ::com::sun::star::uno::Reference< const css::uno::Reference<
::com::sun::star::rendering::XPolyPolygon2D >& getClip() const { return mxClipPoly; } css::rendering::XPolyPolygon2D >& getClip() const { return mxClipPoly; }
const ::basegfx::B2DHomMatrix& getTransformation() const { return maTransform; } const ::basegfx::B2DHomMatrix& getTransformation() const { return maTransform; }
...@@ -204,7 +204,7 @@ namespace canvas ...@@ -204,7 +204,7 @@ namespace canvas
@derive Needs to be provided by backend-specific code @derive Needs to be provided by backend-specific code
*/ */
virtual ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D( virtual ::basegfx::B2DPolyPolygon polyPolygonFromXPolyPolygon2D(
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPoly ) const = 0; css::uno::Reference< css::rendering::XPolyPolygon2D >& xPoly ) const = 0;
/** Update clip information from current state /** Update clip information from current state
...@@ -239,8 +239,7 @@ namespace canvas ...@@ -239,8 +239,7 @@ namespace canvas
::basegfx::B2DPoint maPosition; ::basegfx::B2DPoint maPosition;
::basegfx::B2DVector maSize; ::basegfx::B2DVector maSize;
::basegfx::B2DHomMatrix maTransform; ::basegfx::B2DHomMatrix maTransform;
::com::sun::star::uno::Reference< css::uno::Reference< css::rendering::XPolyPolygon2D > mxClipPoly;
::com::sun::star::rendering::XPolyPolygon2D > mxClipPoly;
double mfPriority; double mfPriority;
double mfAlpha; double mfAlpha;
bool mbActive; // true, if not hidden bool mbActive; // true, if not hidden
......
include/canvas/base/disambiguationhelper.hxx
Dosyayı görüntüle @ b1659c95
...@@ -60,7 +60,7 @@ namespace canvas ...@@ -60,7 +60,7 @@ namespace canvas
virtual void disposeThis() virtual void disposeThis()
{} {}
virtual void disposeEventSource( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) virtual void disposeEventSource( const css::lang::EventObject& ) throw (css::uno::RuntimeException)
{} {}
mutable ::osl::Mutex m_aMutex; mutable ::osl::Mutex m_aMutex;
...@@ -69,7 +69,7 @@ namespace canvas ...@@ -69,7 +69,7 @@ namespace canvas
virtual void SAL_CALL disposing() override virtual void SAL_CALL disposing() override
{ disposeThis(); } { disposeThis(); }
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) override virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) override
{ disposeEventSource(Source); } { disposeEventSource(Source); }
}; };
......
include/canvas/base/integerbitmapbase.hxx
Dosyayı görüntüle @ b1659c95
...@@ -41,8 +41,8 @@ namespace canvas ...@@ -41,8 +41,8 @@ namespace canvas
{ {
public: public:
// XIntegerBitmap // XIntegerBitmap
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, virtual css::uno::Sequence< sal_Int8 > SAL_CALL getData( css::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) override const css::geometry::IntegerRectangle2D& rect ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override
{ {
tools::verifyArgs(rect, tools::verifyArgs(rect,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -55,9 +55,9 @@ namespace canvas ...@@ -55,9 +55,9 @@ namespace canvas
rect ); rect );
} }
virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< sal_Int8 >&, virtual void SAL_CALL setData( const css::uno::Sequence< sal_Int8 >&,
const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const css::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override const css::geometry::IntegerRectangle2D& rect ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override
{ {
tools::verifyArgs(bitmapLayout, rect, tools::verifyArgs(bitmapLayout, rect,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -69,9 +69,9 @@ namespace canvas ...@@ -69,9 +69,9 @@ namespace canvas
Base::mbSurfaceDirty = true; Base::mbSurfaceDirty = true;
} }
virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >&, virtual void SAL_CALL setPixel( const css::uno::Sequence< sal_Int8 >&,
const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const css::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override const css::geometry::IntegerPoint2D& pos ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override
{ {
tools::verifyArgs(bitmapLayout, pos, tools::verifyArgs(bitmapLayout, pos,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -83,8 +83,8 @@ namespace canvas ...@@ -83,8 +83,8 @@ namespace canvas
Base::mbSurfaceDirty = true; Base::mbSurfaceDirty = true;
} }
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, virtual css::uno::Sequence< sal_Int8 > SAL_CALL getPixel( css::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) override const css::geometry::IntegerPoint2D& pos ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override
{ {
tools::verifyArgs(pos, tools::verifyArgs(pos,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -97,7 +97,7 @@ namespace canvas ...@@ -97,7 +97,7 @@ namespace canvas
pos ); pos );
} }
virtual ::com::sun::star::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (::com::sun::star::uno::RuntimeException) override virtual css::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (css::uno::RuntimeException) override
{ {
typename Base::MutexType aGuard( Base::m_aMutex ); typename Base::MutexType aGuard( Base::m_aMutex );
......
include/canvas/base/sprite.hxx
Dosyayı görüntüle @ b1659c95
...@@ -51,7 +51,7 @@ namespace canvas ...@@ -51,7 +51,7 @@ namespace canvas
functionality (which, of course, is impossible here in a functionality (which, of course, is impossible here in a
generic way) generic way)
*/ */
class Sprite : public ::com::sun::star::lang::XComponent class Sprite : public css::lang::XComponent
{ {
public: public:
typedef ::rtl::Reference< Sprite > Reference; typedef ::rtl::Reference< Sprite > Reference;
......
include/canvas/base/spritecanvasbase.hxx
Dosyayı görüntüle @ b1659c95
...@@ -65,7 +65,7 @@ namespace canvas ...@@ -65,7 +65,7 @@ namespace canvas
template< class Base, template< class Base,
class CanvasHelper, class CanvasHelper,
class Mutex=::osl::MutexGuard, class Mutex=::osl::MutexGuard,
class UnambiguousBase=::com::sun::star::uno::XInterface > class SpriteCanvasBase : class UnambiguousBase = css::uno::XInterface > class SpriteCanvasBase :
public IntegerBitmapBase< BitmapCanvasBase<Base, CanvasHelper, Mutex, UnambiguousBase> > public IntegerBitmapBase< BitmapCanvasBase<Base, CanvasHelper, Mutex, UnambiguousBase> >
{ {
public: public:
...@@ -88,8 +88,8 @@ namespace canvas ...@@ -88,8 +88,8 @@ namespace canvas
} }
// XSpriteCanvas // XSpriteCanvas
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimation >& animation ) throw (::com::sun::star::lang::IllegalArgumentException, virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const css::uno::Reference< css::rendering::XAnimation >& animation ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(animation, tools::verifyArgs(animation,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -100,25 +100,25 @@ namespace canvas ...@@ -100,25 +100,25 @@ namespace canvas
return BaseType::maCanvasHelper.createSpriteFromAnimation(animation); return BaseType::maCanvasHelper.createSpriteFromAnimation(animation);
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > >& animationBitmaps, virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps( const css::uno::Sequence< css::uno::Reference< css::rendering::XBitmap > >& animationBitmaps,
sal_Int8 interpolationMode ) throw (::com::sun::star::lang::IllegalArgumentException, sal_Int8 interpolationMode ) throw (css::lang::IllegalArgumentException,
::com::sun::star::rendering::VolatileContentDestroyedException, css::rendering::VolatileContentDestroyedException,
::com::sun::star::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(animationBitmaps, tools::verifyArgs(animationBitmaps,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
static_cast< typename BaseType::UnambiguousBaseType* >(this)); static_cast< typename BaseType::UnambiguousBaseType* >(this));
tools::verifyRange( interpolationMode, tools::verifyRange( interpolationMode,
::com::sun::star::rendering::InterpolationMode::NEAREST_NEIGHBOR, css::rendering::InterpolationMode::NEAREST_NEIGHBOR,
::com::sun::star::rendering::InterpolationMode::BEZIERSPLINE4 ); css::rendering::InterpolationMode::BEZIERSPLINE4 );
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
return BaseType::maCanvasHelper.createSpriteFromBitmaps(animationBitmaps, interpolationMode); return BaseType::maCanvasHelper.createSpriteFromBitmaps(animationBitmaps, interpolationMode);
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > SAL_CALL createCustomSprite( const ::com::sun::star::geometry::RealSize2D& spriteSize ) throw (::com::sun::star::lang::IllegalArgumentException, virtual css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite( const css::geometry::RealSize2D& spriteSize ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifySpriteSize(spriteSize, tools::verifySpriteSize(spriteSize,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -129,8 +129,8 @@ namespace canvas ...@@ -129,8 +129,8 @@ namespace canvas
return BaseType::maCanvasHelper.createCustomSprite(spriteSize); return BaseType::maCanvasHelper.createCustomSprite(spriteSize);
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > SAL_CALL createClonedSprite( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite >& original ) throw (::com::sun::star::lang::IllegalArgumentException, virtual css::uno::Reference< css::rendering::XSprite > SAL_CALL createClonedSprite( const css::uno::Reference< css::rendering::XSprite >& original ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(original, tools::verifyArgs(original,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
......
include/canvas/base/spritesurface.hxx
Dosyayı görüntüle @ b1659c95
...@@ -33,7 +33,7 @@ namespace canvas ...@@ -33,7 +33,7 @@ namespace canvas
methods provided here are used from the individual sprites to methods provided here are used from the individual sprites to
notify the canvas about necessary screen updates. notify the canvas about necessary screen updates.
*/ */
class SpriteSurface : public ::com::sun::star::uno::XInterface class SpriteSurface : public css::uno::XInterface
{ {
public: public:
typedef ::rtl::Reference< SpriteSurface > Reference; typedef ::rtl::Reference< SpriteSurface > Reference;
......
include/canvas/canvastools.hxx
Dosyayı görüntüle @ b1659c95
This diff is collapsed.
include/canvas/propertysethelper.hxx
Dosyayı görüntüle @ b1659c95
...@@ -50,8 +50,8 @@ namespace canvas ...@@ -50,8 +50,8 @@ namespace canvas
class CANVASTOOLS_DLLPUBLIC PropertySetHelper class CANVASTOOLS_DLLPUBLIC PropertySetHelper
{ {
public: public:
typedef std::function<::com::sun::star::uno::Any ()> GetterType; typedef std::function<css::uno::Any ()> GetterType;
typedef std::function<void (const ::com::sun::star::uno::Any&)> SetterType; typedef std::function<void (const css::uno::Any&)> SetterType;
struct Callbacks struct Callbacks
{ {
GetterType getter; GetterType getter;
...@@ -128,14 +128,14 @@ namespace canvas ...@@ -128,14 +128,14 @@ namespace canvas
const InputMap& getPropertyMap() const { return maMapEntries; } const InputMap& getPropertyMap() const { return maMapEntries; }
// XPropertySet implementation // XPropertySet implementation
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > getPropertySetInfo() const; css::uno::Reference< css::beans::XPropertySetInfo > getPropertySetInfo() const;
void setPropertyValue( const OUString& aPropertyName, void setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue ); const css::uno::Any& aValue );
::com::sun::star::uno::Any getPropertyValue( const OUString& PropertyName ) const; css::uno::Any getPropertyValue( const OUString& PropertyName ) const;
void addPropertyChangeListener( const OUString& aPropertyName, void addPropertyChangeListener( const OUString& aPropertyName,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ); const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener );
void addVetoableChangeListener( const OUString& aPropertyName, void addVetoableChangeListener( const OUString& aPropertyName,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener ); const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener );
private: private:
std::unique_ptr<MapType> mpMap; std::unique_ptr<MapType> mpMap;
......
include/canvas/rendering/bitmap.hxx 100644 → 100755
Dosyayı görüntüle @ b1659c95
This diff is collapsed.
include/canvas/rendering/icachedprimitive.hxx
Dosyayı görüntüle @ b1659c95
...@@ -48,7 +48,7 @@ namespace canvas ...@@ -48,7 +48,7 @@ namespace canvas
Note that the primitive will <em>always</em> be redrawn on Note that the primitive will <em>always</em> be redrawn on
the bitmap it was created from. the bitmap it was created from.
*/ */
virtual sal_Int8 redraw( const ::com::sun::star::rendering::ViewState& aState ) const = 0; virtual sal_Int8 redraw( const css::rendering::ViewState& aState ) const = 0;
}; };
typedef std::shared_ptr< ICachedPrimitive > ICachedPrimitiveSharedPtr; typedef std::shared_ptr< ICachedPrimitive > ICachedPrimitiveSharedPtr;
......
include/canvas/verifyinput.hxx
Dosyayı görüntüle @ b1659c95
This diff is collapsed.
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