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

[Maxim Monastirsky (via logerrit)]

 sc/qa/unit/subsequent_export_test4.cxx |   16 +++++++++++++++-
 sc/source/filter/excel/xlroot.cxx      |    1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 86cbbbccba19ba0433693e3e5c59c67e9dc6a003
Author:     Maxim Monastirsky <momonas...@gmail.com>
AuthorDate: Fri Apr 14 02:19:44 2023 +0300
Commit:     Maxim Monastirsky <momonas...@gmail.com>
CommitDate: Tue Apr 18 01:56:31 2023 +0200

    sc drawstyles: Fix xlsx export for text attributes in comments
    
    Change-Id: Ic5b6099460bd5e978c04aff3233537059ce711b9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150379
    Tested-by: Jenkins
    Reviewed-by: Maxim Monastirsky <momonas...@gmail.com>

diff --git a/sc/qa/unit/subsequent_export_test4.cxx 
b/sc/qa/unit/subsequent_export_test4.cxx
index 5d629e83eb4a..663767c7374f 100644
--- a/sc/qa/unit/subsequent_export_test4.cxx
+++ b/sc/qa/unit/subsequent_export_test4.cxx
@@ -1583,7 +1583,21 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testCommentStyles)
 
         // Check that the style was imported, and survived copying
         CPPUNIT_ASSERT_EQUAL(OUString("MyStyle1"), 
pCaption->GetStyleSheet()->GetName());
-        // Check that the style formatting is in effect
+    }
+
+    saveAndReload("Calc Office Open XML");
+
+    {
+        ScDocument* pDoc = getScDoc();
+
+        ScAddress aPos(0, 0, 0);
+        ScPostIt* pNote = pDoc->GetNote(aPos);
+        CPPUNIT_ASSERT(pNote);
+
+        auto pCaption = pNote->GetOrCreateCaption(aPos);
+        CPPUNIT_ASSERT(pCaption);
+
+        // Check that the style formatting is preserved
         CPPUNIT_ASSERT_EQUAL(sal_uInt32(1129),
                              
pCaption->GetMergedItemSet().Get(EE_CHAR_FONTHEIGHT).GetHeight());
     }
diff --git a/sc/source/filter/excel/xlroot.cxx 
b/sc/source/filter/excel/xlroot.cxx
index 47f5ff7806c1..71d308d2f29c 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -408,6 +408,7 @@ EditEngine& XclRoot::GetDrawEditEngine() const
     {
         mrData.mxDrawEditEng = std::make_shared<EditEngine>( 
&GetDoc().GetDrawLayer()->GetItemPool() );
         EditEngine& rEE = *mrData.mxDrawEditEng;
+        
rEE.SetStyleSheetPool(static_cast<SfxStyleSheetPool*>(GetDoc().GetDrawLayer()->GetStyleSheetPool()));
         rEE.SetRefMapMode(MapMode(MapUnit::Map100thMM));
         rEE.SetUpdateLayout( false );
         rEE.EnableUndo( false );