[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 2 commits - configure.ac sfx2/source starmath/qa

[Thorsten Behrens (via logerrit)]

 configure.ac                                    |    2 +-
 sfx2/source/doc/objmisc.cxx                     |    3 +--
 starmath/qa/cppunit/test_cursor.cxx             |    1 -
 starmath/qa/cppunit/test_node.cxx               |    1 -
 starmath/qa/cppunit/test_nodetotextvisitors.cxx |    1 -
 5 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 9a9424a65d2f04bd3de0f9b1c3f453da50d3dd06
Author:     Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Mon Jun 12 16:47:11 2023 +0200
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Mon Jun 12 16:47:43 2023 +0200

    Bump version to 6.4.0.19
    
    Change-Id: Id0635d370bcb2296f65ae28c1f3daba5a015a265

diff --git a/configure.ac b/configure.ac
index 4867f4ef1629..23cfdfc91927 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([CIB Office],[6.4.0.18],[],[],[https://www.cib.de/office/])
+AC_INIT([CIB Office],[6.4.0.19],[],[],[https://www.cib.de/office/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
commit cf2d0807642b443bb320abed7464dae10f7c5ee0
Author:     Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Mon Jun 12 16:43:49 2023 +0200
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Mon Jun 12 16:43:49 2023 +0200

    Revert "tdf#146547 Mark read-only docs as modified"
    
    This reverts commit cb46fe877fd000ad74eb167a3a6127e89c8990f9.
    
    Causes tdf#155638: "Forms: Form couldn't be closed after it has been
    opened"

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 50f92ee65ac6..ff31ce956bbc 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -262,8 +262,7 @@ void SfxObjectShell::EnableSetModified( bool bEnable )
 
 bool SfxObjectShell::IsEnableSetModified() const
 {
-    // Don't allow when user explicitly requested read only (IsLoadReadonly() 
or IsOriginallyLoadedReadOnlyMedium())
-    return pImpl->m_bEnableSetModified && ! (IsLoadReadonly() || 
IsOriginallyLoadedReadOnlyMedium());
+    return pImpl->m_bEnableSetModified && !IsReadOnly();
 }
 
 
diff --git a/starmath/qa/cppunit/test_cursor.cxx 
b/starmath/qa/cppunit/test_cursor.cxx
index b85b5ceef37a..080e7a274c4d 100644
--- a/starmath/qa/cppunit/test_cursor.cxx
+++ b/starmath/qa/cppunit/test_cursor.cxx
@@ -57,7 +57,6 @@ void Test::setUp()
     SmGlobals::ensure();
 
     xDocShRef = new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT);
-    xDocShRef->DoInitNew();
 }
 
 void Test::tearDown()
diff --git a/starmath/qa/cppunit/test_node.cxx 
b/starmath/qa/cppunit/test_node.cxx
index 570cab00d062..dba0b9ff3c40 100644
--- a/starmath/qa/cppunit/test_node.cxx
+++ b/starmath/qa/cppunit/test_node.cxx
@@ -53,7 +53,6 @@ void NodeTest::setUp()
     mxDocShell = new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT |
                                 SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS |
                                 SfxModelFlags::DISABLE_DOCUMENT_RECOVERY);
-    mxDocShell->DoInitNew();
 }
 
 void NodeTest::tearDown()
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx 
b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index e738351a8d23..c3172ab60126 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -90,7 +90,6 @@ void Test::setUp()
     SmGlobals::ensure();
 
     xDocShRef = new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT);
-    xDocShRef->DoInitNew();
 }
 
 void Test::tearDown()