summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-17 13:38:26 +0200
committerNoel Grandin <noel@peralex.com>2014-03-18 11:27:38 +0200
commitac01de882d368c4d8044361f874edd4b53e33f2b (patch)
tree50b56ce1efa549fec4b69d04ae9f1cd4ecb3ccfe /sw
parent399724aba4b7297a262a775d000ddf4534e38b6c (diff)
sfx2: sal_Bool->bool
Change-Id: I87c5a180566e9da185c2992844e6522e82c17747
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/docsh.hxx18
-rw-r--r--sw/source/core/crsr/crsrsh.cxx10
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks.cxx2
-rw-r--r--sw/source/core/uibase/app/docsh.cxx30
-rw-r--r--sw/source/core/uibase/app/docsh2.cxx12
-rw-r--r--sw/source/core/uibase/app/docshini.cxx14
-rw-r--r--sw/source/core/uibase/dochdl/swdtflvr.cxx2
-rw-r--r--sw/source/core/uibase/docvw/SidebarWin.cxx2
-rw-r--r--sw/source/core/uibase/inc/glshell.hxx4
-rw-r--r--sw/source/core/uibase/misc/glshell.cxx12
-rw-r--r--sw/source/core/uibase/uiview/srcview.cxx2
-rw-r--r--sw/source/core/uibase/uiview/view.cxx6
-rw-r--r--sw/source/core/uibase/uiview/viewling.cxx2
-rw-r--r--sw/source/core/uibase/uno/unotxdoc.cxx4
-rw-r--r--sw/source/core/uibase/utlui/navipi.cxx2
-rw-r--r--sw/source/core/uibase/wrtsh/wrtsh1.cxx4
-rw-r--r--sw/source/filter/html/swhtml.cxx4
-rw-r--r--sw/source/filter/ww1/fltshell.cxx2
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par.cxx2
20 files changed, 68 insertions, 68 deletions
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 30c2ecfbf42f..5f3271c8ffcd 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -82,13 +82,13 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
/// FileIO
- SAL_DLLPRIVATE virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
- SAL_DLLPRIVATE virtual sal_Bool Load( SfxMedium& rMedium );
- SAL_DLLPRIVATE virtual sal_Bool LoadFrom( SfxMedium& rMedium );
- SAL_DLLPRIVATE virtual sal_Bool ConvertFrom( SfxMedium &rMedium );
- SAL_DLLPRIVATE virtual sal_Bool ConvertTo( SfxMedium &rMedium );
- SAL_DLLPRIVATE virtual sal_Bool SaveAs( SfxMedium& rMedium );
- SAL_DLLPRIVATE virtual sal_Bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+ SAL_DLLPRIVATE virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+ SAL_DLLPRIVATE virtual bool Load( SfxMedium& rMedium );
+ SAL_DLLPRIVATE virtual bool LoadFrom( SfxMedium& rMedium );
+ SAL_DLLPRIVATE virtual bool ConvertFrom( SfxMedium &rMedium );
+ SAL_DLLPRIVATE virtual bool ConvertTo( SfxMedium &rMedium );
+ SAL_DLLPRIVATE virtual bool SaveAs( SfxMedium& rMedium );
+ SAL_DLLPRIVATE virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
SAL_DLLPRIVATE virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE;
@@ -171,7 +171,7 @@ public:
virtual sal_uLong GetMiscStatus() const;
virtual void PrepareReload();
- virtual void SetModified( sal_Bool = sal_True );
+ virtual void SetModified( bool = true );
/// Dispatcher
void Execute(SfxRequest &);
@@ -193,7 +193,7 @@ public:
void UpdateChildWindows();
/// global IO.
- virtual sal_Bool Save();
+ virtual bool Save();
/// For Style PI.
virtual SfxStyleSheetBasePool* GetStyleSheetPool();
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 278e1b22b9e3..a9faaadb03f1 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -848,7 +848,7 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, sal_Bool bOnlyText, bool bBlock )
m_bAllProtect = sal_True;
if( GetDoc()->GetDocShell() )
{
- GetDoc()->GetDocShell()->SetReadOnlyUI( sal_True );
+ GetDoc()->GetDocShell()->SetReadOnlyUI( true );
CallChgLnk(); // notify UI
}
}
@@ -1592,7 +1592,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
m_bAllProtect = sal_True;
if( GetDoc()->GetDocShell() )
{
- GetDoc()->GetDocShell()->SetReadOnlyUI( sal_True );
+ GetDoc()->GetDocShell()->SetReadOnlyUI( true );
CallChgLnk(); // notify UI!
}
return;
@@ -1606,7 +1606,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
if( bWasAllProtect && GetDoc()->GetDocShell() &&
GetDoc()->GetDocShell()->IsReadOnlyUI() )
{
- GetDoc()->GetDocShell()->SetReadOnlyUI( sal_False );
+ GetDoc()->GetDocShell()->SetReadOnlyUI( false );
CallChgLnk(); // notify UI!
}
}
@@ -1695,7 +1695,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
m_bAllProtect = sal_True;
if( GetDoc()->GetDocShell() )
{
- GetDoc()->GetDocShell()->SetReadOnlyUI( sal_True );
+ GetDoc()->GetDocShell()->SetReadOnlyUI( true );
CallChgLnk(); // notify UI!
}
return;
@@ -1709,7 +1709,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
if( bWasAllProtect && GetDoc()->GetDocShell() &&
GetDoc()->GetDocShell()->IsReadOnlyUI() )
{
- GetDoc()->GetDocShell()->SetReadOnlyUI( sal_False );
+ GetDoc()->GetDocShell()->SetReadOnlyUI( false );
CallChgLnk(); // notify UI!
}
m_bAllProtect = sal_False;
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 379fefe913fb..eea9eea900da 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -372,7 +372,7 @@ sal_uLong SwXMLTextBlocks::PutBlock( SwPaM& , const OUString& )
pTmpMedium = new SfxMedium( xTempStorage, GetBaseURL() );
sal_Bool bTmpOK = pDocSh->SaveAsChildren( *pTmpMedium );
if( bTmpOK )
- bTmpOK = pDocSh->SaveCompletedChildren( sal_False );
+ bTmpOK = pDocSh->SaveCompletedChildren( false );
xTempStorage->copyToStorage( xRoot );
bOK = bTmpOK;
diff --git a/sw/source/core/uibase/app/docsh.cxx b/sw/source/core/uibase/app/docsh.cxx
index d5062ff42584..58f176942d77 100644
--- a/sw/source/core/uibase/app/docsh.cxx
+++ b/sw/source/core/uibase/app/docsh.cxx
@@ -229,12 +229,12 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
}
// Loading
-sal_Bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
+bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
{
SwReader* pRdr;
SwRead pRead = StartConvertFrom(rMedium, &pRdr);
if (!pRead)
- return sal_False; // #129881# return if no reader is found
+ return false; // #129881# return if no reader is found
SotStorageRef pStg=pRead->getSotStorageRef(); // #i45333# save sot storage ref in case of recursive calls
pDoc->setDocAccTitle(OUString());
@@ -284,7 +284,7 @@ sal_Bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
SW_MOD()->SetEmbeddedLoadSave( sal_False );
SetError( nErr, OUString( OSL_LOG_PREFIX ) );
- sal_Bool bOk = !IsError( nErr );
+ bool bOk = !IsError( nErr );
if ( bOk && !pDoc->IsInLoadAsynchron() )
{
@@ -297,7 +297,7 @@ sal_Bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
}
// Saving the Default-Format, Stg present
-sal_Bool SwDocShell::Save()
+bool SwDocShell::Save()
{
//#i3370# remove quick help to prevent saving of autocorrection suggestions
if(pView)
@@ -385,7 +385,7 @@ sal_Bool SwDocShell::Save()
}
// Save using the Defaultformat
-sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
+bool SwDocShell::SaveAs( SfxMedium& rMedium )
{
SwWait aWait( *this, true );
//#i3370# remove quick help to prevent saving of autocorrection suggestions
@@ -519,11 +519,11 @@ static SwSrcView* lcl_GetSourceView( SwDocShell* pSh )
return PTR_CAST( SwSrcView, pViewShell);
}
-sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium )
+bool SwDocShell::ConvertTo( SfxMedium& rMedium )
{
const SfxFilter* pFlt = rMedium.GetFilter();
if( !pFlt )
- return sal_False;
+ return false;
WriterRef xWriter;
SwReaderWriter::GetWriter( pFlt->GetUserData(), rMedium.GetBaseURL( true ), xWriter );
@@ -531,7 +531,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium )
{ // Filter not available
InfoBox( 0,
SW_RESSTR(STR_DLLNOTFOUND) ).Execute();
- return sal_False;
+ return false;
}
//#i3370# remove quick help to prevent saving of autocorrection suggestions
@@ -668,7 +668,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium )
}
// Now normally save the Document
- sal_Bool bRet = SaveAs( rMedium );
+ bool bRet = SaveAs( rMedium );
if( nMyType != nSaveType )
{
@@ -753,9 +753,9 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium )
// Hands off
// do not yet activate, must deliver TRUE
-sal_Bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor )
+bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor )
{
- sal_Bool bRet = SfxObjectShell::SaveCompleted( xStor );
+ bool bRet = SfxObjectShell::SaveCompleted( xStor );
if( bRet )
{
// Do not decide until here, whether Saving was successful or not
@@ -769,7 +769,7 @@ sal_Bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xS
{
sal_Bool bResetModified = IsEnableSetModified();
if( bResetModified )
- EnableSetModified( sal_False );
+ EnableSetModified( false );
uno::Sequence < OUString > aNames = pOLEChildList->GetObjectNames();
for( sal_Int32 n = aNames.getLength(); n; n-- )
@@ -782,7 +782,7 @@ sal_Bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xS
DELETEZ( pOLEChildList );
if( bResetModified )
- EnableSetModified( sal_True );
+ EnableSetModified( true );
}
return bRet;
}
@@ -794,7 +794,7 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup,
//fix #25341# Draw should not affect the Modified
sal_Bool bResetModified;
if ( sal_True == (bResetModified = IsEnableSetModified()) )
- EnableSetModified( sal_False );
+ EnableSetModified( false );
// When there is a JobSetup connected to the Document, we copy it to
// reconnect it after PrtOle2. We don't use an empty JobSetup because
@@ -827,7 +827,7 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup,
delete pOrig;
}
if ( bResetModified )
- EnableSetModified( sal_True );
+ EnableSetModified( true );
}
void SwDocShell::SetVisArea( const Rectangle &rRect )
diff --git a/sw/source/core/uibase/app/docsh2.cxx b/sw/source/core/uibase/app/docsh2.cxx
index f8ced7043098..0a339253c74c 100644
--- a/sw/source/core/uibase/app/docsh2.cxx
+++ b/sw/source/core/uibase/app/docsh2.cxx
@@ -280,7 +280,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
const bool bResetModified = IsEnableSetModified();
if ( bResetModified )
- EnableSetModified( sal_False );
+ EnableSetModified( false );
// #i41679#
const bool bIsDocModified = pDoc->IsModified();
@@ -290,7 +290,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
if ( !bIsDocModified )
pDoc->ResetModified();
if ( bResetModified )
- EnableSetModified( sal_True );
+ EnableSetModified( true );
}
break;
}
@@ -757,7 +757,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
case FN_OUTLINE_TO_IMPRESS:
{
sal_Bool bEnable = IsEnableSetModified();
- EnableSetModified( sal_False );
+ EnableSetModified( false );
WriterRef xWrt;
// mba: looks as if relative URLs don't make sense here
::GetRTFWriter( OUString('O'), OUString(), xWrt );
@@ -1219,14 +1219,14 @@ void SwDocShell::FillClass( SvGlobalName * pClassName,
*pUserName = SW_RESSTR(STR_HUMAN_SWDOC_NAME);
}
-void SwDocShell::SetModified( sal_Bool bSet )
+void SwDocShell::SetModified( bool bSet )
{
SfxObjectShell::SetModified( bSet );
if( IsEnableSetModified())
{
if (!pDoc->IsInCallModified() )
{
- EnableSetModified( sal_False );
+ EnableSetModified( false );
if( bSet )
{
sal_Bool bOld = pDoc->IsModified();
@@ -1239,7 +1239,7 @@ void SwDocShell::SetModified( sal_Bool bSet )
else
pDoc->ResetModified();
- EnableSetModified( sal_True );
+ EnableSetModified( true );
}
UpdateChildWindows();
diff --git a/sw/source/core/uibase/app/docshini.cxx b/sw/source/core/uibase/app/docshini.cxx
index 968ec591f168..e6c30524588a 100644
--- a/sw/source/core/uibase/app/docshini.cxx
+++ b/sw/source/core/uibase/app/docshini.cxx
@@ -89,11 +89,11 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
// Load Document
-sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
+bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
{
- sal_Bool bRet = SfxObjectShell::InitNew( xStor );
+ bool bRet = SfxObjectShell::InitNew( xStor );
OSL_ENSURE( GetMapUnit() == MAP_TWIP, "map unit is not twip!" );
- sal_Bool bHTMLTemplSet = sal_False;
+ bool bHTMLTemplSet = false;
if( bRet )
{
AddLink(); // create pDoc / pIo if applicable
@@ -464,9 +464,9 @@ void SwDocShell::ReactivateModel()
}
// Load, Default-Format
-sal_Bool SwDocShell::Load( SfxMedium& rMedium )
+bool SwDocShell::Load( SfxMedium& rMedium )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( SfxObjectShell::Load( rMedium ))
{
SAL_INFO( "sw.ui", "after SfxInPlaceObject::Load" );
@@ -563,9 +563,9 @@ sal_Bool SwDocShell::Load( SfxMedium& rMedium )
return bRet;
}
-sal_Bool SwDocShell::LoadFrom( SfxMedium& rMedium )
+bool SwDocShell::LoadFrom( SfxMedium& rMedium )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( pDoc )
RemoveLink();
diff --git a/sw/source/core/uibase/dochdl/swdtflvr.cxx b/sw/source/core/uibase/dochdl/swdtflvr.cxx
index f0819415a513..f5c4af05247e 100644
--- a/sw/source/core/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/core/uibase/dochdl/swdtflvr.cxx
@@ -661,7 +661,7 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
pEmbObj->SetupStorage( xWorkStore, SOFFICE_FILEFORMAT_CURRENT, false );
// mba: no BaseURL for clipboard
SfxMedium aMedium( xWorkStore, OUString() );
- bRet = pEmbObj->DoSaveObjectAs( aMedium, sal_False );
+ bRet = pEmbObj->DoSaveObjectAs( aMedium, false );
pEmbObj->DoSaveCompleted();
uno::Reference< embed::XTransactedObject > xTransact( xWorkStore, uno::UNO_QUERY );
diff --git a/sw/source/core/uibase/docvw/SidebarWin.cxx b/sw/source/core/uibase/docvw/SidebarWin.cxx
index 14553ad2e564..4a37bf25bd07 100644
--- a/sw/source/core/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/core/uibase/docvw/SidebarWin.cxx
@@ -1114,7 +1114,7 @@ IMPL_LINK(SwSidebarWin, ScrollHdl, ScrollBar*, pScroll)
IMPL_LINK_NOARG(SwSidebarWin, ModifyHdl)
{
- mrView.GetDocShell()->SetModified(sal_True);
+ mrView.GetDocShell()->SetModified(true);
return 0;
}
diff --git a/sw/source/core/uibase/inc/glshell.hxx b/sw/source/core/uibase/inc/glshell.hxx
index 9e9513d22b77..13f84e159cbb 100644
--- a/sw/source/core/uibase/inc/glshell.hxx
+++ b/sw/source/core/uibase/inc/glshell.hxx
@@ -29,7 +29,7 @@ class SwGlosDocShell : public SwDocShell
using SotObject::GetInterface;
protected:
- virtual sal_Bool Save();
+ virtual bool Save();
public:
@@ -59,7 +59,7 @@ class SwWebGlosDocShell : public SwWebDocShell
using SotObject::GetInterface;
protected:
- virtual sal_Bool Save();
+ virtual bool Save();
public:
diff --git a/sw/source/core/uibase/misc/glshell.cxx b/sw/source/core/uibase/misc/glshell.cxx
index c3776ceb852a..dc26db2958c4 100644
--- a/sw/source/core/uibase/misc/glshell.cxx
+++ b/sw/source/core/uibase/misc/glshell.cxx
@@ -146,7 +146,7 @@ void SwGlosDocShell::GetState( SfxItemSet& rSet )
::lcl_GetState( *this, rSet );
}
-sal_Bool SwGlosDocShell::Save()
+bool SwGlosDocShell::Save()
{
// In case of an API object which holds this document, it is possible that the WrtShell is already
// dead. For instance, if the doc is modified via this API object, and then, upon office shutdown,
@@ -157,8 +157,8 @@ sal_Bool SwGlosDocShell::Save()
return ::lcl_Save( *GetWrtShell(), aGroupName, aShortName, aLongName );
else
{
- SetModified( sal_False );
- return sal_False;
+ SetModified( false );
+ return false;
}
}
@@ -182,15 +182,15 @@ void SwWebGlosDocShell::GetState( SfxItemSet& rSet )
::lcl_GetState( *this, rSet );
}
-sal_Bool SwWebGlosDocShell::Save()
+bool SwWebGlosDocShell::Save()
{
// same comment as in SwGlosDocShell::Save - see there
if ( GetWrtShell() )
return ::lcl_Save( *GetWrtShell(), aGroupName, aShortName, aLongName );
else
{
- SetModified( sal_False );
- return sal_False;
+ SetModified( false );
+ return false;
}
}
diff --git a/sw/source/core/uibase/uiview/srcview.cxx b/sw/source/core/uibase/uiview/srcview.cxx
index 87ac68ff2330..0427f928f047 100644
--- a/sw/source/core/uibase/uiview/srcview.cxx
+++ b/sw/source/core/uibase/uiview/srcview.cxx
@@ -863,7 +863,7 @@ void SwSrcView::Load(SwDocShell* pDocShell)
if(bDocModified)
pDocShell->SetModified();// The flag will be reset in between times.
// Disable AutoLoad
- pDocShell->SetAutoLoad(INetURLObject(), 0, sal_False);
+ pDocShell->SetAutoLoad(INetURLObject(), 0, false);
OSL_ENSURE(PTR_CAST(SwWebDocShell, pDocShell), "Why no WebDocShell?");
sal_uInt16 nLine = ((SwWebDocShell*)pDocShell)->GetSourcePara();
aEditWin.SetStartLine(nLine);
diff --git a/sw/source/core/uibase/uiview/view.cxx b/sw/source/core/uibase/uiview/view.cxx
index 48eafa1603c5..c89c044bb2c3 100644
--- a/sw/source/core/uibase/uiview/view.cxx
+++ b/sw/source/core/uibase/uiview/view.cxx
@@ -753,7 +753,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
SwDocShell* pDocSh = PTR_CAST( SwDocShell, _pFrame->GetObjectShell() );
sal_Bool bOldModifyFlag = pDocSh->IsEnableSetModified();
if(bOldModifyFlag)
- pDocSh->EnableSetModified( sal_False );
+ pDocSh->EnableSetModified( false );
// HACK: SwDocShell has some cached font info, VCL informs about font updates,
// but loading of docs with embedded fonts happens after SwDocShell is created
// but before SwEditWin (which handles the VCL event) is created. So update
@@ -1016,7 +1016,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
m_aTimer.SetTimeoutHdl(LINK(this, SwView, TimeoutHdl));
m_bAttrChgNotified = m_bAttrChgNotifiedWithRegistrations = sal_False;
if(bOldModifyFlag)
- pDocSh->EnableSetModified( sal_True );
+ pDocSh->EnableSetModified( true );
InvalidateBorder();
if( !m_pHScrollbar->IsVisible( sal_True ) )
@@ -1617,7 +1617,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
/* no break here */
case SFX_HINT_TITLECHANGED:
- if ( GetDocShell()->IsReadOnly() != GetWrtShell().GetViewOptions()->IsReadonly() )
+ if ( (GetDocShell()->IsReadOnly() ? 1 : 0) != GetWrtShell().GetViewOptions()->IsReadonly() )
{
SwWrtShell &rSh = GetWrtShell();
rSh.SetReadonlyOption( GetDocShell()->IsReadOnly() );
diff --git a/sw/source/core/uibase/uiview/viewling.cxx b/sw/source/core/uibase/uiview/viewling.cxx
index 45b2f12d5fb9..e2c41be29048 100644
--- a/sw/source/core/uibase/uiview/viewling.cxx
+++ b/sw/source/core/uibase/uiview/viewling.cxx
@@ -865,7 +865,7 @@ IMPL_LINK( SwFieldDialog, MyListBoxHandler, ListBox *, pBox )
(*pFieldmark->GetParameters())[ sKey ] = makeAny(selection);
pFieldmark->Invalidate();
SwView& rView = ( ( SwEditWin* )GetParent() )->GetView();
- rView.GetDocShell()->SetModified( sal_True );
+ rView.GetDocShell()->SetModified( true );
}
EndPopupMode();
diff --git a/sw/source/core/uibase/uno/unotxdoc.cxx b/sw/source/core/uibase/uno/unotxdoc.cxx
index d5aabc5dad66..9a4a51dff7a5 100644
--- a/sw/source/core/uibase/uno/unotxdoc.cxx
+++ b/sw/source/core/uibase/uno/unotxdoc.cxx
@@ -2590,14 +2590,14 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
bool bStateChanged = false;
if ( bOrigStatus && !SvtPrintWarningOptions().IsModifyDocumentOnPrintingAllowed() )
{
- pRenderDocShell->EnableSetModified( sal_False );
+ pRenderDocShell->EnableSetModified( false );
bStateChanged = true;
}
// #122919# Force field update before PDF export
pViewShell->SwViewShell::UpdateFlds(sal_True);
if( bStateChanged )
- pRenderDocShell->EnableSetModified( sal_True );
+ pRenderDocShell->EnableSetModified( true );
// there is some redundancy between those two function calls, but right now
// there is no time to sort this out.
diff --git a/sw/source/core/uibase/utlui/navipi.cxx b/sw/source/core/uibase/utlui/navipi.cxx
index 9dbb33e41893..53e2c67c9d64 100644
--- a/sw/source/core/uibase/utlui/navipi.cxx
+++ b/sw/source/core/uibase/utlui/navipi.cxx
@@ -856,7 +856,7 @@ SwNavigationPI::~SwNavigationPI()
SwView *pView = GetCreateView();
SwWrtShell &rSh = pView->GetWrtShell();
if( !rSh.IsAllProtect() )
- pView->GetDocShell()->SetReadOnlyUI(sal_False);
+ pView->GetDocShell()->SetReadOnlyUI(false);
}
EndListening(*SFX_APP());
diff --git a/sw/source/core/uibase/wrtsh/wrtsh1.cxx b/sw/source/core/uibase/wrtsh/wrtsh1.cxx
index ad6648d9078e..417ddaeee73e 100644
--- a/sw/source/core/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/core/uibase/wrtsh/wrtsh1.cxx
@@ -664,7 +664,7 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
bool bResetEnableSetModified(false);
if ( GetDoc()->GetDocShell()->IsEnableSetModified() )
{
- GetDoc()->GetDocShell()->EnableSetModified( sal_False );
+ GetDoc()->GetDocShell()->EnableSetModified( false );
bResetEnableSetModified = true;
}
@@ -677,7 +677,7 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
if ( bResetEnableSetModified )
{
- GetDoc()->GetDocShell()->EnableSetModified( sal_True );
+ GetDoc()->GetDocShell()->EnableSetModified( true );
}
}
}
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 0f702fa87356..14cb6c4c4725 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -593,7 +593,7 @@ void SwHTMLParser::Continue( int nToken )
if( pDoc->GetDocShell() &&
(bSetModEnabled = pDoc->GetDocShell()->IsEnableSetModified()) )
{
- pDoc->GetDocShell()->EnableSetModified( sal_False );
+ pDoc->GetDocShell()->EnableSetModified( false );
}
// waehrend des einlesens kein OLE-Modified rufen
@@ -879,7 +879,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
pDoc->ResetModified();
if( bSetModEnabled && pDoc->GetDocShell() )
{
- pDoc->GetDocShell()->EnableSetModified( sal_True );
+ pDoc->GetDocShell()->EnableSetModified( true );
bSetModEnabled = false; // this is unnecessary here
}
}
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 2d23c90d2c27..096f409f1ae6 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -1096,7 +1096,7 @@ SwFltShell::~SwFltShell()
if( !IsFlagSet(SwFltControlStack::DONT_HARD_PROTECT) ){
SwDocShell* pDocSh = rDoc.GetDocShell();
if( pDocSh )
- pDocSh->SetReadOnlyUI( sal_True );
+ pDocSh->SetReadOnlyUI( true );
}
}
// Update document page descriptors (only this way also left
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index d08428207984..346127178bf1 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3345,7 +3345,7 @@ void WW8Export::PrepareStorage()
if ( SvtFilterOptions::Get().IsEnableWordPreview() )
{
::boost::shared_ptr<GDIMetaFile> pMetaFile =
- pDocShell->GetPreviewMetaFile (sal_False);
+ pDocShell->GetPreviewMetaFile(false);
uno::Sequence<sal_uInt8> metaFile(
sfx2::convertMetaFile(pMetaFile.get()));
sfx2::SaveOlePropertySet(xDocProps, &GetWriter().GetStorage(), &metaFile);
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 6f1a3442c066..9df2cfbc89d5 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4836,7 +4836,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
{
SwDocShell * pDocShell = rDoc.GetDocShell();
if (pDocShell)
- pDocShell->SetReadOnlyUI(sal_True);
+ pDocShell->SetReadOnlyUI(true);
}
pPaM = new SwPaM(rPos);