Kaydet (Commit) b651ed7a authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) Valentin Kettner

sw: fix some assertions that still use removed SwDoc methods

Change-Id: Ia33dff51cdb58030ec11ec499ee5c518fba31641
üst abf17aef
...@@ -297,7 +297,7 @@ void DocumentDeviceManager::PrtDataChanged() ...@@ -297,7 +297,7 @@ void DocumentDeviceManager::PrtDataChanged()
// If you change this, also modify InJobSetup in Sw3io if appropriate. // If you change this, also modify InJobSetup in Sw3io if appropriate.
// #i41075# // #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!" ); 0 != getPrinter( false ), "PrtDataChanged will be called recursively!" );
SwRootFrm* pTmpRoot = m_rSwdoc.GetCurrentLayout(); SwRootFrm* pTmpRoot = m_rSwdoc.GetCurrentLayout();
boost::scoped_ptr<SwWait> pWait; boost::scoped_ptr<SwWait> pWait;
......
...@@ -552,7 +552,8 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext) ...@@ -552,7 +552,8 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext)
if( pCont->GetAnchorFrm() && !pObj->IsInserted() ) 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 ); pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage( 0 )->InsertObject( pObj );
} }
pObj->SetRelativePos( aDrawSavePt ); pObj->SetRelativePos( aDrawSavePt );
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include <rtl/strbuf.hxx> #include <rtl/strbuf.hxx>
#include <IDocumentDrawModelAccess.hxx>
#include "charatr.hxx" #include "charatr.hxx"
#include <frmfmt.hxx> #include <frmfmt.hxx>
#include <fmtanchr.hxx> #include <fmtanchr.hxx>
...@@ -134,7 +135,8 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, ...@@ -134,7 +135,8 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
{ {
SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)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; const SdrTextObj *pTextObj = (const SdrTextObj *)&rSdrObject;
// Gibt es ueberhaupt auszugebenden Text // Gibt es ueberhaupt auszugebenden Text
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment