[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - l10ntools/source sw/qa sw/source

[Andras Timar]

 l10ntools/source/xmlparse.cxx                |    4 ++--
 sw/qa/extras/ooxmlexport/data/bnc837302.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx     |   13 +++++++++++++
 sw/source/core/doc/docredln.cxx              |    3 +--
 4 files changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 9af858d2775c5676be518e51656491aed74fcc41
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Dec 2 13:03:59 2013 +0100

    fdo#71056 add <sup> to list of inline help XML tags
    
    Conflicts:
    	l10ntools/source/xmlparse.cxx
    
    Change-Id: If0937bd571658e0f76a51e44dd3fa008f701f02e
    Reviewed-on: https://gerrit.libreoffice.org/6895
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 55bf4bc..2959bba 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -1215,11 +1215,11 @@ static icu::UnicodeString lcl_QuotRange(
 
 static bool lcl_isTag( const icu::UnicodeString& rString )
 {
-    const int nSize = 12;
+    static const int nSize = 13;
     static const icu::UnicodeString vTags[nSize] = {
         "ahelp", "link", "item", "emph", "defaultinline",
         "switchinline", "caseinline", "variable",
-        "bookmark_value", "image", "embedvar", "alt" };
+        "bookmark_value", "image", "embedvar", "alt", "sup" };
 
     for( int nIndex = 0; nIndex < nSize; ++nIndex )
     {
commit 9fd40287546357c53d9eaaff07247c78793acbca
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Nov 20 11:45:39 2013 +0100

    bnc#837302: Allow insertion of redlines with an empty author.
    
    No idea why that was not allowed (since the initial import in 2000), we need
    it for interoperability.
    
    Conflicts:
    
    	sw/qa/extras/ooxmlexport/ooxmlexport.cxx
    	sw/source/core/doc/docredln.cxx
    
    Change-Id: I475fa63f9a4a3219a2b898b6f7d81e0603d32c18
    Reviewed-on: https://gerrit.libreoffice.org/6897
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/qa/extras/ooxmlexport/data/bnc837302.docx b/sw/qa/extras/ooxmlexport/data/bnc837302.docx
new file mode 100644
index 0000000..9d0c0af
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/bnc837302.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index c1bb45e..d7a5c8b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -77,6 +77,7 @@ public:
     void testBnc834035();
     void testCp1000015();
     void testFdo70812();
+    void testBnc837302();
 
     CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -138,6 +139,7 @@ void Test::run()
         {"bnc834035.odt", &Test::testBnc834035},
         {"cp1000015.odt", &Test::testCp1000015},
         {"fdo70812.docx", &Test::testFdo70812},
+        {"bnc837302.docx", &Test::testBnc837302},
     };
     // Don't test the first import of these, for some reason those tests fail
     const char* aBlacklist[] = {
@@ -789,6 +791,17 @@ void Test::testFdo70812()
     getParagraph(1, "Sample pages document.");
 }
 
+void Test::testBnc837302()
+{
+    // The problem was that text with empty author was not inserted as a redline
+    uno::Reference<text::XTextRange> xParagraph = getParagraph(1);
+
+    // previously 'AAA' was not an own run
+    getRun(xParagraph, 3, "AAA");
+    // interestingly the 'Insert' is set on the _previous_ run
+    CPPUNIT_ASSERT_EQUAL(OUString("Insert"), getProperty<OUString>(getRun(xParagraph, 2), "RedlineType"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 7a1fcf9..9a2ea57 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -293,8 +293,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
     bool bError = true;
     _CHECK_REDLINE( this )
 
-    if( IsRedlineOn() && !IsShowOriginal( meRedlineMode ) &&
-         pNewRedl->GetAuthorString().Len() )
+    if (IsRedlineOn() && !IsShowOriginal(meRedlineMode))
     {
         pNewRedl->InvalidateRange();