diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-06-29 10:12:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-29 09:49:07 +0000 |
| commit | 488fd60c2dc2372f3dc33f5a5313e4f032adf968 (patch) | |
| tree | b6d91a1a25416e76d47acdd804ead6f0f1a3eeda /sc/source | |
| parent | 9724eaa94e1f1e58dbbba2ecad4287245e0f0bf0 (diff) | |
Reinstate: tdf#99729: fix text alignment (no autofit & no full width)
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 <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
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 ); |