diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-29 09:58:42 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-29 10:37:43 +0200 |
| commit | a4780b3c8b45261e59ed3cbb34c4463d58ad8079 (patch) | |
| tree | cb7b2db56d6e8461f7e817f907afe4e74d387b7b /sw/source/uibase/app | |
| parent | 6a1c5619be878d2ea7a38ec98d53c36fe3d416f6 (diff) | |
Revert "tdf#99729: fix text alignment (no autofit & no full width)"
This reverts commit 0cb200d000fad8ba31c7400e08cd031823f27308. Even if it
was verified by Jenkins, it broke CppunitTest_sd_import_tests on a
number of tinderboxes. Need to at least find out how to reliably trigger
the crash and fix it before it goes in again.
Change-Id: I7ed52cae559648ec101b7a343046a7d74a7c48d3
Diffstat (limited to 'sw/source/uibase/app')
| -rw-r--r-- | sw/source/uibase/app/docshini.cxx | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index 7d8bf172e332..92b239467b04 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -88,7 +88,6 @@ #include <swerror.h> #include <globals.hrc> #include <unochart.hxx> -#include <drawdoc.hxx> #include <svx/CommonStyleManager.hxx> @@ -491,15 +490,6 @@ void SwDocShell::ReactivateModel() bool SwDocShell::Load( SfxMedium& rMedium ) { bool bRet = false; - - // 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 (m_pDoc && m_pDoc->getIDocumentDrawModelAccess().GetDrawModel()) - m_pDoc->getIDocumentDrawModelAccess().GetDrawModel()->SetAnchoredTextOverflowLegacy(true); - } - if( SfxObjectShell::Load( rMedium )) { SAL_INFO( "sw.ui", "after SfxInPlaceObject::Load" ); |