starmath: Fix missing call of AnnotationSelection() for SmCursor::Copy
... with unit tests of Copy/Cut/Paste.
Change-Id: I74dd6f235b52ef2c1388ea0d15d32af0fb30b2c8
Reviewed-on: https://gerrit.libreoffice.org/25362
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index 2130a22..efaa7b3 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_CppunitTest_use_libraries,starmath_qa_cppunit,\
))
$(eval $(call gb_CppunitTest_add_exception_objects,starmath_qa_cppunit,\
starmath/qa/cppunit/test_cursor \
starmath/qa/cppunit/test_nodetotextvisitors \
starmath/qa/cppunit/test_starmath \
))
diff --git a/starmath/qa/cppunit/test_cursor.cxx b/starmath/qa/cppunit/test_cursor.cxx
new file mode 100644
index 0000000..51e555f
--- /dev/null
+++ b/starmath/qa/cppunit/test_cursor.cxx
@@ -0,0 +1,172 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <sal/config.h>
#include <test/bootstrapfixture.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/sfxmodelfactory.hxx>
#include <smdll.hxx>
#include <document.hxx>
#include <node.hxx>
#include <cursor.hxx>
#include <memory>
typedef tools::SvRef<SmDocShell> SmDocShellRef;
using namespace ::com::sun::star;
namespace {
class Test : public test::BootstrapFixture {
public:
// init
virtual void setUp() override;
virtual void tearDown() override;
// tests
void testCopyPaste();
void testCopySelectPaste();
void testCutPaste();
void testCutSelectPaste();
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(testCopyPaste);
CPPUNIT_TEST(testCopySelectPaste);
CPPUNIT_TEST(testCutPaste);
CPPUNIT_TEST(testCutSelectPaste);
CPPUNIT_TEST_SUITE_END();
private:
SmDocShellRef xDocShRef;
};
void Test::setUp()
{
BootstrapFixture::setUp();
SmGlobals::ensure();
xDocShRef = new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT);
}
void Test::tearDown()
{
xDocShRef.Clear();
BootstrapFixture::tearDown();
}
void Test::testCopyPaste()
{
OUString sInput("a * b + c");
std::unique_ptr<SmNode> xTree(SmParser().Parse(sInput));
xTree->Prepare(xDocShRef->GetFormat(), *xDocShRef);
SmCursor aCursor(xTree.get(), xDocShRef);
ScopedVclPtrInstance<VirtualDevice> pOutputDevice;
// go to the position at "*"
aCursor.Move(pOutputDevice, MoveRight);
// select "* b" and then copy
aCursor.Move(pOutputDevice, MoveRight, false);
aCursor.Move(pOutputDevice, MoveRight, false);
aCursor.Copy();
// go to the right end and then paste
aCursor.Move(pOutputDevice, MoveRight);
aCursor.Move(pOutputDevice, MoveRight);
aCursor.Paste();
CPPUNIT_ASSERT_EQUAL(OUString(" { a * b + c * b } "), xDocShRef->GetText());
}
void Test::testCopySelectPaste()
{
OUString sInput("a * b + c");
std::unique_ptr<SmNode> xTree(SmParser().Parse(sInput));
xTree->Prepare(xDocShRef->GetFormat(), *xDocShRef);
SmCursor aCursor(xTree.get(), xDocShRef);
ScopedVclPtrInstance<VirtualDevice> pOutputDevice;
// go to the right end
for (int i=0;i<5;i++)
aCursor.Move(pOutputDevice, MoveRight);
// select "b + c" and then copy
aCursor.Move(pOutputDevice, MoveLeft, false);
aCursor.Move(pOutputDevice, MoveLeft, false);
aCursor.Move(pOutputDevice, MoveLeft, false);
aCursor.Copy();
// go to the left end
aCursor.Move(pOutputDevice, MoveLeft);
aCursor.Move(pOutputDevice, MoveLeft);
// select "a" and then paste
aCursor.Move(pOutputDevice, MoveRight, false);
aCursor.Paste();
CPPUNIT_ASSERT_EQUAL(OUString(" { b + c * b + c } "), xDocShRef->GetText());
}
void Test::testCutPaste()
{
OUString sInput("a * b + c");
std::unique_ptr<SmNode> xTree(SmParser().Parse(sInput));
xTree->Prepare(xDocShRef->GetFormat(), *xDocShRef);
SmCursor aCursor(xTree.get(), xDocShRef);
ScopedVclPtrInstance<VirtualDevice> pOutputDevice;
// go to the position at "*"
aCursor.Move(pOutputDevice, MoveRight);
// select "* b" and then cut
aCursor.Move(pOutputDevice, MoveRight, false);
aCursor.Move(pOutputDevice, MoveRight, false);
aCursor.Cut();
// go to the left end and then paste
aCursor.Move(pOutputDevice, MoveRight);
aCursor.Move(pOutputDevice, MoveRight);
aCursor.Paste();
CPPUNIT_ASSERT_EQUAL(OUString(" { a + c * b } "), xDocShRef->GetText());
}
void Test::testCutSelectPaste()
{
OUString sInput("a * b + c");
std::unique_ptr<SmNode> xTree(SmParser().Parse(sInput));
xTree->Prepare(xDocShRef->GetFormat(), *xDocShRef);
SmCursor aCursor(xTree.get(), xDocShRef);
ScopedVclPtrInstance<VirtualDevice> pOutputDevice;
// go to the right end
for (int i=0;i<5;i++)
aCursor.Move(pOutputDevice, MoveRight);
// select "b + c" and then cut
aCursor.Move(pOutputDevice, MoveLeft, false);
aCursor.Move(pOutputDevice, MoveLeft, false);
aCursor.Move(pOutputDevice, MoveLeft, false);
aCursor.Cut();
// go to the left end
aCursor.Move(pOutputDevice, MoveLeft);
aCursor.Move(pOutputDevice, MoveLeft);
// select "a" and then paste
aCursor.Move(pOutputDevice, MoveRight, false);
aCursor.Paste();
CPPUNIT_ASSERT_EQUAL(OUString(" { b + c * } "), xDocShRef->GetText());
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index 262d2bd..b70b8ed 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -1160,10 +1160,12 @@ void SmCursor::Copy(){
if(!HasSelection())
return;
AnnotateSelection();
//Find selected node
SmNode* pSNode = FindSelectedNode(mpTree);
//Find visual line
SmNode* pLine = FindTopMostNodeInLine(pSNode, true);
assert(pLine);
//Clone selected nodes
SmNodeList* pList;
