sw/inc/docsh.hxx | 4 ++--
sw/inc/swwait.hxx | 4 ++--
sw/source/core/doc/docdesc.cxx | 2 +-
sw/source/core/edit/autofmt.cxx | 2 +-
sw/source/core/edit/edtab.cxx | 4 ++--
sw/source/core/frmedt/fetab.cxx | 4 ++--
sw/source/core/layout/layact.cxx | 2 +-
sw/source/core/view/viewsh.cxx | 26 +++++++++++++-------------
sw/source/ui/app/appenv.cxx | 2 +-
sw/source/ui/app/applab.cxx | 2 +-
sw/source/ui/app/docsh.cxx | 8 ++++----
sw/source/ui/app/docsh2.cxx | 2 +-
sw/source/ui/app/docshini.cxx | 4 ++--
sw/source/ui/app/swwait.cxx | 6 +++---
sw/source/ui/dbui/dbinsdlg.cxx | 4 ++--
sw/source/ui/dbui/dbmgr.cxx | 2 +-
sw/source/ui/dialog/docstdlg.cxx | 2 +-
sw/source/ui/dialog/wordcountdialog.cxx | 2 +-
sw/source/ui/dochdl/swdtflvr.cxx | 10 +++++-----
sw/source/ui/envelp/envlop1.cxx | 2 +-
sw/source/ui/index/toxmgr.cxx | 2 +-
sw/source/ui/lingu/hyp.cxx | 2 +-
sw/source/ui/misc/glossary.cxx | 2 +-
sw/source/ui/misc/redlndlg.cxx | 10 +++++-----
sw/source/ui/misc/srtdlg.cxx | 2 +-
sw/source/ui/shells/basesh.cxx | 4 ++--
sw/source/ui/shells/grfsh.cxx | 2 +-
sw/source/ui/uiview/view2.cxx | 4 ++--
sw/source/ui/uiview/viewling.cxx | 2 +-
sw/source/ui/uiview/viewsrch.cxx | 10 +++++-----
30 files changed, 67 insertions(+), 67 deletions(-)
New commits:
commit fdc383dcd3cb3ca954fe2f2b120433d8c6290d8c
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Thu Jan 16 07:33:02 2014 +0900
sal_Bool to bool
Change-Id: Ia4336c928f67f2bb4f0cb2e2409dda7940c7e70e
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 10a7b2d..4a6ec3e 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -265,8 +265,8 @@ public:
/** Activate wait cursor for all windows of this document
Optionally all dispatcher could be Locked
Usually locking should be done using the class: SwWaitObject! */
- void EnterWait( sal_Bool bLockDispatcher );
- void LeaveWait( sal_Bool bLockDispatcher );
+ void EnterWait( bool bLockDispatcher );
+ void LeaveWait( bool bLockDispatcher );
void ToggleBrowserMode(sal_Bool bOn, SwView* pView);
diff --git a/sw/inc/swwait.hxx b/sw/inc/swwait.hxx
index 2b6b3ab..089f185 100644
--- a/sw/inc/swwait.hxx
+++ b/sw/inc/swwait.hxx
@@ -27,9 +27,9 @@ class SwDocShell;
class SW_DLLPUBLIC SwWait
{
SwDocShell &rDoc;
- sal_Bool bLock;
+ bool bLock;
public:
- SwWait( SwDocShell &rDocShell, sal_Bool bLockDispatcher );
+ SwWait( SwDocShell &rDocShell, bool bLockDispatcher );
~SwWait();
};
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index c84a5d2..1b0b819 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -668,7 +668,7 @@ void SwDoc::PrtDataChanged()
pSh->GetViewOptions()->IsPrtFormat()) )
{
if ( GetDocShell() )
- pWait = new SwWait( *GetDocShell(), sal_True );
+ pWait = new SwWait( *GetDocShell(), true );
pTmpRoot->StartAllAction();
bEndAction = true;
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 8d13aff..fef903d 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -2548,7 +2548,7 @@ void SwEditShell::AutoFormat( const SvxSwAutoFmtFlags*
pAFlags )
{
aAFFlags = *pAFlags;
if( !aAFFlags.bAFmtByInput )
- pWait = new SwWait( *GetDoc()->GetDocShell(), sal_True );
+ pWait = new SwWait( *GetDoc()->GetDocShell(), true );
}
SwPaM* pCrsr = GetCrsr();
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index 783a0bc..7672e74 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -121,7 +121,7 @@ sal_Bool SwEditShell::TextToTable( const
SwInsertTableOptions& rInsTblOpts,
sal_Int16 eAdj,
const SwTableAutoFmt* pTAFmt )
{
- SwWait aWait( *GetDoc()->GetDocShell(), sal_True );
+ SwWait aWait( *GetDoc()->GetDocShell(), true );
sal_Bool bRet = sal_False;
StartAllAction();
FOREACHPAM_START(GetCrsr())
@@ -135,7 +135,7 @@ sal_Bool SwEditShell::TextToTable( const
SwInsertTableOptions& rInsTblOpts,
sal_Bool SwEditShell::TableToText( sal_Unicode cCh )
{
- SwWait aWait( *GetDoc()->GetDocShell(), sal_True );
+ SwWait aWait( *GetDoc()->GetDocShell(), true );
sal_Bool bRet = sal_False;
SwPaM* pCrsr = GetCrsr();
const SwTableNode* pTblNd =
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index b2589d0..8eaed08 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -95,7 +95,7 @@ TblWait::TblWait(size_t const nCnt, SwFrm *pFrm, SwDocShell
&rDocShell, size_t c
bool bWait = 20 < nCnt || 20 < nCnt2 || (pFrm &&
20 <
pFrm->ImplFindTabFrm()->GetTable()->GetTabLines().size());
if( bWait )
- pWait = new SwWait( rDocShell, sal_True );
+ pWait = new SwWait( rDocShell, true );
}
@@ -1084,7 +1084,7 @@ void SwFEShell::SetRowsToRepeat( sal_uInt16 nSet )
SwTabFrm *pTab = pFrm ? pFrm->FindTabFrm() : 0;
if( pTab && pTab->GetTable()->GetRowsToRepeat() != nSet )
{
- SwWait aWait( *GetDoc()->GetDocShell(), sal_True );
+ SwWait aWait( *GetDoc()->GetDocShell(), true );
SET_CURR_SHELL( this );
StartAllAction();
GetDoc()->SetRowsToRepeat( *pTab->GetTable(), nSet );
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index d6301a4..ea7b644 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -138,7 +138,7 @@ void SwLayAction::CheckWaitCrsr()
if ( !IsWait() && IsWaitAllowed() && IsPaint() &&
((Ticks() - GetStartTicks()) >= CLOCKS_PER_SEC/2) )
{
- pWait = new SwWait( *pRoot->GetFmt()->GetDoc()->GetDocShell(),
sal_True );
+ pWait = new SwWait( *pRoot->GetFmt()->GetDoc()->GetDocShell(), true );
}
}
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index bd90cbe..b2794d0 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -714,7 +714,7 @@ void SwViewShell::SetParaSpaceMax( bool bNew )
IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess();
if( pIDSA->get(IDocumentSettingAccess::PARA_SPACE_MAX) != bNew )
{
- SwWait aWait( *GetDoc()->GetDocShell(), sal_True );
+ SwWait aWait( *GetDoc()->GetDocShell(), true );
pIDSA->set(IDocumentSettingAccess::PARA_SPACE_MAX, bNew );
const sal_uInt8 nInv = INV_PRTAREA | INV_TABLE | INV_SECTION;
lcl_InvalidateAllCntnt( *this, nInv );
@@ -726,7 +726,7 @@ void SwViewShell::SetParaSpaceMaxAtPages( bool bNew )
IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess();
if( pIDSA->get(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES) != bNew )
{
- SwWait aWait( *GetDoc()->GetDocShell(), sal_True );
+ SwWait aWait( *GetDoc()->GetDocShell(), true );
pIDSA->set(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES, bNew );
const sal_uInt8 nInv = INV_PRTAREA | INV_TABLE | INV_SECTION;
lcl_InvalidateAllCntnt( *this, nInv );
@@ -738,7 +738,7 @@ void SwViewShell::SetTabCompat( bool bNew )
IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess();
if( pIDSA->get(IDocumentSettingAccess::TAB_COMPAT) != bNew )
{
- SwWait aWait( *GetDoc()->GetDocShell(), sal_True );
+ SwWait aWait( *GetDoc()->GetDocShell(), true );
pIDSA->set(IDocumentSettingAccess::TAB_COMPAT, bNew );
const sal_uInt8 nInv = INV_PRTAREA | INV_SIZE | INV_TABLE |
INV_SECTION;
lcl_InvalidateAllCntnt( *this, nInv );
@@ -750,7 +750,7 @@ void SwViewShell::SetAddExtLeading( bool bNew )
IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess();
if ( pIDSA->get(IDocumentSettingAccess::ADD_EXT_LEADING) != bNew )
{
- SwWait aWait( *GetDoc()->GetDocShell(), sal_True );
+ SwWait aWait( *GetDoc()->GetDocShell(), true );
pIDSA->set(IDocumentSettingAccess::ADD_EXT_LEADING, bNew );
SdrModel* pTmpDrawModel =
getIDocumentDrawModelAccess()->GetDrawModel();
if ( pTmpDrawModel )
@@ -765,7 +765,7 @@ void SwViewShell::SetUseVirDev( bool bNewVirtual )
IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess();
if ( pIDSA->get(IDocumentSettingAccess::USE_VIRTUAL_DEVICE) != bNewVirtual
)
{
- SwWait aWait( *GetDoc()->GetDocShell(), sal_True );
+ SwWait aWait( *GetDoc()->GetDocShell(), true );
// this sets the flag at the document and calls PrtDataChanged
IDocumentDeviceAccess* pIDDA = getIDocumentDeviceAccess();
pIDDA->setReferenceDeviceType( bNewVirtual, true );
@@ -781,7 +781,7 @@ void SwViewShell::SetAddParaSpacingToTableCells( bool
_bAddParaSpacingToTableCel
IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess();
if ( pIDSA->get(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS)
!= _bAddParaSpacingToTableCells )
{
- SwWait aWait( *GetDoc()->GetDocShell(), sal_True );
+ SwWait aWait( *GetDoc()->GetDocShell(), true );
pIDSA->set(IDocumentSettingAccess::ADD_PARA_SPACING_TO_TABLE_CELLS,
_bAddParaSpacingToTableCells );
const sal_uInt8 nInv = INV_PRTAREA;
lcl_InvalidateAllCntnt( *this, nInv );
@@ -798,7 +798,7 @@ void SwViewShell::SetUseFormerLineSpacing( bool
_bUseFormerLineSpacing )
IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess();
if ( pIDSA->get(IDocumentSettingAccess::OLD_LINE_SPACING) !=
_bUseFormerLineSpacing )
{
- SwWait aWait( *GetDoc()->GetDocShell(), sal_True );
+ SwWait aWait( *GetDoc()->GetDocShell(), true );
pIDSA->set(IDocumentSettingAccess::OLD_LINE_SPACING,
_bUseFormerLineSpacing );
const sal_uInt8 nInv = INV_PRTAREA;
lcl_InvalidateAllCntnt( *this, nInv );
@@ -815,7 +815,7 @@ void SwViewShell::SetUseFormerObjectPositioning( bool
_bUseFormerObjPos )
IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess();
if ( pIDSA->get(IDocumentSettingAccess::USE_FORMER_OBJECT_POS) !=
_bUseFormerObjPos )
{
- SwWait aWait( *GetDoc()->GetDocShell(), sal_True );
+ SwWait aWait( *GetDoc()->GetDocShell(), true );
pIDSA->set(IDocumentSettingAccess::USE_FORMER_OBJECT_POS,
_bUseFormerObjPos );
lcl_InvalidateAllObjPos( *this );
}
@@ -827,7 +827,7 @@ void SwViewShell::SetConsiderWrapOnObjPos( bool
_bConsiderWrapOnObjPos )
IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess();
if ( pIDSA->get(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION)
!= _bConsiderWrapOnObjPos )
{
- SwWait aWait( *GetDoc()->GetDocShell(), sal_True );
+ SwWait aWait( *GetDoc()->GetDocShell(), true );
pIDSA->set(IDocumentSettingAccess::CONSIDER_WRAP_ON_OBJECT_POSITION,
_bConsiderWrapOnObjPos );
lcl_InvalidateAllObjPos( *this );
}
@@ -838,7 +838,7 @@ void SwViewShell::SetUseFormerTextWrapping( bool
_bUseFormerTextWrapping )
IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess();
if ( pIDSA->get(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING) !=
_bUseFormerTextWrapping )
{
- SwWait aWait( *GetDoc()->GetDocShell(), sal_True );
+ SwWait aWait( *GetDoc()->GetDocShell(), true );
pIDSA->set(IDocumentSettingAccess::USE_FORMER_TEXT_WRAPPING,
_bUseFormerTextWrapping );
const sal_uInt8 nInv = INV_PRTAREA | INV_SIZE | INV_TABLE |
INV_SECTION;
lcl_InvalidateAllCntnt( *this, nInv );
@@ -851,7 +851,7 @@ void SwViewShell::SetDoNotJustifyLinesWithManualBreak( bool
_bDoNotJustifyLinesW
IDocumentSettingAccess* pIDSA = getIDocumentSettingAccess();
if (
pIDSA->get(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK) !=
_bDoNotJustifyLinesWithManualBreak )
{
- SwWait aWait( *GetDoc()->GetDocShell(), sal_True );
+ SwWait aWait( *GetDoc()->GetDocShell(), true );
pIDSA->set(IDocumentSettingAccess::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK,
_bDoNotJustifyLinesWithManualBreak );
const sal_uInt8 nInv = INV_PRTAREA | INV_SIZE | INV_TABLE |
INV_SECTION;
lcl_InvalidateAllCntnt( *this, nInv );
@@ -860,7 +860,7 @@ void SwViewShell::SetDoNotJustifyLinesWithManualBreak( bool
_bDoNotJustifyLinesW
void SwViewShell::Reformat()
{
- SwWait aWait( *GetDoc()->GetDocShell(), sal_True );
+ SwWait aWait( *GetDoc()->GetDocShell(), true );
// we go for safe: get rid of the old font information,
// when the printer resolution or zoom factor changes.
@@ -891,7 +891,7 @@ void SwViewShell::ChgNumberDigits()
void SwViewShell::CalcLayout()
{
SET_CURR_SHELL( this );
- SwWait aWait( *GetDoc()->GetDocShell(), sal_True );
+ SwWait aWait( *GetDoc()->GetDocShell(), true );
//prepare and recover cache, so that it will not get fouled.
SwSaveSetLRUOfst aSaveLRU( *SwTxtFrm::GetTxtCache(),
diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx
index 63b614a6..5e272f2 100644
--- a/sw/source/ui/app/appenv.cxx
+++ b/sw/source/ui/app/appenv.cxx
@@ -224,7 +224,7 @@ void SwModule::InsertEnv( SfxRequest& rReq )
if (nMode == ENV_NEWDOC || nMode == ENV_INSERT)
{
- SwWait aWait( (SwDocShell&)*xDocSh, sal_True );
+ SwWait aWait( (SwDocShell&)*xDocSh, true );
// Read dialog and save item to config
const SwEnvItem& rItem = pItem ? *pItem : (const SwEnvItem&)
pDlg->GetOutputItemSet()->Get(FN_ENVELOP);
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index 9c25742..e264225 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -219,7 +219,7 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel)
{ // block for locks the dispatcher!!
- SwWait aWait( (SwDocShell&)*xDocSh, sal_True );
+ SwWait aWait( (SwDocShell&)*xDocSh, true );
SET_CURR_SHELL(pSh);
pSh->SetLabelDoc(rItem.bSynchron);
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index e96af96..58bec90 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -253,7 +253,7 @@ sal_Bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
}
}
}
- SwWait aWait( *this, sal_True );
+ SwWait aWait( *this, true );
// Suppress SfxProgress, when we are Embedded
SW_MOD()->SetEmbeddedLoadSave(
@@ -305,7 +305,7 @@ sal_Bool SwDocShell::Save()
//#i3370# remove quick help to prevent saving of autocorrection suggestions
if(pView)
pView->GetEditWin().StopQuickHelp();
- SwWait aWait( *this, sal_True );
+ SwWait aWait( *this, true );
CalcLayoutForOLEObjects(); // format for OLE objets
// #i62875#
@@ -390,7 +390,7 @@ sal_Bool SwDocShell::Save()
// Save using the Defaultformat
sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
{
- SwWait aWait( *this, sal_True );
+ SwWait aWait( *this, true );
//#i3370# remove quick help to prevent saving of autocorrection suggestions
if(pView)
pView->GetEditWin().StopQuickHelp();
@@ -713,7 +713,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium )
// No View, so the whole Document!
if ( pWrtShell )
{
- SwWait aWait( *this, sal_True );
+ SwWait aWait( *this, true );
// #i106906#
const sal_Bool bFormerLockView = pWrtShell->IsViewLocked();
pWrtShell->LockView( sal_True );
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 334d7e8..8b83dda 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -1034,7 +1034,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
{
if( PrepareClose( sal_False ) )
{
- SwWait aWait( *this, sal_True );
+ SwWait aWait( *this, true );
if ( bCreateByOutlineLevel )
{
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index ce96cc8..d82c6d3 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -486,7 +486,7 @@ sal_Bool SwDocShell::Load( SfxMedium& rMedium )
nUpdateDocMode = pUpdateDocItem ? pUpdateDocItem->GetValue() :
document::UpdateDocMode::NO_UPDATE;
}
- SwWait aWait( *this, sal_True );
+ SwWait aWait( *this, true );
sal_uInt32 nErr = ERR_SWG_READ_ERROR;
switch( GetCreateMode() )
{
@@ -579,7 +579,7 @@ sal_Bool SwDocShell::LoadFrom( SfxMedium& rMedium )
if ( xAccess->hasByName( aStreamName ) &&
rMedium.GetStorage()->isStreamElement( aStreamName ) )
{
// Loading
- SwWait aWait( *this, sal_True );
+ SwWait aWait( *this, true );
{
OSL_ENSURE( !mxBasePool.is(), "who hasn't destroyed their
Pool?" );
mxBasePool = new SwDocStyleSheetPool( *pDoc,
SFX_CREATE_MODE_ORGANIZER == GetCreateMode() );
diff --git a/sw/source/ui/app/swwait.cxx b/sw/source/ui/app/swwait.cxx
index 377353c..683b825 100644
--- a/sw/source/ui/app/swwait.cxx
+++ b/sw/source/ui/app/swwait.cxx
@@ -24,7 +24,7 @@
#include <swwait.hxx>
-void SwDocShell::EnterWait( sal_Bool bLockDispatcher )
+void SwDocShell::EnterWait( bool bLockDispatcher )
{
SfxViewFrame *pFrame = SfxViewFrame::GetFirst( this, sal_False );
while ( pFrame )
@@ -36,7 +36,7 @@ void SwDocShell::EnterWait( sal_Bool bLockDispatcher )
}
}
-void SwDocShell::LeaveWait( sal_Bool bLockDispatcher )
+void SwDocShell::LeaveWait( bool bLockDispatcher )
{
SfxViewFrame *pFrame = SfxViewFrame::GetFirst( this, sal_False );
while ( pFrame )
@@ -48,7 +48,7 @@ void SwDocShell::LeaveWait( sal_Bool bLockDispatcher )
}
}
-SwWait::SwWait( SwDocShell &rDocShell, sal_Bool bLockDispatcher ) :
+SwWait::SwWait( SwDocShell &rDocShell, bool bLockDispatcher ) :
rDoc ( rDocShell ),
bLock( bLockDispatcher )
{
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 2a3d397..c1cf61b 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1153,7 +1153,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const
Sequence<Any>& rSelection,
break;
if( 10 == i )
- pWait.reset(new SwWait( *pView->GetDocShell(), sal_True ));
+ pWait.reset(new SwWait( *pView->GetDocShell(), true ));
}
rSh.MoveTable( GetfnTableCurr(), GetfnTableStart() );
@@ -1381,7 +1381,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const
Sequence<Any>& rSelection,
rSh.SwEditShell::SplitNode();
if( 10 == i )
- pWait.reset(new SwWait( *pView->GetDocShell(), sal_True ));
+ pWait.reset(new SwWait( *pView->GetDocShell(), true ));
}
if( !bSetCrsr && pMark != NULL)
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 4616520..0225dce 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -480,7 +480,7 @@ void SwNewDBMgr::ImportFromConnection( SwWrtShell* pSh )
ImportDBEntry(pSh);
if( 10 == ++i )
- pWait = new SwWait( *pSh->GetView().GetDocShell(),
sal_True);
+ pWait = new SwWait( *pSh->GetView().GetDocShell(),
true);
} while(ToNextMergeRecord());
}
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index be2f113..9f015c0 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -122,7 +122,7 @@ void SwDocStatPage::Update()
OSL_ENSURE( pSh, "Shell not found" );
- SwWait aWait( *pSh->GetDoc()->GetDocShell(), sal_True );
+ SwWait aWait( *pSh->GetDoc()->GetDocShell(), true );
pSh->StartAction();
aDocStat = pSh->GetDoc()->GetUpdatedDocStat();
pSh->EndAction();
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx
b/sw/source/ui/dialog/wordcountdialog.cxx
index 4bbd622..2e47c069 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -121,7 +121,7 @@ void SwWordCountFloatDlg::UpdateCounts()
SwDocStat aCurrCnt;
SwDocStat aDocStat;
{
- SwWait aWait( *::GetActiveView()->GetDocShell(), sal_True );
+ SwWait aWait( *::GetActiveView()->GetDocShell(), true );
rSh.StartAction();
rSh.CountWords( aCurrCnt );
aDocStat = rSh.GetUpdatedDocStat();
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 64aeb9f..1182eca 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -835,7 +835,7 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut )
{
SwWait *pWait = 0;
if( pWrtShell->ShouldWait() )
- pWait = new SwWait( *pWrtShell->GetView().GetDocShell(), sal_True
);
+ pWait = new SwWait( *pWrtShell->GetView().GetDocShell(), true );
pClpDocFac = new SwDocFac;
@@ -998,7 +998,7 @@ int SwTransferable::CalculateAndCopy()
{
if(!pWrtShell)
return 0;
- SwWait aWait( *pWrtShell->GetView().GetDocShell(), sal_True );
+ SwWait aWait( *pWrtShell->GetView().GetDocShell(), true );
OUString aStr( pWrtShell->Calculate() );
@@ -1018,7 +1018,7 @@ int SwTransferable::CopyGlossary( SwTextBlocks& rGlossary,
{
if(!pWrtShell)
return 0;
- SwWait aWait( *pWrtShell->GetView().GetDocShell(), sal_True );
+ SwWait aWait( *pWrtShell->GetView().GetDocShell(), true );
pClpDocFac = new SwDocFac;
SwDoc *const pCDoc = lcl_GetDoc(*pClpDocFac);
@@ -1159,7 +1159,7 @@ bool SwTransferable::PasteData( TransferableDataHelper&
rData,
sal_Bool bPasteSelection )
{
SwWait aWait( *rSh.GetView().
- GetDocShell(), sal_False );
+ GetDocShell(), false );
SwTrnsfrActionAndUndo* pAction = 0;
SwModule* pMod = SW_MOD();
@@ -2735,7 +2735,7 @@ int SwTransferable::PasteFormat( SwWrtShell& rSh,
TransferableDataHelper& rData,
sal_uLong nFormat )
{
- SwWait aWait( *rSh.GetView().GetDocShell(), sal_False );
+ SwWait aWait( *rSh.GetView().GetDocShell(), false );
int nRet = 0;
sal_uLong nPrivateFmt = FORMAT_PRIVATE;
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index f2e240a..5cbd619 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -238,7 +238,7 @@ SwEnvPage::~SwEnvPage()
IMPL_LINK( SwEnvPage, DatabaseHdl, ListBox *, pListBox )
{
- SwWait aWait( *pSh->GetView().GetDocShell(), sal_True );
+ SwWait aWait( *pSh->GetView().GetDocShell(), true );
if (pListBox == m_pDatabaseLB)
{
diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/ui/index/toxmgr.cxx
index eb8fdf0..abc2e37 100644
--- a/sw/source/ui/index/toxmgr.cxx
+++ b/sw/source/ui/index/toxmgr.cxx
@@ -281,7 +281,7 @@ sal_Bool SwTOXMgr::UpdateOrInsertTOX(const
SwTOXDescription& rDesc,
SwTOXBase** ppBase,
const SfxItemSet* pSet)
{
- SwWait aWait( *pSh->GetView().GetDocShell(), sal_True );
+ SwWait aWait( *pSh->GetView().GetDocShell(), true );
sal_Bool bRet = sal_True;
const SwTOXBase* pCurTOX = ppBase && *ppBase ? *ppBase : GetCurTOX();
SwTOXBase* pTOX = (SwTOXBase*)pCurTOX;
diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/ui/lingu/hyp.cxx
index 814e49a..9ae1d41 100644
--- a/sw/source/ui/lingu/hyp.cxx
+++ b/sw/source/ui/lingu/hyp.cxx
@@ -81,7 +81,7 @@ sal_Bool SwHyphWrapper::SpellContinue()
if( bAutomatic )
{
PSH->StartAllAction();
- pWait = new SwWait( *pView->GetDocShell(), sal_True );
+ pWait = new SwWait( *pView->GetDocShell(), true );
}
uno::Reference< uno::XInterface > xHyphWord = bInSelection ?
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 629a319..65c9f0f 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -973,7 +973,7 @@ sal_Bool SwGlTreeListBox::NotifyCopyingOrMoving(
if(pDestParent != pSrcParent)
{
SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParentDialog();
- SwWait aWait( *pDlg->pSh->GetView().GetDocShell(), sal_True );
+ SwWait aWait( *pDlg->pSh->GetView().GetDocShell(), true );
GroupUserData* pGroupData = (GroupUserData*)pSrcParent->GetUserData();
OUString sSourceGroup = pGroupData->sGroupName
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index d6168a1..8a11966 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -104,7 +104,7 @@ void SwModelessRedlineAcceptDlg::Activate()
if (pChildWin->GetOldDocShell() != pDocSh)
{ // doc-switch
- SwWait aWait( *pDocSh, sal_False );
+ SwWait aWait( *pDocSh, false );
SwWrtShell* pSh = pView->GetWrtShellPtr();
pChildWin->SetOldDocShell(pDocSh); // avoid recursion (using
modified-Hdl)
@@ -221,7 +221,7 @@ SwRedlineAcceptDlg::~SwRedlineAcceptDlg()
void SwRedlineAcceptDlg::Init(sal_uInt16 nStart)
{
- SwWait aWait( *::GetActiveView()->GetDocShell(), sal_False );
+ SwWait aWait( *::GetActiveView()->GetDocShell(), false );
pTable->SetUpdateMode(sal_False);
aUsedSeqNo.clear();
@@ -360,7 +360,7 @@ void SwRedlineAcceptDlg::Activate()
if (!pView) // can happen when switching to another app, when a Listbox in
the dialog
return; // had the focus previously (actually THs Bug)
- SwWait aWait( *pView->GetDocShell(), sal_False );
+ SwWait aWait( *pView->GetDocShell(), false );
aUsedSeqNo.clear();
@@ -782,7 +782,7 @@ void SwRedlineAcceptDlg::CallAcceptReject( sal_Bool
bSelect, sal_Bool bAccept )
if( !bAccept )
FnAccRej = &SwEditShell::RejectRedline;
- SwWait aWait( *pSh->GetView().GetDocShell(), sal_True );
+ SwWait aWait( *pSh->GetView().GetDocShell(), true );
pSh->StartAction();
// #111827#
@@ -1142,7 +1142,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl)
if (pTable->GetSortedCol() == nSortMode)
bSortDir = !pTable->GetSortDirection();
- SwWait aWait( *::GetActiveView()->GetDocShell(), sal_False
);
+ SwWait aWait( *::GetActiveView()->GetDocShell(), false );
pTable->SortByCol(nSortMode, bSortDir);
if (nSortMode == 0xffff)
Init(); // newly fill everything
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index be65809..f452f13 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -347,7 +347,7 @@ void SwSortDlg::Apply()
sal_Bool bRet;
{
- SwWait aWait( *rSh.GetView().GetDocShell(), sal_True );
+ SwWait aWait( *rSh.GetView().GetDocShell(), true );
rSh.StartAllAction();
if( 0 != (bRet = rSh.Sort( aOptions )))
rSh.SetModified();
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 9720fca..06b3467 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -605,7 +605,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
break;
case FN_UPDATE_CHARTS:
{
- SwWait aWait( *rView.GetDocShell(), sal_True );
+ SwWait aWait( *rView.GetDocShell(), true );
rSh.UpdateAllCharts();
}
break;
@@ -710,7 +710,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
if ( (!rSh.IsSelFrmMode() || nSelType & nsSelectionType::SEL_GRF)
&&
nGalleryItemType ==
com::sun::star::gallery::GalleryItemType::GRAPHIC )
{
- SwWait aWait( *rView.GetDocShell(), sal_True );
+ SwWait aWait( *rView.GetDocShell(), true );
OUString aGrfName, aFltName;
const Graphic aGrf( pGalleryItem->GetGraphic() );
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 07efba6..6e6c757 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -395,7 +395,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
if( !sGrfNm.isEmpty() )
{
SwDocShell* pDocSh = GetView().GetDocShell();
- SwWait aWait( *pDocSh, sal_True );
+ SwWait aWait( *pDocSh, true );
SfxMedium* pMedium = pDocSh->GetMedium();
INetURLObject aAbs;
if( pMedium )
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 94e5738..37a178a 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -2138,7 +2138,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium*
pMedium, sal_Int16 nVe
sal_uLong nErrno;
{ //Scope for SwWait-Object, to be able to execute slots
//outside this scope.
- SwWait aWait( *GetDocShell(), sal_True );
+ SwWait aWait( *GetDocShell(), true );
m_pWrtShell->StartAllAction();
if ( m_pWrtShell->HasSelection() )
m_pWrtShell->DelRight(); // delete selections
@@ -2197,7 +2197,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium*
pMedium, sal_Int16 nVe
sFltNm, nVersion, pDocSh );
if( nRet )
{
- SwWait aWait( *GetDocShell(), sal_True );
+ SwWait aWait( *GetDocShell(), true );
m_pWrtShell->StartAllAction();
m_pWrtShell->EnterStdMode(); // delete selections
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index 58e6e8e..5df515f 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -577,7 +577,7 @@ void SwView::StartThesaurus()
{
// create dialog
{ //Scope for SwWait-Object
- SwWait aWait( *GetDocShell(), sal_True );
+ SwWait aWait( *GetDocShell(), true );
// load library with dialog only on demand ...
SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
pDlg = pFact->CreateThesaurusDialog( &GetEditWin(), xThes, aTmp,
eLang );
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index bcf09c7..fb564fd 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -316,7 +316,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool
bNoMessage)
sal_uLong nFound;
{ //Scope for SwWait-Object
- SwWait aWait( *GetDocShell(), sal_True );
+ SwWait aWait( *GetDocShell(), true );
m_pWrtShell->StartAllAction();
if (!m_pSrchItem->GetSelection())
{
@@ -485,7 +485,7 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
if (!m_pSrchItem->GetSelection())
m_pWrtShell->KillSelection(0, false);
- SwWait *pWait = new SwWait( *GetDocShell(), sal_True );
+ SwWait *pWait = new SwWait( *GetDocShell(), true );
if( FUNC_Search( aOpts ) )
{
m_bFound = sal_True;
@@ -561,7 +561,7 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
}
m_pWrtShell->StartAllAction();
m_pWrtShell->Pop(sal_False);
- pWait = new SwWait( *GetDocShell(), sal_True );
+ pWait = new SwWait( *GetDocShell(), true );
bool bSrchBkwrd = DOCPOS_START == aOpts.eEnd;
@@ -592,7 +592,7 @@ sal_Bool SwView::SearchAndWrap(sal_Bool bApi)
sal_Bool SwView::SearchAll(sal_uInt16* pFound)
{
- SwWait aWait( *GetDocShell(), sal_True );
+ SwWait aWait( *GetDocShell(), true );
m_pWrtShell->StartAllAction();
SwSearchOptions aOpts( m_pWrtShell, m_pSrchItem->GetBackward() );
@@ -620,7 +620,7 @@ sal_Bool SwView::SearchAll(sal_uInt16* pFound)
void SwView::Replace()
{
- SwWait aWait( *GetDocShell(), sal_True );
+ SwWait aWait( *GetDocShell(), true );
m_pWrtShell->StartAllAction();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
