desktop/source/lib/init.cxx | 6 ++----
include/vcl/virdev.hxx | 6 ++----
vcl/source/gdi/virdev.cxx | 14 +++++---------
3 files changed, 9 insertions(+), 17 deletions(-)
New commits:
commit 2191a11022f657eae5fb21f87dd443ea9228920b
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Dec 7 13:45:26 2015 +0000
last arg of SetOutputSizePixelScaleOffsetAndBuffer no longer used
Change-Id: I65e7e82e46c5751617b00a39df47d864b29b6ce1
Reviewed-on: https://gerrit.libreoffice.org/20441
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8dd6290..8fa8e0e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -904,11 +904,9 @@ void doc_paintTile (LibreOfficeKitDocument* pThis,
boost::shared_array< sal_uInt8 > aBuffer( pBuffer, NoDelete< sal_uInt8 >()
);
- boost::shared_array<sal_uInt8> aAlphaBuffer;
-
pDevice->SetOutputSizePixelScaleOffsetAndBuffer(
Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(),
- aBuffer, aAlphaBuffer);
+ aBuffer);
pDoc->paintTile(*pDevice.get(), nCanvasWidth, nCanvasHeight,
nTilePosX, nTilePosY, nTileWidth, nTileHeight);
@@ -1554,7 +1552,7 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument*
/*pThis*/,
aDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
aDevice->SetOutputSizePixelScaleOffsetAndBuffer(
Size(nFontWidth, nFontHeight), Fraction(1.0), Point(),
- aBuffer, nullptr);
+ aBuffer);
aDevice->DrawText(Point(0,0), aFontName);
return pBuffer;
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index cd6db85..c48f10d 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -48,8 +48,7 @@ private:
SAL_DLLPRIVATE bool InnerImplSetOutputSizePixel( const Size& rNewSize,
bool bErase,
const
basebmp::RawMemorySharedArray &pBuffer );
SAL_DLLPRIVATE bool ImplSetOutputSizePixel( const Size& rNewSize, bool
bErase,
- const
basebmp::RawMemorySharedArray &pBuffer,
- const
basebmp::RawMemorySharedArray &pAlphaBuffer );
+ const
basebmp::RawMemorySharedArray &pBuffer );
VirtualDevice (const VirtualDevice &) = delete;
VirtualDevice & operator= (const VirtualDevice &) = delete;
@@ -127,8 +126,7 @@ public:
bool SetOutputSizePixelScaleOffsetAndBuffer( const Size&
rNewSize,
const
Fraction& rScale,
const Point&
rNewOffset,
- const
basebmp::RawMemorySharedArray &pBuffer,
- const
basebmp::RawMemorySharedArray &pAlphaBuffer );
+ const
basebmp::RawMemorySharedArray &pBuffer );
bool SetOutputSize( const Size& rNewSize, bool bErase =
true )
{ return SetOutputSizePixel( LogicToPixel(
rNewSize ), bErase ); }
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 085237f..af9bbbd 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -394,8 +394,7 @@ void VirtualDevice::ImplFillOpaqueRectangle( const
Rectangle& rRect )
}
bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase,
- const
basebmp::RawMemorySharedArray &pBuffer,
- const
basebmp::RawMemorySharedArray &pAlphaBuffer )
+ const
basebmp::RawMemorySharedArray &pBuffer )
{
if( InnerImplSetOutputSizePixel(rNewSize, bErase, pBuffer) )
{
@@ -411,7 +410,7 @@ bool VirtualDevice::ImplSetOutputSizePixel( const Size&
rNewSize, bool bErase,
{
mpAlphaVDev = VclPtr<VirtualDevice>::Create(*this,
meAlphaFormat);
mpAlphaVDev->InnerImplSetOutputSizePixel(rNewSize, bErase,
- pAlphaBuffer);
+
basebmp::RawMemorySharedArray());
}
// TODO: copy full outdev state to new one, here. Also needed in
outdev2.cxx:DrawOutDev
@@ -444,16 +443,13 @@ void VirtualDevice::EnableRTL( bool bEnable )
bool VirtualDevice::SetOutputSizePixel( const Size& rNewSize, bool bErase )
{
- return ImplSetOutputSizePixel( rNewSize, bErase,
basebmp::RawMemorySharedArray(), basebmp::RawMemorySharedArray());
+ return ImplSetOutputSizePixel(rNewSize, bErase,
basebmp::RawMemorySharedArray());
}
bool VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(
const Size& rNewSize, const Fraction& rScale, const Point& rNewOffset,
- const basebmp::RawMemorySharedArray &pBuffer, const
basebmp::RawMemorySharedArray &pAlphaBuffer )
+ const basebmp::RawMemorySharedArray &pBuffer )
{
- if (pAlphaBuffer)
- meAlphaFormat = DeviceFormat::DEFAULT;
-
if (pBuffer) {
MapMode mm = GetMapMode();
mm.SetOrigin( rNewOffset );
@@ -461,7 +457,7 @@ bool VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(
mm.SetScaleY( rScale );
SetMapMode( mm );
}
- return ImplSetOutputSizePixel( rNewSize, true, pBuffer, pAlphaBuffer );
+ return ImplSetOutputSizePixel(rNewSize, true, pBuffer);
}
void VirtualDevice::SetReferenceDevice( RefDevMode i_eRefDevMode )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
