Revert "Lok: support for batch API calls"

This was for the moment removed from the online.git, so let's disable the API
bits too before it shows this is really necessary.  Reverts also:
Revert "Lok: unittest batch API"

Change-Id: I7bf3fe62d1e73b6f233992d51f587868a78f4bec
This commit is contained in:
Jan Holesovsky
2017-01-31 17:45:29 +01:00
parent fedbbc5e3f
commit be71e2b860
5 changed files with 0 additions and 95 deletions
-4
View File
@@ -41,10 +41,6 @@ namespace desktop {
void setEventLatch(const bool bEventLatch)
{
m_bEventLatch = bEventLatch;
if (!IsActive())
{
Start();
}
}
bool isEventLatchOn() const { return m_bEventLatch; }
@@ -96,7 +96,6 @@ public:
void testContextMenuImpress();
void testNotificationCompression();
void testTileInvalidationCompression();
void testBatching();
void testPartInInvalidation();
void testRedlineWriter();
void testTrackChanges();
@@ -133,7 +132,6 @@ public:
CPPUNIT_TEST(testContextMenuImpress);
CPPUNIT_TEST(testNotificationCompression);
CPPUNIT_TEST(testTileInvalidationCompression);
CPPUNIT_TEST(testBatching);
CPPUNIT_TEST(testPartInInvalidation);
CPPUNIT_TEST(testRedlineWriter);
CPPUNIT_TEST(testTrackChanges);
@@ -1588,49 +1586,6 @@ void DesktopLOKTest::testPartInInvalidation()
}
}
void DesktopLOKTest::testBatching()
{
LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
comphelper::LibreOfficeKit::setPartInInvalidation(true);
comphelper::ScopeGuard aGuard([]()
{
comphelper::LibreOfficeKit::setPartInInvalidation(false);
});
std::vector<std::tuple<int, std::string>> notifs;
std::unique_ptr<CallbackFlushHandler> handler(new CallbackFlushHandler(pDocument, callbackCompressionTest, &notifs));
// Enable Batch mode.
handler->setEventLatch(true);
handler->queue(LOK_CALLBACK_INVALIDATE_TILES, "0, 0, 239, 239, 0");
handler->queue(LOK_CALLBACK_INVALIDATE_TILES, "EMPTY, 0");
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), notifs.size());
handler->queue(LOK_CALLBACK_INVALIDATE_TILES, "0, 0, 239, 240, 0");
handler->queue(LOK_CALLBACK_INVALIDATE_TILES, "-121, -121, 300, 300, 0");
handler->queue(LOK_CALLBACK_INVALIDATE_TILES, "0, 0, -32767, -32767, 0");
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), notifs.size());
// Disable Batch mode.
handler->setEventLatch(false);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), notifs.size());
size_t i = 0;
CPPUNIT_ASSERT_EQUAL((int)LOK_CALLBACK_INVALIDATE_TILES, (int)std::get<0>(notifs[i]));
CPPUNIT_ASSERT_EQUAL(std::string("0, 0, 1000000000, 1000000000, 0"), std::get<1>(notifs[i++]));
}
void DesktopLOKTest::testRedlineWriter()
{
// Load a Writer document, enable change recording and press a key.
-26
View File
@@ -537,8 +537,6 @@ static unsigned char* doc_renderFont(LibreOfficeKitDocument* pThis,
int* pFontWidth,
int* pFontHeight);
static char* doc_getPartHash(LibreOfficeKitDocument* pThis, int nPart);
static void doc_beginBatch(LibreOfficeKitDocument* pThis);
static void doc_endBatch(LibreOfficeKitDocument* pThis);
LibLODocument_Impl::LibLODocument_Impl(const uno::Reference <css::lang::XComponent> &xComponent)
: mxComponent(xComponent)
@@ -585,8 +583,6 @@ LibLODocument_Impl::LibLODocument_Impl(const uno::Reference <css::lang::XCompone
m_pDocumentClass->renderFont = doc_renderFont;
m_pDocumentClass->getPartHash = doc_getPartHash;
m_pDocumentClass->beginBatch = doc_beginBatch;
m_pDocumentClass->endBatch = doc_endBatch;
gDocumentClass = m_pDocumentClass;
}
@@ -2734,28 +2730,6 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* /*pThis*/,
return nullptr;
}
static void doc_beginBatch(LibreOfficeKitDocument* pThis)
{
SolarMutexGuard aGuard;
LibLODocument_Impl* pDocument = static_cast<LibLODocument_Impl*>(pThis);
for (const auto& pair : pDocument->mpCallbackFlushHandlers)
{
pair.second->setEventLatch(true);
}
}
static void doc_endBatch(LibreOfficeKitDocument* pThis)
{
SolarMutexGuard aGuard;
LibLODocument_Impl* pDocument = static_cast<LibLODocument_Impl*>(pThis);
for (const auto& pair : pDocument->mpCallbackFlushHandlers)
{
pair.second->setEventLatch(false);
}
}
static char* lo_getError (LibreOfficeKit *pThis)
{
SolarMutexGuard aGuard;
-10
View File
@@ -250,16 +250,6 @@ struct _LibreOfficeKitDocumentClass
int* pArray,
size_t nSize);
/// Starts a batch of operations.
/// Events are emmitted only after ending the batch.
/// @see lok::Document::endBatch();
void (*beginBatch) (LibreOfficeKitDocument* pThis);
/// Ends a batch of operations.
/// @see lok::Document::beginBatch();
void (*endBatch) (LibreOfficeKitDocument* pThis);
#endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
};
-10
View File
@@ -452,16 +452,6 @@ public:
return mpDoc->pClass->getViewIds(mpDoc, pArray, nSize);
}
inline void beginBatch()
{
mpDoc->pClass->beginBatch(mpDoc);
}
inline void endBatch()
{
mpDoc->pClass->endBatch(mpDoc);
}
#endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
};