From 85ce992473a435497014f856f95f3914783f8d72 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 20 Oct 2015 11:46:57 +0200 Subject: loplugin:defaultparams Change-Id: I6bd0482967f35a4fc4c2384e775753c413c52162 --- svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 2 +- svx/source/dialog/dlgctrl.cxx | 2 +- svx/source/dialog/svxbmpnumvalueset.cxx | 2 +- svx/source/fmcomp/gridcell.cxx | 2 +- svx/source/form/delayedevent.cxx | 2 +- svx/source/form/fmobjfac.cxx | 2 +- svx/source/form/fmtextcontrolshell.cxx | 2 +- svx/source/form/fmvwimp.cxx | 2 +- svx/source/form/formcontroller.cxx | 2 +- svx/source/form/navigatortree.cxx | 2 +- svx/source/gallery2/galobj.cxx | 2 +- svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx | 4 ++-- svx/source/svdraw/svdattr.cxx | 2 +- svx/source/svdraw/svdcrtv.cxx | 4 ++-- svx/source/svdraw/svdmodel.cxx | 6 +++--- svx/source/svdraw/svdmrkv.cxx | 2 +- svx/source/svdraw/svdobj.cxx | 2 +- svx/source/svdraw/svdograf.cxx | 2 +- svx/source/svdraw/svdoole2.cxx | 4 ++-- svx/source/svdraw/svdotxln.cxx | 3 +-- svx/source/svdraw/svdview.cxx | 4 ++-- svx/source/table/tablecontroller.cxx | 2 +- svx/source/unodraw/UnoGraphicExporter.cxx | 2 +- svx/source/unodraw/unoshap2.cxx | 4 ++-- svx/source/unodraw/unoshtxt.cxx | 2 +- svx/source/xoutdev/_xoutbmp.cxx | 2 +- 26 files changed, 33 insertions(+), 34 deletions(-) (limited to 'svx') diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 34f408661bd9..8235db8530d5 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -360,7 +360,7 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render() { aCustomShape2d.ApplyGluePoints( pRenderedShape ); xShape = SvxDrawPage::CreateShapeByTypeAndInventor( pRenderedShape->GetObjIdentifier(), - pRenderedShape->GetObjInventor(), pRenderedShape, NULL ); + pRenderedShape->GetObjInventor(), pRenderedShape ); } SetTemporary( xShape ); } diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index e9e00080893c..9248301600e0 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -210,7 +210,7 @@ void SvxRectCtl::InitRectBitmap() } #endif - pBitmap->Replace( aColorAry1, aColorAry2, 7, NULL ); + pBitmap->Replace( aColorAry1, aColorAry2, 7 ); } diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 1d01cd92cf48..d7be12c594d3 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -503,7 +503,7 @@ void SvxBmpNumValueSet::UserDraw(const UserDrawEvent& rUDEvt) Graphic aGraphic; if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nItemId - 1, - &aGraphic, NULL)) + &aGraphic)) { bGrfNotFound = true; } diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index ac24e425d6e2..369d16d03857 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1166,7 +1166,7 @@ CellControllerRef DbTextField::CreateController() const void DbTextField::PaintFieldToCell( OutputDevice& _rDev, const Rectangle& _rRect, const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& _rxFormatter ) { if ( m_pPainterImplementation ) - m_pPainterImplementation->SetText( GetFormatText( _rxField, _rxFormatter, NULL ) ); + m_pPainterImplementation->SetText( GetFormatText( _rxField, _rxFormatter ) ); DbLimitedLengthField::PaintFieldToCell( _rDev, _rRect, _rxField, _rxFormatter ); } diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx index 1105e1a1de5c..a61ba0beb1fb 100644 --- a/svx/source/form/delayedevent.cxx +++ b/svx/source/form/delayedevent.cxx @@ -27,7 +27,7 @@ namespace svxform CancelPendingCall(); SAL_WARN_IF( m_nEventId != 0, "svx.form", "DelayedEvent::Call: CancelPendingCall did not work!" ); - m_nEventId = Application::PostUserEvent( LINK( this, DelayedEvent, OnCall ), nullptr ); + m_nEventId = Application::PostUserEvent( LINK( this, DelayedEvent, OnCall ) ); } void DelayedEvent::CancelPendingCall() diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 894421729954..f83c8ec74e1d 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -79,7 +79,7 @@ FmFormObjFactory::FmFormObjFactory() #endif // Interface fuer die Formshell registrieren - FmFormShell::RegisterInterface(0); + FmFormShell::RegisterInterface(); ImplSmartRegisterUnoServices(); bInit = true; diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 7de8f4f4fe91..e8530ebf01cb 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -416,7 +416,7 @@ namespace svx { OUString sSlotUnoName; - SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool( NULL ); + SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool(); const SfxSlot* pSlot = rSlotPool.GetSlot( _nSlotId ); const sal_Char* pAsciiUnoName = NULL; diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 7ca908280742..01465c72c370 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1492,7 +1492,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_ const MapMode eSourceMode(MAP_100TH_MM); const sal_uInt16 nObjID = OBJ_FM_BUTTON; ::Size controlSize(4000, 500); - FmFormObj *pControl = static_cast(SdrObjFactory::MakeNewObject( FmFormInventor, nObjID, NULL, NULL )); + FmFormObj *pControl = static_cast(SdrObjFactory::MakeNewObject( FmFormInventor, nObjID, NULL )); controlSize.Width() = Fraction(controlSize.Width(), 1) * eTargetMode.GetScaleX(); controlSize.Height() = Fraction(controlSize.Height(), 1) * eTargetMode.GetScaleY(); ::Point controlPos( OutputDevice::LogicToLogic( ::Point( controlSize.Width(), 0 ), eSourceMode, eTargetMode ) ); diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 7f7b99a20861..28c8e47e61ff 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -825,7 +825,7 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons if ( pParseNode != nullptr ) { // don't use a parse context here, we need it unlocalized - pParseNode->parseNodeToStr( sCriteria, xConnection, NULL ); + pParseNode->parseNodeToStr( sCriteria, xConnection ); if ( condition != rRow.begin() ) aRowFilter.append( " AND " ); aRowFilter.append( sCriteria ); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 6411f129e265..e19fa8e5ba53 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -594,7 +594,7 @@ namespace svxform // default-entry "Forms" Image aRootImage( m_aNavigatorImages.GetImage( RID_SVXIMG_FORMS ) ); m_pRootEntry = InsertEntry( SVX_RESSTR(RID_STR_FORMS), aRootImage, aRootImage, - NULL, false, 0, NULL ); + NULL, false, 0 ); } else if (!m_bMarkingObjects && dynamic_cast(&rHint)) { // if m_bMarkingObjects is sal_True, I mark objects myself diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 7d7770bc2923..696258f3fb79 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -426,7 +426,7 @@ SvxGalleryDrawModel::SvxGalleryDrawModel() if( mxDoc.Is() ) { - mxDoc->DoInitNew(0); + mxDoc->DoInitNew(); uno::Reference< lang::XUnoTunnel > xTunnel( mxDoc->GetModel(), uno::UNO_QUERY ); if( xTunnel.is() ) diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index 6e39be6bfc80..d1b8a003474e 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -194,7 +194,7 @@ namespace drawinglayer // #i101443# check change of TextBackgroundolor if(!bDoDelete && getSdrText() && getSdrText()->GetModel()) { - SdrOutliner& rDrawOutliner = getSdrText()->GetModel()->GetDrawOutliner(0); + SdrOutliner& rDrawOutliner = getSdrText()->GetModel()->GetDrawOutliner(); aNewTextBackgroundColor = rDrawOutliner.GetBackgroundColor(); bNewTextBackgroundColorIsSet = true; @@ -229,7 +229,7 @@ namespace drawinglayer if(!bNewTextBackgroundColorIsSet && getSdrText() && getSdrText()->GetModel()) { - SdrOutliner& rDrawOutliner = getSdrText()->GetModel()->GetDrawOutliner(0); + SdrOutliner& rDrawOutliner = getSdrText()->GetModel()->GetDrawOutliner(); aNewTextBackgroundColor = rDrawOutliner.GetBackgroundColor(); } diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 0447ca858ae8..9a26fc04f6c2 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -2183,7 +2183,7 @@ SfxPoolItem* SdrGrafCropItem::Clone( SfxItemPool* /*pPool*/) const SfxPoolItem* SdrGrafCropItem::Create( SvStream& rIn, sal_uInt16 nVer ) const { - return( ( 0 == nVer ) ? Clone( NULL ) : SvxGrfCrop::Create( rIn, nVer ) ); + return( ( 0 == nVer ) ? Clone() : SvxGrfCrop::Create( rIn, nVer ) ); } sal_uInt16 SdrGrafCropItem::GetVersion( sal_uInt16 /*nFileVersion*/) const diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index ebad073b9dff..fe3aceabc9c2 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -360,7 +360,7 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent) { nAktInvent=nInvent; nAktIdent=nIdent; - SdrObject* pObj = SdrObjFactory::MakeNewObject(nInvent,nIdent,NULL,NULL); + SdrObject* pObj = SdrObjFactory::MakeNewObject(nInvent,nIdent,NULL); if(pObj) { @@ -699,7 +699,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) SdrTextObj* pText=dynamic_cast( pObjMerk ); if (pText!=NULL && pText->IsTextFrame()) { - SdrBeginTextEdit(pText, pPVMerk, nullptr, true, nullptr, nullptr); + SdrBeginTextEdit(pText, pPVMerk, nullptr, true); } } } diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 81935dbaec1d..2f938d5663bb 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -734,7 +734,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt nLanguage = LANGUAGE_ENGLISH_US; // get DEFAULTFONT_LATIN_TEXT and set at pool as dynamic default - vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT, nLanguage, GetDefaultFontFlags::OnlyOne, 0)); + vcl::Font aFont(OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT, nLanguage, GetDefaultFontFlags::OnlyOne)); aSvxFontItem.SetFamily(aFont.GetFamily()); aSvxFontItem.SetFamilyName(aFont.GetName()); aSvxFontItem.SetStyleName(OUString()); @@ -743,7 +743,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt pItemPool->SetPoolDefaultItem(aSvxFontItem); // get DEFAULTFONT_CJK_TEXT and set at pool as dynamic default - vcl::Font aFontCJK(OutputDevice::GetDefaultFont(DefaultFontType::CJK_TEXT, nLanguage, GetDefaultFontFlags::OnlyOne, 0)); + vcl::Font aFontCJK(OutputDevice::GetDefaultFont(DefaultFontType::CJK_TEXT, nLanguage, GetDefaultFontFlags::OnlyOne)); aSvxFontItemCJK.SetFamily( aFontCJK.GetFamily()); aSvxFontItemCJK.SetFamilyName(aFontCJK.GetName()); aSvxFontItemCJK.SetStyleName(OUString()); @@ -752,7 +752,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt pItemPool->SetPoolDefaultItem(aSvxFontItemCJK); // get DEFAULTFONT_CTL_TEXT and set at pool as dynamic default - vcl::Font aFontCTL(OutputDevice::GetDefaultFont(DefaultFontType::CTL_TEXT, nLanguage, GetDefaultFontFlags::OnlyOne, 0)); + vcl::Font aFontCTL(OutputDevice::GetDefaultFont(DefaultFontType::CTL_TEXT, nLanguage, GetDefaultFontFlags::OnlyOne)); aSvxFontItemCTL.SetFamily(aFontCTL.GetFamily()); aSvxFontItemCTL.SetFamilyName(aFontCTL.GetName()); aSvxFontItemCTL.SetStyleName(OUString()); diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index e4ca8d722ce8..919157964637 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -1736,7 +1736,7 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nT bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, SdrSearchOptions nOptions) const { - return PickObj(rPnt,nTol,rpObj,rpPV,nOptions,NULL,NULL); + return PickObj(rPnt,nTol,rpObj,rpPV,nOptions,NULL); } bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, SdrSearchOptions nOptions, SdrObject** ppRootObj, bool* pbHitPassDirect) const diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 5b8f84d19b3e..65c29ee0d108 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2948,7 +2948,7 @@ SvxShape* SdrObject::getSvxShape() } else { - mpSvxShape = SvxDrawPage::CreateShapeByTypeAndInventor( GetObjIdentifier(), GetObjInventor(), this, NULL ); + mpSvxShape = SvxDrawPage::CreateShapeByTypeAndInventor( GetObjIdentifier(), GetObjInventor(), this ); maWeakUnoShape = xShape = static_cast< ::cppu::OWeakObject* >( mpSvxShape ); } } diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 9f8ea80933a4..4c4d74c72d69 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -598,7 +598,7 @@ void SdrGrafObj::ImpLinkAnmeldung() { pGraphicLink = new SdrGraphicLink( *this ); pLinkManager->InsertFileLink( - *pGraphicLink, OBJECT_CLIENT_GRF, aFileName, (aFilterName.isEmpty() ? NULL : &aFilterName), NULL); + *pGraphicLink, OBJECT_CLIENT_GRF, aFileName, (aFilterName.isEmpty() ? NULL : &aFilterName)); pGraphicLink->Connect(); } } diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 05d6fea1c669..485c473e8350 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -930,7 +930,7 @@ bool SdrOle2Obj::UpdateLinkURL_Impl() if ( pLinkManager ) { OUString aNewLinkURL; - sfx2::LinkManager::GetDisplayNames( mpImpl->mpObjectLink, 0, &aNewLinkURL, 0, 0 ); + sfx2::LinkManager::GetDisplayNames( mpImpl->mpObjectLink, 0, &aNewLinkURL ); if ( !aNewLinkURL.equalsIgnoreAsciiCase( mpImpl->maLinkURL ) ) { GetObjRef_Impl(); @@ -1043,7 +1043,7 @@ void SdrOle2Obj::CheckFileLink_Impl() { mpImpl->mpObjectLink = new SdrEmbedObjectLink( this ); mpImpl->maLinkURL = aLinkURL; - pLinkManager->InsertFileLink( *mpImpl->mpObjectLink, OBJECT_CLIENT_OLE, aLinkURL, NULL, NULL ); + pLinkManager->InsertFileLink( *mpImpl->mpObjectLink, OBJECT_CLIENT_OLE, aLinkURL ); mpImpl->mpObjectLink->Connect(); } } diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 2a807efdeec1..27d3649f90b5 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -267,8 +267,7 @@ void SdrTextObj::ImpLinkAnmeldung() pData->pLink = new ImpSdrObjTextLink(this); pLinkManager->InsertFileLink(*pData->pLink,OBJECT_CLIENT_FILE,pData->aFileName, !pData->aFilterName.isEmpty() ? - &pData->aFilterName : NULL, - NULL); + &pData->aFilterName : NULL); } } diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index c276991d749c..c007a337d4e9 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -822,7 +822,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) if (eHit==SDRHIT_TEXTEDIT) { bool bRet2(mpActualOutDev && OUTDEV_WINDOW == mpActualOutDev->GetOutDevType() && - SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, const_cast(static_cast(mpActualOutDev.get())), false, nullptr)); + SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, const_cast(static_cast(mpActualOutDev.get())))); if(bRet2) { @@ -915,7 +915,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } bRet = mpActualOutDev && OUTDEV_WINDOW == mpActualOutDev->GetOutDevType()&& - SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, const_cast(static_cast(mpActualOutDev.get())), false, nullptr); + SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, const_cast(static_cast(mpActualOutDev.get()))); if(bRet) { diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index a8c29d047655..be4109b8828d 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -1726,7 +1726,7 @@ bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, vcl::W CellPos aNextCell( pTableObj->getNextCell( aSelectionEnd, true ) ); if( aSelectionEnd == aNextCell ) { - onInsert( SID_TABLE_INSERT_ROW, 0 ); + onInsert( SID_TABLE_INSERT_ROW ); aNextCell = pTableObj->getNextCell( aSelectionEnd, true ); } gotoCell( aNextCell, false, pWindow, nAction ); 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(pObject)->MergeDefaultAttributes(0); + static_cast(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( mpObject ); if (pTextObj && pTextObj->IsTextEditActive()) diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 54cfc760f16e..e6cfbe3cdcc5 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -314,7 +314,7 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileNam if( 0 == (nFlags & XOUTBMP_DONT_ADD_EXTENSION)) aURL.setExtension( aExt ); rFileName = aURL.GetMainURL( INetURLObject::NO_DECODE ); - nErr = ExportGraphic( aGraphic, aURL, rFilter, nFilter, NULL ); + nErr = ExportGraphic( aGraphic, aURL, rFilter, nFilter ); } } } -- cgit