officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |    4 ----
 sw/qa/extras/odfimport/odfimport.cxx                         |    8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 09c988b80976533562e68ffbfaa5e0eec690073d
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Oct 13 13:35:13 2021 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Oct 13 15:46:47 2021 +0200

    tdf#92586: restore unittest
    
    it was removed in ac84e4ff6135d51461122e0e1b5b39614b3e6eca
    < tdf#94011: load&save more border types > for no apparent reason
    
    Change-Id: I18c4c974de5e519df6f6e7539f95dfb734e4b0aa
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123557
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 9fb6a740f1b1..a331ca918dd4 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -884,6 +884,14 @@ CPPUNIT_TEST_FIXTURE(Test, testBnc800714)
     CPPUNIT_ASSERT(getProperty<bool>(getParagraph(2), "ParaKeepTogether"));
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testTdf92586)
+{
+    load(mpTestDocumentPath, "tdf92586.odt");
+    uno::Any aPageStyle = getStyles("PageStyles")->getByName("Standard");
+    // This was BitmapMode_NO_REPEAT.
+    CPPUNIT_ASSERT_EQUAL(drawing::BitmapMode_STRETCH, 
getProperty<drawing::BitmapMode>(aPageStyle, "FillBitmapMode"));
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testTdf103025)
 {
     load(mpTestDocumentPath, "tdf103025.odt");
commit 3b84dc9474d0085606a4033db47d2d4891cf40d4
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Mon Oct 11 12:09:52 2021 +0200
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Wed Oct 13 15:46:33 2021 +0200

    Revert "tdf#136141 Sidebar wrap section visible like popupmenu"
    
    This reverts commit 8280491bec32fea5bbdad23f000538d000ed2f24.
    
    Wrap options are not available for Shapes, Media files etc.
    When we insert a shape and select any wrap option from the sidebar - app
    crashes.
    This feature should be implemented first in the code before beeing
    visible.
    
    Change-Id: I1110939e9ee40509e380d003665478889e7a2c24
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123374
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123448
    Tested-by: Jenkins

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 6876d922072d..8a5c37223c92 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -1347,10 +1347,6 @@
               Writer,   Graphic, visible ;
               Writer,   OLE,     visible ;
               Writer,   Frame,   visible ;
-              Writer,   Draw,    visible ;
-              Writer,   Form,    visible ;
-              Writer,   Frame,   visible ;
-              Writer,   Media,   visible ;
           </value>
         </prop>
         <prop oor:name="ImplementationURL" oor:type="xs:string">

Reply via email to