summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-06-29 10:12:28 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-06-29 09:49:07 +0000
commit488fd60c2dc2372f3dc33f5a5313e4f032adf968 (patch)
treeb6d91a1a25416e76d47acdd804ead6f0f1a3eeda /sw
parent9724eaa94e1f1e58dbbba2ecad4287245e0f0bf0 (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 'sw')
-rw-r--r--sw/source/uibase/app/docshini.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index 92b239467b04..7d8bf172e332 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -88,6 +88,7 @@
#include <swerror.h>
#include <globals.hrc>
#include <unochart.hxx>
+#include <drawdoc.hxx>
#include <svx/CommonStyleManager.hxx>
@@ -490,6 +491,15 @@ 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" );