summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLászló Németh <laszlo.nemeth@collabora.com>2015-04-30 11:21:17 +0200
committerLászló Németh <laszlo.nemeth@collabora.com>2015-04-30 11:21:17 +0200
commit7abc8b800a3bfea57866bdcd719e1ccde17aca3a (patch)
tree3cabb02982b7e2142ae82128199c13e4c32a6c74
parentUse HWND instead of HDC, according to XTiledRenderable (diff)
downloadcore-feature/xtiledrenderable.tar.gz
core-feature/xtiledrenderable.zip
Change-Id: I52e6c2bf0621b3d95e5a943bbebd8426e25e6d52
-rw-r--r--include/vcl/virdev.hxx3
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx12
-rw-r--r--vcl/source/gdi/virdev.cxx21
3 files changed, 25 insertions, 11 deletions
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index 06dbae6ddffa..4dbfda793cd9 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -117,6 +117,9 @@ public:
explicit VirtualDevice(const SystemGraphicsData *pData, const Size &rSize,
sal_uInt16 nBitCount);
+ explicit VirtualDevice(const ::css::uno::Any& Parent, const Size &rSize,
+ sal_uInt16 nBitCount);
+
virtual ~VirtualDevice();
virtual void EnableRTL( bool bEnable = true ) SAL_OVERRIDE;
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 23635e33e6dd..faa1b09226d2 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -20,7 +20,6 @@
#include <osl/mutex.hxx>
#include <vcl/image.hxx>
#include <vcl/virdev.hxx>
-#include <vcl/sysdata.hxx>
#include <vcl/svapp.hxx>
#include <vcl/print.hxx>
#include <sfx2/viewfrm.hxx>
@@ -3284,17 +3283,8 @@ void SwXTextDocument::resetSelection()
void SAL_CALL SwXTextDocument::paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) throw (::css::uno::RuntimeException, ::std::exception)
{
- SystemGraphicsData aData;
- aData.nSize = sizeof(SystemGraphicsData);
- #if defined WNT
- sal_Int64 nWindowHandle;
- Parent >>= nWindowHandle;
- aData.hWnd = (HWND) nWindowHandle;
- VirtualDevice aDevice(&aData, Size(1, 1), (sal_uInt16)32);
+ VirtualDevice aDevice(Parent, Size(1, 1), (sal_uInt16)32);
paintTile( aDevice, nOutputWidth, nOutputHeight, nTilePosX, nTilePosY, nTileWidth, nTileHeight );
- #else
- // TODO: support other platforms
- #endif
}
void * SAL_CALL SwXTextDocument::operator new( size_t t) throw()
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index eec2fa98768b..3505a623519e 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -21,6 +21,7 @@
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/sysdata.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/virdev.hxx>
@@ -252,6 +253,26 @@ VirtualDevice::VirtualDevice(const SystemGraphicsData *pData, const Size &rSize,
nBitCount, pData);
}
+VirtualDevice::VirtualDevice(const ::css::uno::Any& Parent,
+ const Size &rSize, sal_uInt16 nBitCount)
+ : mpVirDev( NULL ),
+ meRefDevMode( REFDEV_NONE )
+{
+ SystemGraphicsData aData;
+ SAL_INFO( "vcl.gdi", "VirtualDevice::VirtualDevice( " << nBitCount << " )" );
+ aData.nSize = sizeof(SystemGraphicsData);
+ #if defined WNT
+ sal_Int64 nWindowHandle;
+ Parent >>= nWindowHandle;
+ aData.hWnd = (HWND) nWindowHandle;
+ #else
+ // TODO: support other platforms
+ #endif
+ ImplInitVirDev(Application::GetDefaultDevice(), rSize.Width(), rSize.Height(),
+ nBitCount, &aData);
+}
+
+
VirtualDevice::~VirtualDevice()
{
SAL_INFO( "vcl.gdi", "VirtualDevice::~VirtualDevice()" );