Skip to content

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

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

Change-Id: Iacf28606e41f0b1345864762612cbb009066bfeb
Reviewed-on: https://gerrit.libreoffice.org/19458Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst baffe9bd
Expand all Show whitespace changes
Inline Side-by-side
Showing with 158 additions and 163 deletions
include/canvas/base/bitmapcanvasbase.hxx
Dosyayı görüntüle @ b1659c95
......@@ -61,26 +61,26 @@ namespace canvas
template< class Base,
class CanvasHelper,
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:
typedef CanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType;
// 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 );
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;
}
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
{
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
......@@ -93,7 +93,7 @@ namespace canvas
template< class Base,
class CanvasHelper,
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 >
{
typedef BitmapCanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase >
......@@ -101,14 +101,14 @@ namespace canvas
public:
// XBitmapCanvas
virtual void SAL_CALL copyRect( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& sourceCanvas,
const ::com::sun::star::geometry::RealRectangle2D& sourceRect,
const ::com::sun::star::rendering::ViewState& sourceViewState,
const ::com::sun::star::rendering::RenderState& sourceRenderState,
const ::com::sun::star::geometry::RealRectangle2D& destRect,
const ::com::sun::star::rendering::ViewState& destViewState,
const ::com::sun::star::rendering::RenderState& destRenderState ) throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override
virtual void SAL_CALL copyRect( const css::uno::Reference< css::rendering::XBitmapCanvas >& sourceCanvas,
const css::geometry::RealRectangle2D& sourceRect,
const css::rendering::ViewState& sourceViewState,
const css::rendering::RenderState& sourceRenderState,
const css::geometry::RealRectangle2D& destRect,
const css::rendering::ViewState& destViewState,
const css::rendering::RenderState& destRenderState ) throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException) override
{
tools::verifyArgs(sourceCanvas, sourceRect, sourceViewState, sourceRenderState,
destRect, destViewState, destRenderState,
......
include/canvas/base/bufferedgraphicdevicebase.hxx
Dosyayı görüntüle @ b1659c95
......@@ -73,7 +73,7 @@ namespace canvas
template< class Base,
class DeviceHelper,
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:
......@@ -93,26 +93,26 @@ namespace canvas
}
// 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;
}
// XBufferController
virtual ::sal_Int32 SAL_CALL createBuffers( ::sal_Int32 nBuffers ) throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override
virtual ::sal_Int32 SAL_CALL createBuffers( ::sal_Int32 nBuffers ) throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException) override
{
tools::verifyRange( nBuffers, (sal_Int32)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 )
throw (::com::sun::star::uno::RuntimeException,
throw (css::uno::RuntimeException,
std::exception) override
{
MutexType aGuard( BaseType::m_aMutex );
......@@ -120,7 +120,7 @@ namespace canvas
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 );
......@@ -139,8 +139,7 @@ namespace canvas
is called, with rBounds the window bound rect relative to
the frame window.
*/
void setWindow( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindow2 >& rWindow )
void setWindow( const css::uno::Reference< css::awt::XWindow2 >& rWindow )
{
if( mxWindow.is() )
mxWindow->removeWindowListener( this );
......@@ -151,23 +150,23 @@ namespace canvas
{
mbIsVisible = mxWindow->isVisible();
mbIsTopLevel =
::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindow >(
css::uno::Reference< css::awt::XTopWindow >(
mxWindow,
::com::sun::star::uno::UNO_QUERY ).is();
css::uno::UNO_QUERY ).is();
maBounds = transformBounds( mxWindow->getPosSize() );
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;
}
::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
......@@ -184,7 +183,7 @@ namespace canvas
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
// window
......@@ -193,16 +192,15 @@ namespace canvas
rBounds,
mxWindow );
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 );
const ::com::sun::star::awt::Rectangle& rNewBounds(
transformBounds(
::com::sun::star::awt::Rectangle( e.X,
const css::awt::Rectangle& rNewBounds(
transformBounds( css::awt::Rectangle( e.X,
e.Y,
e.Width,
e.Height )));
......@@ -218,7 +216,7 @@ namespace canvas
}
// 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 );
......@@ -228,24 +226,24 @@ namespace canvas
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 );
}
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 );
}
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 );
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 );
......@@ -253,10 +251,10 @@ namespace canvas
}
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
::com::sun::star::awt::Rectangle maBounds;
css::awt::Rectangle maBounds;
/// True, if the window this canvas is contained in, is visible
bool mbIsVisible;
......
include/canvas/base/cachedprimitivebase.hxx
Dosyayı görüntüle @ b1659c95
......@@ -34,8 +34,8 @@
namespace canvas
{
typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XCachedPrimitive,
::com::sun::star::lang::XServiceInfo > CachedPrimitiveBase_Base;
typedef ::cppu::WeakComponentImplHelper2< css::rendering::XCachedPrimitive,
css::lang::XServiceInfo > CachedPrimitiveBase_Base;
/** Base class, providing common functionality for implementers of
the XCachedPrimitive interface.
......@@ -60,21 +60,20 @@ namespace canvas
objects where re-transforming the generated output is not
desirable, e.g. for hinted font output.
*/
CachedPrimitiveBase( const ::com::sun::star::rendering::ViewState& rUsedViewState,
const ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XCanvas >& rTarget,
CachedPrimitiveBase( const css::rendering::ViewState& rUsedViewState,
const css::uno::Reference< css::rendering::XCanvas >& rTarget,
bool bFailForChangedViewTransform );
/// Dispose all internal references
virtual void SAL_CALL disposing() override;
// 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
virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::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 OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
protected:
virtual ~CachedPrimitiveBase(); // we're a ref-counted UNO class. _We_ destroy ourselves.
......@@ -100,14 +99,13 @@ namespace canvas
@param bSameViewTransform
When true, rNewState and rOldState have the same transformation.
*/
virtual ::sal_Int8 doRedraw( const ::com::sun::star::rendering::ViewState& rNewState,
const ::com::sun::star::rendering::ViewState& rOldState,
const ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XCanvas >& rTargetCanvas,
virtual ::sal_Int8 doRedraw( const css::rendering::ViewState& rNewState,
const css::rendering::ViewState& rOldState,
const css::uno::Reference< css::rendering::XCanvas >& rTargetCanvas,
bool bSameViewTransform ) = 0;
::com::sun::star::rendering::ViewState maUsedViewState;
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxTarget;
css::rendering::ViewState maUsedViewState;
css::uno::Reference< css::rendering::XCanvas > mxTarget;
const bool mbFailForChangedViewTransform;
};
}
......
include/canvas/base/canvascustomspritebase.hxx
Dosyayı görüntüle @ b1659c95
......@@ -74,7 +74,7 @@ namespace canvas
class SpriteHelper,
class CanvasHelper,
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:
......@@ -105,7 +105,7 @@ namespace canvas
}
// 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 );
......@@ -115,11 +115,11 @@ namespace canvas
return BaseType::clear();
}
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
drawBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap,
const ::com::sun::star::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override
virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL
drawBitmap( const css::uno::Reference< css::rendering::XBitmap >& xBitmap,
const css::rendering::ViewState& viewState,
const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException) override
{
tools::verifyArgs(xBitmap, viewState, renderState,
BOOST_CURRENT_FUNCTION,
......@@ -143,8 +143,8 @@ namespace canvas
// functionality provided at the baseclass.
// XSprite
virtual void SAL_CALL setAlpha( double alpha ) throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override
virtual void SAL_CALL setAlpha( double alpha ) throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException) override
{
tools::verifyRange( alpha, 0.0, 1.0 );
......@@ -153,10 +153,10 @@ namespace canvas
maSpriteHelper.setAlpha( this, alpha );
}
virtual void SAL_CALL move( const ::com::sun::star::geometry::RealPoint2D& aNewPos,
const ::com::sun::star::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override
virtual void SAL_CALL move( const css::geometry::RealPoint2D& aNewPos,
const css::rendering::ViewState& viewState,
const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException) override
{
tools::verifyArgs(aNewPos, viewState, renderState,
BOOST_CURRENT_FUNCTION,
......@@ -167,8 +167,8 @@ namespace canvas
maSpriteHelper.move( this, aNewPos, viewState, renderState );
}
virtual void SAL_CALL transform( const ::com::sun::star::geometry::AffineMatrix2D& aTransformation ) throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) override
virtual void SAL_CALL transform( const css::geometry::AffineMatrix2D& aTransformation ) throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException) override
{
tools::verifyArgs(aTransformation,
BOOST_CURRENT_FUNCTION,
......@@ -179,7 +179,7 @@ namespace canvas
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)
......@@ -188,21 +188,21 @@ namespace canvas
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 );
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 );
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 );
......@@ -210,8 +210,8 @@ namespace canvas
}
// XCustomSprite
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > SAL_CALL
getContentCanvas() throw (::com::sun::star::uno::RuntimeException) override
virtual css::uno::Reference< css::rendering::XCanvas > SAL_CALL
getContentCanvas() throw (css::uno::RuntimeException) override
{
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
......
include/canvas/base/canvascustomspritehelper.hxx
Dosyayı görüntüle @ b1659c95
......@@ -51,7 +51,7 @@ namespace canvas
@param rOwningSpriteCanvas
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 );
/** Object is being disposed, release all internal references
......@@ -67,21 +67,21 @@ namespace canvas
/// need to call this method for XCanvas::drawBitmap(), for opacity tracking
void checkDrawBitmap( const Sprite::Reference& rSprite,
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap,
const ::com::sun::star::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState );
const css::uno::Reference< css::rendering::XBitmap >& xBitmap,
const css::rendering::ViewState& viewState,
const css::rendering::RenderState& renderState );
// XSprite
void setAlpha( const Sprite::Reference& rSprite,
double alpha );
void move( const Sprite::Reference& rSprite,
const ::com::sun::star::geometry::RealPoint2D& aNewPos,
const ::com::sun::star::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState );
const css::geometry::RealPoint2D& aNewPos,
const css::rendering::ViewState& viewState,
const css::rendering::RenderState& renderState );
void transform( const Sprite::Reference& rSprite,
const ::com::sun::star::geometry::AffineMatrix2D& aTransformation );
const css::geometry::AffineMatrix2D& aTransformation );
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,
double nPriority );
void show( const Sprite::Reference& rSprite );
......@@ -138,8 +138,8 @@ namespace canvas
double getAlpha() const { return mfAlpha; }
/// Retrieve current clip
const ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XPolyPolygon2D >& getClip() const { return mxClipPoly; }
const css::uno::Reference<
css::rendering::XPolyPolygon2D >& getClip() const { return mxClipPoly; }
const ::basegfx::B2DHomMatrix& getTransformation() const { return maTransform; }
......@@ -204,7 +204,7 @@ namespace canvas
@derive Needs to be provided by backend-specific code
*/
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
......@@ -239,8 +239,7 @@ namespace canvas
::basegfx::B2DPoint maPosition;
::basegfx::B2DVector maSize;
::basegfx::B2DHomMatrix maTransform;
::com::sun::star::uno::Reference<
::com::sun::star::rendering::XPolyPolygon2D > mxClipPoly;
css::uno::Reference< css::rendering::XPolyPolygon2D > mxClipPoly;
double mfPriority;
double mfAlpha;
bool mbActive; // true, if not hidden
......
include/canvas/base/disambiguationhelper.hxx
Dosyayı görüntüle @ b1659c95
......@@ -60,7 +60,7 @@ namespace canvas
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;
......@@ -69,7 +69,7 @@ namespace canvas
virtual void SAL_CALL disposing() override
{ 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); }
};
......
include/canvas/base/integerbitmapbase.hxx
Dosyayı görüntüle @ b1659c95
......@@ -41,8 +41,8 @@ namespace canvas
{
public:
// XIntegerBitmap
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getData( ::com::sun::star::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
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getData( css::rendering::IntegerBitmapLayout& bitmapLayout,
const css::geometry::IntegerRectangle2D& rect ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override
{
tools::verifyArgs(rect,
BOOST_CURRENT_FUNCTION,
......@@ -55,9 +55,9 @@ namespace canvas
rect );
}
virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< sal_Int8 >&,
const ::com::sun::star::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
virtual void SAL_CALL setData( const css::uno::Sequence< sal_Int8 >&,
const css::rendering::IntegerBitmapLayout& bitmapLayout,
const css::geometry::IntegerRectangle2D& rect ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override
{
tools::verifyArgs(bitmapLayout, rect,
BOOST_CURRENT_FUNCTION,
......@@ -69,9 +69,9 @@ namespace canvas
Base::mbSurfaceDirty = true;
}
virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >&,
const ::com::sun::star::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
virtual void SAL_CALL setPixel( const css::uno::Sequence< sal_Int8 >&,
const css::rendering::IntegerBitmapLayout& bitmapLayout,
const css::geometry::IntegerPoint2D& pos ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override
{
tools::verifyArgs(bitmapLayout, pos,
BOOST_CURRENT_FUNCTION,
......@@ -83,8 +83,8 @@ namespace canvas
Base::mbSurfaceDirty = true;
}
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getPixel( ::com::sun::star::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
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getPixel( css::rendering::IntegerBitmapLayout& bitmapLayout,
const css::geometry::IntegerPoint2D& pos ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override
{
tools::verifyArgs(pos,
BOOST_CURRENT_FUNCTION,
......@@ -97,7 +97,7 @@ namespace canvas
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 );
......
include/canvas/base/sprite.hxx
Dosyayı görüntüle @ b1659c95
......@@ -51,7 +51,7 @@ namespace canvas
functionality (which, of course, is impossible here in a
generic way)
*/
class Sprite : public ::com::sun::star::lang::XComponent
class Sprite : public css::lang::XComponent
{
public:
typedef ::rtl::Reference< Sprite > Reference;
......
include/canvas/base/spritecanvasbase.hxx
Dosyayı görüntüle @ b1659c95
......@@ -65,7 +65,7 @@ namespace canvas
template< class Base,
class CanvasHelper,
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:
......@@ -88,8 +88,8 @@ namespace canvas
}
// 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,
::com::sun::star::uno::RuntimeException) override
virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const css::uno::Reference< css::rendering::XAnimation >& animation ) throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException) override
{
tools::verifyArgs(animation,
BOOST_CURRENT_FUNCTION,
......@@ -100,25 +100,25 @@ namespace canvas
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,
sal_Int8 interpolationMode ) throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::rendering::VolatileContentDestroyedException,
::com::sun::star::uno::RuntimeException) override
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 (css::lang::IllegalArgumentException,
css::rendering::VolatileContentDestroyedException,
css::uno::RuntimeException) override
{
tools::verifyArgs(animationBitmaps,
BOOST_CURRENT_FUNCTION,
static_cast< typename BaseType::UnambiguousBaseType* >(this));
tools::verifyRange( interpolationMode,
::com::sun::star::rendering::InterpolationMode::NEAREST_NEIGHBOR,
::com::sun::star::rendering::InterpolationMode::BEZIERSPLINE4 );
css::rendering::InterpolationMode::NEAREST_NEIGHBOR,
css::rendering::InterpolationMode::BEZIERSPLINE4 );
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
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,
::com::sun::star::uno::RuntimeException) override
virtual css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite( const css::geometry::RealSize2D& spriteSize ) throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException) override
{
tools::verifySpriteSize(spriteSize,
BOOST_CURRENT_FUNCTION,
......@@ -129,8 +129,8 @@ namespace canvas
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,
::com::sun::star::uno::RuntimeException) override
virtual css::uno::Reference< css::rendering::XSprite > SAL_CALL createClonedSprite( const css::uno::Reference< css::rendering::XSprite >& original ) throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException) override
{
tools::verifyArgs(original,
BOOST_CURRENT_FUNCTION,
......
include/canvas/base/spritesurface.hxx
Dosyayı görüntüle @ b1659c95
......@@ -33,7 +33,7 @@ namespace canvas
methods provided here are used from the individual sprites to
notify the canvas about necessary screen updates.
*/
class SpriteSurface : public ::com::sun::star::uno::XInterface
class SpriteSurface : public css::uno::XInterface
{
public:
typedef ::rtl::Reference< SpriteSurface > Reference;
......
include/canvas/canvastools.hxx
Dosyayı görüntüle @ b1659c95
......@@ -147,56 +147,56 @@ namespace canvas
/** 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
CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState&
initRenderState( ::com::sun::star::rendering::RenderState& renderState );
CANVASTOOLS_DLLPUBLIC css::rendering::RenderState&
initRenderState( css::rendering::RenderState& renderState );
CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState&
initViewState( ::com::sun::star::rendering::ViewState& viewState );
CANVASTOOLS_DLLPUBLIC css::rendering::ViewState&
initViewState( css::rendering::ViewState& viewState );
CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix&
getViewStateTransform( ::basegfx::B2DHomMatrix& transform,
const ::com::sun::star::rendering::ViewState& viewState );
const css::rendering::ViewState& viewState );
CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState&
setViewStateTransform( ::com::sun::star::rendering::ViewState& viewState,
CANVASTOOLS_DLLPUBLIC css::rendering::ViewState&
setViewStateTransform( css::rendering::ViewState& viewState,
const ::basegfx::B2DHomMatrix& transform );
CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix&
getRenderStateTransform( ::basegfx::B2DHomMatrix& transform,
const ::com::sun::star::rendering::RenderState& renderState );
const css::rendering::RenderState& renderState );
CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState&
setRenderStateTransform( ::com::sun::star::rendering::RenderState& renderState,
CANVASTOOLS_DLLPUBLIC css::rendering::RenderState&
setRenderStateTransform( css::rendering::RenderState& renderState,
const ::basegfx::B2DHomMatrix& transform );
CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState&
appendToRenderState( ::com::sun::star::rendering::RenderState& renderState,
CANVASTOOLS_DLLPUBLIC css::rendering::RenderState&
appendToRenderState( css::rendering::RenderState& renderState,
const ::basegfx::B2DHomMatrix& transform );
CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState&
prependToRenderState( ::com::sun::star::rendering::RenderState& renderState,
CANVASTOOLS_DLLPUBLIC css::rendering::RenderState&
prependToRenderState( css::rendering::RenderState& renderState,
const ::basegfx::B2DHomMatrix& transform );
CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix&
mergeViewAndRenderTransform( ::basegfx::B2DHomMatrix& transform,
const ::com::sun::star::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState );
const css::rendering::ViewState& viewState,
const css::rendering::RenderState& renderState );
// Matrix utilities
CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::AffineMatrix2D&
setIdentityAffineMatrix2D( ::com::sun::star::geometry::AffineMatrix2D& matrix );
CANVASTOOLS_DLLPUBLIC css::geometry::AffineMatrix2D&
setIdentityAffineMatrix2D( css::geometry::AffineMatrix2D& matrix );
CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::Matrix2D&
setIdentityMatrix2D( ::com::sun::star::geometry::Matrix2D& matrix );
CANVASTOOLS_DLLPUBLIC css::geometry::Matrix2D&
setIdentityMatrix2D( css::geometry::Matrix2D& matrix );
// Special utilities
......@@ -349,16 +349,16 @@ namespace canvas
@return A reference to the resulting sequence of parameters
*/
CANVASTOOLS_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& getDeviceInfo(
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >& i_rxCanvas,
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& o_rxParams );
CANVASTOOLS_DLLPUBLIC css::uno::Sequence< css::uno::Any >& getDeviceInfo(
const css::uno::Reference< css::rendering::XCanvas >& i_rxCanvas,
css::uno::Sequence< css::uno::Any >& o_rxParams );
/** Return a color space for a default RGBA integer format
Use this method for dead-simple bitmap implementations,
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
......@@ -366,21 +366,21 @@ namespace canvas
that map all their formats to 8888 RGB color (the last byte
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
Use this method for dead-simple bitmap implementations,
that map all their formats to 8888 RGBA color.
*/
CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::IntegerBitmapLayout getStdMemoryLayout(
const ::com::sun::star::geometry::IntegerSize2D& rBitmapSize );
CANVASTOOLS_DLLPUBLIC css::rendering::IntegerBitmapLayout getStdMemoryLayout(
const css::geometry::IntegerSize2D& rBitmapSize );
/// 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
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
// issue some trace output here and throw a RuntimeException
......@@ -408,7 +408,7 @@ namespace canvas
# if OSL_DEBUG_LEVEL > 2
OSL_TRACE("numeric_cast detected data loss");
#endif
throw ::com::sun::star::uno::RuntimeException(
throw css::uno::RuntimeException(
"numeric_cast detected data loss",
NULL );
}
......@@ -416,9 +416,9 @@ namespace canvas
return static_cast<Target>(arg);
}
CANVASTOOLS_DLLPUBLIC ::com::sun::star::awt::Rectangle getAbsoluteWindowRect(
const ::com::sun::star::awt::Rectangle& rRect,
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2 >& xWin );
CANVASTOOLS_DLLPUBLIC css::awt::Rectangle getAbsoluteWindowRect(
const css::awt::Rectangle& rRect,
const css::uno::Reference< css::awt::XWindow2 >& xWin );
/** Retrieve for small bound marks around each corner of the given rectangle
*/
......@@ -432,9 +432,9 @@ namespace canvas
for smooth gradient color differences
*/
CANVASTOOLS_DLLPUBLIC int calcGradientStepCount( ::basegfx::B2DHomMatrix& rTotalTransform,
const ::com::sun::star::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState,
const ::com::sun::star::rendering::Texture& texture,
const css::rendering::ViewState& viewState,
const css::rendering::RenderState& renderState,
const css::rendering::Texture& texture,
int nColorSteps );
/** A very simplistic map for ASCII strings and arbitrary value
......
include/canvas/propertysethelper.hxx
Dosyayı görüntüle @ b1659c95
......@@ -50,8 +50,8 @@ namespace canvas
class CANVASTOOLS_DLLPUBLIC PropertySetHelper
{
public:
typedef std::function<::com::sun::star::uno::Any ()> GetterType;
typedef std::function<void (const ::com::sun::star::uno::Any&)> SetterType;
typedef std::function<css::uno::Any ()> GetterType;
typedef std::function<void (const css::uno::Any&)> SetterType;
struct Callbacks
{
GetterType getter;
......@@ -128,14 +128,14 @@ namespace canvas
const InputMap& getPropertyMap() const { return maMapEntries; }
// 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,
const ::com::sun::star::uno::Any& aValue );
::com::sun::star::uno::Any getPropertyValue( const OUString& PropertyName ) const;
const css::uno::Any& aValue );
css::uno::Any getPropertyValue( const OUString& PropertyName ) const;
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,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener );
const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener );
private:
std::unique_ptr<MapType> mpMap;
......
include/canvas/rendering/bitmap.hxx 100644 → 100755
Dosyayı görüntüle @ b1659c95
This diff is collapsed.
include/canvas/rendering/icachedprimitive.hxx
Dosyayı görüntüle @ b1659c95
......@@ -48,7 +48,7 @@ namespace canvas
Note that the primitive will <em>always</em> be redrawn on
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;
......
include/canvas/verifyinput.hxx
Dosyayı görüntüle @ b1659c95
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment