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
Show whitespace changes
Inline Side-by-side
Showing with 389 additions and 429 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,10 +251,10 @@ namespace canvas ...@@ -253,10 +251,10 @@ 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;
......
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,14 +99,13 @@ namespace canvas ...@@ -100,14 +99,13 @@ 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;
::com::sun::star::rendering::ViewState maUsedViewState; css::rendering::ViewState maUsedViewState;
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxTarget; css::uno::Reference< css::rendering::XCanvas > mxTarget;
const bool mbFailForChangedViewTransform; const bool mbFailForChangedViewTransform;
}; };
} }
......
include/canvas/base/canvasbase.hxx
Dosyayı görüntüle @ b1659c95
...@@ -47,10 +47,10 @@ namespace canvas ...@@ -47,10 +47,10 @@ namespace canvas
<pre> <pre>
Example: Example:
typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::rendering::XSpriteCanvas, typedef ::cppu::WeakComponentImplHelper4< css::rendering::XSpriteCanvas,
::com::sun::star::lang::XInitialization, css::lang::XInitialization,
::com::sun::star::lang::XServiceInfo, css::lang::XServiceInfo,
::com::sun::star::lang::XServiceName > CanvasBase_Base; css::lang::XServiceName > CanvasBase_Base;
typedef ::canvas::internal::CanvasBase< CanvasBase_Base, CanvasHelper > ExampleCanvas_Base; typedef ::canvas::internal::CanvasBase< CanvasBase_Base, CanvasHelper > ExampleCanvas_Base;
class ExampleCanvas : public ExampleCanvas_Base, class ExampleCanvas : public ExampleCanvas_Base,
...@@ -94,7 +94,7 @@ namespace canvas ...@@ -94,7 +94,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 CanvasBase : class UnambiguousBase=css::uno::XInterface > class CanvasBase :
public Base public Base
{ {
public: public:
...@@ -122,7 +122,7 @@ namespace canvas ...@@ -122,7 +122,7 @@ namespace canvas
} }
// XCanvas // XCanvas
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
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
...@@ -185,8 +185,8 @@ namespace canvas ...@@ -185,8 +185,8 @@ namespace canvas
maCanvasHelper.drawBezier( this, aBezierSegment, aEndPoint, viewState, renderState ); maCanvasHelper.drawBezier( this, aBezierSegment, aEndPoint, viewState, renderState );
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
drawPolyPolygon(const css::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, drawPolyPolygon(const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
const css::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const css::rendering::RenderState& renderState) const css::rendering::RenderState& renderState)
throw (css::lang::IllegalArgumentException, throw (css::lang::IllegalArgumentException,
...@@ -204,8 +204,8 @@ namespace canvas ...@@ -204,8 +204,8 @@ namespace canvas
return maCanvasHelper.drawPolyPolygon( this, xPolyPolygon, viewState, renderState ); return maCanvasHelper.drawPolyPolygon( this, xPolyPolygon, viewState, renderState );
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
strokePolyPolygon(const css::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, strokePolyPolygon(const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
const css::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const css::rendering::RenderState& renderState, const css::rendering::RenderState& renderState,
const css::rendering::StrokeAttributes& strokeAttributes) const css::rendering::StrokeAttributes& strokeAttributes)
...@@ -224,13 +224,13 @@ namespace canvas ...@@ -224,13 +224,13 @@ namespace canvas
return maCanvasHelper.strokePolyPolygon( this, xPolyPolygon, viewState, renderState, strokeAttributes ); return maCanvasHelper.strokePolyPolygon( this, xPolyPolygon, viewState, renderState, strokeAttributes );
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
strokeTexturedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, strokeTexturedPolyPolygon( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState, const css::rendering::RenderState& renderState,
const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures, const css::uno::Sequence< css::rendering::Texture >& textures,
const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, const css::rendering::StrokeAttributes& strokeAttributes ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -243,14 +243,14 @@ namespace canvas ...@@ -243,14 +243,14 @@ namespace canvas
return maCanvasHelper.strokeTexturedPolyPolygon( this, xPolyPolygon, viewState, renderState, textures, strokeAttributes ); return maCanvasHelper.strokeTexturedPolyPolygon( this, xPolyPolygon, viewState, renderState, textures, strokeAttributes );
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
strokeTextureMappedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, strokeTextureMappedPolyPolygon( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState, const css::rendering::RenderState& renderState,
const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures, const css::uno::Sequence< css::rendering::Texture >& textures,
const ::com::sun::star::uno::Reference< ::com::sun::star::geometry::XMapping2D >& xMapping, const css::uno::Reference< css::geometry::XMapping2D >& xMapping,
const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, const css::rendering::StrokeAttributes& strokeAttributes ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes, tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -263,12 +263,12 @@ namespace canvas ...@@ -263,12 +263,12 @@ namespace canvas
return maCanvasHelper.strokeTextureMappedPolyPolygon( this, xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes ); return maCanvasHelper.strokeTextureMappedPolyPolygon( this, xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes );
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > SAL_CALL virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL
queryStrokeShapes( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, queryStrokeShapes( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState, const css::rendering::RenderState& renderState,
const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, const css::rendering::StrokeAttributes& strokeAttributes ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -281,8 +281,8 @@ namespace canvas ...@@ -281,8 +281,8 @@ namespace canvas
return maCanvasHelper.queryStrokeShapes( this, xPolyPolygon, viewState, renderState, strokeAttributes ); return maCanvasHelper.queryStrokeShapes( this, xPolyPolygon, viewState, renderState, strokeAttributes );
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
fillPolyPolygon(const css::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, fillPolyPolygon(const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
const css::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const css::rendering::RenderState& renderState) const css::rendering::RenderState& renderState)
throw (css::lang::IllegalArgumentException, throw (css::lang::IllegalArgumentException,
...@@ -300,11 +300,11 @@ namespace canvas ...@@ -300,11 +300,11 @@ namespace canvas
return maCanvasHelper.fillPolyPolygon( this, xPolyPolygon, viewState, renderState ); return maCanvasHelper.fillPolyPolygon( this, xPolyPolygon, viewState, renderState );
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
fillTexturedPolyPolygon(const css::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, fillTexturedPolyPolygon(const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
const css::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const css::rendering::RenderState& renderState, const css::rendering::RenderState& renderState,
const css::uno::Sequence< ::com::sun::star::rendering::Texture >& textures) const css::uno::Sequence< css::rendering::Texture >& textures)
throw (css::lang::IllegalArgumentException, throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException, css::uno::RuntimeException,
std::exception) override std::exception) override
...@@ -320,12 +320,12 @@ namespace canvas ...@@ -320,12 +320,12 @@ namespace canvas
return maCanvasHelper.fillTexturedPolyPolygon( this, xPolyPolygon, viewState, renderState, textures ); return maCanvasHelper.fillTexturedPolyPolygon( this, xPolyPolygon, viewState, renderState, textures );
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
fillTextureMappedPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, fillTextureMappedPolyPolygon( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState, const css::rendering::RenderState& renderState,
const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures, const css::uno::Sequence< css::rendering::Texture >& textures,
const ::com::sun::star::uno::Reference< ::com::sun::star::geometry::XMapping2D >& xMapping ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) override const css::uno::Reference< css::geometry::XMapping2D >& xMapping ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override
{ {
tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -339,11 +339,11 @@ namespace canvas ...@@ -339,11 +339,11 @@ namespace canvas
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > SAL_CALL virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL
createFont( const ::com::sun::star::rendering::FontRequest& fontRequest, createFont( const css::rendering::FontRequest& fontRequest,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& extraFontProperties, const css::uno::Sequence< css::beans::PropertyValue >& extraFontProperties,
const ::com::sun::star::geometry::Matrix2D& fontMatrix ) throw (::com::sun::star::lang::IllegalArgumentException, const css::geometry::Matrix2D& fontMatrix ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(fontRequest, tools::verifyArgs(fontRequest,
// dummy, to keep argPos in sync // dummy, to keep argPos in sync
...@@ -358,10 +358,10 @@ namespace canvas ...@@ -358,10 +358,10 @@ namespace canvas
} }
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::FontInfo > SAL_CALL virtual css::uno::Sequence< css::rendering::FontInfo > SAL_CALL
queryAvailableFonts( const ::com::sun::star::rendering::FontInfo& aFilter, queryAvailableFonts( const css::rendering::FontInfo& aFilter,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aFontProperties ) throw (::com::sun::star::lang::IllegalArgumentException, const css::uno::Sequence< css::beans::PropertyValue >& aFontProperties ) throw (css::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(aFilter, tools::verifyArgs(aFilter,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -373,9 +373,9 @@ namespace canvas ...@@ -373,9 +373,9 @@ namespace canvas
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
drawText(const css::rendering::StringContext& text, drawText(const css::rendering::StringContext& text,
const css::uno::Reference< ::com::sun::star::rendering::XCanvasFont >& xFont, const css::uno::Reference< css::rendering::XCanvasFont >& xFont,
const css::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const css::rendering::RenderState& renderState, const css::rendering::RenderState& renderState,
sal_Int8 textDirection) sal_Int8 textDirection)
...@@ -387,8 +387,8 @@ namespace canvas ...@@ -387,8 +387,8 @@ namespace canvas
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
tools::verifyRange( textDirection, tools::verifyRange( textDirection,
::com::sun::star::rendering::TextDirection::WEAK_LEFT_TO_RIGHT, css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT,
::com::sun::star::rendering::TextDirection::STRONG_RIGHT_TO_LEFT ); css::rendering::TextDirection::STRONG_RIGHT_TO_LEFT );
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
...@@ -398,8 +398,8 @@ namespace canvas ...@@ -398,8 +398,8 @@ namespace canvas
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
drawTextLayout(const css::uno::Reference< ::com::sun::star::rendering::XTextLayout >& laidOutText, drawTextLayout(const css::uno::Reference< css::rendering::XTextLayout >& laidOutText,
const css::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const css::rendering::RenderState& renderState) const css::rendering::RenderState& renderState)
throw (css::lang::IllegalArgumentException, throw (css::lang::IllegalArgumentException,
...@@ -418,10 +418,10 @@ namespace canvas ...@@ -418,10 +418,10 @@ namespace canvas
} }
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, ::com::sun::star::uno::RuntimeException) override const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override
{ {
tools::verifyArgs(xBitmap, viewState, renderState, tools::verifyArgs(xBitmap, viewState, renderState,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -434,10 +434,10 @@ namespace canvas ...@@ -434,10 +434,10 @@ namespace canvas
return maCanvasHelper.drawBitmap( this, xBitmap, viewState, renderState ); return maCanvasHelper.drawBitmap( this, xBitmap, viewState, renderState );
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
drawBitmapModulated( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap, drawBitmapModulated( 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, ::com::sun::star::uno::RuntimeException) override const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override
{ {
tools::verifyArgs(xBitmap, viewState, renderState, tools::verifyArgs(xBitmap, viewState, renderState,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -450,8 +450,8 @@ namespace canvas ...@@ -450,8 +450,8 @@ namespace canvas
return maCanvasHelper.drawBitmapModulated( this, xBitmap, viewState, renderState ); return maCanvasHelper.drawBitmapModulated( this, xBitmap, viewState, renderState );
} }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > SAL_CALL virtual css::uno::Reference< css::rendering::XGraphicDevice > SAL_CALL
getDevice() throw (::com::sun::star::uno::RuntimeException) override getDevice() throw (css::uno::RuntimeException) override
{ {
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
......
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
...@@ -67,21 +67,21 @@ namespace canvas ...@@ -67,21 +67,21 @@ namespace canvas
/// 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
...@@ -147,56 +147,56 @@ namespace canvas ...@@ -147,56 +147,56 @@ namespace canvas
/** Create a RealSize2D with both coordinate values set to +infinity /** Create a RealSize2D with both coordinate values set to +infinity
*/ */
CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::RealSize2D createInfiniteSize2D(); CANVASTOOLS_DLLPUBLIC css::geometry::RealSize2D createInfiniteSize2D();
// View- and RenderState utilities // View- and RenderState utilities
CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& CANVASTOOLS_DLLPUBLIC css::rendering::RenderState&
initRenderState( ::com::sun::star::rendering::RenderState& renderState ); initRenderState( css::rendering::RenderState& renderState );
CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& CANVASTOOLS_DLLPUBLIC css::rendering::ViewState&
initViewState( ::com::sun::star::rendering::ViewState& viewState ); initViewState( css::rendering::ViewState& viewState );
CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix&
getViewStateTransform( ::basegfx::B2DHomMatrix& transform, getViewStateTransform( ::basegfx::B2DHomMatrix& transform,
const ::com::sun::star::rendering::ViewState& viewState ); const css::rendering::ViewState& viewState );
CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& CANVASTOOLS_DLLPUBLIC css::rendering::ViewState&
setViewStateTransform( ::com::sun::star::rendering::ViewState& viewState, setViewStateTransform( css::rendering::ViewState& viewState,
const ::basegfx::B2DHomMatrix& transform ); const ::basegfx::B2DHomMatrix& transform );
CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix&
getRenderStateTransform( ::basegfx::B2DHomMatrix& transform, getRenderStateTransform( ::basegfx::B2DHomMatrix& transform,
const ::com::sun::star::rendering::RenderState& renderState ); const css::rendering::RenderState& renderState );
CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& CANVASTOOLS_DLLPUBLIC css::rendering::RenderState&
setRenderStateTransform( ::com::sun::star::rendering::RenderState& renderState, setRenderStateTransform( css::rendering::RenderState& renderState,
const ::basegfx::B2DHomMatrix& transform ); const ::basegfx::B2DHomMatrix& transform );
CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& CANVASTOOLS_DLLPUBLIC css::rendering::RenderState&
appendToRenderState( ::com::sun::star::rendering::RenderState& renderState, appendToRenderState( css::rendering::RenderState& renderState,
const ::basegfx::B2DHomMatrix& transform ); const ::basegfx::B2DHomMatrix& transform );
CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& CANVASTOOLS_DLLPUBLIC css::rendering::RenderState&
prependToRenderState( ::com::sun::star::rendering::RenderState& renderState, prependToRenderState( css::rendering::RenderState& renderState,
const ::basegfx::B2DHomMatrix& transform ); const ::basegfx::B2DHomMatrix& transform );
CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix&
mergeViewAndRenderTransform( ::basegfx::B2DHomMatrix& transform, mergeViewAndRenderTransform( ::basegfx::B2DHomMatrix& transform,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ); const css::rendering::RenderState& renderState );
// Matrix utilities // Matrix utilities
CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::AffineMatrix2D& CANVASTOOLS_DLLPUBLIC css::geometry::AffineMatrix2D&
setIdentityAffineMatrix2D( ::com::sun::star::geometry::AffineMatrix2D& matrix ); setIdentityAffineMatrix2D( css::geometry::AffineMatrix2D& matrix );
CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::Matrix2D& CANVASTOOLS_DLLPUBLIC css::geometry::Matrix2D&
setIdentityMatrix2D( ::com::sun::star::geometry::Matrix2D& matrix ); setIdentityMatrix2D( css::geometry::Matrix2D& matrix );
// Special utilities // Special utilities
...@@ -349,16 +349,16 @@ namespace canvas ...@@ -349,16 +349,16 @@ namespace canvas
@return A reference to the resulting sequence of parameters @return A reference to the resulting sequence of parameters
*/ */
CANVASTOOLS_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& getDeviceInfo( CANVASTOOLS_DLLPUBLIC css::uno::Sequence< css::uno::Any >& getDeviceInfo(
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >& i_rxCanvas, const css::uno::Reference< css::rendering::XCanvas >& i_rxCanvas,
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& o_rxParams ); css::uno::Sequence< css::uno::Any >& o_rxParams );
/** Return a color space for a default RGBA integer format /** Return a color space for a default RGBA integer format
Use this method for dead-simple bitmap implementations, Use this method for dead-simple bitmap implementations,
that map all their formats to 8888 RGBA color. that map all their formats to 8888 RGBA color.
*/ */
CANVASTOOLS_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerBitmapColorSpace> getStdColorSpace(); CANVASTOOLS_DLLPUBLIC css::uno::Reference< css::rendering::XIntegerBitmapColorSpace> getStdColorSpace();
/** Return a color space for a default RGB integer format /** Return a color space for a default RGB integer format
...@@ -366,21 +366,21 @@ namespace canvas ...@@ -366,21 +366,21 @@ namespace canvas
that map all their formats to 8888 RGB color (the last byte that map all their formats to 8888 RGB color (the last byte
is unused). is unused).
*/ */
CANVASTOOLS_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerBitmapColorSpace> getStdColorSpaceWithoutAlpha(); CANVASTOOLS_DLLPUBLIC css::uno::Reference< css::rendering::XIntegerBitmapColorSpace> getStdColorSpaceWithoutAlpha();
/** Return a memory layout for a default RGBA integer format /** Return a memory layout for a default RGBA integer format
Use this method for dead-simple bitmap implementations, Use this method for dead-simple bitmap implementations,
that map all their formats to 8888 RGBA color. that map all their formats to 8888 RGBA color.
*/ */
CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::IntegerBitmapLayout getStdMemoryLayout( CANVASTOOLS_DLLPUBLIC css::rendering::IntegerBitmapLayout getStdMemoryLayout(
const ::com::sun::star::geometry::IntegerSize2D& rBitmapSize ); const css::geometry::IntegerSize2D& rBitmapSize );
/// Convert standard 8888 RGBA color to vcl color /// Convert standard 8888 RGBA color to vcl color
CANVASTOOLS_DLLPUBLIC ::Color stdIntSequenceToColor( const ::com::sun::star::uno::Sequence<sal_Int8>& rColor ); CANVASTOOLS_DLLPUBLIC ::Color stdIntSequenceToColor( const css::uno::Sequence<sal_Int8>& rColor );
/// Convert standard 8888 RGBA color to vcl color /// Convert standard 8888 RGBA color to vcl color
CANVASTOOLS_DLLPUBLIC ::com::sun::star::uno::Sequence<sal_Int8> colorToStdIntSequence( const ::Color& rColor ); CANVASTOOLS_DLLPUBLIC css::uno::Sequence<sal_Int8> colorToStdIntSequence( const ::Color& rColor );
// Modelled closely after boost::numeric_cast, only that we // Modelled closely after boost::numeric_cast, only that we
// issue some trace output here and throw a RuntimeException // issue some trace output here and throw a RuntimeException
...@@ -408,7 +408,7 @@ namespace canvas ...@@ -408,7 +408,7 @@ namespace canvas
# if OSL_DEBUG_LEVEL > 2 # if OSL_DEBUG_LEVEL > 2
OSL_TRACE("numeric_cast detected data loss"); OSL_TRACE("numeric_cast detected data loss");
#endif #endif
throw ::com::sun::star::uno::RuntimeException( throw css::uno::RuntimeException(
"numeric_cast detected data loss", "numeric_cast detected data loss",
NULL ); NULL );
} }
...@@ -416,9 +416,9 @@ namespace canvas ...@@ -416,9 +416,9 @@ namespace canvas
return static_cast<Target>(arg); return static_cast<Target>(arg);
} }
CANVASTOOLS_DLLPUBLIC ::com::sun::star::awt::Rectangle getAbsoluteWindowRect( CANVASTOOLS_DLLPUBLIC css::awt::Rectangle getAbsoluteWindowRect(
const ::com::sun::star::awt::Rectangle& rRect, const css::awt::Rectangle& rRect,
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2 >& xWin ); const css::uno::Reference< css::awt::XWindow2 >& xWin );
/** Retrieve for small bound marks around each corner of the given rectangle /** Retrieve for small bound marks around each corner of the given rectangle
*/ */
...@@ -432,9 +432,9 @@ namespace canvas ...@@ -432,9 +432,9 @@ namespace canvas
for smooth gradient color differences for smooth gradient color differences
*/ */
CANVASTOOLS_DLLPUBLIC int calcGradientStepCount( ::basegfx::B2DHomMatrix& rTotalTransform, CANVASTOOLS_DLLPUBLIC int calcGradientStepCount( ::basegfx::B2DHomMatrix& rTotalTransform,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState, const css::rendering::RenderState& renderState,
const ::com::sun::star::rendering::Texture& texture, const css::rendering::Texture& texture,
int nColorSteps ); int nColorSteps );
/** A very simplistic map for ASCII strings and arbitrary value /** A very simplistic map for ASCII strings and arbitrary value
......
include/canvas/parametricpolypolygon.hxx
Dosyayı görüntüle @ b1659c95
...@@ -41,8 +41,8 @@ namespace basegfx ...@@ -41,8 +41,8 @@ namespace basegfx
namespace canvas namespace canvas
{ {
typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XParametricPolyPolygon2D, typedef ::cppu::WeakComponentImplHelper2< css::rendering::XParametricPolyPolygon2D,
::com::sun::star::lang::XServiceInfo > ParametricPolyPolygon_Base; css::lang::XServiceInfo > ParametricPolyPolygon_Base;
class CANVASTOOLS_DLLPUBLIC ParametricPolyPolygon : public ::comphelper::OBaseMutex, class CANVASTOOLS_DLLPUBLIC ParametricPolyPolygon : public ::comphelper::OBaseMutex,
public ParametricPolyPolygon_Base, public ParametricPolyPolygon_Base,
...@@ -64,8 +64,8 @@ namespace canvas ...@@ -64,8 +64,8 @@ namespace canvas
struct Values struct Values
{ {
Values( const ::basegfx::B2DPolygon& rGradientPoly, Values( const ::basegfx::B2DPolygon& rGradientPoly,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& rColors, const css::uno::Sequence< css::uno::Sequence< double > >& rColors,
const ::com::sun::star::uno::Sequence< double >& rStops, const css::uno::Sequence< double >& rStops,
double nAspectRatio, double nAspectRatio,
GradientType eType ) : GradientType eType ) :
maGradientPoly( rGradientPoly ), maGradientPoly( rGradientPoly ),
...@@ -83,34 +83,34 @@ namespace canvas ...@@ -83,34 +83,34 @@ namespace canvas
const double mnAspectRatio; const double mnAspectRatio;
/// Gradient colors /// Gradient colors
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > maColors; const css::uno::Sequence< css::uno::Sequence< double > > maColors;
/// Gradient color stops /// Gradient color stops
const ::com::sun::star::uno::Sequence< double > maStops; const css::uno::Sequence< double > maStops;
/// Type of gradient to render (as e.g. linear grads are not represented by maGradientPoly) /// Type of gradient to render (as e.g. linear grads are not represented by maGradientPoly)
const GradientType meType; const GradientType meType;
}; };
static ::com::sun::star::uno::Sequence< OUString > getAvailableServiceNames(); static css::uno::Sequence< OUString > getAvailableServiceNames();
static ParametricPolyPolygon* create( static ParametricPolyPolygon* create(
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice, const css::uno::Reference< css::rendering::XGraphicDevice >& rDevice,
const OUString& rServiceName, const OUString& rServiceName,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs ); const css::uno::Sequence< css::uno::Any >& rArgs );
/// Dispose all internal references /// Dispose all internal references
virtual void SAL_CALL disposing() override; virtual void SAL_CALL disposing() override;
// XParametricPolyPolygon2D // XParametricPolyPolygon2D
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > SAL_CALL getOutline( double t ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL getOutline( double t ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getColor( double t ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< double > SAL_CALL getColor( double t ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getPointColor( const ::com::sun::star::geometry::RealPoint2D& point ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< double > SAL_CALL getPointColor( const css::geometry::RealPoint2D& point ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace > SAL_CALL getColorSpace() throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::rendering::XColorSpace > SAL_CALL getColorSpace() throw (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;
/// Query all defining values of this object atomically /// Query all defining values of this object atomically
Values getValues() const; Values getValues() const;
...@@ -119,37 +119,37 @@ namespace canvas ...@@ -119,37 +119,37 @@ namespace canvas
virtual ~ParametricPolyPolygon(); // we're a ref-counted UNO class. _We_ destroy ourselves. virtual ~ParametricPolyPolygon(); // we're a ref-counted UNO class. _We_ destroy ourselves.
private: private:
static ParametricPolyPolygon* createLinearHorizontalGradient( const ::com::sun::star::uno::Reference< static ParametricPolyPolygon* createLinearHorizontalGradient( const css::uno::Reference<
::com::sun::star::rendering::XGraphicDevice >& rDevice, css::rendering::XGraphicDevice >& rDevice,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors, const css::uno::Sequence< css::uno::Sequence< double > >& colors,
const ::com::sun::star::uno::Sequence< double >& stops ); const css::uno::Sequence< double >& stops );
static ParametricPolyPolygon* createEllipticalGradient( const ::com::sun::star::uno::Reference< static ParametricPolyPolygon* createEllipticalGradient( const css::uno::Reference<
::com::sun::star::rendering::XGraphicDevice >& rDevice, css::rendering::XGraphicDevice >& rDevice,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors, const css::uno::Sequence< css::uno::Sequence< double > >& colors,
const ::com::sun::star::uno::Sequence< double >& stops, const css::uno::Sequence< double >& stops,
double fAspect ); double fAspect );
static ParametricPolyPolygon* createRectangularGradient( const ::com::sun::star::uno::Reference< static ParametricPolyPolygon* createRectangularGradient( const css::uno::Reference<
::com::sun::star::rendering::XGraphicDevice >& rDevice, css::rendering::XGraphicDevice >& rDevice,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors, const css::uno::Sequence< css::uno::Sequence< double > >& colors,
const ::com::sun::star::uno::Sequence< double >& stops, const css::uno::Sequence< double >& stops,
double fAspect ); double fAspect );
/// Private, because objects can only be created from the static factories /// Private, because objects can only be created from the static factories
ParametricPolyPolygon( const ::com::sun::star::uno::Reference< ParametricPolyPolygon( const css::uno::Reference<
::com::sun::star::rendering::XGraphicDevice >& rDevice, css::rendering::XGraphicDevice >& rDevice,
const ::basegfx::B2DPolygon& rGradientPoly, const ::basegfx::B2DPolygon& rGradientPoly,
GradientType eType, GradientType eType,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors, const css::uno::Sequence< css::uno::Sequence< double > >& colors,
const ::com::sun::star::uno::Sequence< double >& stops, const css::uno::Sequence< double >& stops,
double nAspectRatio ); double nAspectRatio );
ParametricPolyPolygon( const ::com::sun::star::uno::Reference< ParametricPolyPolygon( const css::uno::Reference<
::com::sun::star::rendering::XGraphicDevice >& rDevice, css::rendering::XGraphicDevice >& rDevice,
GradientType eType, GradientType eType,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& colors, const css::uno::Sequence< css::uno::Sequence< double > >& colors,
const ::com::sun::star::uno::Sequence< double >& stops ); const css::uno::Sequence< double >& stops );
::com::sun::star::uno::Reference< css::uno::Reference<
::com::sun::star::rendering::XGraphicDevice > mxDevice; css::rendering::XGraphicDevice > mxDevice;
/// All defining values of this object /// All defining values of this object
const Values maValues; const Values maValues;
......
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
...@@ -77,23 +77,23 @@ namespace canvas ...@@ -77,23 +77,23 @@ namespace canvas
/// Query size of the bitmap in pixel /// Query size of the bitmap in pixel
::basegfx::B2IVector getSize() const; ::basegfx::B2IVector getSize() const;
::com::sun::star::uno::Sequence< sal_Int8 > getData( css::uno::Sequence< sal_Int8 > getData(
::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, css::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerRectangle2D& rect ); const css::geometry::IntegerRectangle2D& rect );
void setData( void setData(
const ::com::sun::star::uno::Sequence< sal_Int8 >& data, const css::uno::Sequence< sal_Int8 >& data,
const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const css::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerRectangle2D& rect ); const css::geometry::IntegerRectangle2D& rect );
void setPixel( void setPixel(
const ::com::sun::star::uno::Sequence< sal_Int8 >& color, const css::uno::Sequence< sal_Int8 >& color,
const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const css::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerPoint2D& pos ); const css::geometry::IntegerPoint2D& pos );
::com::sun::star::uno::Sequence< sal_Int8 > getPixel( css::uno::Sequence< sal_Int8 > getPixel(
::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, css::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerPoint2D& pos ); const css::geometry::IntegerPoint2D& pos );
/** Render the bitmap content to associated /** Render the bitmap content to associated
SurfaceProxyManager's screen. SurfaceProxyManager's screen.
...@@ -159,45 +159,45 @@ namespace canvas ...@@ -159,45 +159,45 @@ namespace canvas
This method sets every single pixel of the bitmap to the This method sets every single pixel of the bitmap to the
specified color value. specified color value.
*/ */
void clear( const ::com::sun::star::uno::Sequence< double >& color ); void clear( const css::uno::Sequence< double >& color );
void fillB2DPolyPolygon( void fillB2DPolyPolygon(
const ::basegfx::B2DPolyPolygon& rPolyPolygon, const ::basegfx::B2DPolyPolygon& rPolyPolygon,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ); const css::rendering::RenderState& renderState );
// High-level drawing operations (from the XCanvas interface) // High-level drawing operations (from the XCanvas interface)
/// See XCanvas interface /// See XCanvas interface
void drawPoint( const ::com::sun::star::geometry::RealPoint2D& aPoint, void drawPoint( const css::geometry::RealPoint2D& aPoint,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ); const css::rendering::RenderState& renderState );
/// See XCanvas interface /// See XCanvas interface
void drawLine( const ::com::sun::star::geometry::RealPoint2D& aStartPoint, void drawLine( const css::geometry::RealPoint2D& aStartPoint,
const ::com::sun::star::geometry::RealPoint2D& aEndPoint, const css::geometry::RealPoint2D& aEndPoint,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ); const css::rendering::RenderState& renderState );
/// See XCanvas interface /// See XCanvas interface
void drawBezier( const ::com::sun::star::geometry::RealBezierSegment2D& aBezierSegment, void drawBezier( const css::geometry::RealBezierSegment2D& aBezierSegment,
const ::com::sun::star::geometry::RealPoint2D& aEndPoint, const css::geometry::RealPoint2D& aEndPoint,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ); const css::rendering::RenderState& renderState );
/// See XCanvas interface /// See XCanvas interface
ICachedPrimitiveSharedPtr drawPolyPolygon( ICachedPrimitiveSharedPtr drawPolyPolygon(
const ::com::sun::star::uno::Reference< const css::uno::Reference<
::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, css::rendering::XPolyPolygon2D >& xPolyPolygon,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ); const css::rendering::RenderState& renderState );
/// See XCanvas interface /// See XCanvas interface
ICachedPrimitiveSharedPtr strokePolyPolygon( ICachedPrimitiveSharedPtr strokePolyPolygon(
const ::com::sun::star::uno::Reference< const css::uno::Reference<
::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, css::rendering::XPolyPolygon2D >& xPolyPolygon,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState, const css::rendering::RenderState& renderState,
const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ); const css::rendering::StrokeAttributes& strokeAttributes );
/** See XCanvas interface /** See XCanvas interface
@param textureAnnotations @param textureAnnotations
...@@ -207,14 +207,12 @@ namespace canvas ...@@ -207,14 +207,12 @@ namespace canvas
client's XBitmap-implementation class. client's XBitmap-implementation class.
*/ */
ICachedPrimitiveSharedPtr strokeTexturedPolyPolygon( ICachedPrimitiveSharedPtr strokeTexturedPolyPolygon(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::RenderState& renderState,
const ::com::sun::star::rendering::RenderState& renderState, const css::uno::Sequence< css::rendering::Texture >& textures,
const ::com::sun::star::uno::Sequence<
::com::sun::star::rendering::Texture >& textures,
const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations, const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations,
const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ); const css::rendering::StrokeAttributes& strokeAttributes );
/** See XCanvas interface /** See XCanvas interface
@param textureAnnotations @param textureAnnotations
...@@ -224,22 +222,18 @@ namespace canvas ...@@ -224,22 +222,18 @@ namespace canvas
client's XBitmap-implementation class. client's XBitmap-implementation class.
*/ */
ICachedPrimitiveSharedPtr strokeTextureMappedPolyPolygon( ICachedPrimitiveSharedPtr strokeTextureMappedPolyPolygon(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::RenderState& renderState,
const ::com::sun::star::rendering::RenderState& renderState, const css::uno::Sequence< css::rendering::Texture >& textures,
const ::com::sun::star::uno::Sequence<
::com::sun::star::rendering::Texture >& textures,
const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations, const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::geometry::XMapping2D >& xMapping,
::com::sun::star::geometry::XMapping2D >& xMapping, const css::rendering::StrokeAttributes& strokeAttributes );
const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes );
/// See XCanvas interface /// See XCanvas interface
ICachedPrimitiveSharedPtr fillPolyPolygon( ICachedPrimitiveSharedPtr fillPolyPolygon(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::RenderState& renderState );
const ::com::sun::star::rendering::RenderState& renderState );
/** See XCanvas interface /** See XCanvas interface
@param textureAnnotations @param textureAnnotations
...@@ -249,12 +243,10 @@ namespace canvas ...@@ -249,12 +243,10 @@ namespace canvas
client's XBitmap-implementation class. client's XBitmap-implementation class.
*/ */
ICachedPrimitiveSharedPtr fillTexturedPolyPolygon( ICachedPrimitiveSharedPtr fillTexturedPolyPolygon(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::RenderState& renderState,
const ::com::sun::star::rendering::RenderState& renderState, const css::uno::Sequence< css::rendering::Texture >& textures,
const ::com::sun::star::uno::Sequence<
::com::sun::star::rendering::Texture >& textures,
const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations ); const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations );
/** See XCanvas interface /** See XCanvas interface
...@@ -265,39 +257,36 @@ namespace canvas ...@@ -265,39 +257,36 @@ namespace canvas
client's XBitmap-implementation class. client's XBitmap-implementation class.
*/ */
ICachedPrimitiveSharedPtr fillTextureMappedPolyPolygon( ICachedPrimitiveSharedPtr fillTextureMappedPolyPolygon(
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
::com::sun::star::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::RenderState& renderState,
const ::com::sun::star::rendering::RenderState& renderState, const css::uno::Sequence< css::rendering::Texture >& textures,
const ::com::sun::star::uno::Sequence<
::com::sun::star::rendering::Texture >& textures,
const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations, const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::geometry::XMapping2D >& xMapping );
::com::sun::star::geometry::XMapping2D >& xMapping );
/// See XCanvas interface /// See XCanvas interface
ICachedPrimitiveSharedPtr drawBitmap( ICachedPrimitiveSharedPtr drawBitmap(
const ::com::sun::star::uno::Reference< const css::uno::Reference<
::com::sun::star::rendering::XBitmap >& xBitmap, 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 );
/// See XCanvas interface /// See XCanvas interface
ICachedPrimitiveSharedPtr drawBitmap( ICachedPrimitiveSharedPtr drawBitmap(
const std::shared_ptr<Bitmap>& rImage, const std::shared_ptr<Bitmap>& rImage,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ); const css::rendering::RenderState& renderState );
/// See XCanvas interface /// See XCanvas interface
ICachedPrimitiveSharedPtr drawBitmapModulated( ICachedPrimitiveSharedPtr drawBitmapModulated(
const ::com::sun::star::uno::Reference< const css::uno::Reference<
::com::sun::star::rendering::XBitmap >& xBitmap, 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 );
/// See XCanvas interface /// See XCanvas interface
ICachedPrimitiveSharedPtr drawBitmapModulated( ICachedPrimitiveSharedPtr drawBitmapModulated(
const std::shared_ptr<Bitmap>& rImage, const std::shared_ptr<Bitmap>& rImage,
const ::com::sun::star::rendering::ViewState& viewState, const css::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ); const css::rendering::RenderState& renderState );
private: private:
friend class ImplBitmap; friend class ImplBitmap;
......
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
...@@ -86,10 +86,9 @@ namespace canvas ...@@ -86,10 +86,9 @@ namespace canvas
@throws an lang::IllegalArgumentException, if anything is wrong @throws an lang::IllegalArgumentException, if anything is wrong
*/ */
CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix, CANVASTOOLS_DLLPUBLIC void verifyInput( const css::geometry::AffineMatrix2D& rMatrix,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf,
::com::sun::star::uno::XInterface >& xIf,
::sal_Int16 nArgPos ); ::sal_Int16 nArgPos );
/** Verify that the given transformation contains valid floating point /** Verify that the given transformation contains valid floating point
...@@ -109,10 +108,9 @@ namespace canvas ...@@ -109,10 +108,9 @@ namespace canvas
@throws an lang::IllegalArgumentException, if anything is wrong @throws an lang::IllegalArgumentException, if anything is wrong
*/ */
CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::Matrix2D& rMatrix, CANVASTOOLS_DLLPUBLIC void verifyInput( const css::geometry::Matrix2D& rMatrix,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf,
::com::sun::star::uno::XInterface >& xIf,
::sal_Int16 nArgPos ); ::sal_Int16 nArgPos );
/** Verify that the given point contains valid floating point /** Verify that the given point contains valid floating point
...@@ -132,10 +130,9 @@ namespace canvas ...@@ -132,10 +130,9 @@ namespace canvas
@throws an lang::IllegalArgumentException, if anything is wrong @throws an lang::IllegalArgumentException, if anything is wrong
*/ */
CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealPoint2D& rPoint, CANVASTOOLS_DLLPUBLIC void verifyInput( const css::geometry::RealPoint2D& rPoint,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf,
::com::sun::star::uno::XInterface >& xIf,
::sal_Int16 nArgPos ); ::sal_Int16 nArgPos );
/** Verify that the given bezier segment contains valid /** Verify that the given bezier segment contains valid
...@@ -155,10 +152,9 @@ namespace canvas ...@@ -155,10 +152,9 @@ namespace canvas
@throws an lang::IllegalArgumentException, if anything is wrong @throws an lang::IllegalArgumentException, if anything is wrong
*/ */
CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealBezierSegment2D& rSegment, CANVASTOOLS_DLLPUBLIC void verifyInput( const css::geometry::RealBezierSegment2D& rSegment,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf,
::com::sun::star::uno::XInterface >& xIf,
::sal_Int16 nArgPos ); ::sal_Int16 nArgPos );
/** Verify that the given rectangle contains valid floating /** Verify that the given rectangle contains valid floating
...@@ -178,10 +174,9 @@ namespace canvas ...@@ -178,10 +174,9 @@ namespace canvas
@throws an lang::IllegalArgumentException, if anything is wrong @throws an lang::IllegalArgumentException, if anything is wrong
*/ */
CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealRectangle2D& rRect, CANVASTOOLS_DLLPUBLIC void verifyInput( const css::geometry::RealRectangle2D& rRect,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf,
::com::sun::star::uno::XInterface >& xIf,
::sal_Int16 nArgPos ); ::sal_Int16 nArgPos );
/** Basic check for view state validity. /** Basic check for view state validity.
...@@ -200,10 +195,9 @@ namespace canvas ...@@ -200,10 +195,9 @@ namespace canvas
@throws an lang::IllegalArgumentException, if anything is wrong @throws an lang::IllegalArgumentException, if anything is wrong
*/ */
CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::ViewState& viewState, CANVASTOOLS_DLLPUBLIC void verifyInput( const css::rendering::ViewState& viewState,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf,
::com::sun::star::uno::XInterface >& xIf,
::sal_Int16 nArgPos ); ::sal_Int16 nArgPos );
/** Basic check for render state validity. /** Basic check for render state validity.
...@@ -226,10 +220,9 @@ namespace canvas ...@@ -226,10 +220,9 @@ namespace canvas
@throws an lang::IllegalArgumentException, if anything is wrong @throws an lang::IllegalArgumentException, if anything is wrong
*/ */
CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::RenderState& renderState, CANVASTOOLS_DLLPUBLIC void verifyInput( const css::rendering::RenderState& renderState,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf,
::com::sun::star::uno::XInterface >& xIf,
::sal_Int16 nArgPos, ::sal_Int16 nArgPos,
sal_Int32 nMinColorComponents=0 ); sal_Int32 nMinColorComponents=0 );
...@@ -249,10 +242,9 @@ namespace canvas ...@@ -249,10 +242,9 @@ namespace canvas
@throws an lang::IllegalArgumentException, if anything is wrong @throws an lang::IllegalArgumentException, if anything is wrong
*/ */
CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes, CANVASTOOLS_DLLPUBLIC void verifyInput( const css::rendering::StrokeAttributes& strokeAttributes,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf,
::com::sun::star::uno::XInterface >& xIf,
::sal_Int16 nArgPos ); ::sal_Int16 nArgPos );
/** Basic check for texture validity. /** Basic check for texture validity.
...@@ -271,10 +263,9 @@ namespace canvas ...@@ -271,10 +263,9 @@ namespace canvas
@throws an lang::IllegalArgumentException, if anything is wrong @throws an lang::IllegalArgumentException, if anything is wrong
*/ */
CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::Texture& texture, CANVASTOOLS_DLLPUBLIC void verifyInput( const css::rendering::Texture& texture,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf,
::com::sun::star::uno::XInterface >& xIf,
::sal_Int16 nArgPos ); ::sal_Int16 nArgPos );
/** Basic check for bitmap layout validity. /** Basic check for bitmap layout validity.
...@@ -293,10 +284,9 @@ namespace canvas ...@@ -293,10 +284,9 @@ namespace canvas
@throws an lang::IllegalArgumentException, if anything is wrong @throws an lang::IllegalArgumentException, if anything is wrong
*/ */
CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, CANVASTOOLS_DLLPUBLIC void verifyInput( const css::rendering::IntegerBitmapLayout& bitmapLayout,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf,
::com::sun::star::uno::XInterface >& xIf,
::sal_Int16 nArgPos ); ::sal_Int16 nArgPos );
/** Basic check for font info validity. /** Basic check for font info validity.
...@@ -315,10 +305,9 @@ namespace canvas ...@@ -315,10 +305,9 @@ namespace canvas
@throws an lang::IllegalArgumentException, if anything is wrong @throws an lang::IllegalArgumentException, if anything is wrong
*/ */
CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::FontInfo& fontInfo, CANVASTOOLS_DLLPUBLIC void verifyInput( const css::rendering::FontInfo& fontInfo,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf,
::com::sun::star::uno::XInterface >& xIf,
::sal_Int16 nArgPos ); ::sal_Int16 nArgPos );
/** Basic check for font request validity. /** Basic check for font request validity.
...@@ -337,10 +326,9 @@ namespace canvas ...@@ -337,10 +326,9 @@ namespace canvas
@throws an lang::IllegalArgumentException, if anything is wrong @throws an lang::IllegalArgumentException, if anything is wrong
*/ */
CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::FontRequest& fontRequest, CANVASTOOLS_DLLPUBLIC void verifyInput( const css::rendering::FontRequest& fontRequest,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf,
::com::sun::star::uno::XInterface >& xIf,
::sal_Int16 nArgPos ); ::sal_Int16 nArgPos );
/** Templatized check for uno::Reference validity. /** Templatized check for uno::Reference validity.
...@@ -360,10 +348,9 @@ namespace canvas ...@@ -360,10 +348,9 @@ namespace canvas
@throws an lang::IllegalArgumentException, if anything is wrong @throws an lang::IllegalArgumentException, if anything is wrong
*/ */
template< class Interface > void verifyInput( template< class Interface > void verifyInput(
const ::com::sun::star::uno::Reference< Interface >& rRef, const css::uno::Reference< Interface >& rRef,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf,
::com::sun::star::uno::XInterface >& xIf,
::sal_Int16 nArgPos ) ::sal_Int16 nArgPos )
{ {
(void)pStr; (void)xIf; (void)nArgPos; (void)pStr; (void)xIf; (void)nArgPos;
...@@ -371,12 +358,12 @@ namespace canvas ...@@ -371,12 +358,12 @@ namespace canvas
if( !rRef.is() ) if( !rRef.is() )
{ {
#if OSL_DEBUG_LEVEL > 0 #if OSL_DEBUG_LEVEL > 0
throw ::com::sun::star::lang::IllegalArgumentException( throw css::lang::IllegalArgumentException(
OUString::createFromAscii(pStr) + ": reference is NULL", OUString::createFromAscii(pStr) + ": reference is NULL",
xIf, xIf,
nArgPos ); nArgPos );
#else #else
throw ::com::sun::star::lang::IllegalArgumentException(); throw css::lang::IllegalArgumentException();
#endif #endif
} }
} }
...@@ -398,10 +385,9 @@ namespace canvas ...@@ -398,10 +385,9 @@ namespace canvas
@throws an lang::IllegalArgumentException, if anything is wrong @throws an lang::IllegalArgumentException, if anything is wrong
*/ */
template< typename SequenceContent > void verifyInput( template< typename SequenceContent > void verifyInput(
const ::com::sun::star::uno::Sequence< SequenceContent >& rSequence, const css::uno::Sequence< SequenceContent >& rSequence,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf,
::com::sun::star::uno::XInterface >& xIf,
::sal_Int16 nArgPos ) ::sal_Int16 nArgPos )
{ {
const SequenceContent* pCurr = rSequence.getConstArray(); const SequenceContent* pCurr = rSequence.getConstArray();
...@@ -413,8 +399,7 @@ namespace canvas ...@@ -413,8 +399,7 @@ namespace canvas
/// Catch-all, to handle cases that DON'T need input checking (i.e. the Integer geometry ones) /// Catch-all, to handle cases that DON'T need input checking (i.e. the Integer geometry ones)
template< typename T > void verifyInput( const T& /*rDummy*/, template< typename T > void verifyInput( const T& /*rDummy*/,
const char* /*pStr*/, const char* /*pStr*/,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& /*xIf*/,
::com::sun::star::uno::XInterface >& /*xIf*/,
::sal_Int16 /*nArgPos*/ ) ::sal_Int16 /*nArgPos*/ )
{ {
} }
...@@ -424,8 +409,7 @@ namespace canvas ...@@ -424,8 +409,7 @@ namespace canvas
template< typename Arg0 > void verifyArgs( const Arg0& rArg0, template< typename Arg0 > void verifyArgs( const Arg0& rArg0,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf )
::com::sun::star::uno::XInterface >& xIf )
{ {
verifyInput( rArg0, pStr, xIf, 0 ); verifyInput( rArg0, pStr, xIf, 0 );
} }
...@@ -434,8 +418,7 @@ namespace canvas ...@@ -434,8 +418,7 @@ namespace canvas
typename Arg1 > void verifyArgs( const Arg0& rArg0, typename Arg1 > void verifyArgs( const Arg0& rArg0,
const Arg1& rArg1, const Arg1& rArg1,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf )
::com::sun::star::uno::XInterface >& xIf )
{ {
verifyInput( rArg0, pStr, xIf, 0 ); verifyInput( rArg0, pStr, xIf, 0 );
verifyInput( rArg1, pStr, xIf, 1 ); verifyInput( rArg1, pStr, xIf, 1 );
...@@ -447,8 +430,7 @@ namespace canvas ...@@ -447,8 +430,7 @@ namespace canvas
const Arg1& rArg1, const Arg1& rArg1,
const Arg2& rArg2, const Arg2& rArg2,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf )
::com::sun::star::uno::XInterface >& xIf )
{ {
verifyInput( rArg0, pStr, xIf, 0 ); verifyInput( rArg0, pStr, xIf, 0 );
verifyInput( rArg1, pStr, xIf, 1 ); verifyInput( rArg1, pStr, xIf, 1 );
...@@ -463,8 +445,7 @@ namespace canvas ...@@ -463,8 +445,7 @@ namespace canvas
const Arg2& rArg2, const Arg2& rArg2,
const Arg3& rArg3, const Arg3& rArg3,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf )
::com::sun::star::uno::XInterface >& xIf )
{ {
verifyInput( rArg0, pStr, xIf, 0 ); verifyInput( rArg0, pStr, xIf, 0 );
verifyInput( rArg1, pStr, xIf, 1 ); verifyInput( rArg1, pStr, xIf, 1 );
...@@ -482,8 +463,7 @@ namespace canvas ...@@ -482,8 +463,7 @@ namespace canvas
const Arg3& rArg3, const Arg3& rArg3,
const Arg4& rArg4, const Arg4& rArg4,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf )
::com::sun::star::uno::XInterface >& xIf )
{ {
verifyInput( rArg0, pStr, xIf, 0 ); verifyInput( rArg0, pStr, xIf, 0 );
verifyInput( rArg1, pStr, xIf, 1 ); verifyInput( rArg1, pStr, xIf, 1 );
...@@ -504,8 +484,7 @@ namespace canvas ...@@ -504,8 +484,7 @@ namespace canvas
const Arg4& rArg4, const Arg4& rArg4,
const Arg5& rArg5, const Arg5& rArg5,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf )
::com::sun::star::uno::XInterface >& xIf )
{ {
verifyInput( rArg0, pStr, xIf, 0 ); verifyInput( rArg0, pStr, xIf, 0 );
verifyInput( rArg1, pStr, xIf, 1 ); verifyInput( rArg1, pStr, xIf, 1 );
...@@ -529,8 +508,7 @@ namespace canvas ...@@ -529,8 +508,7 @@ namespace canvas
const Arg5& rArg5, const Arg5& rArg5,
const Arg6& rArg6, const Arg6& rArg6,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf )
::com::sun::star::uno::XInterface >& xIf )
{ {
verifyInput( rArg0, pStr, xIf, 0 ); verifyInput( rArg0, pStr, xIf, 0 );
verifyInput( rArg1, pStr, xIf, 1 ); verifyInput( rArg1, pStr, xIf, 1 );
...@@ -542,7 +520,7 @@ namespace canvas ...@@ -542,7 +520,7 @@ namespace canvas
} }
/** Range checker, which throws ::com::sun::star::lang::IllegalArgument exception, when /** Range checker, which throws css::lang::IllegalArgument exception, when
range is violated range is violated
*/ */
template< typename NumType > inline void verifyRange( NumType arg, NumType lowerBound, NumType upperBound ) template< typename NumType > inline void verifyRange( NumType arg, NumType lowerBound, NumType upperBound )
...@@ -550,11 +528,11 @@ namespace canvas ...@@ -550,11 +528,11 @@ namespace canvas
if( arg < lowerBound || if( arg < lowerBound ||
arg > upperBound ) arg > upperBound )
{ {
throw ::com::sun::star::lang::IllegalArgumentException(); throw css::lang::IllegalArgumentException();
} }
} }
/** Range checker, which throws ::com::sun::star::lang::IllegalArgument exception, when /** Range checker, which throws css::lang::IllegalArgument exception, when
range is violated range is violated
The checked range is half open, i.e. only bound by the specified value. The checked range is half open, i.e. only bound by the specified value.
...@@ -574,11 +552,11 @@ namespace canvas ...@@ -574,11 +552,11 @@ namespace canvas
if( (bLowerBound && arg < bound) || if( (bLowerBound && arg < bound) ||
(!bLowerBound && arg > bound) ) (!bLowerBound && arg > bound) )
{ {
throw ::com::sun::star::lang::IllegalArgumentException(); throw css::lang::IllegalArgumentException();
} }
} }
/** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when /** Range checker, which throws css::lang::IndexOutOfBounds exception, when
index range is violated index range is violated
*/ */
template< typename NumType > inline void verifyIndexRange( NumType arg, NumType lowerBound, NumType upperBound ) template< typename NumType > inline void verifyIndexRange( NumType arg, NumType lowerBound, NumType upperBound )
...@@ -586,11 +564,11 @@ namespace canvas ...@@ -586,11 +564,11 @@ namespace canvas
if( arg < lowerBound || if( arg < lowerBound ||
arg > upperBound ) arg > upperBound )
{ {
throw ::com::sun::star::lang::IndexOutOfBoundsException(); throw css::lang::IndexOutOfBoundsException();
} }
} }
/** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when /** Range checker, which throws css::lang::IndexOutOfBounds exception, when
index range is violated index range is violated
@param rect @param rect
...@@ -599,10 +577,10 @@ namespace canvas ...@@ -599,10 +577,10 @@ namespace canvas
@param size @param size
Given rectangle must be within ((0,0), (size.Width, size.Height)) Given rectangle must be within ((0,0), (size.Width, size.Height))
*/ */
CANVASTOOLS_DLLPUBLIC void verifyIndexRange( const ::com::sun::star::geometry::IntegerRectangle2D& rect, CANVASTOOLS_DLLPUBLIC void verifyIndexRange( const css::geometry::IntegerRectangle2D& rect,
const ::com::sun::star::geometry::IntegerSize2D& size ); const css::geometry::IntegerSize2D& size );
/** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when /** Range checker, which throws css::lang::IndexOutOfBounds exception, when
index range is violated index range is violated
@param pos @param pos
...@@ -611,30 +589,28 @@ namespace canvas ...@@ -611,30 +589,28 @@ namespace canvas
@param size @param size
Given position must be within ((0,0), (size.Width, size.Height)) Given position must be within ((0,0), (size.Width, size.Height))
*/ */
CANVASTOOLS_DLLPUBLIC void verifyIndexRange( const ::com::sun::star::geometry::IntegerPoint2D& pos, CANVASTOOLS_DLLPUBLIC void verifyIndexRange( const css::geometry::IntegerPoint2D& pos,
const ::com::sun::star::geometry::IntegerSize2D& size ); const css::geometry::IntegerSize2D& size );
/** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when /** Range checker, which throws css::lang::IndexOutOfBounds exception, when
the size is negative or null the size is negative or null
@param size @param size
Size to verify Size to verify
*/ */
CANVASTOOLS_DLLPUBLIC void verifyBitmapSize( const ::com::sun::star::geometry::IntegerSize2D& size, CANVASTOOLS_DLLPUBLIC void verifyBitmapSize( const css::geometry::IntegerSize2D& size,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf );
::com::sun::star::uno::XInterface >& xIf );
/** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when /** Range checker, which throws css::lang::IndexOutOfBounds exception, when
the size is negative or null the size is negative or null
@param size @param size
Size to verify Size to verify
*/ */
CANVASTOOLS_DLLPUBLIC void verifySpriteSize( const ::com::sun::star::geometry::RealSize2D& size, CANVASTOOLS_DLLPUBLIC void verifySpriteSize( const css::geometry::RealSize2D& size,
const char* pStr, const char* pStr,
const ::com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XInterface >& xIf );
::com::sun::star::uno::XInterface >& xIf );
} }
} }
......
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