diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-12-04 16:30:31 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-06 12:16:04 +0100 |
commit | 69c546e1e7a697217f273baa7c1729ff823efd76 (patch) | |
tree | 4533c38b84d1cd57f86094ac816f0eb7c526ade1 /desktop | |
parent | 2c61782812b1b8b382dd48a04a712da9eaeb4685 (diff) |
weld annotation window
note the labels in sw/uiconfig/swriter/ui/annotation.ui are deliberately
yaligned to 0 to retain the preexisting SwAnnotationWin::PaintTile hack which
depends on this for bin/run gtktiledviewer --enable-tiled-annotations to
not show clipped author/date/etc labels
Change-Id: I53827aa98ed4d71d532a5993d21c6e22190b8063
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107264
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/qa/desktop_lib/test_desktop_lib.cxx | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 8660906e5659..7a52bee8c6fa 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -172,7 +172,6 @@ public: void testTrackChanges(); void testRedlineCalc(); void testPaintPartTile(); - void testWriterCommentInsertCursor(); #if HAVE_MORE_FONTS void testGetFontSubset(); #endif @@ -234,7 +233,6 @@ public: CPPUNIT_TEST(testTrackChanges); CPPUNIT_TEST(testRedlineCalc); CPPUNIT_TEST(testPaintPartTile); - CPPUNIT_TEST(testWriterCommentInsertCursor); #if HAVE_MORE_FONTS CPPUNIT_TEST(testGetFontSubset); #endif @@ -2050,40 +2048,6 @@ void DesktopLOKTest::testPaintPartTile() //CPPUNIT_ASSERT(aView1.m_bTilesInvalidated); } -void DesktopLOKTest::testWriterCommentInsertCursor() -{ - // Load a document and type a character into the body text of the second view. - LibLODocument_Impl* pDocument = loadDoc("blank_text.odt"); - pDocument->m_pDocumentClass->initializeForRendering(pDocument, "{}"); - ViewCallback aView1(pDocument); - pDocument->m_pDocumentClass->createView(pDocument); - pDocument->m_pDocumentClass->initializeForRendering(pDocument, "{}"); - ViewCallback aView2(pDocument); - pDocument->m_pDocumentClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'x', 0); - pDocument->m_pDocumentClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYUP, 'x', 0); - Scheduler::ProcessEventsToIdle(); - tools::Rectangle aBodyCursor = aView2.m_aOwnCursor; - - // Now insert a comment and make sure that the comment's cursor is shown, - // not the body text's one. - aView1.m_aOwnCursor.SetEmpty(); - const int nCtrlAltC = KEY_MOD1 + KEY_MOD2 + 512 + 'c' - 'a'; - pDocument->m_pDocumentClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'c', nCtrlAltC); - pDocument->m_pDocumentClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYUP, 'c', nCtrlAltC); - Scheduler::ProcessEventsToIdle(); - // Wait for SfxBindings to actually update the state, which updated the - // cursor as well. - osl::Thread::wait(std::chrono::seconds(1)); - Scheduler::ProcessEventsToIdle(); - // This failed: the body cursor was shown right after inserting a comment. - CPPUNIT_ASSERT(aView2.m_aOwnCursor.getX() > aBodyCursor.getX()); - // This failed, the first view's cursor also jumped when the second view - // inserted the comment. - CPPUNIT_ASSERT(aView1.m_aOwnCursor.IsEmpty()); - - Scheduler::ProcessEventsToIdle(); -} - #if HAVE_MORE_FONTS void DesktopLOKTest::testGetFontSubset() { |