diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mailmergewizard.cxx | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index a3043d437b16..73f68bd7de49 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2115,7 +2115,7 @@ void DrawGraphic( aAlignedPaintRect.SVRect(), aGrf.SSize(), Size( aPaintOffset.X(), aPaintOffset.Y() ), - nullptr, GraphicManagerDrawFlags::STANDARD, + GraphicManagerDrawFlags::STANDARD, std::max( 128, static_cast<int>( sqrt(sqrt( Abitmap)) + .5 ) ) ); } // reset clipping at output device diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 968c71e201ee..9a0ff9047e44 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -39,8 +39,7 @@ using namespace svt; using namespace ::com::sun::star; SwMailMergeWizard::SwMailMergeWizard(SwView& rView, std::shared_ptr<SwMailMergeConfigItem>& rItem) : - RoadmapWizard(&rView.GetViewFrame()->GetWindow(), - WizardButtonFlags::NEXT|WizardButtonFlags::PREVIOUS|WizardButtonFlags::FINISH|WizardButtonFlags::CANCEL|WizardButtonFlags::HELP), + RoadmapWizard(&rView.GetViewFrame()->GetWindow()), m_pSwView(&rView), m_bDocumentLoad( false ), m_xConfigItem(rItem), |