diff options
| author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2016-09-14 10:26:55 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-09-15 13:17:32 +0000 |
| commit | c0dd075d52409031876f5bc3923062ba5847fd53 (patch) | |
| tree | 64413bb8a2d6e6bb4ac4aa13ef93f252de927f60 /desktop/source | |
| parent | 106cd072747a48ba064d8522cc15f581abffab51 (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>
Diffstat (limited to 'desktop/source')
| -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 582c52ce9cee..a4ec903f780a 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -392,6 +392,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); @@ -443,9 +444,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) @@ -492,8 +490,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(); @@ -2369,19 +2365,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); |