diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-11-28 02:53:48 +0530 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-19 14:55:43 +0100 |
| commit | b072ae6c039f54cbd96cf1c1ce415fb1196023f5 (patch) | |
| tree | 618c16ce16e359310990483011a911c826d77750 /desktop/source/lib/init.cxx | |
| parent | b741a44b655eace04c7f5228c5019390b763e1f3 (diff) | |
lokdialog: Remove getDialogInfo + update gtktiledviewer accordingly.
Change-Id: I6f810c97f2fadd3b1ea602a97e24c8b42f4a84b9
(cherry picked from commit d0f0a3c289c269476e1724f5b6bb527210121c3d)
Diffstat (limited to 'desktop/source/lib/init.cxx')
| -rw-r--r-- | desktop/source/lib/init.cxx | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index ece7600f178d..0261040e4d35 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -615,9 +615,6 @@ static void doc_paintDialog(LibreOfficeKitDocument* pThis, unsigned nLOKWindowId const int nX, const int nY, const int nWidth, const int nHeight); -static void doc_getDialogInfo(LibreOfficeKitDocument* pThis, unsigned nLOKWindowId, - char** pDialogTitle, int* nWidth, int* nHeight); - static void doc_paintActiveFloatingWindow(LibreOfficeKitDocument* pThis, unsigned nLOKWindowId, unsigned char* pBuffer, int* nWidth, int* nHeight); LibLODocument_Impl::LibLODocument_Impl(const uno::Reference <css::lang::XComponent> &xComponent) @@ -670,7 +667,6 @@ LibLODocument_Impl::LibLODocument_Impl(const uno::Reference <css::lang::XCompone m_pDocumentClass->getPartHash = doc_getPartHash; m_pDocumentClass->paintDialog = doc_paintDialog; - m_pDocumentClass->getDialogInfo = doc_getDialogInfo; m_pDocumentClass->paintActiveFloatingWindow = doc_paintActiveFloatingWindow; gDocumentClass = m_pDocumentClass; @@ -3267,35 +3263,6 @@ unsigned char* doc_renderFont(SAL_UNUSED_PARAMETER LibreOfficeKitDocument* /*pTh return nullptr; } -static void doc_getDialogInfo(LibreOfficeKitDocument* pThis, unsigned nLOKWindowId, - char** pDialogTitle, int* nWidth, int* nHeight) -{ - // FIXME - I guess we should kill this one, and use only the callback - // "created"? - - SolarMutexGuard aGuard; - - VclPtr<Window> pWindow = vcl::Window::FindLOKWindow(nLOKWindowId); - if (!pWindow) - { - gImpl->maLastExceptionMsg = "Document doesn't support dialog rendering, or window not found."; - return; - } - - OUString aDialogTitle(pWindow->GetText()); - const Size aSize = pWindow->GetSizePixel(); - *nWidth = aSize.getWidth(); - *nHeight = aSize.getHeight(); - - // copy dialog title - if (!aDialogTitle.isEmpty()) - { - OString aTitleString = OUStringToOString(aDialogTitle, RTL_TEXTENCODING_UTF8); - *pDialogTitle = static_cast<char*>(malloc(aTitleString.getLength() + 1)); - strcpy(*pDialogTitle, aTitleString.getStr()); - } -} - static void doc_paintDialog(LibreOfficeKitDocument* pThis, unsigned nLOKWindowId, unsigned char* pBuffer, const int nX, const int nY, |