diff options
-rw-r--r-- | sc/inc/chgviset.hxx | 58 | ||||
-rw-r--r-- | sc/source/core/tool/chgviset.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xcl97/XclImpChangeTrack.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh3.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 8 |
6 files changed, 43 insertions, 43 deletions
diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx index 565225a76730..8a379d43fa95 100644 --- a/sc/inc/chgviset.hxx +++ b/sc/inc/chgviset.hxx @@ -40,18 +40,18 @@ private: utl::TextSearch* pCommentSearcher; DateTime aFirstDateTime; DateTime aLastDateTime; - OUString aAuthorToShow; - OUString aComment; + OUString aAuthorToShow; + OUString aComment; ScRangeList aRangeList; ScChgsDateMode eDateMode; - sal_Bool bShowIt; - sal_Bool bIsDate; - sal_Bool bIsAuthor; - sal_Bool bIsComment; - sal_Bool bIsRange; - sal_Bool bEveryoneButMe; - sal_Bool bShowAccepted; - sal_Bool bShowRejected; + bool bShowIt; + bool bIsDate; + bool bIsAuthor; + bool bIsComment; + bool bIsRange; + bool bEveryoneButMe; + bool bShowAccepted; + bool bShowRejected; bool mbIsActionRange; sal_uLong mnFirstAction; sal_uLong mnLastAction; @@ -79,11 +79,11 @@ public: ~ScChangeViewSettings(); - sal_Bool ShowChanges() const {return bShowIt;} - void SetShowChanges(sal_Bool nFlag=sal_True){bShowIt=nFlag;} + bool ShowChanges() const {return bShowIt;} + void SetShowChanges(bool nFlag) {bShowIt=nFlag;} - sal_Bool HasDate() const {return bIsDate;} - void SetHasDate(sal_Bool nFlag=sal_True) {bIsDate=nFlag;} + bool HasDate() const {return bIsDate;} + void SetHasDate(bool nFlag) {bIsDate=nFlag;} void SetTheDateMode(ScChgsDateMode eDatMod){ eDateMode=eDatMod; } ScChgsDateMode GetTheDateMode() const { return eDateMode; } @@ -95,35 +95,35 @@ public: const DateTime& GetTheLastDateTime()const {return aLastDateTime;} - sal_Bool HasAuthor() const {return bIsAuthor;} - void SetHasAuthor(sal_Bool nFlag=sal_True) {bIsAuthor=nFlag;} + bool HasAuthor() const {return bIsAuthor;} + void SetHasAuthor(bool nFlag) {bIsAuthor=nFlag;} - OUString GetTheAuthorToShow()const {return aAuthorToShow;} + OUString GetTheAuthorToShow()const {return aAuthorToShow;} void SetTheAuthorToShow(const OUString& aString){aAuthorToShow=aString;} - sal_Bool HasComment() const {return bIsComment;} - void SetHasComment(sal_Bool nFlag=sal_True) {bIsComment=nFlag;} + bool HasComment() const {return bIsComment;} + void SetHasComment(bool nFlag) {bIsComment=nFlag;} - OUString GetTheComment()const {return aComment;} + OUString GetTheComment()const {return aComment;} void SetTheComment(const OUString& aString); - sal_Bool IsValidComment(const OUString* pCommentStr) const; + bool IsValidComment(const OUString* pCommentStr) const; - sal_Bool IsEveryoneButMe() const {return bEveryoneButMe;} - void SetEveryoneButMe(sal_Bool nFlag=sal_True) {bEveryoneButMe=nFlag;} + bool IsEveryoneButMe() const {return bEveryoneButMe;} + void SetEveryoneButMe(bool nFlag) {bEveryoneButMe=nFlag;} - sal_Bool HasRange() const {return bIsRange;} - void SetHasRange(sal_Bool nFlag=sal_True) {bIsRange=nFlag;} + bool HasRange() const {return bIsRange;} + void SetHasRange(bool nFlag) {bIsRange=nFlag;} const ScRangeList& GetTheRangeList()const {return aRangeList;} void SetTheRangeList(const ScRangeList& aRl){aRangeList=aRl;} - sal_Bool IsShowAccepted() const { return bShowAccepted; } - void SetShowAccepted( sal_Bool bVal ) { bShowAccepted = bVal; } + bool IsShowAccepted() const { return bShowAccepted; } + void SetShowAccepted( bool bVal ) { bShowAccepted = bVal; } - sal_Bool IsShowRejected() const { return bShowRejected; } - void SetShowRejected( sal_Bool bVal ) { bShowRejected = bVal; } + bool IsShowRejected() const { return bShowRejected; } + void SetShowRejected( bool bVal ) { bShowRejected = bVal; } ScChangeViewSettings& operator= ( const ScChangeViewSettings& r ); diff --git a/sc/source/core/tool/chgviset.cxx b/sc/source/core/tool/chgviset.cxx index 52620f5d86b4..17185aafb8bf 100644 --- a/sc/source/core/tool/chgviset.cxx +++ b/sc/source/core/tool/chgviset.cxx @@ -80,7 +80,7 @@ ScChangeViewSettings& ScChangeViewSettings::operator=( const ScChangeViewSetting return *this; } -sal_Bool ScChangeViewSettings::IsValidComment(const OUString* pCommentStr) const +bool ScChangeViewSettings::IsValidComment(const OUString* pCommentStr) const { bool nTheFlag = true; diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index 9defd8a98c4f..d693243406ea 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -492,7 +492,7 @@ void XclImpChangeTrack::Apply() pChangeTrack = NULL; ScChangeViewSettings aSettings; - aSettings.SetShowChanges( sal_True ); + aSettings.SetShowChanges( true ); GetDoc().SetChangeViewSettings( aSettings ); } } diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index e7cdf57d2cd7..39838ffaad82 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -884,8 +884,8 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if ( bChangedViewSettings ) { - pChangeViewSet->SetShowChanges( sal_True ); - pChangeViewSet->SetShowAccepted( sal_True ); + pChangeViewSet->SetShowChanges( true ); + pChangeViewSet->SetShowAccepted( true ); aDocument.SetChangeViewSettings( *pChangeViewSet ); } } @@ -3137,7 +3137,7 @@ void ScDocShell::SetChangeRecording( bool bActivate ) { aDocument.StartChangeTracking(); ScChangeViewSettings aChangeViewSet; - aChangeViewSet.SetShowChanges(sal_True); + aChangeViewSet.SetShowChanges(true); aDocument.SetChangeViewSettings(aChangeViewSet); } else diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index ad2806d94c1c..b744b624f23a 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -803,7 +803,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck { // visuelles RedLining einschalten ScChangeViewSettings aChangeViewSet; - aChangeViewSet.SetShowChanges(sal_True); + aChangeViewSet.SetShowChanges(true); aDocument.SetChangeViewSettings(aChangeViewSet); } } @@ -1293,8 +1293,8 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell ) nEndShared = pThisTrack->GetActionMax(); // only show changes from shared document - aChangeViewSet.SetShowChanges( sal_True ); - aChangeViewSet.SetShowAccepted( sal_True ); + aChangeViewSet.SetShowChanges( true ); + aChangeViewSet.SetShowAccepted( true ); aChangeViewSet.SetHasActionRange( true ); aChangeViewSet.SetTheActionRange( nStartShared, nEndShared ); aDocument.SetChangeViewSettings( aChangeViewSet ); @@ -1337,8 +1337,8 @@ bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell ) sal_uLong nEndShared = pThisTrack->GetActionMax(); // only show changes from shared document - aChangeViewSet.SetShowChanges( sal_True ); - aChangeViewSet.SetShowAccepted( sal_True ); + aChangeViewSet.SetShowChanges( true ); + aChangeViewSet.SetShowAccepted( true ); aChangeViewSet.SetHasActionRange( true ); aChangeViewSet.SetTheActionRange( nStartShared, nEndShared ); aDocument.SetChangeViewSettings( aChangeViewSet ); diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index eeb9e03dd3b4..db9f38c43c12 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -607,7 +607,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) { pDoc->StartChangeTracking(); ScChangeViewSettings aChangeViewSet; - aChangeViewSet.SetShowChanges(sal_True); + aChangeViewSet.SetShowChanges(true); pDoc->SetChangeViewSettings(aChangeViewSet); } @@ -778,7 +778,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) if ( !pOldSet || !pOldSet->ShowChanges() ) { ScChangeViewSettings aChangeViewSet; - aChangeViewSet.SetShowChanges(sal_True); + aChangeViewSet.SetShowChanges(true); aDocument.SetChangeViewSettings(aChangeViewSet); } } @@ -790,8 +790,8 @@ void ScDocShell::Execute( SfxRequest& rReq ) { // only show changes from merged document ScChangeViewSettings aChangeViewSet; - aChangeViewSet.SetShowChanges( sal_True ); - aChangeViewSet.SetShowAccepted( sal_True ); + aChangeViewSet.SetShowChanges( true ); + aChangeViewSet.SetShowAccepted( true ); aChangeViewSet.SetHasActionRange( true ); aChangeViewSet.SetTheActionRange( nStart, nEnd ); aDocument.SetChangeViewSettings( aChangeViewSet ); |