diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2013-10-25 10:54:51 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2013-10-25 10:56:31 +0900 |
commit | 324b47aabcddc75e98ef56769e24362668e26ebc (patch) | |
tree | 7558eae44646d7164e68df57e5c33ff27616f8df /sd | |
parent | b7e5ab6f65eb682bfa200459d745d3bc4056e42a (diff) |
sal_Bool to bool
Change-Id: I4fe71f0418b3c2c9b0ca261c5b24fe2d093f7bb9
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/drawdoc.hxx | 12 | ||||
-rw-r--r-- | sd/source/core/drawdoc.cxx | 14 | ||||
-rw-r--r-- | sd/source/core/drawdoc3.cxx | 6 | ||||
-rw-r--r-- | sd/source/core/drawdoc4.cxx | 6 |
4 files changed, 19 insertions, 19 deletions
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 90405341fbf5..d8e2de742f37 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -151,8 +151,8 @@ private: SdCustomShowList* mpCustomShowList; ::sd::DrawDocShell* mpDocSh; SdTransferable * mpCreatingTransferable; - sal_Bool mbHasOnlineSpellErrors; - sal_Bool mbInitialOnlineSpellingEnabled; + bool mbHasOnlineSpellErrors; + bool mbInitialOnlineSpellingEnabled; OUString maBookmarkFile; ::sd::DrawDocShellRef mxBookmarkDocShRef; @@ -160,7 +160,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation2 > mxPresentation; - sal_Bool mbNewOrLoadCompleted; + bool mbNewOrLoadCompleted; sal_Bool mbOnlineSpell; sal_Bool mbSummationOfParagraphs; @@ -171,7 +171,7 @@ private: LanguageType meLanguageCTL; SvxNumType mePageNumType; ::sd::DrawDocShellRef mxAllocedDocShRef; // => AllocModel() - sal_Bool mbAllocDocSh; // => AllocModel() + bool mbAllocDocSh; // => AllocModel() DocumentType meDocType; CharClass* mpCharClass; ::com::sun::star::lang::Locale* mpLocale; @@ -229,7 +229,7 @@ public: DocumentType GetDocumentType() const { return meDocType; } - void SetAllocDocSh(sal_Bool bAlloc); + void SetAllocDocSh(bool bAlloc); void CreatingDataObj( SdTransferable* pTransferable ) { mpCreatingTransferable = pTransferable; } @@ -426,7 +426,7 @@ public: void NewOrLoadCompleted(DocCreationMode eMode); void NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool ); - sal_Bool IsNewOrLoadCompleted() const {return mbNewOrLoadCompleted; } + bool IsNewOrLoadCompleted() const {return mbNewOrLoadCompleted; } ::sd::FrameView* GetFrameView(sal_uLong nPos) { return nPos < maFrameViewList.size() ? maFrameViewList[nPos] : NULL; } diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index e252589febad..f0c14c6df739 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -156,16 +156,16 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) , mpCustomShowList(NULL) , mpDocSh(static_cast< ::sd::DrawDocShell*>(pDrDocSh)) , mpCreatingTransferable( NULL ) -, mbHasOnlineSpellErrors(sal_False) -, mbInitialOnlineSpellingEnabled(sal_True) -, mbNewOrLoadCompleted(sal_False) +, mbHasOnlineSpellErrors(false) +, mbInitialOnlineSpellingEnabled(true) +, mbNewOrLoadCompleted(false) , mbStartWithPresentation( false ) , mbExitAfterPresenting( false ) , meLanguage( LANGUAGE_SYSTEM ) , meLanguageCJK( LANGUAGE_SYSTEM ) , meLanguageCTL( LANGUAGE_SYSTEM ) , mePageNumType(SVX_ARABIC) -, mbAllocDocSh(sal_False) +, mbAllocDocSh(false) , meDocType(eType) , mpCharClass(NULL) , mpLocale(NULL) @@ -386,7 +386,7 @@ SdDrawDocument::~SdDrawDocument() mpOnlineSearchItem = NULL; CloseBookmarkDoc(); - SetAllocDocSh(sal_False); + SetAllocDocSh(false); ClearModel(sal_True); @@ -482,7 +482,7 @@ SdrModel* SdDrawDocument::AllocModel() const { // Create a DocShell which is then returned with GetAllocedDocSh() SdDrawDocument* pDoc = (SdDrawDocument*) this; - pDoc->SetAllocDocSh(sal_False); + pDoc->SetAllocDocSh(false); pDoc->mxAllocedDocShRef = new ::sd::DrawDocShell( SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType); pDoc->mxAllocedDocShRef->DoInitNew(NULL); @@ -657,7 +657,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) } } - mbNewOrLoadCompleted = sal_True; + mbNewOrLoadCompleted = true; // Update all linked pages SdPage* pPage = NULL; diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 3a207962851e..4ce381f2fe9a 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1046,13 +1046,13 @@ sal_Bool SdDrawDocument::InsertBookmarkAsObject( } if (bOLEObjFound) - pBMView->GetDoc().SetAllocDocSh(sal_True); + pBMView->GetDoc().SetAllocDocSh(true); SdDrawDocument* pTmpDoc = (SdDrawDocument*) pBMView->GetMarkedObjModel(); bOK = pView->Paste(*pTmpDoc, aObjPos, pPage); if (bOLEObjFound) - pBMView->GetDoc().SetAllocDocSh(sal_False); + pBMView->GetDoc().SetAllocDocSh(false); if (!bOLEObjFound) delete pTmpDoc; // Would otherwise be destroyed by DocShell @@ -1107,7 +1107,7 @@ bool SdDrawDocument::IsReadOnly() const // In the subsequent AllocModel() a DocShell (xAllocedDocShRef) is created. // Any pre-existing DocShell is deleted -void SdDrawDocument::SetAllocDocSh(sal_Bool bAlloc) +void SdDrawDocument::SetAllocDocSh(bool bAlloc) { mbAllocDocSh = bAlloc; diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 453b616e49ee..daa51ca9dd6d 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -863,7 +863,7 @@ IMPL_LINK_NOARG(SdDrawDocument, OnlineSpellingHdl) else { // Initial spelling has finished - mbInitialOnlineSpellingEnabled = sal_False; + mbInitialOnlineSpellingEnabled = false; // Stop search StopOnlineSpelling(); @@ -880,7 +880,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj) { if (pObj && pObj->GetOutlinerParaObject() /* && pObj != pView->GetTextEditObject() */) { - mbHasOnlineSpellErrors = sal_False; + mbHasOnlineSpellErrors = false; ::sd::Outliner* pOutl = GetInternalOutliner(sal_True); pOutl->SetUpdateMode(sal_True); Link aEvtHdl = pOutl->GetStatusEventHdl(); @@ -925,7 +925,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj) pOutl->SetStatusEventHdl(aEvtHdl); pOutl->SetUpdateMode(sal_False); pOutl->Init( nOldOutlMode ); - mbHasOnlineSpellErrors = sal_False; + mbHasOnlineSpellErrors = false; } } |