diff options
| author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2016-09-14 10:26:55 +0200 |
|---|---|---|
| committer | Marco Cecchetti <mrcekets@gmail.com> | 2016-09-15 13:25:51 +0000 |
| commit | a097d680d2e8eccbfba42ae1cf6b316235460291 (patch) | |
| tree | ca4fb3eeef41fecd224a83d14f7d60ef7140c0b1 /desktop | |
| parent | e93b30c9d9f4deba597b73e04df7d4082b779b69 (diff) | |
Revert "LOK: we use callbacks latch for not missing messages sent very early"
This reverts commit bbae556d12e4edf7795b0b5643df77fd8cdbdacd.
Change-Id: If1370751b612ff06ef5be13e8a4017af7dc34a7c
Reviewed-on: https://gerrit.libreoffice.org/28908
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit c0dd075d52409031876f5bc3923062ba5847fd53)
Reviewed-on: https://gerrit.libreoffice.org/28929
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Tested-by: Marco Cecchetti <mrcekets@gmail.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 18cb0532b57e..affc0197799d 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -391,6 +391,7 @@ static void doc_getDocumentSize(LibreOfficeKitDocument* pThis, long* pHeight); static void doc_initializeForRendering(LibreOfficeKitDocument* pThis, const char* pArguments); + static void doc_registerCallback(LibreOfficeKitDocument* pThis, LibreOfficeKitCallback pCallback, void* pData); @@ -442,9 +443,6 @@ static unsigned char* doc_renderFont(LibreOfficeKitDocument* pThis, int* pFontWidth, int* pFontHeight); static char* doc_getPartHash(LibreOfficeKitDocument* pThis, int nPart); -static void doc_setCallbackLatch(LibreOfficeKitDocument* pThis, - bool bCallbackLatch); - LibLODocument_Impl::LibLODocument_Impl(const uno::Reference <css::lang::XComponent> &xComponent) : mxComponent(xComponent) @@ -491,8 +489,6 @@ LibLODocument_Impl::LibLODocument_Impl(const uno::Reference <css::lang::XCompone m_pDocumentClass->renderFont = doc_renderFont; m_pDocumentClass->getPartHash = doc_getPartHash; - m_pDocumentClass->setCallbackLatch = doc_setCallbackLatch; - gDocumentClass = m_pDocumentClass; } pClass = m_pDocumentClass.get(); @@ -2366,19 +2362,6 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* /*pThis*/, return nullptr; } -static void doc_setCallbackLatch(LibreOfficeKitDocument* pThis, bool bCallbackLatch) -{ - SolarMutexGuard aGuard; - LibLODocument_Impl* pDocument = static_cast<LibLODocument_Impl*>(pThis); - - int nView = SfxLokHelper::getView(); - if (nView < 0) - return; - - if (pDocument->mpCallbackFlushHandlers[nView]) - pDocument->mpCallbackFlushHandlers[nView]->setEventLatch(bCallbackLatch); -} - static char* lo_getError (LibreOfficeKit *pThis) { LibLibreOffice_Impl* pLib = static_cast<LibLibreOffice_Impl*>(pThis); |