diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 11:46:57 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 11:46:57 +0200 |
| commit | 85ce992473a435497014f856f95f3914783f8d72 (patch) | |
| tree | 8bf9e29073312fac5c117d0794660d2825b794b6 /svx/source/unodraw | |
| parent | 173a75bad357c65f4e77dc1688445276bdaeaf9c (diff) | |
loplugin:defaultparams
Change-Id: I6bd0482967f35a4fc4c2384e775753c413c52162
Diffstat (limited to 'svx/source/unodraw')
| -rw-r--r-- | svx/source/unodraw/UnoGraphicExporter.cxx | 2 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshap2.cxx | 4 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshtxt.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 20074f364e79..7eb569d7bb06 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -623,7 +623,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, ScopedVclPtrInstance< VirtualDevice > aVDev; const MapMode aMap( mpDoc->GetScaleUnit(), Point(), rSettings.maScaleX, rSettings.maScaleY ); - SdrOutliner& rOutl=mpDoc->GetDrawOutliner(NULL); + SdrOutliner& rOutl=mpDoc->GetDrawOutliner(); maOldCalcFieldValueHdl = rOutl.GetCalcFieldValueHdl(); rOutl.SetCalcFieldValueHdl( LINK(this, GraphicExporter, CalcFieldValueHdl) ); rOutl.SetBackgroundColor( pPage->GetPageBackgroundColor() ); diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 55a20ba912af..15df912443af 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1496,7 +1496,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte const SfxFilter* pSfxFilter = NULL; SfxMedium aSfxMedium( aURL, referer_, StreamMode::READ | StreamMode::SHARE_DENYNONE ); - SfxGetpApp()->GetFilterMatcher().GuessFilter( aSfxMedium, &pSfxFilter, SfxFilterFlags::IMPORT, SFX_FILTER_NOTINSTALLED ); + SfxGetpApp()->GetFilterMatcher().GuessFilter( aSfxMedium, &pSfxFilter ); if( !pSfxFilter ) { @@ -1861,7 +1861,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c if ( bCustomShapeGeometry ) { - static_cast<SdrObjCustomShape*>(pObject)->MergeDefaultAttributes(0); + static_cast<SdrObjCustomShape*>(pObject)->MergeDefaultAttributes(); Rectangle aRect( pObject->GetSnapRect() ); // #i38892# diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 7f141fa7918c..30c096d0bdab 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -818,7 +818,7 @@ SvxEditViewForwarder* SvxTextEditSourceImpl::GetEditViewForwarder( bool bCreate // enter edit mode mpView->SdrEndTextEdit(); - if(mpView->SdrBeginTextEdit(mpObject, 0L, 0L, false, nullptr, 0L)) + if(mpView->SdrBeginTextEdit(mpObject)) { SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>( mpObject ); if (pTextObj && pTextObj->IsTextEditActive()) |