diff options
author | Pranav Kant <pranavk@collabora.co.uk> | 2018-02-07 21:23:42 +0530 |
---|---|---|
committer | pranavk <pranavk@collabora.co.uk> | 2018-02-08 09:44:51 +0100 |
commit | b746577d27437f9298fa111512d083eaccd4fbed (patch) | |
tree | 9d10d171d4f1e39cd643eb3e09af30d9a5c96e26 /sc | |
parent | 0d0c13bfbdff85a18433aee6e94558689f0cb722 (diff) |
sd, sc lok: IME support + unit tests
Change-Id: I710ba4347977641102b89fd274a159d34bc29e72
Reviewed-on: https://gerrit.libreoffice.org/49385
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/docuno.hxx | 3 | ||||
-rw-r--r-- | sc/qa/unit/tiledrendering/tiledrendering.cxx | 35 | ||||
-rw-r--r-- | sc/source/ui/unoobj/docuno.cxx | 25 |
3 files changed, 63 insertions, 0 deletions
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index aa55a1ad4c35..6cf2cc35c360 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -325,6 +325,9 @@ public: /// @see vcl::ITiledRenderable::postKeyEvent(). virtual void postKeyEvent(int nType, int nCharCode, int nKeyCode) override; + /// @see vcl::ITiledRenderable::postExtTextInputEvent(). + virtual void postExtTextInputEvent(int nType, const OUString& rText) override; + /// @see vcl::ITiledRenderable::postMouseEvent(). virtual void postMouseEvent(int nType, int nX, int nY, int nCount, int nButtons, int nModifier) override; diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx index a1dd154f4717..e70ec8b519a5 100644 --- a/sc/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx @@ -89,6 +89,7 @@ public: void testDocumentRepair(); void testLanguageStatus(); void testMultiViewCopyPaste(); + void testIMESupport(); CPPUNIT_TEST_SUITE(ScTiledRenderingTest); CPPUNIT_TEST(testRowColumnSelections); @@ -119,6 +120,7 @@ public: CPPUNIT_TEST(testDocumentRepair); CPPUNIT_TEST(testLanguageStatus); CPPUNIT_TEST(testMultiViewCopyPaste); + CPPUNIT_TEST(testIMESupport); CPPUNIT_TEST_SUITE_END(); private: @@ -1568,6 +1570,39 @@ void ScTiledRenderingTest::testMultiViewCopyPaste() comphelper::LibreOfficeKit::setActive(false); } +void ScTiledRenderingTest::testIMESupport() +{ + comphelper::LibreOfficeKit::setActive(); + + ScModelObj* pModelObj = createDoc("empty.ods"); + ScDocument* pDoc = pModelObj->GetDocument(); + + ScTabViewShell* pView = dynamic_cast<ScTabViewShell*>(SfxViewShell::Current()); + CPPUNIT_ASSERT(pView); + + pView->SetCursor(0, 0); + // sequence of chineese IME compositions when 'nihao' is typed in an IME + const std::vector<OString> aUtf8Inputs{ "年", "你", "你好", "你哈", "你好", "你好" }; + std::vector<OUString> aInputs; + std::transform(aUtf8Inputs.begin(), aUtf8Inputs.end(), + std::back_inserter(aInputs), [](OString aInput) { + return OUString::fromUtf8(aInput); + }); + for (const auto& aInput: aInputs) + { + pModelObj->postExtTextInputEvent(LOK_EXT_TEXTINPUT, aInput); + } + pModelObj->postExtTextInputEvent(LOK_EXT_TEXTINPUT_END, ""); + + // commit the string to the cell + pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::RETURN); + pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::RETURN); + + CPPUNIT_ASSERT_EQUAL(aInputs[aInputs.size() - 1], pDoc->GetString(ScAddress(0, 0, 0))); + + comphelper::LibreOfficeKit::setActive(false); +} + } CPPUNIT_TEST_SUITE_REGISTRATION(ScTiledRenderingTest); diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 70c8123711af..d12a063a926a 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -44,6 +44,7 @@ #include <sfx2/printer.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> +#include <vcl/commandevent.hxx> #include <vcl/pdfextoutdevdata.hxx> #include <vcl/waitobj.hxx> #include <unotools/charclass.hxx> @@ -618,6 +619,30 @@ void ScModelObj::postKeyEvent(int nType, int nCharCode, int nKeyCode) } } +void ScModelObj::postExtTextInputEvent(int nType, const OUString& rText) +{ + SolarMutexGuard aGuard; + + ScViewData* pViewData = ScDocShell::GetViewData(); + vcl::Window* pWindow = pViewData->GetActiveWin(); + + if (!pWindow) + return; + + CommandExtTextInputData aTextInputData(rText, nullptr, 0, 0, false); + switch (nType) + { + case LOK_EXT_TEXTINPUT: + pWindow->PostExtTextInputEvent(VclEventId::ExtTextInput, rText); + break; + case LOK_EXT_TEXTINPUT_END: + pWindow->PostExtTextInputEvent(VclEventId::EndExtTextInput, ""); + break; + default: + assert(false && "Unhandled External Text input event!"); + } +} + void ScModelObj::postMouseEvent(int nType, int nX, int nY, int nCount, int nButtons, int nModifier) { SolarMutexGuard aGuard; |