summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-19 17:51:00 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-19 17:51:00 +0200
commit34100b30c87123fc631d5536158ffb6443258e40 (patch)
tree23b9499ecb0bf819ff11d615bc8a0833d47f2e97 /sd
parent4b603aaa4adde6789099f2fd7e95c11df4116c0c (diff)
loplugin:defaultparams
Change-Id: I5f3b978823ec43519744f49739b9b4ee6ca1e1e9
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/drawdoc3.cxx2
-rw-r--r--sd/source/core/undo/undoobjects.cxx2
-rw-r--r--sd/source/filter/eppt/epptso.cxx14
-rw-r--r--sd/source/filter/html/htmlex.cxx2
-rw-r--r--sd/source/filter/ppt/pptin.cxx12
-rw-r--r--sd/source/filter/xml/sdtransform.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx4
-rw-r--r--sd/source/ui/dlg/animobjs.cxx4
-rw-r--r--sd/source/ui/dlg/custsdlg.cxx2
-rw-r--r--sd/source/ui/dlg/dlgass.cxx4
-rw-r--r--sd/source/ui/dlg/dlgolbul.cxx4
-rw-r--r--sd/source/ui/dlg/present.cxx4
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx2
-rw-r--r--sd/source/ui/dlg/tpaction.cxx2
-rw-r--r--sd/source/ui/docshell/docshel4.cxx2
-rw-r--r--sd/source/ui/func/fuconstr.cxx2
-rw-r--r--sd/source/ui/func/fuolbull.cxx2
-rw-r--r--sd/source/ui/func/fupoor.cxx2
-rw-r--r--sd/source/ui/func/fusel.cxx8
-rw-r--r--sd/source/ui/func/futext.cxx4
-rw-r--r--sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx2
-rw-r--r--sd/source/ui/sidebar/DocumentHelper.cxx2
-rw-r--r--sd/source/ui/slideshow/showwin.cxx2
-rw-r--r--sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx2
-rw-r--r--sd/source/ui/view/drawview.cxx2
-rw-r--r--sd/source/ui/view/drtxtob.cxx2
-rw-r--r--sd/source/ui/view/drviews2.cxx4
-rw-r--r--sd/source/ui/view/drviewse.cxx2
-rw-r--r--sd/source/ui/view/drviewsf.cxx2
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx2
-rw-r--r--sd/source/ui/view/viewshe3.cxx4
-rw-r--r--sd/source/ui/view/viewshel.cxx2
33 files changed, 55 insertions, 55 deletions
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 36b0bf59ca17..7785466ad2ed 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1039,7 +1039,7 @@ bool SdDrawDocument::InsertBookmarkAsObject(
pPV = pBMView->ShowSdrPage(pPage);
}
- pBMView->MarkObj(pObj, pPV, false);
+ pBMView->MarkObj(pObj, pPV);
}
}
}
diff --git a/sd/source/core/undo/undoobjects.cxx b/sd/source/core/undo/undoobjects.cxx
index 0595c1c7f456..c4333b4f38e5 100644
--- a/sd/source/core/undo/undoobjects.cxx
+++ b/sd/source/core/undo/undoobjects.cxx
@@ -285,7 +285,7 @@ void UndoAutoLayoutPosAndSize::Redo()
{
SdPage* pPage = static_cast< SdPage* >( mxPage.get() );
if( pPage )
- pPage->SetAutoLayout( pPage->GetAutoLayout(), false );
+ pPage->SetAutoLayout( pPage->GetAutoLayout() );
}
UndoGeoObject::UndoGeoObject( SdrObject& rNewObj )
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 3b00337cc395..e96a7d928ae2 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2110,7 +2110,7 @@ bool PPTWriter::ImplCreatePresentationPlaceholder( const bool bMasterPage, const
SvMemoryStream aClientTextBox( 0x200, 0x200 );
ImplWriteTextStyleAtom( aClientTextBox, nStyleInstance, 0, NULL, aExtBu, &aPropOpt );
- aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, false );
+ aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60 );
aPropOpt.CreateShapeProperties( mXShape );
aPropOpt.Commit( *mpStrm );
mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor );
@@ -2152,7 +2152,7 @@ void PPTWriter::ImplCreateTextShape( EscherPropertyContainer& rPropOpt, EscherSo
if ( bFill )
rPropOpt.CreateFillProperties( mXPropSet, true, mXShape );
if ( ImplGetText() )
- rPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, false );
+ rPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60 );
}
void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& aSolverContainer, PageType ePageType, bool bMasterPage, int nPageNumber )
@@ -2809,7 +2809,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( aPropertyOptions.GetOpt( ESCHER_Prop_fNoLineDrawDash, nLineFlags ) )
nLineFlags |= 0x10001; // draw dashed line if no line
aPropertyOptions.AddOpt( ESCHER_Prop_fNoLineDrawDash, nLineFlags );
- aPropertyOptions.CreateTextProperties( mXPropSet, mnTxId += 0x60, false );
+ aPropertyOptions.CreateTextProperties( mXPropSet, mnTxId += 0x60 );
ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt );
aPropertyOptions.Commit( *mpStrm );
mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor );
@@ -2850,7 +2850,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
ImplCreateShape( ESCHER_ShpInst_Rectangle, 0x220, aSolverContainer ); // Flags: HaveAnchor | HaveMaster
aPropOpt.AddOpt( ESCHER_Prop_hspMaster, mnShapeMasterTitle );
aPropOpt.CreateFillProperties( mXPropSet, true, mXShape );
- aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, false );
+ aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60 );
ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt );
if ( mbEmptyPresObj )
{
@@ -2901,7 +2901,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( aPropOpt2.GetOpt( ESCHER_Prop_fNoLineDrawDash, nLineFlags ) )
nLineFlags |= 0x10001; // draw dashed line if no line
aPropOpt2.AddOpt( ESCHER_Prop_fNoLineDrawDash, nLineFlags );
- aPropOpt2.CreateTextProperties( mXPropSet, mnTxId += 0x60, false );
+ aPropOpt2.CreateTextProperties( mXPropSet, mnTxId += 0x60 );
ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt2 );
aPropOpt2.Commit( *mpStrm );
mpPptEscherEx->AddAtom( 8, ESCHER_ClientAnchor );
@@ -2951,7 +2951,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
ImplCreateShape( ESCHER_ShpInst_Rectangle, 0x220, aSolverContainer ); // Flags: HaveAnchor | HaveMaster
aPropOpt.AddOpt( ESCHER_Prop_hspMaster, mnShapeMasterBody );
aPropOpt.CreateFillProperties( mXPropSet, true, mXShape );
- aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, false );
+ aPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60 );
ImplAdjustFirstLineLineSpacing( aTextObj, aPropOpt );
if ( mbEmptyPresObj )
{
@@ -3696,7 +3696,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
ImplCreateShape( ESCHER_ShpInst_Rectangle, 0xa02, aSolverContainer ); // Flags: Connector | HasSpt | Child
aPropOptSp.CreateFillProperties( mXPropSet, true );
aPropOptSp.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x90000 );
- aPropOptSp.CreateTextProperties( mXPropSet, mnTxId += 0x60, false );
+ aPropOptSp.CreateTextProperties( mXPropSet, mnTxId += 0x60 );
aPropOptSp.AddOpt( ESCHER_Prop_WrapText, ESCHER_WrapSquare );
SvMemoryStream aClientTextBox( 0x200, 0x200 );
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index e42370313e02..12d4786363e6 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -830,7 +830,7 @@ void HtmlExport::SetDocColors( SdPage* pPage )
if(pSheet)
{
SfxItemSet& rSet = pSheet->GetItemSet();
- if(rSet.GetItemState(EE_CHAR_COLOR,true) == SfxItemState::SET)
+ if(rSet.GetItemState(EE_CHAR_COLOR) == SfxItemState::SET)
maTextColor = static_cast<const SvxColorItem*>(rSet.GetItem(EE_CHAR_COLOR))->GetValue();
}
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index d4d12b3ad083..4f18d7356026 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -411,14 +411,14 @@ bool ImplSdPPTImport::Import()
if ( nType != VT_I4 )
break;
aPropItem.ReadInt32( pHyperlink->nInfo );
- if ( !aPropItem.Read( pHyperlink->aTarget, VT_EMPTY ) )
+ if ( !aPropItem.Read( pHyperlink->aTarget ) )
break;
// Convert '\\' notation to 'smb://'
INetURLObject aUrl( pHyperlink->aTarget, INetProtocol::File );
pHyperlink->aTarget = aUrl.GetMainURL( INetURLObject::NO_DECODE );
- if ( !aPropItem.Read( pHyperlink->aSubAdress, VT_EMPTY ) )
+ if ( !aPropItem.Read( pHyperlink->aSubAdress ) )
break;
pHyperlink->nStartPos = pHyperlink->nEndPos = -1;
@@ -1019,7 +1019,7 @@ bool ImplSdPPTImport::Import()
pSdrModel->InsertPage( pNotesPage ); // SJ: #i29625# because of form controls, the
ImportPage( pNotesPage, pMasterPersist2 ); // page must be inserted before importing
SetHeaderFooterPageSettings( pNotesPage, pMasterPersist2 );
- pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, false );
+ pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES );
}
else
{
@@ -1027,7 +1027,7 @@ bool ImplSdPPTImport::Import()
pNotesPage->TRG_SetMasterPage(*pSdrModel->GetMasterPage(nNotesMasterNum));
pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, true );
pSdrModel->InsertPage( pNotesPage );
- SdrObject* pPageObj = pNotesPage->GetPresObj( PRESOBJ_PAGE, 1 );
+ SdrObject* pPageObj = pNotesPage->GetPresObj( PRESOBJ_PAGE );
if ( pPageObj )
static_cast<SdrPageObj*>(pPageObj)->SetReferencedPage(pSdrModel->GetPage(( nPage << 1 ) + 1));
}
@@ -1197,7 +1197,7 @@ bool ImplSdPPTImport::Import()
break;
}
if ( eAutoLayout != AUTOLAYOUT_NONE )
- pPage->SetAutoLayout( eAutoLayout, false );
+ pPage->SetAutoLayout( eAutoLayout );
}
}
@@ -2130,7 +2130,7 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv
!= osl::FileBase::E_None) )
aBookmarkURL.clear();
if( aBookmarkURL.isEmpty() )
- aBookmarkURL = URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), pPtr->aTarget, URIHelper::GetMaybeFileHdl(), true );
+ aBookmarkURL = URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), pPtr->aTarget, URIHelper::GetMaybeFileHdl() );
pInfo->SetBookmark( aBookmarkURL );
pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PROGRAM;
}
diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx
index 46a986dee476..e00cc5e8fb4e 100644
--- a/sd/source/filter/xml/sdtransform.cxx
+++ b/sd/source/filter/xml/sdtransform.cxx
@@ -223,7 +223,7 @@ void SdTransformOOo2xDocument::transformTextShape( SdrTextObj& rTextShape )
// now set all none hard attributes from the style
while(nWhich)
{
- if(SfxItemState::SET != aParaSet.GetItemState(nWhich, true))
+ if(SfxItemState::SET != aParaSet.GetItemState(nWhich))
{
aParaSet.Put(rStyleSet.Get(nWhich));
bItemChange = true;
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index e8810c331d44..70004faa5350 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -2191,7 +2191,7 @@ void CustomAnimationTextAnimTabPage::updateControlStates()
}
else
{
- maCBXAnimateForm->Enable(true);
+ maCBXAnimateForm->Enable();
}
}
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 9baee5b2479b..35abbbc28fdd 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -606,7 +606,7 @@ void CustomAnimationPane::updateControls()
mpCBSpeed->SelectEntryPos( nPos );
}
- mpPBPropertyMore->Enable( true );
+ mpPBPropertyMore->Enable();
}
else
{
@@ -2247,7 +2247,7 @@ void CustomAnimationPane::markShapesFromSelectedEffects()
Reference< XShape > xShape( pEffect->getTargetShape() );
SdrObject* pObj = GetSdrObjectFromXShape( xShape );
if( pObj )
- pView->MarkObj(pObj, pView->GetSdrPageView(), false);
+ pView->MarkObj(pObj, pView->GetSdrPageView());
}
}
}
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 9c6ea9e18399..c2d83e45f548 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -612,8 +612,8 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls)
m_pRbtBitmap->Enable();
m_pBtnCreateGroup->Enable(!m_FrameList.empty());
- m_pFtAdjustment->Enable( true );
- m_pLbAdjustment->Enable( true );
+ m_pFtAdjustment->Enable();
+ m_pLbAdjustment->Enable();
}
ClickRbtHdl( NULL );
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 14fff3034c74..153a1cc3510d 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -111,7 +111,7 @@ void SdCustomShowDlg::CheckState()
m_pBtnRemove->Enable( bEnable );
m_pBtnCopy->Enable( bEnable );
m_pCbxUseCustomShow->Enable( bEnable );
- m_pBtnStartShow->Enable( true );
+ m_pBtnStartShow->Enable();
if (bEnable && pCustomShowList)
pCustomShowList->Seek( nPos );
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 163e2dfe4b71..7fa6101b5817 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1028,7 +1028,7 @@ void AssistentDlgImpl::UpdatePage()
{
// Show elements on first page depending of start type
SetStartType( GetStartType() );
- mpPage1TemplateRB->Enable(true /*mbTemplatesReady*/);
+ mpPage1TemplateRB->Enable(/*mbTemplatesReady*/);
break;
}
@@ -1039,7 +1039,7 @@ void AssistentDlgImpl::UpdatePage()
if( GetStartType() != ST_EMPTY )
{
- mpPage2Medium5RB->Enable( true );
+ mpPage2Medium5RB->Enable();
}
else
{
diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index 45e92550ea82..9a208364eff8 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -109,7 +109,7 @@ OutlineBulletDlg::OutlineBulletDlg(
aInputSet.Put(*pItem, EE_PARA_NUMBULLET);
}
- if(bTitle && aInputSet.GetItemState(EE_PARA_NUMBULLET,true) == SfxItemState::SET )
+ if(bTitle && aInputSet.GetItemState(EE_PARA_NUMBULLET) == SfxItemState::SET )
{
const SvxNumBulletItem* pItem = static_cast<const SvxNumBulletItem*>( aInputSet.GetItem(EE_PARA_NUMBULLET) );
SvxNumRule* pRule = pItem->GetNumRule();
@@ -184,7 +184,7 @@ const SfxItemSet* OutlineBulletDlg::GetOutputItemSet() const
// #i35937 - removed EE_PARA_BULLETSTATE setting
}
- if(bTitle && pOutputSet->GetItemState(EE_PARA_NUMBULLET,true) == SfxItemState::SET )
+ if(bTitle && pOutputSet->GetItemState(EE_PARA_NUMBULLET) == SfxItemState::SET )
{
const SvxNumBulletItem* pBulletItem = static_cast<const SvxNumBulletItem*>(pOutputSet->GetItem(EE_PARA_NUMBULLET));
SvxNumRule* pRule = pBulletItem->GetNumRule();
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 472f523f821c..5efb4d9d49a2 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -221,8 +221,8 @@ void SdStartPresentationDlg::InitMonitorSettings()
{
try
{
- maFtMonitor->Show( true );
- maLBMonitor->Show( true );
+ maFtMonitor->Show();
+ maLBMonitor->Show();
mnMonitors = Application::GetScreenCount();
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 7993f5dae0d3..a37abe0907d0 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1161,7 +1161,7 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel)
Select(pParent);
// for (SvTreeListEntry*pChild=FirstChild(pParent); pChild!=NULL; pChild=NextSibling(pChild))
// Select(pChild, sal_True);
- EnableSelectionAsDropTarget(true);//sal_False);
+ EnableSelectionAsDropTarget();//sal_False);
}
// Set selection back to the entry under the mouse.
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index ee4fd3d9e2ed..bdd3915c13fb 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -823,7 +823,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination )
aBaseURL = mpDoc->GetDocSh()->GetMedium()->GetBaseURL();
if( !aStr.isEmpty() && aURL.GetProtocol() == INetProtocol::NotValid )
- aURL = INetURLObject( ::URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), aStr, URIHelper::GetMaybeFileHdl(), true, false ) );
+ aURL = INetURLObject( ::URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), aStr, URIHelper::GetMaybeFileHdl() ) );
// get adjusted file name
aStr = aURL.GetMainURL( INetURLObject::NO_DECODE );
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index fd6e879a8609..dfcf1c03ea1a 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -816,7 +816,7 @@ bool DrawDocShell::GotoBookmark(const OUString& rBookmark)
pDrawViewShell->GetView()->UnmarkAll();
pDrawViewShell->GetView()->MarkObj(
pObj,
- pDrawViewShell->GetView()->GetSdrPageView(), false);
+ pDrawViewShell->GetView()->GetSdrPageView());
}
}
}
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index 610297948e02..b170b6684273 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -147,7 +147,7 @@ bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt)
if (bDragWithCopy)
{
- bDragWithCopy = !mpView->IsPresObjSelected(false, true);
+ bDragWithCopy = !mpView->IsPresObjSelected(false);
}
mpView->SetDragWithCopy(bDragWithCopy);
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index d1fe66dc8329..80cdcc22792b 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -347,7 +347,7 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u
aNewAttr.Put(*pItem, EE_PARA_NUMBULLET);
- if(bTitle && aNewAttr.GetItemState(EE_PARA_NUMBULLET,true) == SfxItemState::SET )
+ if(bTitle && aNewAttr.GetItemState(EE_PARA_NUMBULLET) == SfxItemState::SET )
{
const SvxNumBulletItem* pBulletItem = static_cast<const SvxNumBulletItem*>( aNewAttr.GetItem(EE_PARA_NUMBULLET) );
SvxNumRule* pLclRule = pBulletItem->GetNumRule();
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 76c59e158deb..1ab03ceba8bb 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -960,7 +960,7 @@ IMPL_LINK_NOARG_TYPED(FuPoor, DragHdl, Timer *, void)
SdrHdl* pHdl = mpView->PickHandle(aMDPos);
if ( pHdl==NULL && mpView->IsMarkedHit(aMDPos, nHitLog)
- && !mpView->IsPresObjSelected(false, true) )
+ && !mpView->IsPresObjSelected(false) )
{
mpWindow->ReleaseMouse();
bIsInDragMode = true;
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 61f5b4b8fdc0..077e66e16651 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -663,7 +663,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
if (bDragWithCopy)
{
- bDragWithCopy = !mpView->IsPresObjSelected(false, true);
+ bDragWithCopy = !mpView->IsPresObjSelected(false);
}
mpView->SetDragWithCopy(bDragWithCopy);
@@ -687,7 +687,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
if (pPV->IsObjSelectable(pObj))
{
mpView->UnmarkAllObj();
- mpView->MarkObj(pObj,pPV,false);
+ mpView->MarkObj(pObj,pPV);
return true;
}
}
@@ -867,7 +867,7 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
if (bDragWithCopy)
{
- bDragWithCopy = !mpView->IsPresObjSelected(false, true);
+ bDragWithCopy = !mpView->IsPresObjSelected(false);
}
mpView->SetDragWithCopy(bDragWithCopy);
@@ -1362,7 +1362,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
{
// Assign verb
mpView->UnmarkAll();
- mpView->MarkObj(pObj, mpView->GetSdrPageView(), false);
+ mpView->MarkObj(pObj, mpView->GetSdrPageView());
pDrViewSh->DoVerb((sal_Int16)pInfo->mnVerb);
bAnimated = true;
}
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 6159c81cb5d5..8dc5bcb5215e 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -630,7 +630,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
if (bDragWithCopy)
{
- bDragWithCopy = !mpView->IsPresObjSelected(false, true);
+ bDragWithCopy = !mpView->IsPresObjSelected(false);
}
mpView->SetDragWithCopy(bDragWithCopy);
@@ -660,7 +660,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
if (pPV->IsObjSelectable(pObj))
{
mpView->UnmarkAllObj();
- mpView->MarkObj(pObj,pPV,false);
+ mpView->MarkObj(pObj,pPV);
return bReturn;
}
}
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index 624bb4ec38c2..adb5de107452 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -226,7 +226,7 @@ void CurrentMasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId)
// Removing the precious flag so that the following call to
// RemoveUnnessesaryMasterPages() will remove this master page.
pMasterPage->SetPrecious(false);
- mrDocument.RemoveUnnecessaryMasterPages(pMasterPage, false);
+ mrDocument.RemoveUnnecessaryMasterPages(pMasterPage);
}
}
else
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index 2bac79f6682d..05bd618e5921 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -459,7 +459,7 @@ void DocumentHelper::AssignMasterPageToPage (
// 3. Replace the master page A by a copy of the given master
// page B.
pDocument->RemoveUnnecessaryMasterPages (
- pPage, false);
+ pPage);
}
}
}
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 2854779ac0d6..33a487229c09 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -617,7 +617,7 @@ void ShowWindow::AddWindowToPaintView()
sal_uInt16 nChild = GetChildCount();
while( nChild-- )
- GetChild( nChild )->Show( true );
+ GetChild( nChild )->Show();
}
// Override the sd::Window's CreateAccessible to create a different accessible object
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 2d0523b0ed51..1461c7045071 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -633,7 +633,7 @@ void SlideSorterViewShell::UpdateScrollBars()
{
// Do not call the overwritten method of the base class: We do all the
// scroll bar setup by ourselves.
- mpSlideSorter->GetController().GetScrollBarManager().UpdateScrollBars (false);
+ mpSlideSorter->GetController().GetScrollBarManager().UpdateScrollBars ();
}
void SlideSorterViewShell::StartDrag (
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 9df992965cc2..c2d914e94460 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -432,7 +432,7 @@ bool DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAtt
// is there a masterpage edit?
if (mpDrawViewShell && mpDrawViewShell->GetEditMode() == EM_MASTERPAGE)
{
- if (IsPresObjSelected(false, true))
+ if (IsPresObjSelected(false))
{
ScopedVclPtr<InfoBox>::Create(mpDrawViewShell->GetActiveWindow(),
SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 900ea482b165..1fa225f8aa51 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -138,7 +138,7 @@ void TextObjectBar::GetCharState( SfxItemSet& rSet )
//aKern.SetWhich(SID_ATTR_CHAR_KERNING);
rSet.Put(aKern);
- SfxItemState eState = aCharAttrSet.GetItemState( EE_CHAR_KERNING, true );
+ SfxItemState eState = aCharAttrSet.GetItemState( EE_CHAR_KERNING );
if ( eState == SfxItemState::DONTCARE )
{
rSet.InvalidateItem(EE_CHAR_KERNING);
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index e81d073f9f45..ed339232a135 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1153,7 +1153,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_COPYOBJECTS:
{
- if ( mpDrawView->IsPresObjSelected(false, true) )
+ if ( mpDrawView->IsPresObjSelected(false) )
{
::sd::Window* pWindow = GetActiveWindow();
ScopedVclPtr<InfoBox>::Create(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE))->Execute();
@@ -2397,7 +2397,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
}
WaitObject aWait( GetActiveWindow() );
- mpDrawView->ConvertMarkedObjTo3D(true);
+ mpDrawView->ConvertMarkedObjTo3D();
}
}
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index f3ec602de426..60002348136d 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -638,7 +638,7 @@ void DrawViewShell::FuDeleteSelectedObjects()
bool bConsumed = false;
//if any placeholders are selected
- if (mpDrawView->IsPresObjSelected(false, true, false))
+ if (mpDrawView->IsPresObjSelected(false))
{
//If there are placeholders in the list which can be toggled
//off in edit->master->master elements then do that here,
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index bd6070a3ee53..e6641739f981 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -737,7 +737,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, true ) );
}
- eState = pSet->GetItemState( EE_CHAR_KERNING, true );
+ eState = pSet->GetItemState( EE_CHAR_KERNING );
if ( eState == SfxItemState::DONTCARE )
{
rSet.InvalidateItem(EE_CHAR_KERNING);
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 576923300a4f..41fb110043a6 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -298,7 +298,7 @@ bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& /*rMEvt*/, SmartHd
{
SdrPageView* pPV = mrView.GetSdrPageView();
mrView.UnmarkAllObj(pPV );
- mrView.MarkObj(mxPlaceholderObj.get(), pPV, false);
+ mrView.MarkObj(mxPlaceholderObj.get(), pPV);
}
}
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 7ed8a970f5d8..06892405f074 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -141,7 +141,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet )
// Set the necessary string like in
// sfx2/source/view/viewfrm.cxx ver 1.23 ln 1072 ff.
OUString aTmp(SVT_RESSTR(STR_UNDO));
- aTmp += pUndoManager->GetUndoActionComment(0);
+ aTmp += pUndoManager->GetUndoActionComment();
rSet.Put(SfxStringItem(SID_UNDO, aTmp));
}
else
@@ -168,7 +168,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet )
// Set the necessary string like in
// sfx2/source/view/viewfrm.cxx ver 1.23 ln 1081 ff.
OUString aTmp(SVT_RESSTR(STR_REDO));
- aTmp += pUndoManager->GetRedoActionComment(0);
+ aTmp += pUndoManager->GetRedoActionComment();
rSet.Put(SfxStringItem(SID_REDO, aTmp));
}
else
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index b00aaf9c4192..4f92351f2638 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -917,7 +917,7 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16&
aNewAttr.Put(*pItem, EE_PARA_NUMBULLET);
- if(bTitle && aNewAttr.GetItemState(EE_PARA_NUMBULLET,true) == SfxItemState::SET )
+ if(bTitle && aNewAttr.GetItemState(EE_PARA_NUMBULLET) == SfxItemState::SET )
{
const SvxNumBulletItem* pBulletItem = static_cast<const SvxNumBulletItem*>(aNewAttr.GetItem(EE_PARA_NUMBULLET));
SvxNumRule* pRule = pBulletItem->GetNumRule();