2 files changed, 25 insertions, 0 deletions
diff --git a/sw/qa/extras/uiwriter/data/unicodeAltX.odt b/sw/qa/extras/uiwriter/data/unicodeAltX.odt
new file mode 100644
index 000000000000..4c96eff0120f
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data/unicodeAltX.odt
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index cedc59654a0e..2230c76d2585 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -147,6 +147,7 @@ public:
     void testTdf90883TableBoxGetCoordinates();
     void testEmbeddedDataSource();
     void testUnoCursorPointer();
+    void testUnicodeNotationToggle();
     void testTextTableCellNames();
     void testShapeAnchorUndo();
     void testDde();
@@ -215,6 +216,7 @@ public:
     CPPUNIT_TEST(testTdf90883TableBoxGetCoordinates);
     CPPUNIT_TEST(testEmbeddedDataSource);
     CPPUNIT_TEST(testUnoCursorPointer);
+    CPPUNIT_TEST(testUnicodeNotationToggle);
     CPPUNIT_TEST(testTextTableCellNames);
     CPPUNIT_TEST(testShapeAnchorUndo);
     CPPUNIT_TEST(testDde);
@@ -2176,6 +2178,29 @@ void SwUiWriterTest::testDde()
     CPPUNIT_ASSERT(xField->getString().endsWith("asdf"));
 }
 
+void SwUiWriterTest::testUnicodeNotationToggle()
+{
+    SwDoc* pDoc = createDoc("unicodeAltX.odt");
+    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+    OUString sOriginalDocString;
+    OUString sDocString;
+    OUString sExpectedString;
+    uno::Sequence<beans::PropertyValue> aPropertyValues;
+
+    pWrtShell->EndPara();
+    sOriginalDocString = pWrtShell->GetCrsr()->GetNode().GetTextNode()->GetText();
+    CPPUNIT_ASSERT( sOriginalDocString.equals("uU+2b") );
+
+    lcl_dispatchCommand(mxComponent, ".uno:UnicodeNotationToggle", aPropertyValues);
+    sExpectedString = "u+";
+    sDocString = pWrtShell->GetCrsr()->GetNode().GetTextNode()->GetText();
+    CPPUNIT_ASSERT( sDocString.equals(sExpectedString) );
+
+    lcl_dispatchCommand(mxComponent, ".uno:UnicodeNotationToggle", aPropertyValues);
+    sDocString = pWrtShell->GetCrsr()->GetNode().GetTextNode()->GetText();
+    CPPUNIT_ASSERT( sDocString.equals(sOriginalDocString) );
+}
+
 void SwUiWriterTest::testTdf89954()
 {
     SwDoc* pDoc = createDoc("tdf89954.odt");