From 488fd60c2dc2372f3dc33f5a5313e4f032adf968 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 29 Jun 2016 10:12:28 +0100 Subject: Reinstate: tdf#99729: fix text alignment (no autofit & no full width) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit with extra disposes to shutdown the test thingies in the right order This reverts commit a4780b3c8b45261e59ed3cbb34c4463d58ad8079. Change-Id: I13282d6bc54a0dceb3ed91a04cd438a9011154fe Reviewed-on: https://gerrit.libreoffice.org/26756 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sc/source/ui/docshell/docsh.cxx | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'sc/source') diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 79cb8c844be0..d700e16a7d9a 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -557,6 +557,14 @@ bool ScDocShell::Load( SfxMedium& rMedium ) // -> initialize the others from options (before loading) InitOptions(true); + // If this is an ODF file being loaded, then by default, use legacy processing + // for tdf#99729 (if required, it will be overriden in *::ReadUserDataSequence()) + if (IsOwnStorageFormat(rMedium)) + { + if (aDocument.GetDrawLayer()) + aDocument.GetDrawLayer()->SetAnchoredTextOverflowLegacy(true); + } + GetUndoManager()->Clear(); bool bRet = SfxObjectShell::Load( rMedium ); -- cgit