Kaydet (Commit) 324b47aa authored tarafından Takeshi Abe's avatar Takeshi Abe

sal_Bool to bool

Change-Id: I4fe71f0418b3c2c9b0ca261c5b24fe2d093f7bb9
üst b7e5ab6f
...@@ -151,8 +151,8 @@ private: ...@@ -151,8 +151,8 @@ private:
SdCustomShowList* mpCustomShowList; SdCustomShowList* mpCustomShowList;
::sd::DrawDocShell* mpDocSh; ::sd::DrawDocShell* mpDocSh;
SdTransferable * mpCreatingTransferable; SdTransferable * mpCreatingTransferable;
sal_Bool mbHasOnlineSpellErrors; bool mbHasOnlineSpellErrors;
sal_Bool mbInitialOnlineSpellingEnabled; bool mbInitialOnlineSpellingEnabled;
OUString maBookmarkFile; OUString maBookmarkFile;
::sd::DrawDocShellRef mxBookmarkDocShRef; ::sd::DrawDocShellRef mxBookmarkDocShRef;
...@@ -160,7 +160,7 @@ private: ...@@ -160,7 +160,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation2 > mxPresentation; ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation2 > mxPresentation;
sal_Bool mbNewOrLoadCompleted; bool mbNewOrLoadCompleted;
sal_Bool mbOnlineSpell; sal_Bool mbOnlineSpell;
sal_Bool mbSummationOfParagraphs; sal_Bool mbSummationOfParagraphs;
...@@ -171,7 +171,7 @@ private: ...@@ -171,7 +171,7 @@ private:
LanguageType meLanguageCTL; LanguageType meLanguageCTL;
SvxNumType mePageNumType; SvxNumType mePageNumType;
::sd::DrawDocShellRef mxAllocedDocShRef; // => AllocModel() ::sd::DrawDocShellRef mxAllocedDocShRef; // => AllocModel()
sal_Bool mbAllocDocSh; // => AllocModel() bool mbAllocDocSh; // => AllocModel()
DocumentType meDocType; DocumentType meDocType;
CharClass* mpCharClass; CharClass* mpCharClass;
::com::sun::star::lang::Locale* mpLocale; ::com::sun::star::lang::Locale* mpLocale;
...@@ -229,7 +229,7 @@ public: ...@@ -229,7 +229,7 @@ public:
DocumentType GetDocumentType() const { return meDocType; } DocumentType GetDocumentType() const { return meDocType; }
void SetAllocDocSh(sal_Bool bAlloc); void SetAllocDocSh(bool bAlloc);
void CreatingDataObj( SdTransferable* pTransferable ) { mpCreatingTransferable = pTransferable; } void CreatingDataObj( SdTransferable* pTransferable ) { mpCreatingTransferable = pTransferable; }
...@@ -426,7 +426,7 @@ public: ...@@ -426,7 +426,7 @@ public:
void NewOrLoadCompleted(DocCreationMode eMode); void NewOrLoadCompleted(DocCreationMode eMode);
void NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool ); void NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool );
sal_Bool IsNewOrLoadCompleted() const {return mbNewOrLoadCompleted; } bool IsNewOrLoadCompleted() const {return mbNewOrLoadCompleted; }
::sd::FrameView* GetFrameView(sal_uLong nPos) { ::sd::FrameView* GetFrameView(sal_uLong nPos) {
return nPos < maFrameViewList.size() ? maFrameViewList[nPos] : NULL; } return nPos < maFrameViewList.size() ? maFrameViewList[nPos] : NULL; }
......
...@@ -156,16 +156,16 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) ...@@ -156,16 +156,16 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
, mpCustomShowList(NULL) , mpCustomShowList(NULL)
, mpDocSh(static_cast< ::sd::DrawDocShell*>(pDrDocSh)) , mpDocSh(static_cast< ::sd::DrawDocShell*>(pDrDocSh))
, mpCreatingTransferable( NULL ) , mpCreatingTransferable( NULL )
, mbHasOnlineSpellErrors(sal_False) , mbHasOnlineSpellErrors(false)
, mbInitialOnlineSpellingEnabled(sal_True) , mbInitialOnlineSpellingEnabled(true)
, mbNewOrLoadCompleted(sal_False) , mbNewOrLoadCompleted(false)
, mbStartWithPresentation( false ) , mbStartWithPresentation( false )
, mbExitAfterPresenting( false ) , mbExitAfterPresenting( false )
, meLanguage( LANGUAGE_SYSTEM ) , meLanguage( LANGUAGE_SYSTEM )
, meLanguageCJK( LANGUAGE_SYSTEM ) , meLanguageCJK( LANGUAGE_SYSTEM )
, meLanguageCTL( LANGUAGE_SYSTEM ) , meLanguageCTL( LANGUAGE_SYSTEM )
, mePageNumType(SVX_ARABIC) , mePageNumType(SVX_ARABIC)
, mbAllocDocSh(sal_False) , mbAllocDocSh(false)
, meDocType(eType) , meDocType(eType)
, mpCharClass(NULL) , mpCharClass(NULL)
, mpLocale(NULL) , mpLocale(NULL)
...@@ -386,7 +386,7 @@ SdDrawDocument::~SdDrawDocument() ...@@ -386,7 +386,7 @@ SdDrawDocument::~SdDrawDocument()
mpOnlineSearchItem = NULL; mpOnlineSearchItem = NULL;
CloseBookmarkDoc(); CloseBookmarkDoc();
SetAllocDocSh(sal_False); SetAllocDocSh(false);
ClearModel(sal_True); ClearModel(sal_True);
...@@ -482,7 +482,7 @@ SdrModel* SdDrawDocument::AllocModel() const ...@@ -482,7 +482,7 @@ SdrModel* SdDrawDocument::AllocModel() const
{ {
// Create a DocShell which is then returned with GetAllocedDocSh() // Create a DocShell which is then returned with GetAllocedDocSh()
SdDrawDocument* pDoc = (SdDrawDocument*) this; SdDrawDocument* pDoc = (SdDrawDocument*) this;
pDoc->SetAllocDocSh(sal_False); pDoc->SetAllocDocSh(false);
pDoc->mxAllocedDocShRef = new ::sd::DrawDocShell( pDoc->mxAllocedDocShRef = new ::sd::DrawDocShell(
SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType); SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType);
pDoc->mxAllocedDocShRef->DoInitNew(NULL); pDoc->mxAllocedDocShRef->DoInitNew(NULL);
...@@ -657,7 +657,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) ...@@ -657,7 +657,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
} }
} }
mbNewOrLoadCompleted = sal_True; mbNewOrLoadCompleted = true;
// Update all linked pages // Update all linked pages
SdPage* pPage = NULL; SdPage* pPage = NULL;
......
...@@ -1046,13 +1046,13 @@ sal_Bool SdDrawDocument::InsertBookmarkAsObject( ...@@ -1046,13 +1046,13 @@ sal_Bool SdDrawDocument::InsertBookmarkAsObject(
} }
if (bOLEObjFound) if (bOLEObjFound)
pBMView->GetDoc().SetAllocDocSh(sal_True); pBMView->GetDoc().SetAllocDocSh(true);
SdDrawDocument* pTmpDoc = (SdDrawDocument*) pBMView->GetMarkedObjModel(); SdDrawDocument* pTmpDoc = (SdDrawDocument*) pBMView->GetMarkedObjModel();
bOK = pView->Paste(*pTmpDoc, aObjPos, pPage); bOK = pView->Paste(*pTmpDoc, aObjPos, pPage);
if (bOLEObjFound) if (bOLEObjFound)
pBMView->GetDoc().SetAllocDocSh(sal_False); pBMView->GetDoc().SetAllocDocSh(false);
if (!bOLEObjFound) if (!bOLEObjFound)
delete pTmpDoc; // Would otherwise be destroyed by DocShell delete pTmpDoc; // Would otherwise be destroyed by DocShell
...@@ -1107,7 +1107,7 @@ bool SdDrawDocument::IsReadOnly() const ...@@ -1107,7 +1107,7 @@ bool SdDrawDocument::IsReadOnly() const
// In the subsequent AllocModel() a DocShell (xAllocedDocShRef) is created. // In the subsequent AllocModel() a DocShell (xAllocedDocShRef) is created.
// Any pre-existing DocShell is deleted // Any pre-existing DocShell is deleted
void SdDrawDocument::SetAllocDocSh(sal_Bool bAlloc) void SdDrawDocument::SetAllocDocSh(bool bAlloc)
{ {
mbAllocDocSh = bAlloc; mbAllocDocSh = bAlloc;
......
...@@ -863,7 +863,7 @@ IMPL_LINK_NOARG(SdDrawDocument, OnlineSpellingHdl) ...@@ -863,7 +863,7 @@ IMPL_LINK_NOARG(SdDrawDocument, OnlineSpellingHdl)
else else
{ {
// Initial spelling has finished // Initial spelling has finished
mbInitialOnlineSpellingEnabled = sal_False; mbInitialOnlineSpellingEnabled = false;
// Stop search // Stop search
StopOnlineSpelling(); StopOnlineSpelling();
...@@ -880,7 +880,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj) ...@@ -880,7 +880,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj)
{ {
if (pObj && pObj->GetOutlinerParaObject() /* && pObj != pView->GetTextEditObject() */) if (pObj && pObj->GetOutlinerParaObject() /* && pObj != pView->GetTextEditObject() */)
{ {
mbHasOnlineSpellErrors = sal_False; mbHasOnlineSpellErrors = false;
::sd::Outliner* pOutl = GetInternalOutliner(sal_True); ::sd::Outliner* pOutl = GetInternalOutliner(sal_True);
pOutl->SetUpdateMode(sal_True); pOutl->SetUpdateMode(sal_True);
Link aEvtHdl = pOutl->GetStatusEventHdl(); Link aEvtHdl = pOutl->GetStatusEventHdl();
...@@ -925,7 +925,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj) ...@@ -925,7 +925,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj)
pOutl->SetStatusEventHdl(aEvtHdl); pOutl->SetStatusEventHdl(aEvtHdl);
pOutl->SetUpdateMode(sal_False); pOutl->SetUpdateMode(sal_False);
pOutl->Init( nOldOutlMode ); pOutl->Init( nOldOutlMode );
mbHasOnlineSpellErrors = sal_False; mbHasOnlineSpellErrors = false;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment