|
 |
135360 |
From 72189a2e2d875772e83eb7c110540f224262eec9 Mon Sep 17 00:00:00 2001
|
|
|
135360 |
From: Mihai Varga <mihai.varga@collabora.com>
|
|
|
135360 |
Date: Wed, 12 Aug 2015 10:32:07 +0300
|
|
|
135360 |
Subject: [PATCH 091/398] tdf#93154: Save button often does not save
|
|
|
135360 |
|
|
|
135360 |
The problem is that in tiled rendering LO doesn't always consider the
|
|
|
135360 |
document to be modified. Some operations such as Bold, Italic, etc do
|
|
|
135360 |
not mark the document as being modified, but we need to be able to save
|
|
|
135360 |
the changes. This solved the issue by always allowing to save.
|
|
|
135360 |
|
|
|
135360 |
Change-Id: Iaf8120abadc768a07b24f42c287c50080b4e4d89
|
|
|
135360 |
Reviewed-on: https://gerrit.libreoffice.org/17665
|
|
|
135360 |
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
|
|
|
135360 |
Tested-by: Jan Holesovsky <kendy@collabora.com>
|
|
|
135360 |
(cherry picked from commit e5ba9090f4809906ffa1c1dea352161cb988b97f)
|
|
|
135360 |
---
|
|
|
135360 |
sc/source/ui/unoobj/docuno.cxx | 4 ++++
|
|
|
135360 |
sd/source/ui/unoidl/unomodel.cxx | 4 ++++
|
|
|
135360 |
sw/source/uibase/uno/unotxdoc.cxx | 4 ++++
|
|
|
135360 |
3 files changed, 12 insertions(+)
|
|
|
135360 |
|
|
|
135360 |
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
|
|
|
135360 |
index e1235b90cb7a..84b2857b6542 100644
|
|
|
135360 |
--- a/sc/source/ui/unoobj/docuno.cxx
|
|
|
135360 |
+++ b/sc/source/ui/unoobj/docuno.cxx
|
|
|
135360 |
@@ -44,6 +44,7 @@
|
|
|
135360 |
#include <tools/multisel.hxx>
|
|
|
135360 |
#include <tools/resary.hxx>
|
|
|
135360 |
#include <toolkit/awt/vclxdevice.hxx>
|
|
|
135360 |
+#include <svtools/miscopt.hxx>
|
|
|
135360 |
|
|
|
135360 |
#include <ctype.h>
|
|
|
135360 |
#include <float.h>
|
|
|
135360 |
@@ -839,6 +840,9 @@ void ScModelObj::initializeForTiledRendering()
|
|
|
135360 |
aInputOptions.SetTextWysiwyg(true);
|
|
|
135360 |
SC_MOD()->SetInputOptions(aInputOptions);
|
|
|
135360 |
pDocShell->CalcOutputFactor();
|
|
|
135360 |
+ // tdf#93154: in tiled rendering LO doesn't always detect changes
|
|
|
135360 |
+ SvtMiscOptions aMiscOpt;
|
|
|
135360 |
+ aMiscOpt.SetSaveAlwaysAllowed(true);
|
|
|
135360 |
}
|
|
|
135360 |
|
|
|
135360 |
uno::Any SAL_CALL ScModelObj::queryInterface( const uno::Type& rType )
|
|
|
135360 |
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
|
|
|
135360 |
index 4148035c899a..0e88a099e081 100644
|
|
|
135360 |
--- a/sd/source/ui/unoidl/unomodel.cxx
|
|
|
135360 |
+++ b/sd/source/ui/unoidl/unomodel.cxx
|
|
|
135360 |
@@ -60,6 +60,7 @@
|
|
|
135360 |
#include <editeng/unolingu.hxx>
|
|
|
135360 |
#include <svx/svdpagv.hxx>
|
|
|
135360 |
#include <svtools/unoimap.hxx>
|
|
|
135360 |
+#include <svtools/miscopt.hxx>
|
|
|
135360 |
#include <svx/unoshape.hxx>
|
|
|
135360 |
#include <editeng/unonrule.hxx>
|
|
|
135360 |
#include <editeng/eeitem.hxx>
|
|
|
135360 |
@@ -2388,6 +2389,9 @@ void SdXImpressDocument::initializeForTiledRendering()
|
|
|
135360 |
pWindow->EnableMapMode(false);
|
|
|
135360 |
}
|
|
|
135360 |
}
|
|
|
135360 |
+ // tdf#93154: in tiled rendering LO doesn't always detect changes
|
|
|
135360 |
+ SvtMiscOptions aMiscOpt;
|
|
|
135360 |
+ aMiscOpt.SetSaveAlwaysAllowed(true);
|
|
|
135360 |
}
|
|
|
135360 |
|
|
|
135360 |
void SdXImpressDocument::registerCallback(LibreOfficeKitCallback pCallback, void* pData)
|
|
|
135360 |
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
|
|
|
135360 |
index 0dbde54f9144..d6315d2964ae 100644
|
|
|
135360 |
--- a/sw/source/uibase/uno/unotxdoc.cxx
|
|
|
135360 |
+++ b/sw/source/uibase/uno/unotxdoc.cxx
|
|
|
135360 |
@@ -136,6 +136,7 @@
|
|
|
135360 |
#include <swdtflvr.hxx>
|
|
|
135360 |
|
|
|
135360 |
#include <svtools/langtab.hxx>
|
|
|
135360 |
+#include <svtools/miscopt.hxx>
|
|
|
135360 |
#include <map>
|
|
|
135360 |
#include <set>
|
|
|
135360 |
#include <vector>
|
|
|
135360 |
@@ -3235,6 +3236,9 @@ void SwXTextDocument::initializeForTiledRendering()
|
|
|
135360 |
// directly in twips.
|
|
|
135360 |
SwEditWin& rEditWin = pDocShell->GetView()->GetEditWin();
|
|
|
135360 |
rEditWin.EnableMapMode(false);
|
|
|
135360 |
+ // tdf#93154: in tiled rendering LO doesn't always detect changes
|
|
|
135360 |
+ SvtMiscOptions aMiscOpt;
|
|
|
135360 |
+ aMiscOpt.SetSaveAlwaysAllowed(true);
|
|
|
135360 |
}
|
|
|
135360 |
|
|
|
135360 |
void SwXTextDocument::registerCallback(LibreOfficeKitCallback pCallback, void* pData)
|
|
|
135360 |
--
|
|
|
135360 |
2.12.0
|
|
|
135360 |
|