Kaydet (Commit) 287aaa33 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky Kaydeden (comit) Caolán McNamara

tdf#89381 Revert "vcl: SalGraphics::mirror() - always use GetGraphicsWidth()"

This reverts commit 28effca6.

Change-Id: Ie21ae1ef969b2cfdce81a152c195a69ad3c27f65
Reviewed-on: https://gerrit.libreoffice.org/17950Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 2ec31453
...@@ -99,7 +99,11 @@ bool SalGraphics::drawTransformedBitmap( ...@@ -99,7 +99,11 @@ bool SalGraphics::drawTransformedBitmap(
void SalGraphics::mirror( long& x, const OutputDevice *pOutDev, bool bBack ) const void SalGraphics::mirror( long& x, const OutputDevice *pOutDev, bool bBack ) const
{ {
long w = GetGraphicsWidth(); long w;
if( pOutDev && pOutDev->GetOutDevType() == OUTDEV_VIRDEV )
w = pOutDev->GetOutputWidthPixel();
else
w = GetGraphicsWidth();
if( w ) if( w )
{ {
...@@ -131,7 +135,11 @@ void SalGraphics::mirror( long& x, const OutputDevice *pOutDev, bool bBack ) con ...@@ -131,7 +135,11 @@ void SalGraphics::mirror( long& x, const OutputDevice *pOutDev, bool bBack ) con
void SalGraphics::mirror( long& x, long& nWidth, const OutputDevice *pOutDev, bool bBack ) const void SalGraphics::mirror( long& x, long& nWidth, const OutputDevice *pOutDev, bool bBack ) const
{ {
long w = GetGraphicsWidth(); long w;
if( pOutDev && pOutDev->GetOutDevType() == OUTDEV_VIRDEV )
w = pOutDev->GetOutputWidthPixel();
else
w = GetGraphicsWidth();
if( w ) if( w )
{ {
...@@ -164,7 +172,11 @@ void SalGraphics::mirror( long& x, long& nWidth, const OutputDevice *pOutDev, bo ...@@ -164,7 +172,11 @@ void SalGraphics::mirror( long& x, long& nWidth, const OutputDevice *pOutDev, bo
bool SalGraphics::mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev, bool bBack ) const bool SalGraphics::mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev, bool bBack ) const
{ {
long w = GetGraphicsWidth(); long w;
if( pOutDev && pOutDev->GetOutDevType() == OUTDEV_VIRDEV )
w = pOutDev->GetOutputWidthPixel();
else
w = GetGraphicsWidth();
if( w ) if( w )
{ {
...@@ -286,7 +298,11 @@ void SalGraphics::mirror( Rectangle& rRect, const OutputDevice *pOutDev, bool bB ...@@ -286,7 +298,11 @@ void SalGraphics::mirror( Rectangle& rRect, const OutputDevice *pOutDev, bool bB
basegfx::B2DPoint SalGraphics::mirror( const basegfx::B2DPoint& i_rPoint, const OutputDevice *i_pOutDev, bool i_bBack ) const basegfx::B2DPoint SalGraphics::mirror( const basegfx::B2DPoint& i_rPoint, const OutputDevice *i_pOutDev, bool i_bBack ) const
{ {
long w = GetGraphicsWidth(); long w;
if( i_pOutDev && i_pOutDev->GetOutDevType() == OUTDEV_VIRDEV )
w = i_pOutDev->GetOutputWidthPixel();
else
w = GetGraphicsWidth();
DBG_ASSERT( w, "missing graphics width" ); DBG_ASSERT( w, "missing graphics width" );
...@@ -311,7 +327,11 @@ basegfx::B2DPoint SalGraphics::mirror( const basegfx::B2DPoint& i_rPoint, const ...@@ -311,7 +327,11 @@ basegfx::B2DPoint SalGraphics::mirror( const basegfx::B2DPoint& i_rPoint, const
basegfx::B2DPolygon SalGraphics::mirror( const basegfx::B2DPolygon& i_rPoly, const OutputDevice *i_pOutDev, bool i_bBack ) const basegfx::B2DPolygon SalGraphics::mirror( const basegfx::B2DPolygon& i_rPoly, const OutputDevice *i_pOutDev, bool i_bBack ) const
{ {
long w = GetGraphicsWidth(); long w;
if( i_pOutDev && i_pOutDev->GetOutDevType() == OUTDEV_VIRDEV )
w = i_pOutDev->GetOutputWidthPixel();
else
w = GetGraphicsWidth();
DBG_ASSERT( w, "missing graphics width" ); DBG_ASSERT( w, "missing graphics width" );
...@@ -337,7 +357,11 @@ basegfx::B2DPolygon SalGraphics::mirror( const basegfx::B2DPolygon& i_rPoly, con ...@@ -337,7 +357,11 @@ basegfx::B2DPolygon SalGraphics::mirror( const basegfx::B2DPolygon& i_rPoly, con
basegfx::B2DPolyPolygon SalGraphics::mirror( const basegfx::B2DPolyPolygon& i_rPoly, const OutputDevice *i_pOutDev, bool i_bBack ) const basegfx::B2DPolyPolygon SalGraphics::mirror( const basegfx::B2DPolyPolygon& i_rPoly, const OutputDevice *i_pOutDev, bool i_bBack ) const
{ {
long w = GetGraphicsWidth(); long w;
if( i_pOutDev && i_pOutDev->GetOutDevType() == OUTDEV_VIRDEV )
w = i_pOutDev->GetOutputWidthPixel();
else
w = GetGraphicsWidth();
DBG_ASSERT( w, "missing graphics width" ); DBG_ASSERT( w, "missing graphics width" );
......
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