diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-06-02 16:31:40 +0200 |
|---|---|---|
| committer | Valentin Kettner <vakevk+libreoffice@gmail.com> | 2014-06-03 19:12:05 +0200 |
| commit | b651ed7a6700b560052b67102a65f06a498dd182 (patch) | |
| tree | 797878ef70ba5100c336cfa61713981c90f72426 | |
| parent | abf17aef7a1b5c559fee58e6db526fbd1758e331 (diff) | |
sw: fix some assertions that still use removed SwDoc methods
Change-Id: Ia33dff51cdb58030ec11ec499ee5c518fba31641
| -rw-r--r-- | sw/source/core/doc/DocumentDeviceManager.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/undo/unattr.cxx | 3 | ||||
| -rw-r--r-- | sw/source/filter/html/htmldrawwriter.cxx | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx index 392654f19502..aabfd966d135 100644 --- a/sw/source/core/doc/DocumentDeviceManager.cxx +++ b/sw/source/core/doc/DocumentDeviceManager.cxx @@ -297,7 +297,7 @@ void DocumentDeviceManager::PrtDataChanged() // If you change this, also modify InJobSetup in Sw3io if appropriate. // #i41075# - OSL_ENSURE( m_rSwdoc.get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) || + OSL_ENSURE( m_rSwdoc.getIDocumentSettingAccess().get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) || 0 != getPrinter( false ), "PrtDataChanged will be called recursively!" ); SwRootFrm* pTmpRoot = m_rSwdoc.GetCurrentLayout(); boost::scoped_ptr<SwWait> pWait; diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx index c454ac933777..5401023c6797 100644 --- a/sw/source/core/undo/unattr.cxx +++ b/sw/source/core/undo/unattr.cxx @@ -552,7 +552,8 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext) if( pCont->GetAnchorFrm() && !pObj->IsInserted() ) { - OSL_ENSURE( pDoc->GetDrawModel(), "RestoreFlyAnchor without DrawModel" ); + OSL_ENSURE( pDoc->getIDocumentDrawModelAccess().GetDrawModel(), + "RestoreFlyAnchor without DrawModel" ); pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage( 0 )->InsertObject( pObj ); } pObj->SetRelativePos( aDrawSavePt ); diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx index 49baf6034a7a..27d0775d85e4 100644 --- a/sw/source/filter/html/htmldrawwriter.cxx +++ b/sw/source/filter/html/htmldrawwriter.cxx @@ -40,6 +40,7 @@ #include <rtl/strbuf.hxx> +#include <IDocumentDrawModelAccess.hxx> #include "charatr.hxx" #include <frmfmt.hxx> #include <fmtanchr.hxx> @@ -134,7 +135,8 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, { SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt; - OSL_ENSURE( rWrt.pDoc->GetDrawModel(), "Da gibt's ein Draw-Obj ohne ein Draw-Model zu haben?" ); + OSL_ENSURE( rWrt.pDoc->getIDocumentDrawModelAccess().GetDrawModel(), + "There is a Draw-Obj with no Draw-Model?" ); const SdrTextObj *pTextObj = (const SdrTextObj *)&rSdrObject; // Gibt es ueberhaupt auszugebenden Text |