diff options
| author | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2023-06-12 16:43:49 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2023-06-12 16:43:49 +0200 |
| commit | cf2d0807642b443bb320abed7464dae10f7c5ee0 (patch) | |
| tree | 0b276900ae196ba183da5a9f050d3b744ed818ae | |
| parent | cbcfada382a5a9aa33d55e996e7865487f5b769e (diff) | |
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"
| -rw-r--r-- | sfx2/source/doc/objmisc.cxx | 3 | ||||
| -rw-r--r-- | starmath/qa/cppunit/test_cursor.cxx | 1 | ||||
| -rw-r--r-- | starmath/qa/cppunit/test_node.cxx | 1 | ||||
| -rw-r--r-- | starmath/qa/cppunit/test_nodetotextvisitors.cxx | 1 |
4 files changed, 1 insertions, 5 deletions
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() |