[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - sc/source sd/source sw/source

Mihai Varga mihai.varga at collabora.com
Thu Aug 13 04:51:46 PDT 2015


 sc/source/ui/unoobj/docuno.cxx    |    4 ++++
 sd/source/ui/unoidl/unomodel.cxx  |    4 ++++
 sw/source/uibase/uno/unotxdoc.cxx |    4 ++++
 3 files changed, 12 insertions(+)

New commits:
commit 3f55e14c3660a687b0b805c36e6d3e85458a1014
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Wed Aug 12 10:32:07 2015 +0300

    tdf#93154: Save button often does not save
    
    The problem is that in tiled rendering LO doesn't always consider the
    document to be modified. Some operations such as Bold, Italic, etc do
    not mark the document as being modified, but we need to be able to save
    the changes. This solved the issue by always allowing to save.
    
    Change-Id: Iaf8120abadc768a07b24f42c287c50080b4e4d89
    Reviewed-on: https://gerrit.libreoffice.org/17665
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index e1235b9..84b2857 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -44,6 +44,7 @@
 #include <tools/multisel.hxx>
 #include <tools/resary.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
+#include <svtools/miscopt.hxx>
 
 #include <ctype.h>
 #include <float.h>
@@ -839,6 +840,9 @@ void ScModelObj::initializeForTiledRendering()
     aInputOptions.SetTextWysiwyg(true);
     SC_MOD()->SetInputOptions(aInputOptions);
     pDocShell->CalcOutputFactor();
+    // tdf#93154: in tiled rendering LO doesn't always detect changes
+    SvtMiscOptions aMiscOpt;
+    aMiscOpt.SetSaveAlwaysAllowed(true);
 }
 
 uno::Any SAL_CALL ScModelObj::queryInterface( const uno::Type& rType )
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 7a9bf2a..7e37836 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -60,6 +60,7 @@
 #include <editeng/unolingu.hxx>
 #include <svx/svdpagv.hxx>
 #include <svtools/unoimap.hxx>
+#include <svtools/miscopt.hxx>
 #include <svx/unoshape.hxx>
 #include <editeng/unonrule.hxx>
 #include <editeng/eeitem.hxx>
@@ -2401,6 +2402,9 @@ void SdXImpressDocument::initializeForTiledRendering()
             pWindow->EnableMapMode(false);
         }
     }
+    // tdf#93154: in tiled rendering LO doesn't always detect changes
+    SvtMiscOptions aMiscOpt;
+    aMiscOpt.SetSaveAlwaysAllowed(true);
 }
 
 void SdXImpressDocument::registerCallback(LibreOfficeKitCallback pCallback, void* pData)
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index f8110cc..b0f37a8 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -136,6 +136,7 @@
 #include <swdtflvr.hxx>
 
 #include <svtools/langtab.hxx>
+#include <svtools/miscopt.hxx>
 #include <map>
 #include <set>
 #include <vector>
@@ -3226,6 +3227,9 @@ void SwXTextDocument::initializeForTiledRendering()
     // directly in twips.
     SwEditWin& rEditWin = pDocShell->GetView()->GetEditWin();
     rEditWin.EnableMapMode(false);
+    // tdf#93154: in tiled rendering LO doesn't always detect changes
+    SvtMiscOptions aMiscOpt;
+    aMiscOpt.SetSaveAlwaysAllowed(true);
 }
 
 void SwXTextDocument::registerCallback(LibreOfficeKitCallback pCallback, void* pData)


More information about the Libreoffice-commits mailing list