summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--vcl/headless/svpvd.cxx12
-rw-r--r--vcl/inc/headless/svpvd.hxx1
-rw-r--r--vcl/inc/opengl/x11/salvd.hxx1
-rw-r--r--vcl/inc/quartz/salvd.h1
-rw-r--r--vcl/inc/salvd.hxx3
-rw-r--r--vcl/inc/unx/salvd.h3
-rw-r--r--vcl/inc/win/salvd.h1
-rw-r--r--vcl/opengl/x11/salvd.cxx6
-rw-r--r--vcl/quartz/salvd.cxx16
-rw-r--r--vcl/source/gdi/virdev.cxx6
-rw-r--r--vcl/unx/generic/gdi/salvd.cxx6
-rw-r--r--vcl/win/source/gdi/salvd.cxx6
12 files changed, 1 insertions, 61 deletions
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index dc280db879cd..e2f9042d9edb 100644
--- a/vcl/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -93,18 +93,6 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY,
return true;
}
-void SvpSalVirtualDevice::GetSize( long& rWidth, long& rHeight )
-{
- if( m_aDevice.get() )
- {
- B2IVector aDevSize( m_aDevice->getSize() );
- rWidth = aDevSize.getX();
- rHeight = aDevSize.getY();
- }
- else
- rWidth = rHeight = 0;
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx
index e69bf8f4828c..eb6b8d1b2b0c 100644
--- a/vcl/inc/headless/svpvd.hxx
+++ b/vcl/inc/headless/svpvd.hxx
@@ -45,7 +45,6 @@ public:
const basebmp::RawMemorySharedArray &pBuffer,
const bool bTopDown
) SAL_OVERRIDE;
- virtual void GetSize( long& rWidth, long& rHeight ) SAL_OVERRIDE;
basebmp::BitmapDeviceSharedPtr getBitmapDevice() { return m_aDevice; }
};
diff --git a/vcl/inc/opengl/x11/salvd.hxx b/vcl/inc/opengl/x11/salvd.hxx
index 0d7143b2b01f..7696e04c62ac 100644
--- a/vcl/inc/opengl/x11/salvd.hxx
+++ b/vcl/inc/opengl/x11/salvd.hxx
@@ -47,7 +47,6 @@ public:
// Set new size, without saving the old contents
virtual bool SetSize( long nNewDX, long nNewDY ) SAL_OVERRIDE;
- virtual void GetSize( long& rWidth, long& rHeight ) SAL_OVERRIDE;
};
#endif // INCLUDED_VCL_INC_OPENGL_X11_SALVD_H
diff --git a/vcl/inc/quartz/salvd.h b/vcl/inc/quartz/salvd.h
index f48a19a1915d..e1d1d5137c33 100644
--- a/vcl/inc/quartz/salvd.h
+++ b/vcl/inc/quartz/salvd.h
@@ -61,7 +61,6 @@ public:
virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
virtual bool SetSize( long nNewDX, long nNewDY ) SAL_OVERRIDE;
- virtual void GetSize( long& rWidth, long& rHeight ) SAL_OVERRIDE;
};
#endif // INCLUDED_VCL_INC_QUARTZ_SALVD_H
diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx
index f5a63eea461b..13979359919d 100644
--- a/vcl/inc/salvd.hxx
+++ b/vcl/inc/salvd.hxx
@@ -49,9 +49,6 @@ public:
// pBuffer (and bTopDown).
return SetSize( nNewDX, nNewDY );
}
-
- /// Get actual VDev size in pixel
- virtual void GetSize( long& rWidth, long& rHeight ) = 0;
};
#endif // INCLUDED_VCL_INC_SALVD_HXX
diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h
index b1caa68f0a39..9b520a7c848c 100644
--- a/vcl/inc/unx/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -71,9 +71,8 @@ public:
virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
- // Set new size, without saving the old contents
+ /// Set new size, without saving the old contents
virtual bool SetSize( long nNewDX, long nNewDY ) SAL_OVERRIDE;
- virtual void GetSize( long& rWidth, long& rHeight ) SAL_OVERRIDE;
};
#endif // INCLUDED_VCL_INC_UNX_SALVD_H
diff --git a/vcl/inc/win/salvd.h b/vcl/inc/win/salvd.h
index 2c59f47ab7e9..9abb46bf4ebc 100644
--- a/vcl/inc/win/salvd.h
+++ b/vcl/inc/win/salvd.h
@@ -50,7 +50,6 @@ public:
virtual SalGraphics* AcquireGraphics();
virtual void ReleaseGraphics( SalGraphics* pGraphics );
virtual bool SetSize( long nNewDX, long nNewDY );
- virtual void GetSize( long& rWidth, long& rHeight );
static HBITMAP ImplCreateVirDevBitmap(HDC hDC, long nDX, long nDY, sal_uInt16 nBitCount, void **ppDummy);
};
diff --git a/vcl/opengl/x11/salvd.cxx b/vcl/opengl/x11/salvd.cxx
index b7c4eea60bf0..4fde8f84c8ad 100644
--- a/vcl/opengl/x11/salvd.cxx
+++ b/vcl/opengl/x11/salvd.cxx
@@ -93,10 +93,4 @@ bool X11OpenGLSalVirtualDevice::SetSize( long nDX, long nDY )
return true;
}
-void X11OpenGLSalVirtualDevice::GetSize( long& rWidth, long& rHeight )
-{
- rWidth = mnWidth;
- rHeight = mnHeight;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index f43090882de1..a524c1ed7127 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -277,20 +277,4 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
return (mxLayer != NULL);
}
-void AquaSalVirtualDevice::GetSize( long& rWidth, long& rHeight )
-{
- if( mxLayer )
- {
- const CGSize aSize = CGLayerGetSize( mxLayer );
- rWidth = static_cast<long>(aSize.width);
- rHeight = static_cast<long>(aSize.height);
- CG_TRACE( "CGLayerGetSize(" << mxLayer << ") = " << aSize << "(" << rWidth << "x" << rHeight << ")" );
- }
- else
- {
- rWidth = 0;
- rHeight = 0;
- }
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index d783cd9b70e0..063bef16b209 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -164,12 +164,6 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev,
mbScreenComp = true;
mnAlphaDepth = -1;
- // #i59315# init vdev size from system object, when passed a
- // SystemGraphicsData. Otherwise, output size will always
- // incorrectly stay at (1,1)
- if( pData && mpVirDev )
- mpVirDev->GetSize(mnOutWidth,mnOutHeight);
-
if( mnBitCount < 8 )
SetAntialiasing( ANTIALIASING_DISABLE_TEXT );
diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx
index 7967a4d84acf..b4bcfa16edb5 100644
--- a/vcl/unx/generic/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -214,10 +214,4 @@ bool X11SalVirtualDevice::SetSize( long nDX, long nDY )
return true;
}
-void X11SalVirtualDevice::GetSize( long& rWidth, long& rHeight )
-{
- rWidth = GetWidth();
- rHeight = GetHeight();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx
index c85133d6584c..b5986b1b6056 100644
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.cxx
@@ -216,10 +216,4 @@ bool WinSalVirtualDevice::SetSize( long nDX, long nDY )
}
}
-void WinSalVirtualDevice::GetSize( long& rWidth, long& rHeight )
-{
- rWidth = GetDeviceCaps( getHDC(), HORZRES );
- rHeight= GetDeviceCaps( getHDC(), VERTRES );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit (git 2.34.1) at 2025-01-14 11:12:48 +0000