diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-03-20 12:36:09 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-03-20 12:52:31 +0200 |
| commit | a84456142ae1f578b3d02550df6a1d749c372028 (patch) | |
| tree | 912b180a585de4f6da869d8ef09cc079e9ab8053 /vcl/headless | |
| parent | 1dc47816ac137d9bd5ce2070fdec1ddebebcbbd3 (diff) | |
Don't include vcl's private include files in desktop
Introduce a handful of small public wrapper functions.
Change-Id: I80e1e35d09675112d67b831f3efda483e709b540
Diffstat (limited to 'vcl/headless')
| -rw-r--r-- | vcl/headless/svpframe.cxx | 14 | ||||
| -rw-r--r-- | vcl/headless/svpvd.cxx | 17 |
2 files changed, 30 insertions, 1 deletions
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index 8e56c82f97ac..e1218d7ab3e6 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -18,7 +18,9 @@ */ #include <string.h> -#include "vcl/syswin.hxx" +#include <vcl/svpforlokit.hxx> +#include <vcl/syswin.hxx> + #include "headless/svpframe.hxx" #include "headless/svpinst.hxx" #include "headless/svpgdi.hxx" @@ -493,4 +495,14 @@ void SvpSalFrame::EndSetClipRegion() { } +SalFrame* GetSvpFocusFrameForLibreOfficeKit() +{ + return SvpSalFrame::GetFocusFrame(); +} + +vcl::Window* GetSalFrameWindowForLibreOfficeKit(SalFrame *pSF) +{ + return pSF->GetWindow(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx index 84701eb6c459..0daf4cdc0cfb 100644 --- a/vcl/headless/svpvd.cxx +++ b/vcl/headless/svpvd.cxx @@ -19,6 +19,8 @@ #ifndef IOS +#include <vcl/svpforlokit.hxx> + #include "headless/svpbmp.hxx" #include "headless/svpinst.hxx" #include "headless/svpvd.hxx" @@ -95,6 +97,21 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY, return true; } +void InitSvpForLibreOfficeKit() +{ + ImplSVData* pSVData = ImplGetSVData(); + SvpSalInstance* pSalInstance = static_cast< SvpSalInstance* >(pSVData->mpDefInst); + pSalInstance->setBitCountFormatMapping( 32, ::basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_RGBA ); +} + +int GetRowStrideForLibreOfficeKit(SalVirtualDevice* pVD) +{ + SvpSalVirtualDevice* pSalDev = static_cast< SvpSalVirtualDevice* >(pVD); + basebmp::BitmapDeviceSharedPtr pBmpDev = pSalDev->getBitmapDevice(); + + return pBmpDev->getScanlineStride(); +} + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |