summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-03-08 14:10:53 +0200
committerNoel Grandin <noel@peralex.com>2016-03-09 10:07:45 +0200
commitff745fc0d973b8d793c3ec21f258ebe695ce3ee2 (patch)
tree79a77c34041c5c9f93aea7c10bce5bfb5ec55d98 /svx/source
parentc09b3e32372537be739182b02ae83a96386d1e1c (diff)
loplugin:constantparam in svx
Change-Id: Ib2a432fc334898c75ab5e5cf629a21fd310bd467
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/dialog/_contdlg.cxx31
-rw-r--r--svx/source/dialog/contimp.hxx2
-rw-r--r--svx/source/dialog/framelink.cxx12
-rw-r--r--svx/source/dialog/framelinkarray.cxx4
-rw-r--r--svx/source/engine3d/view3d.cxx4
-rw-r--r--svx/source/engine3d/view3d1.cxx6
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx2
-rw-r--r--svx/source/form/fmshell.cxx8
-rw-r--r--svx/source/form/fmshimp.cxx8
-rw-r--r--svx/source/gallery2/galbrws1.cxx2
-rw-r--r--svx/source/inc/fmshimp.hxx2
-rw-r--r--svx/source/sdr/contact/viewcontact.cxx18
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx12
-rw-r--r--svx/source/svdraw/svdedtv2.cxx2
-rw-r--r--svx/source/svdraw/svdetc.cxx2
-rw-r--r--svx/source/svdraw/svdograf.cxx4
-rw-r--r--svx/source/svdraw/svdundo.cxx4
-rw-r--r--svx/source/table/tablecontroller.cxx2
18 files changed, 54 insertions, 71 deletions
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 26099ab883b0..d948c3a60fdc 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -195,7 +195,7 @@ bool SvxContourDlg::IsGraphicChanged() const
tools::PolyPolygon SvxContourDlg::GetPolyPolygon()
{
- return pSuperClass->GetPolyPolygon(true);
+ return pSuperClass->GetPolyPolygon();
}
const void* SvxContourDlg::GetEditingObject() const
@@ -376,30 +376,27 @@ void SvxSuperContourDlg::SetPolyPolygon( const tools::PolyPolygon& rPolyPoly )
m_pContourWnd->GetSdrModel()->SetChanged();
}
-tools::PolyPolygon SvxSuperContourDlg::GetPolyPolygon( bool bRescaleToGraphic )
+tools::PolyPolygon SvxSuperContourDlg::GetPolyPolygon()
{
tools::PolyPolygon aRetPolyPoly( m_pContourWnd->GetPolyPolygon() );
- if ( bRescaleToGraphic )
+ const MapMode aMap100( MAP_100TH_MM );
+ const MapMode aGrfMap( aGraphic.GetPrefMapMode() );
+ OutputDevice* pOutDev = Application::GetDefaultDevice();
+ bool bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
+
+ for ( sal_uInt16 j = 0, nPolyCount = aRetPolyPoly.Count(); j < nPolyCount; j++ )
{
- const MapMode aMap100( MAP_100TH_MM );
- const MapMode aGrfMap( aGraphic.GetPrefMapMode() );
- OutputDevice* pOutDev = Application::GetDefaultDevice();
- bool bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
+ tools::Polygon& rPoly = aRetPolyPoly[ j ];
- for ( sal_uInt16 j = 0, nPolyCount = aRetPolyPoly.Count(); j < nPolyCount; j++ )
+ for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
{
- tools::Polygon& rPoly = aRetPolyPoly[ j ];
-
- for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
- {
- Point& rPt = rPoly[ i ];
+ Point& rPt = rPoly[ i ];
- rPt = pOutDev->LogicToPixel( rPt, aMap100 );
+ rPt = pOutDev->LogicToPixel( rPt, aMap100 );
- if ( !bPixelMap )
- rPt = pOutDev->PixelToLogic( rPt, aGrfMap );
- }
+ if ( !bPixelMap )
+ rPt = pOutDev->PixelToLogic( rPt, aGrfMap );
}
}
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index ea565d049eca..a27b14553582 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -108,7 +108,7 @@ public:
bool IsGraphicChanged() const { return nGrfChanged > 0UL; }
void SetPolyPolygon( const tools::PolyPolygon& rPolyPoly );
- tools::PolyPolygon GetPolyPolygon( bool bRescaleToGraphic );
+ tools::PolyPolygon GetPolyPolygon();
void SetEditingObject( void* pObj ) { pCheckObj = pObj; }
const void* GetEditingObject() const { return pCheckObj; }
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 79c64c029ef2..30a3da78c64a 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -908,8 +908,8 @@ LinePoints lclGetDiagLineEnds( const Rectangle& rRect, bool bTLBR, long nDiagOff
// vertical top-left to bottom-right borders are handled mirrored
if( bVert && bTLBR )
nDiagOffs = -nDiagOffs;
- long nTOffs = bTLBR ? GetTLDiagOffset( 0, nDiagOffs, fAngle ) : GetTRDiagOffset( 0, nDiagOffs, fAngle );
- long nBOffs = bTLBR ? GetBRDiagOffset( 0, nDiagOffs, fAngle ) : GetBLDiagOffset( 0, nDiagOffs, fAngle );
+ long nTOffs = bTLBR ? GetTLDiagOffset( 0, nDiagOffs, fAngle ) : GetTRDiagOffset( nDiagOffs, fAngle );
+ long nBOffs = bTLBR ? GetBRDiagOffset( nDiagOffs, fAngle ) : GetBLDiagOffset( 0, nDiagOffs, fAngle );
// vertical bottom-left to top-right borders are handled with exchanged end points
if( bVert && !bTLBR )
std::swap( nTOffs, nBOffs );
@@ -1312,14 +1312,14 @@ long GetBLDiagOffset( long nVerOffs, long nDiagOffs, double fAngle )
return lclD2L( -nVerOffs / tan( fAngle ) + nDiagOffs / sin( fAngle ) );
}
-long GetBRDiagOffset( long nVerOffs, long nDiagOffs, double fAngle )
+long GetBRDiagOffset( long nDiagOffs, double fAngle )
{
- return -lclD2L( -nVerOffs / tan( fAngle ) - nDiagOffs / sin( fAngle ) );
+ return -lclD2L( - nDiagOffs / sin( fAngle ) );
}
-long GetTRDiagOffset( long nVerOffs, long nDiagOffs, double fAngle )
+long GetTRDiagOffset( long nDiagOffs, double fAngle )
{
- return -lclD2L( nVerOffs / tan( fAngle ) - nDiagOffs / sin( fAngle ) );
+ return -lclD2L( - nDiagOffs / sin( fAngle ) );
}
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index 0dc49696299f..513f3221d6c6 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -857,7 +857,7 @@ void Array::SetUseDiagDoubleClipping( bool bSet )
}
// mirroring
-void Array::MirrorSelfX( bool bMirrorStyles, bool bSwapDiag )
+void Array::MirrorSelfX( bool bSwapDiag )
{
CellVec aNewCells;
aNewCells.reserve( GetCellCount() );
@@ -868,7 +868,7 @@ void Array::MirrorSelfX( bool bMirrorStyles, bool bSwapDiag )
for( nCol = 0; nCol < mxImpl->mnWidth; ++nCol )
{
aNewCells.push_back( CELL( mxImpl->GetMirrorCol( nCol ), nRow ) );
- aNewCells.back().MirrorSelfX( bMirrorStyles, bSwapDiag );
+ aNewCells.back().MirrorSelfX( true, bSwapDiag );
}
}
for( nRow = 0; nRow < mxImpl->mnHeight; ++nRow )
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index f6a54f41f491..7eac614b28be 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -621,8 +621,8 @@ bool E3dView::IsConvertTo3DObjPossible() const
bRetval = !bAny3D
&& (
- IsConvertToPolyObjPossible(false)
- || IsConvertToPathObjPossible(false)
+ IsConvertToPolyObjPossible()
+ || IsConvertToPathObjPossible()
|| IsImportMtfPossible());
return bRetval;
}
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index b99ff181680f..d60346079a8e 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -42,7 +42,7 @@
#include <svx/e3dsceneupdater.hxx>
#include <com/sun/star/drawing/LineStyle.hpp>
-void E3dView::ConvertMarkedToPolyObj(bool bLineToArea)
+void E3dView::ConvertMarkedToPolyObj()
{
SdrObject* pNewObj = nullptr;
@@ -53,7 +53,7 @@ void E3dView::ConvertMarkedToPolyObj(bool bLineToArea)
if (pObj && dynamic_cast< const E3dPolyScene* >(pObj) != nullptr)
{
bool bBezier = false;
- pNewObj = static_cast<E3dPolyScene*>(pObj)->ConvertToPolyObj(bBezier, bLineToArea);
+ pNewObj = static_cast<E3dPolyScene*>(pObj)->ConvertToPolyObj(bBezier, false/*bLineToArea*/);
if (pNewObj)
{
@@ -66,7 +66,7 @@ void E3dView::ConvertMarkedToPolyObj(bool bLineToArea)
if (!pNewObj)
{
- SdrView::ConvertMarkedToPolyObj(bLineToArea);
+ SdrView::ConvertMarkedToPolyObj(false/*bLineToArea*/);
}
}
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 75ffd75145a7..268bceab00fc 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -862,7 +862,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- std::unique_ptr<AbstractFmShowColsDialog> pDlg(pFact->CreateFmShowColsDialog(nullptr));
+ std::unique_ptr<AbstractFmShowColsDialog> pDlg(pFact->CreateFmShowColsDialog());
DBG_ASSERT(pDlg, "Dialog creation failed!");
pDlg->SetColumns(xCols);
pDlg->Execute();
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 18a29f44c7ed..16e04f349dd0 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -750,7 +750,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
DBG_ASSERT( pFact, "no dialog factory!" );
if ( pFact )
{
- std::unique_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( nullptr ) );
+ std::unique_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog() );
DBG_ASSERT( dlg.get(), "Dialog creation failed!" );
dlg->SetValue( rController->getCursor()->getRow() );
if ( dlg->Execute() == RET_OK )
@@ -959,7 +959,7 @@ void FmFormShell::GetState(SfxItemSet &rSet)
// der Impl eventuell die Moeglichjkeit geben, ihre an der aktuellen MarkList ausgerichteten Objekte
// auf den neuesten Stand zu bringen
if (GetImpl()->IsSelectionUpdatePending())
- GetImpl()->ForceUpdateSelection(false);
+ GetImpl()->ForceUpdateSelection();
if ( !m_pFormView || !m_bDesignMode || !GetImpl()->onlyControlsAreMarked() )
rSet.DisableItem( nWhich );
@@ -978,7 +978,7 @@ void FmFormShell::GetState(SfxItemSet &rSet)
// der Impl eventuell die Moeglichjkeit geben, ihre an der aktuellen MarkList ausgerichteten Objekte
// auf den neuesten Stand zu bringen
if (GetImpl()->IsSelectionUpdatePending())
- GetImpl()->ForceUpdateSelection(false);
+ GetImpl()->ForceUpdateSelection();
if ( !m_pFormView || !m_bDesignMode || !GetImpl()->getCurrentForm().is() )
rSet.DisableItem( nWhich );
@@ -992,7 +992,7 @@ void FmFormShell::GetState(SfxItemSet &rSet)
// der Impl eventuell die Moeglichjkeit geben, ihre an der aktuellen MarkList ausgerichteten Objekte
// auf den neuesten Stand zu bringen
if (GetImpl()->IsSelectionUpdatePending())
- GetImpl()->ForceUpdateSelection(false);
+ GetImpl()->ForceUpdateSelection();
if (!m_pFormView || !m_bDesignMode || !GetImpl()->getCurrentForm().is() )
rSet.DisableItem( nWhich );
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index d03efc06f4ad..0e8f324268db 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1021,7 +1021,7 @@ IMPL_LINK_NOARG_TYPED(FmXFormShell, OnInvalidateSlots, void*,void)
}
-void FmXFormShell::ForceUpdateSelection(bool bAllowInvalidation)
+void FmXFormShell::ForceUpdateSelection()
{
if ( impl_checkDisposed() )
return;
@@ -1031,13 +1031,11 @@ void FmXFormShell::ForceUpdateSelection(bool bAllowInvalidation)
m_aMarkTimer.Stop();
// die Invalidierung der Slots, die implizit von SetSelection besorgt wird, eventuell abschalten
- if (!bAllowInvalidation)
- LockSlotInvalidation(true);
+ LockSlotInvalidation(true);
SetSelection(m_pShell->GetFormView()->GetMarkedObjectList());
- if (!bAllowInvalidation)
- LockSlotInvalidation(false);
+ LockSlotInvalidation(false);
}
}
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 024eeac29848..6a2d7c063f8d 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -265,7 +265,7 @@ void GalleryBrowser1::ImplGalleryThemeProperties( const OUString & rThemeName, b
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
assert(pFact && "Got no AbstractDialogFactory!");
- VclAbstractDialog2* pThemeProps = pFact->CreateGalleryThemePropertiesDialog( nullptr, mpExchangeData, mpThemePropsDlgItemSet );
+ VclAbstractDialog2* pThemeProps = pFact->CreateGalleryThemePropertiesDialog( mpExchangeData, mpThemePropsDlgItemSet );
assert(pThemeProps && "Got no GalleryThemePropertiesDialog!");
if ( bCreateNew )
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 2743587ed22b..8de87da53967 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -451,7 +451,7 @@ public:
// das Setzen des curObject/selObject/curForm erfolgt verzoegert (SetSelectionDelayed), mit den folgenden
// Funktionen laesst sich das abfragen/erzwingen
SAL_DLLPRIVATE inline bool IsSelectionUpdatePending();
- SAL_DLLPRIVATE void ForceUpdateSelection(bool bLockInvalidation);
+ SAL_DLLPRIVATE void ForceUpdateSelection();
SAL_DLLPRIVATE css::uno::Reference< css::frame::XModel> getContextDocument() const;
SAL_DLLPRIVATE css::uno::Reference< css::form::XForm> getInternalForm(const css::uno::Reference< css::form::XForm>& _xForm) const;
diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx
index 48ac905bedc3..244aead6fb37 100644
--- a/svx/source/sdr/contact/viewcontact.cxx
+++ b/svx/source/sdr/contact/viewcontact.cxx
@@ -122,26 +122,18 @@ void ViewContact::RemoveViewObjectContact(ViewObjectContact& rVOContact)
// Test if this ViewContact has ViewObjectContacts at all. This can
// be used to test if this ViewContact is visualized ATM or not
-bool ViewContact::HasViewObjectContacts(bool bExcludePreviews) const
+bool ViewContact::HasViewObjectContacts() const
{
const sal_uInt32 nCount(maViewObjectContactVector.size());
- if(bExcludePreviews)
+ for(sal_uInt32 a(0); a < nCount; a++)
{
- for(sal_uInt32 a(0); a < nCount; a++)
+ if(!maViewObjectContactVector[a]->GetObjectContact().IsPreviewRenderer())
{
- if(!maViewObjectContactVector[a]->GetObjectContact().IsPreviewRenderer())
- {
- return true;
- }
+ return true;
}
-
- return false;
- }
- else
- {
- return (0L != nCount);
}
+ return false;
}
// Test if this ViewContact has ViewObjectContacts at all. This can
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index cc57902bb003..cee172fad6a2 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -673,10 +673,6 @@ namespace sdr { namespace contact {
/** adjusts the control visibility so it respects its layer's visibility
- @param _bForce
- set to <TRUE/> if you want to force a ->XWindow::setVisible call,
- no matter if the control visibility is already correct
-
@precond
->m_aControl is not <NULL/>
@@ -688,7 +684,7 @@ namespace sdr { namespace contact {
might not be true, but those instances should never have a need to call
this method.
*/
- void impl_adjustControlVisibilityToLayerVisibility_throw( bool _bForce );
+ void impl_adjustControlVisibilityToLayerVisibility_throw();
/** adjusts the control visibility so it respects its layer's visibility
@@ -1177,7 +1173,7 @@ namespace sdr { namespace contact {
}
- void ViewObjectContactOfUnoControl_Impl::impl_adjustControlVisibilityToLayerVisibility_throw( bool _bForce )
+ void ViewObjectContactOfUnoControl_Impl::impl_adjustControlVisibilityToLayerVisibility_throw()
{
OSL_PRECOND( m_aControl.is(),
"ViewObjectContactOfUnoControl_Impl::impl_adjustControlVisibilityToLayerVisibility_throw: only valid if we have a control!" );
@@ -1191,7 +1187,7 @@ namespace sdr { namespace contact {
return;
SdrPageViewAccess aPVAccess( *pPageView );
- impl_adjustControlVisibilityToLayerVisibility_throw( m_aControl, *pUnoObject, aPVAccess, impl_isControlVisible_nofail(), _bForce );
+ impl_adjustControlVisibilityToLayerVisibility_throw( m_aControl, *pUnoObject, aPVAccess, impl_isControlVisible_nofail(), false/*_bForce*/ );
}
@@ -1404,7 +1400,7 @@ namespace sdr { namespace contact {
try
{
// if the control is part of a invisible layer, we need to explicitly hide it in alive mode
- impl_adjustControlVisibilityToLayerVisibility_throw( false );
+ impl_adjustControlVisibilityToLayerVisibility_throw();
}
catch( const Exception& )
{
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 511c3cbf981b..2342c14253e9 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -771,7 +771,7 @@ void SdrEditView::DistributeMarkedObjects()
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- std::unique_ptr<AbstractSvxDistributeDialog> pDlg(pFact->CreateSvxDistributeDialog(nullptr, aNewAttr));
+ std::unique_ptr<AbstractSvxDistributeDialog> pDlg(pFact->CreateSvxDistributeDialog(aNewAttr));
DBG_ASSERT(pDlg, "Dialog creation failed!");
sal_uInt16 nResult = pDlg->Execute();
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index bc10c23a19b1..091cfca0ea65 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -238,7 +238,7 @@ bool OLEObjCache::UnloadObj(SdrOle2Obj* pObj)
// The question is what will happen when i make it work now suddenly? I
// will try it for 2.4.
const sdr::contact::ViewContact& rViewContact = pObj->GetViewContact();
- const bool bVisible(rViewContact.HasViewObjectContacts(true));
+ const bool bVisible(rViewContact.HasViewObjectContacts());
if(!bVisible)
{
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index ddfef8c9abed..a2bd48eda579 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1276,7 +1276,7 @@ IMPL_LINK_TYPED( SdrGrafObj, ImpSwapHdl, const GraphicObject*, pO, SvStream* )
{
// test if this object is visualized from someone
// ## test only if there are VOCs other than the preview renderer
- if(!GetViewContact().HasViewObjectContacts(true))
+ if(!GetViewContact().HasViewObjectContacts())
{
const SdrSwapGraphicsMode nSwapMode = pModel->GetSwapGraphicsMode();
@@ -1323,7 +1323,7 @@ IMPL_LINK_TYPED( SdrGrafObj, ImpSwapHdl, const GraphicObject*, pO, SvStream* )
std::unique_ptr<css::uno::Sequence< css::beans::PropertyValue > > pFilterData;
- if(mbInsidePaint && !GetViewContact().HasViewObjectContacts(true))
+ if(mbInsidePaint && !GetViewContact().HasViewObjectContacts())
{
pFilterData.reset(new css::uno::Sequence< css::beans::PropertyValue >( 3 ));
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 7c5e3bab2843..5b5c5825bc3d 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -151,8 +151,8 @@ bool SdrUndoGroup::CanSdrRepeat(SdrView& rView) const
case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : return rView.IsCombinePossible(true);
case SDRREPFUNC_OBJ_DISMANTLE_POLYS : return rView.IsDismantlePossible();
case SDRREPFUNC_OBJ_DISMANTLE_LINES : return rView.IsDismantlePossible(true);
- case SDRREPFUNC_OBJ_CONVERTTOPOLY : return rView.IsConvertToPolyObjPossible(false);
- case SDRREPFUNC_OBJ_CONVERTTOPATH : return rView.IsConvertToPathObjPossible(false);
+ case SDRREPFUNC_OBJ_CONVERTTOPOLY : return rView.IsConvertToPolyObjPossible();
+ case SDRREPFUNC_OBJ_CONVERTTOPATH : return rView.IsConvertToPathObjPossible();
case SDRREPFUNC_OBJ_GROUP : return rView.IsGroupPossible();
case SDRREPFUNC_OBJ_UNGROUP : return rView.IsUnGroupPossible();
case SDRREPFUNC_OBJ_PUTTOTOP : return rView.IsToTopPossible();
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 0d1015482554..73e33df3a4ec 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -914,7 +914,7 @@ void SvxTableController::onFormatTable( SfxRequest& rReq )
aNewAttr.Put( aBoxInfoItem );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr< SfxAbstractTabDialog > xDlg( pFact ? pFact->CreateSvxFormatCellsDialog( nullptr, &aNewAttr, pTableObj->GetModel(), pTableObj) : nullptr );
+ std::unique_ptr< SfxAbstractTabDialog > xDlg( pFact ? pFact->CreateSvxFormatCellsDialog( &aNewAttr, pTableObj->GetModel(), pTableObj) : nullptr );
// Even Cancel Button is returning positive(101) value,
if (xDlg.get() && xDlg->Execute() == RET_OK)
{