summaryrefslogtreecommitdiff
path: root/canvas/source/simplecanvas/simplecanvasimpl.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'canvas/source/simplecanvas/simplecanvasimpl.cxx')
-rw-r--r--canvas/source/simplecanvas/simplecanvasimpl.cxx85
1 files changed, 38 insertions, 47 deletions
diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx
index c9b87265d1d6..db1377e419b1 100644
--- a/canvas/source/simplecanvas/simplecanvasimpl.cxx
+++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx
@@ -28,8 +28,7 @@
#include <com/sun/star/rendering/PanoseWeight.hpp>
#include <com/sun/star/rendering/XSimpleCanvas.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
#include <o3tl/lazy_update.hxx>
#include <canvas/canvastools.hxx>
@@ -45,29 +44,25 @@ namespace
uno::Sequence< double > color2Sequence( sal_Int32 nColor )
{
// TODO(F3): Color management
- uno::Sequence< double > aRes( 4 );
-
- aRes[0] = static_cast<sal_uInt8>( (nColor&0xFF000000U) >> 24U ) / 255.0;
- aRes[1] = static_cast<sal_uInt8>( (nColor&0x00FF0000U) >> 16U ) / 255.0;
- aRes[2] = static_cast<sal_uInt8>( (nColor&0x0000FF00U) >> 8U ) / 255.0;
- aRes[3] = static_cast<sal_uInt8>( (nColor&0x000000FFU) ) / 255.0;
-
+ uno::Sequence< double > aRes{
+ static_cast<sal_uInt8>( (nColor&0xFF000000U) >> 24U ) / 255.0,
+ static_cast<sal_uInt8>( (nColor&0x00FF0000U) >> 16U ) / 255.0,
+ static_cast<sal_uInt8>( (nColor&0x0000FF00U) >> 8U ) / 255.0,
+ static_cast<sal_uInt8>( (nColor&0x000000FFU) ) / 255.0
+ };
return aRes;
}
uno::Reference< rendering::XPolyPolygon2D > rect2Poly( uno::Reference<rendering::XGraphicDevice> const& xDevice,
geometry::RealRectangle2D const& rRect )
{
- uno::Sequence< geometry::RealPoint2D > rectSequence( 4 );
- geometry::RealPoint2D* pOutput = rectSequence.getArray();
- pOutput[0] = geometry::RealPoint2D( rRect.X1, rRect.Y1 );
- pOutput[1] = geometry::RealPoint2D( rRect.X2, rRect.Y1 );
- pOutput[2] = geometry::RealPoint2D( rRect.X2, rRect.Y2 );
- pOutput[3] = geometry::RealPoint2D( rRect.X1, rRect.Y2 );
-
- uno::Sequence< uno::Sequence< geometry::RealPoint2D > > sequenceSequence( 1 );
- sequenceSequence[0] = rectSequence;
-
+ uno::Sequence< geometry::RealPoint2D > rectSequence{
+ geometry::RealPoint2D( rRect.X1, rRect.Y1 ),
+ geometry::RealPoint2D( rRect.X2, rRect.Y1 ),
+ geometry::RealPoint2D( rRect.X2, rRect.Y2 ),
+ geometry::RealPoint2D( rRect.X1, rRect.Y2 )
+ };
+ uno::Sequence< uno::Sequence< geometry::RealPoint2D > > sequenceSequence{ rectSequence };
uno::Reference< rendering::XPolyPolygon2D > xRes =
xDevice->createCompatibleLinePolyPolygon( sequenceSequence );
if( xRes.is() )
@@ -91,19 +86,17 @@ namespace
explicit SimpleRenderState( uno::Reference<rendering::XGraphicDevice> const& xDevice ) :
m_aPenColor( &color2Sequence),
m_aFillColor( &color2Sequence ),
- m_aRectClip( [&xDevice](geometry::RealRectangle2D const& rRect) { return rect2Poly(xDevice, rRect); } ),
- m_aTransformation()
+ m_aRectClip( [&xDevice](geometry::RealRectangle2D const& rRect) { return rect2Poly(xDevice, rRect); } )
{
tools::setIdentityAffineMatrix2D( m_aTransformation );
}
};
- typedef ::cppu::WeakComponentImplHelper< css::rendering::XSimpleCanvas,
+ typedef ::comphelper::WeakComponentImplHelper< css::rendering::XSimpleCanvas,
css::lang::XServiceName > SimpleCanvasBase;
- class SimpleCanvasImpl : private cppu::BaseMutex,
- public SimpleCanvasBase
+ class SimpleCanvasImpl : public SimpleCanvasBase
{
private:
bool isStrokingEnabled() const
@@ -152,13 +145,11 @@ namespace
public:
SimpleCanvasImpl( const uno::Sequence< uno::Any >& aArguments,
const uno::Reference< uno::XComponentContext >& ) :
- SimpleCanvasBase( m_aMutex ),
mxCanvas( grabCanvas(aArguments) ),
maFont([this](rendering::FontRequest const& rFontRequest) {
return mxCanvas->createFont(rFontRequest,
uno::Sequence< beans::PropertyValue >(),
geometry::Matrix2D()); } ),
- maViewState(),
maRenderState( mxCanvas->getDevice() )
{
tools::initViewState(maViewState);
@@ -178,7 +169,7 @@ namespace
sal_Bool bold,
sal_Bool italic ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
maFont->FontDescription.FamilyName = sFontName;
maFont->CellSize = size;
@@ -190,31 +181,31 @@ namespace
virtual void SAL_CALL setPenColor( ::sal_Int32 nsRgbaColor ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
*(maRenderState.m_aPenColor) = nsRgbaColor;
}
virtual void SAL_CALL setFillColor( ::sal_Int32 nsRgbaColor ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
*(maRenderState.m_aFillColor) = nsRgbaColor;
}
virtual void SAL_CALL setRectClip( const geometry::RealRectangle2D& aRect ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
*(maRenderState.m_aRectClip) = aRect;
}
virtual void SAL_CALL setTransformation( const geometry::AffineMatrix2D& aTransform ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
maRenderState.m_aTransformation = aTransform;
}
virtual void SAL_CALL drawPixel( const geometry::RealPoint2D& aPoint ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
mxCanvas->drawPoint(aPoint,
maViewState,
createFillingRenderState());
@@ -223,7 +214,7 @@ namespace
virtual void SAL_CALL drawLine( const geometry::RealPoint2D& aStartPoint,
const geometry::RealPoint2D& aEndPoint ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
mxCanvas->drawLine(aStartPoint,
aEndPoint,
maViewState,
@@ -232,7 +223,7 @@ namespace
virtual void SAL_CALL drawRect( const geometry::RealRectangle2D& aRect ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
uno::Reference< rendering::XPolyPolygon2D > xPoly(
rect2Poly( mxCanvas->getDevice(),
aRect));
@@ -249,7 +240,7 @@ namespace
virtual void SAL_CALL drawPolyPolygon( const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
if( isFillingEnabled() )
mxCanvas->drawPolyPolygon(xPolyPolygon,
@@ -265,7 +256,7 @@ namespace
const geometry::RealPoint2D& aOutPos,
::sal_Int8 nTextDirection ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
const basegfx::B2DHomMatrix offsetTransform(basegfx::utils::createTranslateB2DHomMatrix(aOutPos.X,aOutPos.Y));
rendering::RenderState aRenderState( createStrokingRenderState() );
tools::appendToRenderState(aRenderState, offsetTransform);
@@ -280,7 +271,7 @@ namespace
virtual void SAL_CALL drawBitmap( const uno::Reference< rendering::XBitmap >& xBitmap,
const geometry::RealPoint2D& aLeftTop ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
const basegfx::B2DHomMatrix offsetTransform(basegfx::utils::createTranslateB2DHomMatrix(aLeftTop.X,aLeftTop.Y));
rendering::RenderState aRenderState( createStrokingRenderState() );
tools::appendToRenderState(aRenderState, offsetTransform);
@@ -290,61 +281,61 @@ namespace
virtual uno::Reference< rendering::XGraphicDevice > SAL_CALL getDevice( ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
return mxCanvas->getDevice();
}
virtual uno::Reference< rendering::XCanvas > SAL_CALL getCanvas( ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
return mxCanvas;
}
virtual rendering::FontMetrics SAL_CALL getFontMetrics( ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
return maFont.getOutValue()->getFontMetrics();
}
virtual uno::Reference< rendering::XCanvasFont > SAL_CALL getCurrentFont( ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
return maFont.getOutValue();
}
virtual ::sal_Int32 SAL_CALL getCurrentPenColor( ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
return maRenderState.m_aPenColor.getInValue();
}
virtual ::sal_Int32 SAL_CALL getCurrentFillColor( ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
return maRenderState.m_aFillColor.getInValue();
}
virtual geometry::RealRectangle2D SAL_CALL getCurrentClipRect( ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
return maRenderState.m_aRectClip.getInValue();
}
virtual geometry::AffineMatrix2D SAL_CALL getCurrentTransformation( ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
return maRenderState.m_aTransformation;
}
virtual rendering::ViewState SAL_CALL getCurrentViewState( ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
return maViewState;
}
virtual rendering::RenderState SAL_CALL getCurrentRenderState( sal_Bool bUseFillColor ) override
{
- ::osl::MutexGuard aGuard( m_aMutex );
+ std::unique_lock aGuard( m_aMutex );
if( bUseFillColor )
return createFillingRenderState();
else
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 07:42:06 +0000