summaryrefslogtreecommitdiff
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
parentc09b3e32372537be739182b02ae83a96386d1e1c (diff)
loplugin:constantparam in svx
Change-Id: Ib2a432fc334898c75ab5e5cf629a21fd310bd467
-rw-r--r--chart2/source/controller/main/ShapeController.cxx4
-rw-r--r--cui/source/factory/dlgfact.cxx33
-rw-r--r--cui/source/factory/dlgfact.hxx17
-rw-r--r--include/svx/framelink.hxx10
-rw-r--r--include/svx/framelinkarray.hxx4
-rw-r--r--include/svx/sdr/contact/viewcontact.hxx4
-rw-r--r--include/svx/svdedtv.hxx4
-rw-r--r--include/svx/svxdlg.hxx16
-rw-r--r--include/svx/view3d.hxx2
-rw-r--r--sc/source/core/data/fillinfo.cxx2
-rw-r--r--sc/source/ui/drawfunc/drawsh5.cxx4
-rw-r--r--sd/source/ui/table/tablefunction.cxx2
-rw-r--r--sd/source/ui/view/drviews2.cxx6
-rw-r--r--sd/source/ui/view/drviews7.cxx6
-rw-r--r--sd/source/ui/view/drviewsj.cxx6
-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
-rw-r--r--sw/source/uibase/shells/drwbassh.cxx4
-rw-r--r--sw/source/uibase/shells/frmsh.cxx3
35 files changed, 112 insertions, 140 deletions
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index fd0fd480b05d..6e71b3066dea 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -439,7 +439,7 @@ void ShapeController::executeDispatch_ObjectTitleDescription()
if ( pFact )
{
std::unique_ptr< AbstractSvxObjectTitleDescDialog > pDlg(
- pFact->CreateSvxObjectTitleDescDialog( nullptr, aTitle, aDescription ) );
+ pFact->CreateSvxObjectTitleDescDialog( aTitle, aDescription ) );
if ( pDlg.get() && ( pDlg->Execute() == RET_OK ) )
{
pDlg->GetTitle( aTitle );
@@ -469,7 +469,7 @@ void ShapeController::executeDispatch_RenameObject()
if ( pFact )
{
std::unique_ptr< AbstractSvxObjectNameDialog > pDlg(
- pFact->CreateSvxObjectNameDialog( nullptr, aName ) );
+ pFact->CreateSvxObjectNameDialog( aName ) );
pDlg->SetCheckNameHdl( LINK( this, ShapeController, CheckNameHdl ) );
if ( pDlg.get() && ( pDlg->Execute() == RET_OK ) )
{
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 12db20ab7fb9..c59a32f36c75 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -942,10 +942,9 @@ AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog(
return new AbstractSvxCaptionDialog_Impl( pDlg );
}
-AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeDialog(vcl::Window* pParent,
- const SfxItemSet& rAttr)
+AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeDialog(const SfxItemSet& rAttr)
{
- VclPtrInstance<SvxDistributeDialog> pDlg( pParent, rAttr, SvxDistributeHorizontalNone, SvxDistributeVerticalNone);
+ VclPtrInstance<SvxDistributeDialog> pDlg( nullptr, rAttr, SvxDistributeHorizontalNone, SvxDistributeVerticalNone);
return new AbstractSvxDistributeDialog_Impl( pDlg );
}
@@ -973,9 +972,9 @@ AbstractHyphenWordDialog* AbstractDialogFactory_Impl::CreateHyphenWordDialog( vc
return new AbstractHyphenWordDialog_Impl( pDlg );
}
-AbstractFmShowColsDialog * AbstractDialogFactory_Impl::CreateFmShowColsDialog( vcl::Window* pParent )
+AbstractFmShowColsDialog * AbstractDialogFactory_Impl::CreateFmShowColsDialog()
{
- VclPtrInstance<FmShowColsDialog> pDlg( pParent);
+ VclPtrInstance<FmShowColsDialog> pDlg( nullptr );
return new AbstractFmShowColsDialog_Impl( pDlg );
}
AbstractSvxZoomDialog * AbstractDialogFactory_Impl::CreateSvxZoomDialog( vcl::Window* pParent,
@@ -1050,11 +1049,11 @@ AbstractGalleryIdDialog * AbstractDialogFactory_Impl::CreateGalleryIdDialog( vcl
return new AbstractGalleryIdDialog_Impl( pDlg );
}
-VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog( vcl::Window* pParent,
+VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog(
ExchangeData* pData,
SfxItemSet* pItemSet)
{
- VclPtrInstance<GalleryThemeProperties> pDlg( pParent, pData, pItemSet);
+ VclPtrInstance<GalleryThemeProperties> pDlg( nullptr, pData, pItemSet);
return new VclAbstractDialog2_Impl( pDlg );
}
@@ -1158,9 +1157,9 @@ AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOp
return new AbstractSvxJSearchOptionsDialog_Impl( pDlg );
}
-AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog( vcl::Window* pParent )
+AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog( )
{
- VclPtrInstance<FmInputRecordNoDialog> pDlg( pParent );
+ VclPtrInstance<FmInputRecordNoDialog> pDlg( nullptr );
return new AbstractFmInputRecordNoDialog_Impl( pDlg );
}
@@ -1196,14 +1195,14 @@ AbstractSvxNameDialog * AbstractDialogFactory_Impl::CreateSvxNameDialog( vcl::Wi
return new AbstractSvxNameDialog_Impl( pDlg );
}
-AbstractSvxObjectNameDialog* AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(vcl::Window* pParent, const OUString& rName )
+AbstractSvxObjectNameDialog* AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(const OUString& rName )
{
- return new AbstractSvxObjectNameDialog_Impl(VclPtr<SvxObjectNameDialog>::Create(pParent, rName));
+ return new AbstractSvxObjectNameDialog_Impl(VclPtr<SvxObjectNameDialog>::Create(nullptr, rName));
}
-AbstractSvxObjectTitleDescDialog* AbstractDialogFactory_Impl::CreateSvxObjectTitleDescDialog(vcl::Window* pParent, const OUString& rTitle, const OUString& rDescription)
+AbstractSvxObjectTitleDescDialog* AbstractDialogFactory_Impl::CreateSvxObjectTitleDescDialog(const OUString& rTitle, const OUString& rDescription)
{
- return new AbstractSvxObjectTitleDescDialog_Impl(VclPtr<SvxObjectTitleDescDialog>::Create(pParent, rTitle, rDescription));
+ return new AbstractSvxObjectTitleDescDialog_Impl(VclPtr<SvxObjectTitleDescDialog>::Create(nullptr, rTitle, rDescription));
}
AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog(vcl::Window* pParent)
@@ -1578,9 +1577,9 @@ SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( vcl::Wind
return new AbstractLinksDialog_Impl( pLinkDlg );
}
-SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* /*pObj*/ )
+SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog( const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* /*pObj*/ )
{
- return new CuiAbstractTabDialog_Impl( VclPtr<SvxFormatCellsDialog>::Create( pParent, pAttr, pModel ) );
+ return new CuiAbstractTabDialog_Impl( VclPtr<SvxFormatCellsDialog>::Create( nullptr, pAttr, pModel ) );
}
SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )
@@ -1588,9 +1587,9 @@ SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDi
return new SvxSplitTableDlg( pParent, bIsTableVertical, nMaxVertical, nMaxHorizontal );
}
-SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( vcl::Window* pParent )
+SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog()
{
- return new SvxNewTableDialog( pParent );
+ return new SvxNewTableDialog( nullptr );
}
VclAbstractDialog* AbstractDialogFactory_Impl::CreateOptionsDialog(
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index d3d909253911..fd98e4dd46fe 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -507,8 +507,7 @@ public:
virtual AbstractSvxCaptionDialog* CreateCaptionDialog( vcl::Window* pParent,
const SdrView* pView,
sal_uInt16 nAnchorTypes = 0 ) override;
- virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(vcl::Window* pParent,
- const SfxItemSet& rAttr) override;
+ virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(const SfxItemSet& rAttr) override;
virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommmand,
const css::uno::Reference < css::embed::XStorage >& xStor,
const SvObjectServerList* pList = nullptr ) override;
@@ -527,7 +526,7 @@ public:
css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen,
SvxSpellWrapper* pWrapper ) override;
- virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( vcl::Window* pParent ) override;
+ virtual AbstractFmShowColsDialog * CreateFmShowColsDialog() override;
virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( vcl::Window* pParent,
const SfxItemSet& rCoreSet) override;
//UUUU add for SvxBorderBackgroundDlg
@@ -557,7 +556,7 @@ public:
const OUString& rOldText) override;
virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( vcl::Window* pParent,
GalleryTheme* pThm) override;
- virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( vcl::Window* pParent,
+ virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog(
ExchangeData* pData,
SfxItemSet* pItemSet) override;
virtual AbstractURLDlg * CreateURLDialog( vcl::Window* pParent,
@@ -576,7 +575,7 @@ public:
virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( vcl::Window* pParent,
const SfxItemSet& rOptionsSet,
sal_Int32 nInitialFlags) override;
- virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( vcl::Window* pParent ) override;
+ virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog() override;
virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent ) override;
virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent,
const OUString& rName,
@@ -584,8 +583,8 @@ public:
virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window* pParent,
const OUString& rName, const OUString& rDesc ) override;
// #i68101#
- virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(vcl::Window* pParent, const OUString& rName ) override;
- virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(vcl::Window* pParent, const OUString& rTitle, const OUString& rDescription) override;
+ virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(const OUString& rName ) override;
+ virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(const OUString& rTitle, const OUString& rDescription) override;
virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(vcl::Window* pParent) override;
virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(vcl::Window* pParent) override;
@@ -646,11 +645,11 @@ public:
const sal_uInt16 _nInitiallySelectedEvent
) override;
- virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = nullptr ) override;
+ virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = nullptr ) override;
virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) override;
- virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( vcl::Window* pParent ) override ;
+ virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog() override ;
virtual VclAbstractDialog* CreateOptionsDialog(
vcl::Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) override;
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index 752f81890351..adc16dbae326 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -320,9 +320,6 @@ long GetBLDiagOffset( long nVerOffs, long nDiagOffs, double fAngle );
bottom-right diagonal frame border, connected to the right end of a
horizontal frame border.
- @param nVerOffs
- The vertical position of the point to be calculated, relative to the Y
- coordinate of the reference point.
@param nDiagOffs
The width offset across the diagonal frame border (0 = middle),
regardless of the gradient of the diagonal frame border (always
@@ -332,7 +329,7 @@ long GetBLDiagOffset( long nVerOffs, long nDiagOffs, double fAngle );
@param fAngle
Inner (left) angle between diagonal and horizontal frame border.
*/
-long GetBRDiagOffset( long nVerOffs, long nDiagOffs, double fAngle );
+long GetBRDiagOffset( long nDiagOffs, double fAngle );
/** Returns an X coordinate for a diagonal frame border in the specified height.
@@ -340,9 +337,6 @@ long GetBRDiagOffset( long nVerOffs, long nDiagOffs, double fAngle );
top-right diagonal frame border, connected to the right end of a horizontal
frame border.
- @param nVerOffs
- The vertical position of the point to be calculated, relative to the Y
- coordinate of the reference point.
@param nDiagOffs
The width offset across the diagonal frame border (0 = middle),
regardless of the gradient of the diagonal frame border (always
@@ -352,7 +346,7 @@ long GetBRDiagOffset( long nVerOffs, long nDiagOffs, double fAngle );
@param fAngle
Inner (left) angle between diagonal and horizontal frame border.
*/
-long GetTRDiagOffset( long nVerOffs, long nDiagOffs, double fAngle );
+long GetTRDiagOffset( long nDiagOffs, double fAngle );
/** Checks whether two horizontal frame borders are "connectable".
diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx
index 774b55036cb8..2ae5e577d2dd 100644
--- a/include/svx/framelinkarray.hxx
+++ b/include/svx/framelinkarray.hxx
@@ -328,11 +328,9 @@ public:
// mirroring --------------------------------------------------------------
/** Mirrors the entire array horizontally.
- @param bMirrorStyles
- true = Swap primary and secondary line of all vertical double frame borders.
@param bSwapDiag
true = Swap top-left to bottom-right and bottom-left to top-right frame borders. */
- void MirrorSelfX( bool bMirrorStyles, bool bSwapDiag );
+ void MirrorSelfX( bool bSwapDiag );
// drawing ----------------------------------------------------------------
diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx
index f11c188ca789..6f16ff125600 100644
--- a/include/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
@@ -94,9 +94,9 @@ public:
// ObjectContact (->View). Always needs to return something.
ViewObjectContact& GetViewObjectContact(ObjectContact& rObjectContact);
- // Test if this ViewContact has ViewObjectContacts at all. This can
+ // Test if this ViewContact has ViewObjectContacts(excluding previews) at all. This can
// be used to test if this ViewContact is visualized ATM or not
- bool HasViewObjectContacts(bool bExcludePreviews = false) const;
+ bool HasViewObjectContacts() const;
// Check if this primitive is animated in any OC (View) which means it has
// generated a PrimitiveAnimation in its VOC
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 0b4511cecb92..6380ee0b6d1a 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -339,8 +339,8 @@ public:
// return sal_True, if at least one marked object could be converted.
// Also member objects of group objects are converted.
// For a better description see: SdrObj.HXX
- bool IsConvertToPathObjPossible(bool bLineToArea) const { ForcePossibilities(); return bLineToArea ? bCanConvToPathLineToArea : bCanConvToPath; }
- bool IsConvertToPolyObjPossible(bool bLineToArea) const { ForcePossibilities(); return bLineToArea ? bCanConvToPolyLineToArea : bCanConvToPoly; }
+ bool IsConvertToPathObjPossible() const { ForcePossibilities(); return bCanConvToPath; }
+ bool IsConvertToPolyObjPossible() const { ForcePossibilities(); return bCanConvToPoly; }
bool IsConvertToContourPossible() const { ForcePossibilities(); return bCanConvToContour; }
void ConvertMarkedToPathObj(bool bLineToArea);
void ConvertMarkedToPolyObj(bool bLineToArea);
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index c6617dd4c565..f6ddfdf5cb99 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -283,10 +283,10 @@ public:
const SdrView* pView,
sal_uInt16 nAnchorTypes = 0 ) = 0;
- virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(vcl::Window* pParent,
+ virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(
const SfxItemSet& rAttr)= 0;
- virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( vcl::Window* pParent ) = 0;
+ virtual AbstractFmShowColsDialog * CreateFmShowColsDialog() = 0;
virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( vcl::Window* pParent,
const SfxItemSet& rCoreSet )=0;
@@ -301,7 +301,7 @@ public:
const OUString& rOldText ) = 0;
virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( vcl::Window* pParent,
GalleryTheme* pThm ) = 0;
- virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( vcl::Window* pParent,
+ virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog(
ExchangeData* pData,
SfxItemSet* pItemSet ) = 0;
virtual AbstractURLDlg * CreateURLDialog( vcl::Window* pParent,
@@ -339,7 +339,7 @@ public:
virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( vcl::Window* pParent,
const SfxItemSet& rOptionsSet,
sal_Int32 nInitialFlags )=0;
- virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( vcl::Window* pParent ) = 0;
+ virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog() = 0;
virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent ) = 0;
virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent,
const OUString& rName,
@@ -348,8 +348,8 @@ public:
const OUString& rName, const OUString& rDesc ) = 0;
// #i68101#
- virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(vcl::Window* pParent, const OUString& rName ) = 0;
- virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(vcl::Window* pParent, const OUString& rTitle, const OUString& rDescription) = 0;
+ virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(const OUString& rName ) = 0;
+ virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(const OUString& rTitle, const OUString& rDescription) = 0;
virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(vcl::Window* pParent) = 0 ;
virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(vcl::Window* pParent) = 0 ;
@@ -420,11 +420,11 @@ public:
const sal_uInt16 _nInitiallySelectedEvent
) = 0;
- virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = nullptr )=0;
+ virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = nullptr )=0;
virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )=0;
- virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( vcl::Window* pParent ) = 0;
+ virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog() = 0;
virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ) = 0;
};
diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx
index cf2cc0530ba0..66962f1d3ab2 100644
--- a/include/svx/view3d.hxx
+++ b/include/svx/view3d.hxx
@@ -108,7 +108,7 @@ public:
// Means to create all Extrudes in a certain depth order.
static void DoDepthArrange(E3dScene* pScene, double fDepth);
- void ConvertMarkedToPolyObj(bool bLineToArea);
+ void ConvertMarkedToPolyObj();
E3dScene* SetCurrent3DObj(E3dObject* p3DObj);
void Start3DCreation();
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 5d0596b3e7b8..fac9baea0b4f 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -1115,7 +1115,7 @@ void ScDocument::FillInfo(
2nd param = Do not swap diagonal lines.
*/
if( bLayoutRTL )
- rArray.MirrorSelfX( true, false );
+ rArray.MirrorSelfX( false );
}
ScTableInfo::ScTableInfo()
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index bdef1063be5f..6f58a8580e60 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -487,7 +487,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- std::unique_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(nullptr, aName));
+ std::unique_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(aName));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->SetCheckNameHdl(LINK(this, ScDrawShell, NameObjectHdl));
@@ -556,7 +556,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- std::unique_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(nullptr, aTitle, aDescription));
+ std::unique_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(aTitle, aDescription));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if(RET_OK == pDlg->Execute())
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index 7535798d3b7d..4d20312cc5c1 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -127,7 +127,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
if( (nColumns == 0) || (nRows == 0) )
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- std::unique_ptr<SvxAbstractNewTableDialog> pDlg( pFact ? pFact->CreateSvxNewTableDialog( nullptr ) : nullptr);
+ std::unique_ptr<SvxAbstractNewTableDialog> pDlg( pFact ? pFact->CreateSvxNewTableDialog() : nullptr);
if( !pDlg.get() || (pDlg->Execute() != RET_OK) )
break;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index f9c244baf810..a08cbed5be50 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -642,7 +642,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
else
{
WaitObject aWait( GetActiveWindow() );
- mpDrawView->ConvertMarkedToPolyObj(false);
+ mpDrawView->ConvertMarkedToPolyObj();
}
}
@@ -2100,7 +2100,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- std::unique_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(nullptr, aName));
+ std::unique_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(aName));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->SetCheckNameHdl(LINK(this, DrawViewShell, NameObjectHdl));
@@ -2133,7 +2133,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- std::unique_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(nullptr, aTitle, aDescription));
+ std::unique_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(aTitle, aDescription));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if(RET_OK == pDlg->Execute())
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 3ebd45fb3123..3a804658b1c2 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -261,7 +261,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem( SID_DRAW_TEXT_VERTICAL );
}
- bool bConvertToPathPossible = mpDrawView->IsConvertToPathObjPossible(false);
+ bool bConvertToPathPossible = mpDrawView->IsConvertToPathObjPossible();
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
const size_t nMarkCount = rMarkList.GetMarkCount();
@@ -654,10 +654,10 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
return;
}
- if( !( mpDrawView->IsConvertToPolyObjPossible(false) || mpDrawView->IsVectorizeAllowed() ) )
+ if( !( mpDrawView->IsConvertToPolyObjPossible() || mpDrawView->IsVectorizeAllowed() ) )
rSet.DisableItem(SID_CHANGEPOLYGON);
- if( !( mpDrawView->IsConvertToPolyObjPossible(false) || mpDrawView->IsConvertToContourPossible() ) )
+ if( !( mpDrawView->IsConvertToPolyObjPossible() || mpDrawView->IsConvertToContourPossible() ) )
rSet.DisableItem(SID_CONVERT_TO_CONTOUR);
if ( !mpDrawView->IsConvertTo3DObjPossible() )
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index 0773fc9ebbce..0909cbbdbb6a 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -198,7 +198,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
}
if ( nInv == E3dInventor ||
- (!mpDrawView->IsConvertToPathObjPossible(false) &&
+ (!mpDrawView->IsConvertToPathObjPossible() &&
!mpDrawView->IsShearAllowed() &&
!mpDrawView->IsDistortAllowed()) )
{
@@ -365,8 +365,8 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
}
if (b3dObj ||
- (!mpDrawView->IsConvertToPathObjPossible(false) &&
- !mpDrawView->IsShearAllowed() &&
+ (!mpDrawView->IsConvertToPathObjPossible() &&
+ !mpDrawView->IsShearAllowed() &&
!mpDrawView->IsDistortAllowed()) )
{
rSet.DisableItem( SID_OBJECT_SHEAR );
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)
{
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 6e76baf97afe..126986d782ff 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -522,7 +522,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- std::unique_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(nullptr, aName));
+ std::unique_ptr<AbstractSvxObjectNameDialog> pDlg(pFact->CreateSvxObjectNameDialog(aName));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->SetCheckNameHdl(LINK(this, SwDrawBaseShell, CheckGroupShapeNameHdl));
@@ -552,7 +552,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialog creation failed!");
- std::unique_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(nullptr, aTitle, aDescription));
+ std::unique_ptr<AbstractSvxObjectTitleDescDialog> pDlg(pFact->CreateSvxObjectTitleDescDialog(aTitle, aDescription));
OSL_ENSURE(pDlg, "Dialog creation failed!");
if(RET_OK == pDlg->Execute())
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index f181d2a5b72e..9d6892023f87 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -623,8 +623,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
assert(pFact);
std::unique_ptr<AbstractSvxObjectTitleDescDialog> pDlg(
- pFact->CreateSvxObjectTitleDescDialog( nullptr,
- aTitle,
+ pFact->CreateSvxObjectTitleDescDialog( aTitle,
aDescription ));
assert(pDlg);