summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-21 09:06:55 +0200
committerNoel Grandin <noel@peralex.com>2015-08-21 10:19:44 +0200
commitfa12df37f42994cd172ec62be936e84ab01a6cf7 (patch)
tree731ce958ef48bf511ab5bbde80e8005a4fc50110 /sw/source/uibase
parentb0dcd6dbad43c1f7e45240687735b1127acad3ec (diff)
loplugin: defaultparams
Change-Id: I74d5ce7a23b87bed2ecffc8351dc15a9f0a68ed7
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/sidebar/PagePropertyPanel.cxx2
-rw-r--r--sw/source/uibase/sidebar/ThemePanel.cxx4
-rw-r--r--sw/source/uibase/table/tablemgr.cxx4
-rw-r--r--sw/source/uibase/uiview/formatclipboard.cxx4
-rw-r--r--sw/source/uibase/uiview/pview.cxx12
-rw-r--r--sw/source/uibase/uiview/scroll.cxx2
-rw-r--r--sw/source/uibase/uiview/view.cxx8
-rw-r--r--sw/source/uibase/uiview/view1.cxx6
-rw-r--r--sw/source/uibase/uiview/view2.cxx7
-rw-r--r--sw/source/uibase/uiview/viewling.cxx8
-rw-r--r--sw/source/uibase/uiview/viewmdi.cxx8
-rw-r--r--sw/source/uibase/uiview/viewport.cxx4
-rw-r--r--sw/source/uibase/uiview/viewstat.cxx2
-rw-r--r--sw/source/uibase/uno/unoatxt.cxx26
-rw-r--r--sw/source/uibase/utlui/content.cxx12
-rw-r--r--sw/source/uibase/utlui/navipi.cxx10
-rw-r--r--sw/source/uibase/utlui/tmplctrl.cxx2
-rw-r--r--sw/source/uibase/utlui/uitool.cxx4
-rw-r--r--sw/source/uibase/wrtsh/delete.cxx2
-rw-r--r--sw/source/uibase/wrtsh/move.cxx2
-rw-r--r--sw/source/uibase/wrtsh/select.cxx12
-rw-r--r--sw/source/uibase/wrtsh/wrtsh1.cxx2
22 files changed, 70 insertions, 73 deletions
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index 4300404db24c..ea4edfd5a4c9 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -536,7 +536,7 @@ void PagePropertyPanel::NotifyItemUpdate(
case SID_ATTR_PAGE_SIZE:
if ( mbInvalidateSIDAttrPageOnSIDAttrPageSizeNotify )
{
- mpBindings->Invalidate( SID_ATTR_PAGE, true, false );
+ mpBindings->Invalidate( SID_ATTR_PAGE, true );
}
if ( eState >= SfxItemState::DEFAULT &&
pState && pState->ISA(SvxSizeItem) )
diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx
index c2e7406ce2aa..a0457f0b5b02 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -430,7 +430,7 @@ void applyTheme(SfxStyleSheetBasePool* pPool, const OUString& sFontSetName, cons
std::vector<ColorSet> aColorSets = initColorSets();
ColorSet aColorSet = getColorSet(sColorSetName, aColorSets);
- pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL);
+ pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA);
pStyle = static_cast<SwDocStyleSheet*>(pPool->First());
while (pStyle)
@@ -449,7 +449,7 @@ void applyTheme(SfxStyleSheetBasePool* pPool, const OUString& sFontSetName, cons
pStyle = static_cast<SwDocStyleSheet*>(pPool->Next());
}
- pPool->SetSearchMask(SFX_STYLE_FAMILY_CHAR, SFXSTYLEBIT_ALL);
+ pPool->SetSearchMask(SFX_STYLE_FAMILY_CHAR);
pStyle = static_cast<SwDocStyleSheet*>(pPool->First());
while (pStyle)
diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx
index a21b1687de17..cefeea728249 100644
--- a/sw/source/uibase/table/tablemgr.cxx
+++ b/sw/source/uibase/table/tablemgr.cxx
@@ -210,11 +210,11 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart(
aName = pSh->GetTableFormat()->GetName();
// insert node before table
pSh->MoveTable( fnTableCurr, fnTableStart );
- pSh->Up( false, 1, false );
+ pSh->Up( false, 1 );
if ( pSh->IsCrsrInTable() )
{
if ( aName != pSh->GetTableFormat()->GetName() )
- pSh->Down( false, 1, false ); // two adjacent tables
+ pSh->Down( false ); // two adjacent tables
}
pSh->SplitNode();
}
diff --git a/sw/source/uibase/uiview/formatclipboard.cxx b/sw/source/uibase/uiview/formatclipboard.cxx
index 695d62a77517..df1da591c45d 100644
--- a/sw/source/uibase/uiview/formatclipboard.cxx
+++ b/sw/source/uibase/uiview/formatclipboard.cxx
@@ -276,7 +276,7 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP
int nSelectionType = rWrtShell.GetSelectionType();
SfxItemSet* pItemSet_TextAttr = lcl_CreateEmptyItemSet( nSelectionType, rPool, true );
- SfxItemSet* pItemSet_ParAttr = lcl_CreateEmptyItemSet( nSelectionType, rPool, false );
+ SfxItemSet* pItemSet_ParAttr = lcl_CreateEmptyItemSet( nSelectionType, rPool );
rWrtShell.StartAction();
rWrtShell.Push();
@@ -511,7 +511,7 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo
{
// temporary SfxItemSet
boost::scoped_ptr<SfxItemSet> pTemplateItemSet(lcl_CreateEmptyItemSet(
- nSelectionType, *m_pItemSet_ParAttr->GetPool(), false));
+ nSelectionType, *m_pItemSet_ParAttr->GetPool()));
// no need to verify the existence of pTemplateItemSet as we
// know that here the selection type is SEL_TXT
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 39ed4bc0f334..0daf3076b953 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -626,7 +626,7 @@ void SwPagePreview::_ExecPgUpAndPgDown( const bool _bPgUp,
const int eMvMode = _bPgUp ?
SwPagePreviewWin::MV_PAGE_UP :
SwPagePreviewWin::MV_PAGE_DOWN;
- if ( ChgPage( eMvMode, true ) )
+ if ( ChgPage( eMvMode ) )
pViewWin->Invalidate();
}
else
@@ -856,7 +856,7 @@ void SwPagePreview::Execute( SfxRequest &rReq )
{
pViewWin->SetSelectedPage( nNewSelectedPage );
pViewWin->SetSttPage( nNewStartPage );
- bRefresh = ChgPage( SwPagePreviewWin::MV_SELPAGE, true );
+ bRefresh = ChgPage( SwPagePreviewWin::MV_SELPAGE );
}
GetViewShell()->ShowPreviewSelection( nNewSelectedPage );
// invalidate page status.
@@ -890,7 +890,7 @@ void SwPagePreview::Execute( SfxRequest &rReq )
eMvMode = SwPagePreviewWin::MV_DOC_END; bRetVal = true; goto MOVEPAGE;
MOVEPAGE:
{
- bool nRet = ChgPage( eMvMode, true );
+ bool nRet = ChgPage( eMvMode );
// return value fuer Basic
if(bRetVal)
rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), !nRet));
@@ -1199,7 +1199,7 @@ SwPagePreview::SwPagePreview(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
{
pVS = static_cast<SwView*>(pOldSh)->GetWrtShellPtr();
// save the current ViewData of the previous SwView
- pOldSh->WriteUserData( sSwViewData, false );
+ pOldSh->WriteUserData( sSwViewData );
}
else
pVS = GetDocShell()->GetWrtShell();
@@ -1263,7 +1263,7 @@ int SwPagePreview::_CreateScrollbar( bool bHori )
ppScrollbar = VclPtr<SwScrollbar>::Create( pMDI, bHori );
ScrollDocSzChg();
- ppScrollbar->EnableDrag( true );
+ ppScrollbar->EnableDrag();
ppScrollbar->SetEndScrollHdl( LINK( this, SwPagePreview, EndScrollHdl ));
ppScrollbar->SetScrollHdl( LINK( this, SwPagePreview, ScrollHdl ));
@@ -1545,7 +1545,7 @@ void SwPagePreview::DocSzChgd( const Size &rSz )
if( aVisArea.GetWidth() )
{
- ChgPage( SwPagePreviewWin::MV_CALC, true );
+ ChgPage( SwPagePreviewWin::MV_CALC );
ScrollDocSzChg();
pViewWin->Invalidate();
diff --git a/sw/source/uibase/uiview/scroll.cxx b/sw/source/uibase/uiview/scroll.cxx
index 4ff7d471ef8a..d95da36e3956 100644
--- a/sw/source/uibase/uiview/scroll.cxx
+++ b/sw/source/uibase/uiview/scroll.cxx
@@ -97,7 +97,7 @@ void SwScrollbar::SetAuto(bool bSet)
// hide automatically - automatisch versteckt - then show
if(!bAuto && bVisible && !ScrollBar::IsVisible())
- ExtendedShow(true);
+ ExtendedShow();
else if(bAuto)
AutoShow(); // or hide automatically
}
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 9fd8dd788e4b..8cf556d1fb87 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -873,8 +873,8 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
bool bOld = g_bNoInterrupt;
g_bNoInterrupt = true;
- m_pHRuler->SetActive( true );
- m_pVRuler->SetActive( true );
+ m_pHRuler->SetActive();
+ m_pVRuler->SetActive();
SfxViewFrame* pViewFrame = GetViewFrame();
if( pViewFrame->GetFrame().GetParentFrame())
@@ -921,7 +921,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
SAL_WARN_IF(
officecfg::Office::Common::Undo::Steps::get() <= 0,
"sw", "/org.openoffice.Office.Common/Undo/Steps <= 0");
- m_pWrtShell->DoUndo( true );
+ m_pWrtShell->DoUndo();
const bool bBrowse = m_pWrtShell->GetViewOptions()->getBrowseMode();
// Disable "multiple window"
@@ -1009,7 +1009,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
m_aTimer.SetTimeoutHdl(LINK(this, SwView, TimeoutHdl));
m_bAttrChgNotified = m_bAttrChgNotifiedWithRegistrations = false;
if(bOldModifyFlag)
- pDocSh->EnableSetModified( true );
+ pDocSh->EnableSetModified();
InvalidateBorder();
if( !m_pHScrollbar->IsVisible( true ) )
diff --git a/sw/source/uibase/uiview/view1.cxx b/sw/source/uibase/uiview/view1.cxx
index 5abd3b1e544a..9fb3bd92e722 100644
--- a/sw/source/uibase/uiview/view1.cxx
+++ b/sw/source/uibase/uiview/view1.cxx
@@ -66,8 +66,8 @@ void SwView::Activate(bool bMDIActivate)
m_pWrtShell->MakeSelVisible();
m_bMakeSelectionVisible = false;
}
- m_pHRuler->SetActive( true );
- m_pVRuler->SetActive( true );
+ m_pHRuler->SetActive();
+ m_pVRuler->SetActive();
if ( bMDIActivate )
{
@@ -75,7 +75,7 @@ void SwView::Activate(bool bMDIActivate)
if( !m_sSwViewData.isEmpty() )
{
- ReadUserData(m_sSwViewData, false);
+ ReadUserData(m_sSwViewData);
m_sSwViewData.clear();
}
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index c993fbb8e59a..a85fbf96ac82 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -800,7 +800,7 @@ void SwView::Execute(SfxRequest &rReq)
break;
case FN_SYNC_LABELS:
case FN_MAILMERGE_CHILDWINDOW:
- GetViewFrame()->ShowChildWindow(nSlot, true);
+ GetViewFrame()->ShowChildWindow(nSlot);
break;
case FN_ESCAPE:
{
@@ -1080,7 +1080,7 @@ void SwView::Execute(SfxRequest &rReq)
if(pVFrame->HasChildWindow(SID_BROWSER))
{
const SwDBData& rData = GetWrtShell().GetDBDesc();
- SwModule::ShowDBObj(*this, rData, false);
+ SwModule::ShowDBObj(*this, rData);
}
}
break;
@@ -1931,8 +1931,7 @@ bool SwView::JumpToSwMark( const OUString& rMark )
const SwFormatINetFormat* pINet;
OUString sCmp;
OUString sMark( INetURLObject::decode( rMark,
- INetURLObject::DECODE_WITH_CHARSET,
- RTL_TEXTENCODING_UTF8 ));
+ INetURLObject::DECODE_WITH_CHARSET ));
sal_Int32 nLastPos, nPos = sMark.indexOf( cMarkSeparator );
if( -1 != nPos )
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 1758a2fc8222..4980439b3641 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -234,14 +234,14 @@ void SwView::StartTextConversion(
return;
}
- SpellKontext(true);
+ SpellKontext();
const SwViewOption* pVOpt = m_pWrtShell->GetViewOptions();
const bool bOldIdle = pVOpt->IsIdle();
pVOpt->SetIdle( false );
bool bOldIns = m_pWrtShell->IsInsMode();
- m_pWrtShell->SetInsMode( true );
+ m_pWrtShell->SetInsMode();
const bool bSelection = static_cast<SwCrsrShell*>(m_pWrtShell)->HasSelection() ||
m_pWrtShell->GetCrsr() != m_pWrtShell->GetCrsr()->GetNext();
@@ -501,7 +501,7 @@ OUString SwView::GetThesaurusLookUpText( bool bSelection ) const
void SwView::InsertThesaurusSynonym( const OUString &rSynonmText, const OUString &rLookUpText, bool bSelection )
{
bool bOldIns = m_pWrtShell->IsInsMode();
- m_pWrtShell->SetInsMode( true );
+ m_pWrtShell->SetInsMode();
m_pWrtShell->StartAllAction();
m_pWrtShell->StartUndo(UNDO_DELETE);
@@ -898,7 +898,7 @@ IMPL_LINK( SwFieldDialog, MyListBoxHandler, ListBox *, pBox )
(*pFieldmark->GetParameters())[ sKey ] = makeAny(selection);
pFieldmark->Invalidate();
SwView& rView = static_cast<SwEditWin*>( GetParent() )->GetView();
- rView.GetDocShell()->SetModified( true );
+ rView.GetDocShell()->SetModified();
}
EndPopupMode();
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index 83694f68f73f..e27caff132e7 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -152,7 +152,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
{
pUsrPref->SetZoom(nZoomFac);
pUsrPref->SetZoomType(eZoomType);
- SW_MOD()->ApplyUsrPref(*pUsrPref, 0, 0);
+ SW_MOD()->ApplyUsrPref(*pUsrPref, 0);
pUsrPref->SetModified();
}
if ( pOpt->GetZoom() != nZoomFac )
@@ -226,7 +226,7 @@ void SwView::SetViewLayout( sal_uInt16 nColumns, bool bBookMode, bool bViewOnly
{
pUsrPref->SetViewLayoutColumns(nColumns);
pUsrPref->SetViewLayoutBookMode(bBookMode);
- SW_MOD()->ApplyUsrPref(*pUsrPref, 0, 0);
+ SW_MOD()->ApplyUsrPref(*pUsrPref, 0);
pUsrPref->SetModified();
}
}
@@ -302,7 +302,7 @@ int SwView::_CreateScrollbar( bool bHori )
ppScrollbar->SetScrollHdl( LINK( this, SwView, ScrollHdl ));
ppScrollbar->SetEndScrollHdl( LINK( this, SwView, EndScrollHdl ));
- ppScrollbar->EnableDrag( true );
+ ppScrollbar->EnableDrag();
if(GetWindow())
InvalidateBorder();
@@ -522,7 +522,7 @@ int SwView::CreateVRuler()
int SwView::KillVRuler()
{
m_pVRuler->Hide();
- m_pHRuler->SetBorderPos( 0 );
+ m_pHRuler->SetBorderPos();
InvalidateBorder();
return 1;
}
diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx
index e7dad98ac39b..0560f11398b5 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -338,7 +338,7 @@ void SwView::CheckVisArea()
Rectangle aNewVisArea( m_aVisArea );
aNewVisArea.Move( DOCUMENTBORDER - m_aVisArea.Left(),
DOCUMENTBORDER - m_aVisArea.Top() );
- SetVisArea( aNewVisArea, true );
+ SetVisArea( aNewVisArea );
}
}
}
@@ -603,7 +603,7 @@ long SwView::PhyPageUp()
long SwView::PhyPageDown()
{
// Check for the currently visible page, do not format
- sal_uInt16 nActPage = m_pWrtShell->GetNextPrevPageNum( true );
+ sal_uInt16 nActPage = m_pWrtShell->GetNextPrevPageNum();
// If the last page of the document is visible, do nothing.
if( USHRT_MAX != nActPage )
{
diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx
index be077fd82f48..ae97b8799a2d 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -169,7 +169,7 @@ void SwView::GetState(SfxItemSet &rSet)
const SwPageDesc& rDesc = m_pWrtShell->GetPageDesc( nCurIdx );
const SwFrameFormat& rMaster = rDesc.GetMaster();
const SvxBrushItem& rBrush = static_cast<const SvxBrushItem&>(
- rMaster.GetFormatAttr(RES_BACKGROUND, true));
+ rMaster.GetFormatAttr(RES_BACKGROUND));
rSet.Put(rBrush);
}
break;
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index 15d6f2619509..5289e292984c 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -253,7 +253,7 @@ SwXAutoTextGroup::~SwXAutoTextGroup()
uno::Sequence< OUString > SwXAutoTextGroup::getTitles() throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0);
+ boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if (!pGlosGroup || pGlosGroup->GetError())
throw uno::RuntimeException();
const sal_uInt16 nCount = pGlosGroup->GetCount();
@@ -275,7 +275,7 @@ void SwXAutoTextGroup::renameByName(const OUString& aElementName,
// throw exception only if the programmatic name is to be changed into an existing name
if(aNewElementName != aElementName && hasByName(aNewElementName))
throw container::ElementExistException();
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0);
+ boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if(pGlosGroup && !pGlosGroup->GetError())
{
sal_uInt16 nIdx = pGlosGroup->GetIndex( aElementName);
@@ -347,7 +347,7 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const
if(!xTextRange.is())
throw uno::RuntimeException();
- SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0;
+ SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0;
OUString sShortName(aName);
OUString sLongName(aTitle);
if (pGlosGroup && !pGlosGroup->GetError())
@@ -439,7 +439,7 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const
void SwXAutoTextGroup::removeByName(const OUString& aEntryName) throw( container::NoSuchElementException, uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0);
+ boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if(pGlosGroup && !pGlosGroup->GetError())
{
sal_uInt16 nIdx = pGlosGroup->GetIndex(aEntryName);
@@ -501,7 +501,7 @@ void SwXAutoTextGroup::setName(const OUString& rName) throw( uno::RuntimeExcepti
sal_Int32 SwXAutoTextGroup::getCount() throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0);
+ boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if (!pGlosGroup || pGlosGroup->GetError())
throw uno::RuntimeException();
return static_cast<sal_Int32>(pGlosGroup->GetCount());
@@ -511,7 +511,7 @@ uno::Any SwXAutoTextGroup::getByIndex(sal_Int32 nIndex)
throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0);
+ boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if (!pGlosGroup || pGlosGroup->GetError())
throw uno::RuntimeException();
const sal_uInt16 nCount = pGlosGroup->GetCount();
@@ -529,7 +529,7 @@ uno::Type SwXAutoTextGroup::getElementType() throw( uno::RuntimeException, std::
sal_Bool SwXAutoTextGroup::hasElements() throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0);
+ boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if (!pGlosGroup || pGlosGroup->GetError())
throw uno::RuntimeException();
return pGlosGroup->GetCount() > 0;
@@ -550,7 +550,7 @@ uno::Sequence< OUString > SwXAutoTextGroup::getElementNames()
throw( uno::RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0);
+ boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if (!pGlosGroup || pGlosGroup->GetError())
throw uno::RuntimeException();
@@ -568,7 +568,7 @@ sal_Bool SwXAutoTextGroup::hasByName(const OUString& rName)
{
SolarMutexGuard aGuard;
bool bRet = false;
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0);
+ boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if (!pGlosGroup || pGlosGroup->GetError())
throw uno::RuntimeException();
@@ -603,7 +603,7 @@ void SwXAutoTextGroup::setPropertyValue(
if(!pEntry)
throw beans::UnknownPropertyException();
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0);
+ boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if(!pGlosGroup || pGlosGroup->GetError())
throw uno::RuntimeException();
switch(pEntry->nWID)
@@ -631,7 +631,7 @@ uno::Any SwXAutoTextGroup::getPropertyValue(const OUString& rPropertyName)
if(!pEntry)
throw beans::UnknownPropertyException();
- boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0);
+ boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0);
if(!pGlosGroup || pGlosGroup->GetError())
throw uno::RuntimeException();
@@ -782,7 +782,7 @@ void SwXAutoTextEntry::Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint )
{
if(SFX_EVENT_PREPARECLOSEDOC == static_cast< const SfxEventHint& >( _rHint ).GetEventId())
{
- implFlushDocument( false );
+ implFlushDocument();
xBodyText = 0;
EndListening( *&xDocSh );
xDocSh.Clear();
@@ -899,7 +899,7 @@ void SwXAutoTextEntry::applyTo(const uno::Reference< text::XTextRange > & xTextR
// is stored somewhere. And below, we're not working with our copy, but only tell the target
// TextRange to work with the stored version.
// #96380# - 2003-03-03 - fs@openoffice.org
- implFlushDocument( false );
+ implFlushDocument();
// TODO: think about if we should pass "true" here
// The difference would be that when the next modification is made to this instance here, then
// we would be forced to open the document again, instead of working on our current copy.
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index adae6c2f805a..6c560d81615d 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -164,8 +164,7 @@ namespace
p->sText,
INetURLObject::decode(
p->rINetAttr.GetINetFormat().GetValue(),
- INetURLObject::DECODE_UNAMBIGUOUS,
- RTL_TEXTENCODING_UTF8 ),
+ INetURLObject::DECODE_UNAMBIGUOUS ),
&p->rINetAttr,
n );
pMember->insert( pCnt );
@@ -577,8 +576,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged)
pWrtShell->GetGrfNms( &sLink, 0, static_cast<const SwFlyFrameFormat*>( pFrameFormat));
pCnt = new SwGraphicContent(this, sFrmName,
INetURLObject::decode( sLink,
- INetURLObject::DECODE_UNAMBIGUOUS,
- RTL_TEXTENCODING_UTF8 ),
+ INetURLObject::DECODE_UNAMBIGUOUS ),
pFrameFormat->FindLayoutRect(false, &aNullPt).Top());
}
else
@@ -916,7 +914,7 @@ OUString SwContentTree::GetEntryAltText( SvTreeListEntry* pEntry ) const
{
if( pActiveShell && pActiveShell->GetDoc() )
{
- const SwFlyFrameFormat* pFrameFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0);
+ const SwFlyFrameFormat* pFrameFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName());
if( pFrameFormat )
{
// SwNodeIndex aIdx( *(pFrameFormat->GetContent().GetContentIdx()), 1 );
@@ -932,7 +930,7 @@ OUString SwContentTree::GetEntryAltText( SvTreeListEntry* pEntry ) const
case CONTENT_TYPE_FRAME :
{
//Can't find the GetAlternateText function. Need to verify again.
- const SwFlyFrameFormat* pFlyFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0);
+ const SwFlyFrameFormat* pFlyFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName());
if( pFlyFormat )
return pFlyFormat->/*GetAlternateText*/GetName();
}
@@ -1009,7 +1007,7 @@ OUString SwContentTree::GetEntryLongDescription( SvTreeListEntry* pEntry ) const
case CONTENT_TYPE_FRAME :
{
//Can't find the function "GetLongDescription". Need to verify again.
- const SwFlyFrameFormat* pFlyFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0);
+ const SwFlyFrameFormat* pFlyFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName());
if( pFlyFormat )
return pFlyFormat->GetDescription();
}
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 8b5700daa4f8..52c1764a30b1 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -548,7 +548,7 @@ void SwNavigationPI::_ZoomOut()
}
SvTreeListEntry* pFirst = aContentTree->FirstSelected();
if(pFirst)
- aContentTree->Select(pFirst, true); // Enable toolbox
+ aContentTree->Select(pFirst); // Enable toolbox
pConfig->SetSmall( false );
aContentToolBox->CheckItem(FN_SHOW_CONTENT_BOX);
}
@@ -577,7 +577,7 @@ void SwNavigationPI::_ZoomIn()
pFloat->SetOutputSizePixel(aSz);
SvTreeListEntry* pFirst = aContentTree->FirstSelected();
if(pFirst)
- aContentTree->Select(pFirst, true); // Enable toolbox
+ aContentTree->Select(pFirst); // Enable toolbox
pConfig->SetSmall( true );
aContentToolBox->CheckItem(FN_SHOW_CONTENT_BOX, false);
}
@@ -763,7 +763,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
DragDropMode::ENABLE_TOP );
aContentTree->EnableAsyncDrag(true);
aContentTree->ShowTree();
- aContentToolBox->CheckItem(FN_SHOW_CONTENT_BOX, true);
+ aContentToolBox->CheckItem(FN_SHOW_CONTENT_BOX);
// TreeListBox for global document
aGlobalTree->setPosSizePixel( 0, nListboxYPos, 0, 0, PosSizeFlags::Y );
@@ -784,7 +784,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
aContentToolBox->SetDropdownClickHdl( LINK(this, SwNavigationPI, ToolBoxDropdownClickHdl) );
aGlobalToolBox->SetClickHdl( LINK(this, SwNavigationPI, ToolBoxClickHdl) );
aGlobalToolBox->SetDropdownClickHdl( LINK(this, SwNavigationPI, ToolBoxDropdownClickHdl) );
- aGlobalToolBox->CheckItem(FN_GLOBAL_SWITCH, true);
+ aGlobalToolBox->CheckItem(FN_GLOBAL_SWITCH);
vcl::Font aFont(GetFont());
aFont.SetWeight(WEIGHT_NORMAL);
@@ -1300,7 +1300,7 @@ SwNavigationChild::SwNavigationChild( vcl::Window* pParent,
if( nRootType < CONTENT_TYPE_MAX )
{
pNavi->aContentTree->SetRootType(nRootType);
- pNavi->aContentToolBox->CheckItem(FN_SHOW_ROOT, true);
+ pNavi->aContentToolBox->CheckItem(FN_SHOW_ROOT);
}
pNavi->aContentTree->SetOutlineLevel( static_cast< sal_uInt8 >( pNaviConfig->GetOutlineLevel() ) );
pNavi->SetRegionDropMode( static_cast< sal_uInt16 >( pNaviConfig->GetRegionMode() ) );
diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx
index d226e20310f2..282a85cf17b3 100644
--- a/sw/source/uibase/utlui/tmplctrl.cxx
+++ b/sw/source/uibase/utlui/tmplctrl.cxx
@@ -104,7 +104,7 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt )
{
SfxStyleSheetBasePool* pPool = pView->GetDocShell()->
GetStyleSheetPool();
- pPool->SetSearchMask(SFX_STYLE_FAMILY_PAGE, SFXSTYLEBIT_ALL);
+ pPool->SetSearchMask(SFX_STYLE_FAMILY_PAGE);
if( pPool->Count() > 1 )
{
sal_uInt16 nCount = 0;
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index 4b4344ca0840..6ed9aea5d9e0 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -707,7 +707,7 @@ void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, bool bSorted, bo
{
const sal_Int32 nOffset = rToFill.GetEntryCount() > 0 ? 1 : 0;
SfxStyleSheetBasePool* pPool = pDocSh->GetStyleSheetPool();
- pPool->SetSearchMask(SFX_STYLE_FAMILY_CHAR, SFXSTYLEBIT_ALL);
+ pPool->SetSearchMask(SFX_STYLE_FAMILY_CHAR);
SwDoc* pDoc = pDocSh->GetDoc();
const SfxStyleSheetBase* pBase = pPool->First();
OUString sStandard;
@@ -788,7 +788,7 @@ OUString GetAppLangDateTimeString( const DateTime& rDT )
{
const SvtSysLocale aSysLocale;
const LocaleDataWrapper& rAppLclData = aSysLocale.GetLocaleData();
- OUString sRet = rAppLclData.getDate( rDT ) + " " + rAppLclData.getTime( rDT, false, false );
+ OUString sRet = rAppLclData.getDate( rDT ) + " " + rAppLclData.getTime( rDT, false );
return sRet;
}
diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx
index c25a372b1efb..897d9e7f5f10 100644
--- a/sw/source/uibase/wrtsh/delete.cxx
+++ b/sw/source/uibase/wrtsh/delete.cxx
@@ -325,7 +325,7 @@ long SwWrtShell::DelRight()
have moved to a different cell */
if (pSNdOld != pSNdNew)
{
- SwCrsrShell::Pop( true );
+ SwCrsrShell::Pop();
break;
}
}
diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx
index 23a1a28e5b84..4d93e8bfcf34 100644
--- a/sw/source/uibase/wrtsh/move.cxx
+++ b/sw/source/uibase/wrtsh/move.cxx
@@ -89,7 +89,7 @@ bool SwWrtShell::SimpleMove( FNSimpleMove FnSimpleMove, bool bSelect )
EndCrsrMove();
}
else if( ( nRet = (this->*FnSimpleMove)() ) )
- MoveCrsr( false );
+ MoveCrsr();
return nRet;
}
diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx
index a0349962a3df..b5643323eac3 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -221,7 +221,7 @@ sal_uLong SwWrtShell::SearchPattern( const SearchOptions& rSearchOpt, bool bSear
sal_uLong nRet = Find( rSearchOpt, bSearchInNotes, eStt, eEnd, bCancel, eFlags, bReplace );
if(bCancel)
{
- Undo(1);
+ Undo();
nRet = ULONG_MAX;
}
return nRet;
@@ -246,7 +246,7 @@ sal_uLong SwWrtShell::SearchTempl( const OUString &rTempl,
eStt,eEnd, bCancel, eFlags, pReplaceColl);
if(bCancel)
{
- Undo(1);
+ Undo();
nRet = ULONG_MAX;
}
return nRet;
@@ -269,7 +269,7 @@ sal_uLong SwWrtShell::SearchAttr( const SfxItemSet& rFindSet, bool bNoColls,
if(bCancel)
{
- Undo(1);
+ Undo();
nRet = ULONG_MAX;
}
return nRet;
@@ -400,11 +400,11 @@ void SwWrtShell::EndSelect()
m_bInSelect = false;
if (m_bAddMode)
{
- AddLeaveSelect(0, false);
+ AddLeaveSelect(0);
}
else
{
- SttLeaveSelect(0, false);
+ SttLeaveSelect(0);
m_fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
m_fnKillSel = &SwWrtShell::ResetSelect;
}
@@ -656,7 +656,7 @@ void SwWrtShell::SetRedlineModeAndCheckInsMode( sal_uInt16 eMode )
{
SetRedlineMode( eMode );
if (IsRedlineOn())
- SetInsMode( true );
+ SetInsMode();
}
// Edit frame
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 9a691adcf821..76d905cc3ca4 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -690,7 +690,7 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
if ( bResetEnableSetModified )
{
- GetDoc()->GetDocShell()->EnableSetModified( true );
+ GetDoc()->GetDocShell()->EnableSetModified();
}
}
}