diff options
Diffstat (limited to 'sd/source/core/drawdoc.cxx')
-rwxr-xr-x[-rw-r--r--] | sd/source/core/drawdoc.cxx | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index e2fdc2f805e5..4f865836f5c2 100644..100755 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -162,15 +162,15 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) , mpCustomShowList(NULL) , mpDocSh(static_cast< ::sd::DrawDocShell*>(pDrDocSh)) , mpCreatingTransferable( NULL ) -, mbHasOnlineSpellErrors(FALSE) -, mbInitialOnlineSpellingEnabled(TRUE) -, mbNewOrLoadCompleted(FALSE) +, mbHasOnlineSpellErrors(sal_False) +, mbInitialOnlineSpellingEnabled(sal_True) +, mbNewOrLoadCompleted(sal_False) , mbStartWithPresentation( false ) , meLanguage( LANGUAGE_SYSTEM ) , meLanguageCJK( LANGUAGE_SYSTEM ) , meLanguageCTL( LANGUAGE_SYSTEM ) , mePageNumType(SVX_ARABIC) -, mbAllocDocSh(FALSE) +, mbAllocDocSh(sal_False) , meDocType(eType) , mpCharClass(NULL) , mpLocale(NULL) @@ -187,11 +187,11 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) if (mpDocSh) { - SetSwapGraphics(TRUE); + SetSwapGraphics(sal_True); } // Masseinheit (von App) und Massstab (von SdMod) setzen - INT32 nX, nY; + sal_Int32 nX, nY; SdOptions* pOptions = SD_MOD()->GetSdOptions(meDocType); pOptions->GetScale( nX, nY ); @@ -251,12 +251,12 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) // for korean and japanese languages we have a different default for apply spacing between asian, latin and ctl text if( ( LANGUAGE_KOREAN == eRealCTLLanguage ) || ( LANGUAGE_KOREAN_JOHAB == eRealCTLLanguage ) || ( LANGUAGE_JAPANESE == eRealCTLLanguage ) ) { - GetPool().GetSecondaryPool()->SetPoolDefaultItem( SvxScriptSpaceItem( FALSE, EE_PARA_ASIANCJKSPACING ) ); + GetPool().GetSecondaryPool()->SetPoolDefaultItem( SvxScriptSpaceItem( sal_False, EE_PARA_ASIANCJKSPACING ) ); } // DefTab und SpellOptions setzen // Jetzt am Modul (SD) - USHORT nDefTab = pOptions->GetDefTab(); + sal_uInt16 nDefTab = pOptions->GetDefTab(); SetDefaultTabulator( nDefTab ); try @@ -283,7 +283,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) SetLinkManager( new sfx2::LinkManager(mpDocSh) ); } - ULONG nCntrl = rOutliner.GetControlWord(); + sal_uLong nCntrl = rOutliner.GetControlWord(); nCntrl |= EE_CNTRL_ALLOWBIGOBJS; nCntrl |= EE_CNTRL_URLSFXEXECUTE; @@ -332,7 +332,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) pHitTestOutliner->SetDefaultLanguage( Application::GetSettings().GetLanguage() ); - ULONG nCntrl2 = pHitTestOutliner->GetControlWord(); + sal_uLong nCntrl2 = pHitTestOutliner->GetControlWord(); nCntrl2 |= EE_CNTRL_ALLOWBIGOBJS; nCntrl2 |= EE_CNTRL_URLSFXEXECUTE; nCntrl2 &= ~EE_CNTRL_ONLINESPELLING; @@ -399,7 +399,7 @@ SdDrawDocument::~SdDrawDocument() mpOnlineSearchItem = NULL; CloseBookmarkDoc(); - SetAllocDocSh(FALSE); + SetAllocDocSh(sal_False); // #116168# ClearModel(sal_True); @@ -418,7 +418,7 @@ SdDrawDocument::~SdDrawDocument() ::sd::FrameView* pFrameView = NULL; - for (ULONG i = 0; i < mpFrameViewList->Count(); i++) + for (sal_uLong i = 0; i < mpFrameViewList->Count(); i++) { // Ggf. FrameViews loeschen pFrameView = @@ -433,7 +433,7 @@ SdDrawDocument::~SdDrawDocument() if (mpCustomShowList) { - for (ULONG j = 0; j < mpCustomShowList->Count(); j++) + for (sal_uLong j = 0; j < mpCustomShowList->Count(); j++) { // Ggf. CustomShows loeschen SdCustomShow* pCustomShow = (SdCustomShow*) mpCustomShowList->GetObject(j); @@ -477,10 +477,10 @@ SdrModel* SdDrawDocument::AllocModel() const if( meDocType == DOCUMENT_TYPE_IMPRESS ) mpCreatingTransferable->SetDocShell( new ::sd::DrawDocShell( - SFX_CREATE_MODE_EMBEDDED, TRUE, meDocType ) ); + SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType ) ); else mpCreatingTransferable->SetDocShell( new ::sd::GraphicDocShell( - SFX_CREATE_MODE_EMBEDDED, TRUE, meDocType ) ); + SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType ) ); pNewDocSh = static_cast< ::sd::DrawDocShell*>( pObj = mpCreatingTransferable->GetDocShell() ); pNewDocSh->DoInitNew( NULL ); @@ -496,7 +496,7 @@ SdrModel* SdDrawDocument::AllocModel() const pNewStylePool->CopyTableStyles(*pOldStylePool); - for (USHORT i = 0; i < GetMasterSdPageCount(PK_STANDARD); i++) + for (sal_uInt16 i = 0; i < GetMasterSdPageCount(PK_STANDARD); i++) { // Alle Layouts der MasterPage mitnehmen String aOldLayoutName(((SdDrawDocument*) this)->GetMasterSdPage(i, PK_STANDARD)->GetLayoutName()); @@ -511,9 +511,9 @@ SdrModel* SdDrawDocument::AllocModel() const { // Es wird eine DocShell erzeugt, welche mit GetAllocedDocSh() zurueckgegeben wird SdDrawDocument* pDoc = (SdDrawDocument*) this; - pDoc->SetAllocDocSh(FALSE); + pDoc->SetAllocDocSh(sal_False); pDoc->mxAllocedDocShRef = new ::sd::DrawDocShell( - SFX_CREATE_MODE_EMBEDDED, TRUE, meDocType); + SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType); pDoc->mxAllocedDocShRef->DoInitNew(NULL); pNewModel = pDoc->mxAllocedDocShRef->GetDoc(); } @@ -536,7 +536,7 @@ SdrModel* SdDrawDocument::AllocModel() const SdrPage* SdDrawDocument::AllocPage(FASTBOOL bMasterPage) { - return new SdPage(*this, NULL, (BOOL)bMasterPage); + return new SdPage(*this, NULL, (sal_Bool)bMasterPage); } /************************************************************************* @@ -605,9 +605,9 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) CheckMasterPages(); if ( GetMasterSdPageCount(PK_STANDARD) > 1 ) - RemoveUnnecessaryMasterPages( NULL, TRUE, FALSE ); + RemoveUnnecessaryMasterPages( NULL, sal_True, sal_False ); - for ( USHORT i = 0; i < GetPageCount(); i++ ) + for ( sal_uInt16 i = 0; i < GetPageCount(); i++ ) { // Check for correct layout names SdPage* pPage = (SdPage*) GetPage( i ); @@ -623,7 +623,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) } } - for ( USHORT nPage = 0; nPage < GetMasterPageCount(); nPage++) + for ( sal_uInt16 nPage = 0; nPage < GetMasterPageCount(); nPage++) { // LayoutName and PageName must be the same SdPage* pPage = (SdPage*) GetMasterPage( nPage ); @@ -654,7 +654,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) // dokumentspezifisch wie StyleSheetPool und StyleRequestHandler ::Outliner& rDrawOutliner = GetDrawOutliner(); rDrawOutliner.SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool()); - ULONG nCntrl = rDrawOutliner.GetControlWord(); + sal_uLong nCntrl = rDrawOutliner.GetControlWord(); if (mbOnlineSpell) nCntrl |= EE_CNTRL_ONLINESPELLING; else @@ -680,7 +680,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) // Praesentationsobjekte muessen wieder Listener der entsprechenden // Vorlagen werden SdStyleSheetPool* pSPool = (SdStyleSheetPool*) GetStyleSheetPool(); - USHORT nPage, nPageCount; + sal_uInt16 nPage, nPageCount; // #96323# create missing layout style sheets for broken documents // that where created with the 5.2 @@ -707,15 +707,15 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) } } - mbNewOrLoadCompleted = TRUE; + mbNewOrLoadCompleted = sal_True; /************************************************************************** * Alle gelinkten Pages aktualisieren **************************************************************************/ SdPage* pPage = NULL; - USHORT nMaxSdPages = GetSdPageCount(PK_STANDARD); + sal_uInt16 nMaxSdPages = GetSdPageCount(PK_STANDARD); - for (USHORT nSdPage=0; nSdPage < nMaxSdPages; nSdPage++) + for (sal_uInt16 nSdPage=0; nSdPage < nMaxSdPages; nSdPage++) { pPage = (SdPage*) GetSdPage(nSdPage, PK_STANDARD); @@ -727,7 +727,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) UpdateAllLinks(); - SetChanged( FALSE ); + SetChanged( sal_False ); } /** updates all links, only links in this document should by resolved */ @@ -784,23 +784,23 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool if (pObj->GetObjInventor() == SdrInventor) { OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); - UINT16 nId = pObj->GetObjIdentifier(); + sal_uInt16 nId = pObj->GetObjIdentifier(); if (nId == OBJ_TITLETEXT) { if( pOPO && pOPO->GetOutlinerMode() == OUTLINERMODE_DONTKNOW ) pOPO->SetOutlinerMode( OUTLINERMODE_TITLEOBJECT ); - // TRUE: harte Attribute dabei nicht loeschen + // sal_True: harte Attribute dabei nicht loeschen if (pTitleSheet) - pObj->SetStyleSheet(pTitleSheet, TRUE); + pObj->SetStyleSheet(pTitleSheet, sal_True); } else if (nId == OBJ_OUTLINETEXT) { if( pOPO && pOPO->GetOutlinerMode() == OUTLINERMODE_DONTKNOW ) pOPO->SetOutlinerMode( OUTLINERMODE_OUTLINEOBJECT ); - for (USHORT nSheet = 0; nSheet < 10; nSheet++) + for (sal_uInt16 nSheet = 0; nSheet < 10; nSheet++) { SfxStyleSheet* pSheet = (SfxStyleSheet*)pOutlineList->GetObject(nSheet); if (pSheet) @@ -809,7 +809,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool if( nSheet == 0) // Textrahmen hoert auf StyleSheet der Ebene1 - pObj->NbcSetStyleSheet(pSheet, TRUE); + pObj->NbcSetStyleSheet(pSheet, sal_True); } } } @@ -821,9 +821,9 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool if (aString.Len()) { - sd::Outliner* pInternalOutl = GetInternalOutliner(TRUE); + sd::Outliner* pInternalOutl = GetInternalOutliner(sal_True); pPage->SetObjText( (SdrTextObj*) pObj, pInternalOutl, ePresObjKind, aString ); - pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( ePresObjKind ), TRUE ); + pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( ePresObjKind ), sal_True ); pInternalOutl->Clear(); } } @@ -843,7 +843,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool |* \************************************************************************/ -::sd::Outliner* SdDrawDocument::GetOutliner(BOOL bCreateOutliner) +::sd::Outliner* SdDrawDocument::GetOutliner(sal_Bool bCreateOutliner) { if (!mpOutliner && bCreateOutliner) { @@ -868,7 +868,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool |* \************************************************************************/ -::sd::Outliner* SdDrawDocument::GetInternalOutliner(BOOL bCreateOutliner) +::sd::Outliner* SdDrawDocument::GetInternalOutliner(sal_Bool bCreateOutliner) { if ( !mpInternalOutliner && bCreateOutliner ) { @@ -876,9 +876,9 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool // MT: // Dieser Outliner wird nur fuer das Erzeugen spezieller Textobjekte // verwendet. Da in diesen Textobjekten keine Portion-Informationen - // gespeichert werden muessen, kann/soll der Update-Mode immer FALSE bleiben. - mpInternalOutliner->SetUpdateMode( FALSE ); - mpInternalOutliner->EnableUndo( FALSE ); + // gespeichert werden muessen, kann/soll der Update-Mode immer sal_False bleiben. + mpInternalOutliner->SetUpdateMode( sal_False ); + mpInternalOutliner->EnableUndo( sal_False ); if (mpDocSh) mpInternalOutliner->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) ); @@ -887,8 +887,8 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool mpInternalOutliner->SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool()); } - DBG_ASSERT( !mpInternalOutliner || ( mpInternalOutliner->GetUpdateMode() == FALSE ) , "InternalOutliner: UpdateMode = TRUE !" ); - DBG_ASSERT( !mpInternalOutliner || ( mpInternalOutliner->IsUndoEnabled() == FALSE ), "InternalOutliner: Undo = TRUE !" ); + DBG_ASSERT( !mpInternalOutliner || ( mpInternalOutliner->GetUpdateMode() == sal_False ) , "InternalOutliner: UpdateMode = sal_True !" ); + DBG_ASSERT( !mpInternalOutliner || ( mpInternalOutliner->IsUndoEnabled() == sal_False ), "InternalOutliner: Undo = sal_True !" ); // MT: Wer ihn vollmuellt, macht ihn auch gleich wieder leer: // Vorteile: @@ -905,10 +905,10 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool |* \************************************************************************/ -void SdDrawDocument::SetOnlineSpell(BOOL bIn) +void SdDrawDocument::SetOnlineSpell(sal_Bool bIn) { mbOnlineSpell = bIn; - ULONG nCntrl = 0; + sal_uLong nCntrl = 0; if(mpOutliner) { |