core.git: Branch 'distro/collabora/co-25.04' - filter/source sw/qa

[Justin Luth (via logerrit)]

 filter/source/config/fragments/filters/OOXML_Text.xcu          |    2 +-
 filter/source/config/fragments/filters/OOXML_Text_Template.xcu |    2 +-
 sw/qa/extras/uiwriter/uiwriter4.cxx                            |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 54e7424debab35c97d210a1a9a8da26120c82791
Author:     Justin Luth <justin.l...@collabora.com>
AuthorDate: Thu Feb 13 10:15:28 2025 -0500
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Feb 24 08:17:36 2025 +0100

    related tdf#164201 Word 2010 filter should be flagged as FILTER_DOCX
    
    This backport includes dotx commit b4bc81e12533
    
    And I have no idea what all the implications of this will be,
    but a hint is to look for FILTER_DOCX
    (even though the value OXML existed before FILTER_DOCX was defined)
    or git grep -25 SfxFilter | grep -25 GetUserData
    
    "OXML" was always in MS_WORD_2007-XML.xcu since it was created.
    3.x commit 47c4912441c25438b4433069940a0dd4de385cca
    Author: Oliver Bolte on Thu Jan 10 11:56:37 2008 +0000
        2007/02/26 11:10:48 os 1.1.8.1: file MS_Word_2007_XML.xcu
    
    The one "GetUserData" implication I know
    is that "Insert - Text from file"
    uses a different code path and inserts the text with an additional CR.
    
    For FILTER_DOCX,
    likely extremely important is that it was not considered
    IsInWriterfilterImport() before... which looks important for undo.
    commit c4dab726caaa73be9f9c731312080143b0a0b89d
    Author: Caolán McNamara on Thu Mar 12 12:43:10 2020 +0000
        ofz#21168 sw,writerfilter: limit writerfilter hack to writerfilter
    
    FILTER_DOCX was introduced with this commit.
    It seems to be irrelevant and harmless for "import function" of autotext
    since DOCX files are already listed in the file picker...
    5.4 commit 0b31912b1df719c5507b22a2f63086cb8921f597
    Author: Szymon Kłos on Fri Apr 14 10:22:37 2017 +0200
        AutoText: .dotx files visible when import
    [ACTUALLY AutoText: .docx/.docm/.dotx files visible when import]
    
    Change-Id: I7c0b82bc2fb1730c8fff595b7171765339de0330
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181645
    Reviewed-by: Justin Luth <jl...@mail.com>
    Tested-by: Jenkins
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181991
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Tested-by: Justin Luth <jl...@mail.com>

diff --git a/filter/source/config/fragments/filters/OOXML_Text.xcu 
b/filter/source/config/fragments/filters/OOXML_Text.xcu
index bbcceb1713d8..56f4101662f2 100644
--- a/filter/source/config/fragments/filters/OOXML_Text.xcu
+++ b/filter/source/config/fragments/filters/OOXML_Text.xcu
@@ -19,7 +19,7 @@
         <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER 
ENCRYPTION PASSWORDTOMODIFY SUPPORTSSIGNING</value></prop>
         <prop oor:name="UIComponent"/>
         <prop 
oor:name="FilterService"><value>com.sun.star.comp.Writer.WriterFilter</value></prop>
-        <prop oor:name="UserData"><value></value></prop>
+        <prop oor:name="UserData"><value>OXML</value></prop>
         <prop oor:name="UIName">
             <value xml:lang="en-US">Word 2010–365 Document</value>
         </prop>
diff --git a/filter/source/config/fragments/filters/OOXML_Text_Template.xcu 
b/filter/source/config/fragments/filters/OOXML_Text_Template.xcu
index 55d326563bf6..c4a636e3098e 100644
--- a/filter/source/config/fragments/filters/OOXML_Text_Template.xcu
+++ b/filter/source/config/fragments/filters/OOXML_Text_Template.xcu
@@ -19,7 +19,7 @@
         <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER 
TEMPLATE TEMPLATEPATH</value></prop>
         <prop oor:name="UIComponent"/>
         <prop 
oor:name="FilterService"><value>com.sun.star.comp.Writer.WriterFilter</value></prop>
-        <prop oor:name="UserData"><value></value></prop>
+        <prop oor:name="UserData"><value>OXML</value></prop>
         <prop oor:name="UIName">
             <value xml:lang="en-US">Word 2010–365 Template</value>
         </prop>
diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx 
b/sw/qa/extras/uiwriter/uiwriter4.cxx
index aeb226ec595f..0e272ac06c70 100644
--- a/sw/qa/extras/uiwriter/uiwriter4.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter4.cxx
@@ -2267,6 +2267,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf112025)
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest4, testTdf72942)
 {
     mergeDocs("fdo72942.docx", "fdo72942-insert.docx");
+    CPPUNIT_ASSERT_EQUAL(7, getParagraphs());
 
     // check styles of paragraphs added from [fdo72942.docx]
     const uno::Reference<text::XTextRange> xRun1 = getRun(getParagraph(1), 1);