[Libreoffice-commits] core.git: sw/qa sw/source

[Andrea Gelmini (via logerrit)]

 sw/qa/extras/ooxmlexport/data/object_cross_reference.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx               |    8 ++++----
 sw/source/core/layout/pagechg.cxx                        |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5b389b43fd31a7b405b647da4669aafdd04f77d7
Author:     Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Fri Jan 28 19:54:52 2022 +0100
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sat Jan 29 12:05:09 2022 +0100

    Fix typos
    
    Change-Id: Id74af6775a04fee013df6a02b0261155908dc22f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129122
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/sw/qa/extras/ooxmlexport/data/object_cross_reference.odt 
b/sw/qa/extras/ooxmlexport/data/object_cross_reference.odt
index 18b02a38c2a9..31fdb2b01d02 100644
Binary files a/sw/qa/extras/ooxmlexport/data/object_cross_reference.odt and 
b/sw/qa/extras/ooxmlexport/data/object_cross_reference.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index 871875218463..775f7f4154ab 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -437,7 +437,7 @@ CPPUNIT_TEST_FIXTURE(Test, testObjectCrossReference)
         uno::Reference<text::XTextContent> xContent(
             xBookmarksByName->getByName("Ref_Illustration1_caption_only"), 
uno::UNO_QUERY);
         uno::Reference<text::XTextRange> xRange = xContent->getAnchor();
-        CPPUNIT_ASSERT_EQUAL(OUString("an other image"), xRange->getString());
+        CPPUNIT_ASSERT_EQUAL(OUString("another image"), xRange->getString());
     }
 
     // Cross references to text frames
@@ -517,7 +517,7 @@ CPPUNIT_TEST_FIXTURE(Test, testObjectCrossReference)
                     
xServiceInfo->supportsService("com.sun.star.text.TextField.GetReference"));
                 OUString sValue;
                 xPropertySet->getPropertyValue("CurrentPresentation") >>= 
sValue;
-                CPPUNIT_ASSERT_EQUAL(OUString("an other image"), sValue);
+                CPPUNIT_ASSERT_EQUAL(OUString("another image"), sValue);
                 xPropertySet->getPropertyValue("SourceName") >>= sValue;
                 
CPPUNIT_ASSERT_EQUAL(OUString("Ref_Illustration1_caption_only"), sValue);
                 break;
@@ -2057,8 +2057,8 @@ DECLARE_OOXMLEXPORT_TEST(testTdf119952_negativeMargins, 
"tdf119952_negativeMargi
     CPPUNIT_ASSERT(lcl_nearEqual(nHeightHFly, 2152));
     CPPUNIT_ASSERT(lcl_nearEqual(nHeightFFly, 2152));
 
-    // after export these heights increase to like 567..
-    // not sure if it is an other import, or export bug... or just the result 
of the modified document
+    // after export these heights increase to like 567.
+    // not sure if it is another import, or export bug... or just the result 
of the modified document
     if (!mbExported)
     {
         CPPUNIT_ASSERT(lcl_nearEqual(nHeightHFlyBound, 57));
diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index e5e62d0b47bd..73a003223495 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1937,7 +1937,7 @@ void SwRootFrame::UnoRemoveAllActions()
     {
         // #i84729#
         // No end action, if <SwViewShell> instance is currently in its end 
action.
-        // Recursives calls to <::EndAction()> are not allowed.
+        // Recursive calls to <::EndAction()> are not allowed.
         if ( !rSh.IsInEndAction() )
         {
             OSL_ENSURE(!rSh.GetRestoreActions(), "Restore action count is 
already set!");