diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-01-17 11:41:00 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-01-17 11:41:00 +0100 |
| commit | 3d6bed44c8ca414f60c03223482b9f7b94d56c14 (patch) | |
| tree | 9b015da930eaf9856b5f05707245327185fff884 /sd/source | |
| parent | a4babcc4a08648e99d988fca640ab555da10048c (diff) | |
removetooltypes01: #i112600# Remove tools types from sd
Diffstat (limited to 'sd/source')
458 files changed, 6795 insertions, 6795 deletions
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index fb02f01480e7..4d29833e637a 100644..100755 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -219,8 +219,8 @@ Reference< XAnimationNode > CustomAnimationPreset::create( const rtl::OUString& UStringList CustomAnimationPreset::getProperties() const { String aProperties( maProperty ); - USHORT nTokens = aProperties.GetTokenCount(); - USHORT nToken; + sal_uInt16 nTokens = aProperties.GetTokenCount(); + sal_uInt16 nToken; UStringList aPropertyList; for( nToken = 0; nToken < nTokens; nToken++ ) aPropertyList.push_back( aProperties.GetToken( nToken ) ); @@ -233,8 +233,8 @@ bool CustomAnimationPreset::hasProperty( const OUString& rProperty )const { String aProperties( maProperty ); String aProperty( rProperty ); - USHORT nTokens = aProperties.GetTokenCount(); - USHORT nToken; + sal_uInt16 nTokens = aProperties.GetTokenCount(); + sal_uInt16 nToken; for( nToken = 0; nToken < nTokens; nToken++ ) { if( aProperties.GetToken( nToken ) == aProperty ) diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx index a2aed2388e28..97c41c8f2aff 100644..100755 --- a/sd/source/core/anminfo.cxx +++ b/sd/source/core/anminfo.cxx @@ -51,18 +51,18 @@ SdAnimationInfo::SdAnimationInfo(SdrObject& rObject) meEffect (presentation::AnimationEffect_NONE), meTextEffect (presentation::AnimationEffect_NONE), meSpeed (presentation::AnimationSpeed_SLOW), - mbActive (TRUE), - mbDimPrevious (FALSE), - mbIsMovie (FALSE), - mbDimHide (FALSE), - mbSoundOn (FALSE), - mbPlayFull (FALSE), + mbActive (sal_True), + mbDimPrevious (sal_False), + mbIsMovie (sal_False), + mbDimHide (sal_False), + mbSoundOn (sal_False), + mbPlayFull (sal_False), mpPathObj (NULL), meClickAction (presentation::ClickAction_NONE), meSecondEffect (presentation::AnimationEffect_NONE), meSecondSpeed (presentation::AnimationSpeed_SLOW), - mbSecondSoundOn (FALSE), - mbSecondPlayFull (FALSE), + mbSecondSoundOn (sal_False), + mbSecondPlayFull (sal_False), mnVerb (0), mnPresOrder (LIST_APPEND), mrObject (rObject) diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx index b9f23daedd90..11be351df596 100755 --- a/sd/source/core/cusshow.cxx +++ b/sd/source/core/cusshow.cxx @@ -107,7 +107,7 @@ void SdCustomShow::ReplacePage( const SdPage* pOldPage, const SdPage* pNewPage ) } else { - ULONG nPos; + sal_uLong nPos; while( (nPos = GetPos( (void*)pOldPage )) != CONTAINER_ENTRY_NOTFOUND ) { Replace( (void*)pNewPage, nPos ); @@ -117,7 +117,7 @@ void SdCustomShow::ReplacePage( const SdPage* pOldPage, const SdPage* pNewPage ) void SdCustomShow::RemovePage( const SdPage* pPage ) { - ULONG nPos; + sal_uLong nPos; while( (nPos = GetPos( (void*)pPage )) != CONTAINER_ENTRY_NOTFOUND ) { Remove( nPos ); 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) { diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index a3dff08902b8..e6b5bf9ae988 100755 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -102,8 +102,8 @@ SdrObject* SdDrawDocument::GetObj(const String& rObjName) const /************************************************************************** * Zuerst alle Pages durchsuchen **************************************************************************/ - USHORT nPage = 0; - const USHORT nMaxPages = GetPageCount(); + sal_uInt16 nPage = 0; + const sal_uInt16 nMaxPages = GetPageCount(); while (nPage < nMaxPages && !pObjFound) { @@ -130,7 +130,7 @@ SdrObject* SdDrawDocument::GetObj(const String& rObjName) const * Wenn nicht gefunden, dann alle MasterPages durchsuchen **************************************************************************/ nPage = 0; - const USHORT nMaxMasterPages = GetMasterPageCount(); + const sal_uInt16 nMaxMasterPages = GetMasterPageCount(); while (nPage < nMaxMasterPages && !pObjFound) { @@ -163,14 +163,14 @@ SdrObject* SdDrawDocument::GetObj(const String& rObjName) const |* \************************************************************************/ -USHORT SdDrawDocument::GetPageByName(const String& rPgName, BOOL& rbIsMasterPage) const +sal_uInt16 SdDrawDocument::GetPageByName(const String& rPgName, sal_Bool& rbIsMasterPage) const { SdPage* pPage = NULL; - USHORT nPage = 0; - const USHORT nMaxPages = GetPageCount(); - USHORT nPageNum = SDRPAGE_NOTFOUND; + sal_uInt16 nPage = 0; + const sal_uInt16 nMaxPages = GetPageCount(); + sal_uInt16 nPageNum = SDRPAGE_NOTFOUND; - rbIsMasterPage = FALSE; + rbIsMasterPage = sal_False; // Search all regular pages and all notes pages (handout pages are // ignored.) @@ -190,7 +190,7 @@ USHORT SdDrawDocument::GetPageByName(const String& rPgName, BOOL& rbIsMasterPage } // Search all master pages when not found among non-master pages. - const USHORT nMaxMasterPages = GetMasterPageCount(); + const sal_uInt16 nMaxMasterPages = GetMasterPageCount(); nPage = 0; while (nPage < nMaxMasterPages && nPageNum == SDRPAGE_NOTFOUND) @@ -201,7 +201,7 @@ USHORT SdDrawDocument::GetPageByName(const String& rPgName, BOOL& rbIsMasterPage if (pPage && pPage->GetName() == rPgName) { nPageNum = nPage; - rbIsMasterPage = TRUE; + rbIsMasterPage = sal_True; } nPage++; @@ -217,7 +217,7 @@ USHORT SdDrawDocument::GetPageByName(const String& rPgName, BOOL& rbIsMasterPage |* \************************************************************************/ -SdPage* SdDrawDocument::GetSdPage(USHORT nPgNum, PageKind ePgKind) const +SdPage* SdDrawDocument::GetSdPage(sal_uInt16 nPgNum, PageKind ePgKind) const { // #109538# return mpDrawPageListWatcher->GetSdPage(ePgKind, sal_uInt32(nPgNum)); @@ -229,7 +229,7 @@ SdPage* SdDrawDocument::GetSdPage(USHORT nPgNum, PageKind ePgKind) const |* \************************************************************************/ -USHORT SdDrawDocument::GetSdPageCount(PageKind ePgKind) const +sal_uInt16 SdDrawDocument::GetSdPageCount(PageKind ePgKind) const { // #109538# return (sal_uInt16)mpDrawPageListWatcher->GetSdPageCount(ePgKind); @@ -241,7 +241,7 @@ USHORT SdDrawDocument::GetSdPageCount(PageKind ePgKind) const |* \************************************************************************/ -SdPage* SdDrawDocument::GetMasterSdPage(USHORT nPgNum, PageKind ePgKind) +SdPage* SdDrawDocument::GetMasterSdPage(sal_uInt16 nPgNum, PageKind ePgKind) { // #109538# return mpMasterPageListWatcher->GetSdPage(ePgKind, sal_uInt32(nPgNum)); @@ -253,7 +253,7 @@ SdPage* SdDrawDocument::GetMasterSdPage(USHORT nPgNum, PageKind ePgKind) |* \************************************************************************/ -USHORT SdDrawDocument::GetMasterSdPageCount(PageKind ePgKind) const +sal_uInt16 SdDrawDocument::GetMasterSdPageCount(PageKind ePgKind) const { // #109538# return (sal_uInt16)mpMasterPageListWatcher->GetSdPageCount(ePgKind); @@ -266,12 +266,12 @@ USHORT SdDrawDocument::GetMasterSdPageCount(PageKind ePgKind) const |* \************************************************************************/ -void SdDrawDocument::UpdatePageObjectsInNotes(USHORT nStartPos) +void SdDrawDocument::UpdatePageObjectsInNotes(sal_uInt16 nStartPos) { - USHORT nPageCount = GetPageCount(); + sal_uInt16 nPageCount = GetPageCount(); SdPage* pPage = NULL; - for (USHORT nPage = nStartPos; nPage < nPageCount; nPage++) + for (sal_uInt16 nPage = nStartPos; nPage < nPageCount; nPage++) { pPage = (SdPage*)GetPage(nPage); @@ -279,9 +279,9 @@ void SdDrawDocument::UpdatePageObjectsInNotes(USHORT nStartPos) // und Nummer korrigieren if (pPage && pPage->GetPageKind() == PK_NOTES) { - ULONG nObjCount = pPage->GetObjCount(); + sal_uLong nObjCount = pPage->GetObjCount(); SdrObject* pObj = NULL; - for (ULONG nObj = 0; nObj < nObjCount; nObj++) + for (sal_uLong nObj = 0; nObj < nObjCount; nObj++) { pObj = pPage->GetObj(nObj); if (pObj->GetObjIdentifier() == OBJ_PAGE && @@ -347,7 +347,7 @@ void SdDrawDocument::UpdatePageRelativeURLs(const String& rOldName, const String } } -void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, USHORT nPos, sal_Int32 nIncrement) +void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_Int32 nIncrement) { bool bNotes = (pPage->GetPageKind() == PK_NOTES); @@ -387,7 +387,7 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, USHORT nPos, sal_Int3 aURLCopy.Erase(aURLCopy.Len() - sNotes.Len(), sNotes.Len()); sal_Int32 number = aURLCopy.ToInt32(); - USHORT realPageNumber = (nPos + 1)/ 2; + sal_uInt16 realPageNumber = (nPos + 1)/ 2; if ( number >= realPageNumber ) { @@ -415,12 +415,12 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, USHORT nPos, sal_Int3 |* \************************************************************************/ -void SdDrawDocument::MovePage(USHORT nPgNum, USHORT nNewPos) +void SdDrawDocument::MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) { // Seite verschieben FmFormModel::MovePage(nPgNum, nNewPos); - USHORT nMin = Min(nPgNum, nNewPos); + sal_uInt16 nMin = Min(nPgNum, nNewPos); UpdatePageObjectsInNotes(nMin); } @@ -431,7 +431,7 @@ void SdDrawDocument::MovePage(USHORT nPgNum, USHORT nNewPos) |* \************************************************************************/ -void SdDrawDocument::InsertPage(SdrPage* pPage, USHORT nPos) +void SdDrawDocument::InsertPage(SdrPage* pPage, sal_uInt16 nPos) { bool bLast = (nPos == GetPageCount()); @@ -452,7 +452,7 @@ void SdDrawDocument::InsertPage(SdrPage* pPage, USHORT nPos) |* \************************************************************************/ -void SdDrawDocument::DeletePage(USHORT nPgNum) +void SdDrawDocument::DeletePage(sal_uInt16 nPgNum) { FmFormModel::DeletePage(nPgNum); @@ -465,7 +465,7 @@ void SdDrawDocument::DeletePage(USHORT nPgNum) |* \************************************************************************/ -SdrPage* SdDrawDocument::RemovePage(USHORT nPgNum) +SdrPage* SdDrawDocument::RemovePage(sal_uInt16 nPgNum) { SdrPage* pPage = FmFormModel::RemovePage(nPgNum); @@ -483,7 +483,7 @@ SdrPage* SdDrawDocument::RemovePage(USHORT nPgNum) // Warning: This is not called for new master pages created from SdrModel::Merge, // you also have to modify code in SdDrawDocument::Merge! -void SdDrawDocument::InsertMasterPage(SdrPage* pPage, USHORT nPos ) +void SdDrawDocument::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos ) { FmFormModel::InsertMasterPage( pPage, nPos ); if( pPage && pPage->IsMasterPage() && (static_cast<SdPage*>(pPage)->GetPageKind() == PK_STANDARD) ) @@ -495,7 +495,7 @@ void SdDrawDocument::InsertMasterPage(SdrPage* pPage, USHORT nPos ) } } -SdrPage* SdDrawDocument::RemoveMasterPage(USHORT nPgNum) +SdrPage* SdDrawDocument::RemoveMasterPage(sal_uInt16 nPgNum) { SdPage* pPage = static_cast<SdPage*>(GetMasterPage(nPgNum )); if( pPage && pPage->IsMasterPage() && (pPage->GetPageKind() == PK_STANDARD) ) @@ -515,7 +515,7 @@ SdrPage* SdDrawDocument::RemoveMasterPage(USHORT nPgNum) |* \************************************************************************/ -void SdDrawDocument::SetSelected(SdPage* pPage, BOOL bSelect) +void SdDrawDocument::SetSelected(SdPage* pPage, sal_Bool bSelect) { PageKind ePageKind = pPage->GetPageKind(); @@ -558,7 +558,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ ) * Wenn noch keine Seite im Model vorhanden ist (Datei-Neu), wird * eine neue Seite eingefuegt **************************************************************************/ - USHORT nPageCount = GetPageCount(); + sal_uInt16 nPageCount = GetPageCount(); if (nPageCount <= 1) { @@ -568,8 +568,8 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ ) /********************************************************************** * Handzettel-Seite einfuegen **********************************************************************/ - BOOL bMasterPage; - SdPage* pHandoutPage = dynamic_cast< SdPage* >( AllocPage(bMasterPage=FALSE) ); + sal_Bool bMasterPage; + SdPage* pHandoutPage = dynamic_cast< SdPage* >( AllocPage(bMasterPage=sal_False) ); SdPage* pRefPage = NULL; @@ -594,7 +594,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ ) /********************************************************************** * MasterPage einfuegen und an der Handzettel-Seite vermerken **********************************************************************/ - SdPage* pHandoutMPage = (SdPage*) AllocPage(bMasterPage=TRUE); + SdPage* pHandoutMPage = (SdPage*) AllocPage(bMasterPage=sal_True); pHandoutMPage->SetSize( pHandoutPage->GetSize() ); pHandoutMPage->SetPageKind(PK_HANDOUT); pHandoutMPage->SetBorder( pHandoutPage->GetLftBorder(), @@ -610,14 +610,14 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ ) * Eine Standard-Seite ist daher schon vorhanden. **********************************************************************/ SdPage* pPage; - BOOL bClipboard = FALSE; + sal_Bool bClipboard = sal_False; if( pRefDocument ) pRefPage = pRefDocument->GetSdPage( 0, PK_STANDARD ); if (nPageCount == 0) { - pPage = dynamic_cast< SdPage* >( AllocPage(bMasterPage=FALSE) ); + pPage = dynamic_cast< SdPage* >( AllocPage(bMasterPage=sal_False) ); if( pRefPage ) { @@ -629,7 +629,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ ) // Draw: stets Default-Groesse mit Raendern pPage->SetSize(aDefSize); - SfxPrinter* pPrinter = mpDocSh->GetPrinter(FALSE); + SfxPrinter* pPrinter = mpDocSh->GetPrinter(sal_False); if (pPrinter && pPrinter->IsValid()) { Size aOutSize(pPrinter->GetOutputSize()); @@ -637,10 +637,10 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ ) aPageOffset -= pPrinter->PixelToLogic( Point() ); long nOffset = !aPageOffset.X() && !aPageOffset.X() ? 0 : PRINT_OFFSET; - ULONG nTop = aPageOffset.Y(); - ULONG nLeft = aPageOffset.X(); - ULONG nBottom = Max((long)(aDefSize.Height() - aOutSize.Height() - nTop + nOffset), 0L); - ULONG nRight = Max((long)(aDefSize.Width() - aOutSize.Width() - nLeft + nOffset), 0L); + sal_uLong nTop = aPageOffset.Y(); + sal_uLong nLeft = aPageOffset.X(); + sal_uLong nBottom = Max((long)(aDefSize.Height() - aOutSize.Height() - nTop + nOffset), 0L); + sal_uLong nRight = Max((long)(aDefSize.Width() - aOutSize.Width() - nLeft + nOffset), 0L); pPage->SetBorder(nLeft, nTop, nRight, nBottom); } @@ -666,14 +666,14 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ ) } else { - bClipboard = TRUE; + bClipboard = sal_True; pPage = (SdPage*) GetPage(1); } /********************************************************************** * MasterPage einfuegen und an der Seite vermerken **********************************************************************/ - SdPage* pMPage = (SdPage*) AllocPage(bMasterPage=TRUE); + SdPage* pMPage = (SdPage*) AllocPage(bMasterPage=sal_True); pMPage->SetSize( pPage->GetSize() ); pMPage->SetBorder( pPage->GetLftBorder(), pPage->GetUppBorder(), @@ -687,7 +687,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ ) /********************************************************************** * Notizen-Seite einfuegen **********************************************************************/ - SdPage* pNotesPage = (SdPage*) AllocPage(bMasterPage=FALSE); + SdPage* pNotesPage = (SdPage*) AllocPage(bMasterPage=sal_False); if( pRefDocument ) pRefPage = pRefDocument->GetSdPage( 0, PK_NOTES ); @@ -719,7 +719,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ ) /********************************************************************** * MasterPage einfuegen und an der Notizen-Seite vermerken **********************************************************************/ - SdPage* pNotesMPage = (SdPage*) AllocPage(bMasterPage=TRUE); + SdPage* pNotesMPage = (SdPage*) AllocPage(bMasterPage=sal_True); pNotesMPage->SetSize( pNotesPage->GetSize() ); pNotesMPage->SetPageKind(PK_NOTES); pNotesMPage->SetBorder( pNotesPage->GetLftBorder(), @@ -733,14 +733,14 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ ) if( !pRefPage && (meDocType != DOCUMENT_TYPE_DRAW) ) - pPage->SetAutoLayout( AUTOLAYOUT_TITLE, TRUE, TRUE ); + pPage->SetAutoLayout( AUTOLAYOUT_TITLE, sal_True, sal_True ); mpWorkStartupTimer = new Timer(); mpWorkStartupTimer->SetTimeoutHdl( LINK(this, SdDrawDocument, WorkStartupHdl) ); mpWorkStartupTimer->SetTimeout(2000); mpWorkStartupTimer->Start(); - SetChanged(FALSE); + SetChanged(sal_False); } } @@ -752,10 +752,10 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ ) |* \************************************************************************/ -BOOL SdDrawDocument::CreateMissingNotesAndHandoutPages() +sal_Bool SdDrawDocument::CreateMissingNotesAndHandoutPages() { - BOOL bOK = FALSE; - USHORT nPageCount = GetPageCount(); + sal_Bool bOK = sal_False; + sal_uInt16 nPageCount = GetPageCount(); if (nPageCount != 0) { @@ -769,7 +769,7 @@ BOOL SdDrawDocument::CreateMissingNotesAndHandoutPages() pHandoutPage->SetPageKind(PK_HANDOUT); pHandoutPage->TRG_SetMasterPage( *pHandoutMPage ); - for (USHORT i = 1; i < nPageCount; i = i + 2) + for (sal_uInt16 i = 1; i < nPageCount; i = i + 2) { SdPage* pPage = (SdPage*) GetPage(i); @@ -788,9 +788,9 @@ BOOL SdDrawDocument::CreateMissingNotesAndHandoutPages() pNotesPage->TRG_SetMasterPage(*GetMasterPage(nMasterPageAfterPagesMasterPage)); } - bOK = TRUE; + bOK = sal_True; StopWorkStartupDelay(); - SetChanged(FALSE); + SetChanged(sal_False); } return(bOK); @@ -799,18 +799,18 @@ BOOL SdDrawDocument::CreateMissingNotesAndHandoutPages() /************************************************************************* |* |* - selektierte Seiten hinter genannte Seite schieben -|* (nTargetPage = (USHORT)-1 --> vor erste Seite schieben) -|* - ergibt TRUE, wenn Seiten verschoben wurden +|* (nTargetPage = (sal_uInt16)-1 --> vor erste Seite schieben) +|* - ergibt sal_True, wenn Seiten verschoben wurden |* \************************************************************************/ -BOOL SdDrawDocument::MovePages(USHORT nTargetPage) +sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage) { SdPage* pTargetPage = NULL; SdPage* pPage = NULL; - USHORT nPage; - USHORT nNoOfPages = GetSdPageCount(PK_STANDARD); - BOOL bSomethingHappened = FALSE; + sal_uInt16 nPage; + sal_uInt16 nNoOfPages = GetSdPageCount(PK_STANDARD); + sal_Bool bSomethingHappened = sal_False; const bool bUndo = IsUndoEnabled(); @@ -830,7 +830,7 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage) // falls noetig, nach vorne hangeln, bis nicht selektierte Seite gefunden nPage = nTargetPage; - if (nPage != (USHORT)-1) + if (nPage != (sal_uInt16)-1) { pPage = GetSdPage(nPage, PK_STANDARD); while (nPage > 0 && pPage->IsSelected()) @@ -841,12 +841,12 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage) if (pPage->IsSelected()) { - nPage = (USHORT)-1; + nPage = (sal_uInt16)-1; } } // vor der ersten Seite einfuegen - if (nPage == (USHORT)-1) + if (nPage == (sal_uInt16)-1) { while (aPageList.Count() > 0) { @@ -863,7 +863,7 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage) if( bUndo ) AddUndo(GetSdrUndoFactory().CreateUndoSetPageNum(*pPg, nPage+1, 2)); MovePage(nPage+1, 2); - bSomethingHappened = TRUE; + bSomethingHappened = sal_True; } aPageList.Remove(); } @@ -892,7 +892,7 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage) if( bUndo ) AddUndo(GetSdrUndoFactory().CreateUndoSetPageNum(*pPg, nPage+1, nTargetPage+1)); MovePage(nPage+1, nTargetPage+1); - bSomethingHappened = TRUE; + bSomethingHappened = sal_True; } } else @@ -907,10 +907,10 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage) if( bUndo ) AddUndo(GetSdrUndoFactory().CreateUndoSetPageNum(*pPg, nPage, nTargetPage)); MovePage(nPage, nTargetPage); - bSomethingHappened = TRUE; + bSomethingHappened = sal_True; } } - aPageList.Remove((ULONG)0); + aPageList.Remove((sal_uLong)0); nTargetPage = pPage->GetPageNum(); } } @@ -928,7 +928,7 @@ BOOL SdDrawDocument::MovePages(USHORT nTargetPage) |* \************************************************************************/ -ULONG SdDrawDocument::GetLinkCount() +sal_uLong SdDrawDocument::GetLinkCount() { return ( pLinkManager->GetLinks().Count() ); } @@ -939,24 +939,24 @@ ULONG SdDrawDocument::GetLinkCount() |* \************************************************************************/ -void SdDrawDocument::SetLanguage( const LanguageType eLang, const USHORT nId ) +void SdDrawDocument::SetLanguage( const LanguageType eLang, const sal_uInt16 nId ) { - BOOL bChanged = FALSE; + sal_Bool bChanged = sal_False; if( nId == EE_CHAR_LANGUAGE && meLanguage != eLang ) { meLanguage = eLang; - bChanged = TRUE; + bChanged = sal_True; } else if( nId == EE_CHAR_LANGUAGE_CJK && meLanguageCJK != eLang ) { meLanguageCJK = eLang; - bChanged = TRUE; + bChanged = sal_True; } else if( nId == EE_CHAR_LANGUAGE_CTL && meLanguageCTL != eLang ) { meLanguageCTL = eLang; - bChanged = TRUE; + bChanged = sal_True; } if( bChanged ) @@ -975,7 +975,7 @@ void SdDrawDocument::SetLanguage( const LanguageType eLang, const USHORT nId ) |* \************************************************************************/ -LanguageType SdDrawDocument::GetLanguage( const USHORT nId ) const +LanguageType SdDrawDocument::GetLanguage( const sal_uInt16 nId ) const { LanguageType eLangType = meLanguage; @@ -997,9 +997,9 @@ LanguageType SdDrawDocument::GetLanguage( const USHORT nId ) const IMPL_LINK( SdDrawDocument, WorkStartupHdl, Timer *, EMPTYARG ) { if( mpDocSh ) - mpDocSh->SetWaitCursor( TRUE ); + mpDocSh->SetWaitCursor( sal_True ); - BOOL bChanged = IsChanged(); // merken + sal_Bool bChanged = IsChanged(); // merken // Autolayouts initialisieren SdPage* pHandoutMPage = GetMasterSdPage(0, PK_HANDOUT); @@ -1007,7 +1007,7 @@ IMPL_LINK( SdDrawDocument, WorkStartupHdl, Timer *, EMPTYARG ) if (pHandoutMPage->GetAutoLayout() == AUTOLAYOUT_NONE) { // AutoLayout wurde noch nicht umgesetzt -> Initialisieren - pHandoutMPage->SetAutoLayout(AUTOLAYOUT_HANDOUT6, TRUE, TRUE); + pHandoutMPage->SetAutoLayout(AUTOLAYOUT_HANDOUT6, sal_True, sal_True); } SdPage* pPage = GetSdPage(0, PK_STANDARD); @@ -1015,7 +1015,7 @@ IMPL_LINK( SdDrawDocument, WorkStartupHdl, Timer *, EMPTYARG ) if (pPage->GetAutoLayout() == AUTOLAYOUT_NONE) { // AutoLayout wurde noch nicht umgesetzt -> Initialisieren - pPage->SetAutoLayout(AUTOLAYOUT_NONE, TRUE, TRUE); + pPage->SetAutoLayout(AUTOLAYOUT_NONE, sal_True, sal_True); } SdPage* pNotesPage = GetSdPage(0, PK_NOTES); @@ -1023,13 +1023,13 @@ IMPL_LINK( SdDrawDocument, WorkStartupHdl, Timer *, EMPTYARG ) if (pNotesPage->GetAutoLayout() == AUTOLAYOUT_NONE) { // AutoLayout wurde noch nicht umgesetzt -> Initialisieren - pNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, TRUE, TRUE); + pNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, sal_True, sal_True); } - SetChanged(bChanged || FALSE); + SetChanged(bChanged || sal_False); if( mpDocSh ) - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); return 0; } @@ -1077,8 +1077,8 @@ SdAnimationInfo* SdDrawDocument::GetAnimationInfo(SdrObject* pObject) const SdAnimationInfo* SdDrawDocument::GetShapeUserData(SdrObject& rObject, bool bCreate /* = false */ ) { - USHORT nUD = 0; - USHORT nUDCount = rObject.GetUserDataCount(); + sal_uInt16 nUD = 0; + sal_uInt16 nUDCount = rObject.GetUserDataCount(); SdrObjUserData* pUD = 0; SdAnimationInfo* pRet = 0; @@ -1115,10 +1115,10 @@ SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject* pObject ) const SdrObjUserData* pUserData = NULL; SdIMapInfo* pIMapInfo = NULL; - USHORT nCount = pObject->GetUserDataCount(); + sal_uInt16 nCount = pObject->GetUserDataCount(); // gibt es in den User-Daten eine IMap-Information? - for ( USHORT i = 0; i < nCount; i++ ) + for ( sal_uInt16 i = 0; i < nCount; i++ ) { pUserData = pObject->GetUserData( i ); @@ -1150,7 +1150,7 @@ IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj, Point aRelPoint( rWinPoint ); ImageMap& rImageMap = (ImageMap&) pIMapInfo->GetImageMap(); const Rectangle& rRect = pObj->GetLogicRect(); - BOOL bObjSupported = FALSE; + sal_Bool bObjSupported = sal_False; // HitTest ausfuehren if ( pObj->ISA( SdrGrafObj ) ) // einfaches Grafik-Objekt @@ -1178,12 +1178,12 @@ IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj, pGrafObj->GetGrafPrefMapMode(), aMap100 ); delete pGeoData; - bObjSupported = TRUE; + bObjSupported = sal_True; } else if ( pObj->ISA( SdrOle2Obj ) ) // OLE-Objekt { aGraphSize = ( (SdrOle2Obj*) pObj )->GetOrigObjSize(); - bObjSupported = TRUE; + bObjSupported = sal_True; } // hat alles geklappt, dann HitTest ausfuehren @@ -1210,7 +1210,7 @@ void SdDrawDocument::CheckMasterPages() { // RemoveMasterPage(2); // code to test the creation of notes pages - USHORT nMaxPages = GetMasterPageCount(); + sal_uInt16 nMaxPages = GetMasterPageCount(); // we need at least a handout master and one master page if( nMaxPages < 2 ) @@ -1221,7 +1221,7 @@ void SdDrawDocument::CheckMasterPages() SdPage* pPage = NULL; SdPage* pNotesPage = NULL; - USHORT nPage; + sal_uInt16 nPage; // first see if the page order is correct for( nPage = 1; nPage < nMaxPages; nPage++ ) @@ -1246,7 +1246,7 @@ void SdDrawDocument::CheckMasterPages() if( pPage->GetPageKind() != PK_STANDARD ) { bChanged = sal_True; - USHORT nFound = nPage + 1; + sal_uInt16 nFound = nPage + 1; while( nFound < nMaxPages ) { pPage = static_cast<SdPage*>(GetMasterPage( nFound )); @@ -1277,7 +1277,7 @@ void SdDrawDocument::CheckMasterPages() { bChanged = sal_True; - USHORT nFound = nPage + 1; + sal_uInt16 nFound = nPage + 1; while( nFound < nMaxPages ) { pNotesPage = static_cast<SdPage*>(GetMasterPage( nFound )); @@ -1346,15 +1346,15 @@ void SdDrawDocument::CheckMasterPages() } } -USHORT SdDrawDocument::CreatePage ( +sal_uInt16 SdDrawDocument::CreatePage ( SdPage* pActualPage, PageKind ePageKind, const String& sStandardPageName, const String& sNotesPageName, AutoLayout eStandardLayout, AutoLayout eNotesLayout, - BOOL bIsPageBack, - BOOL bIsPageObj, + sal_Bool bIsPageBack, + sal_Bool bIsPageObj, const sal_Int32 nInsertPosition) { SdPage* pPreviousStandardPage; @@ -1367,20 +1367,20 @@ USHORT SdDrawDocument::CreatePage ( if (ePageKind == PK_NOTES) { pPreviousNotesPage = pActualPage; - USHORT nNotesPageNum = pPreviousNotesPage->GetPageNum() + 2; + sal_uInt16 nNotesPageNum = pPreviousNotesPage->GetPageNum() + 2; pPreviousStandardPage = (SdPage*) GetPage(nNotesPageNum - 3); eStandardLayout = pPreviousStandardPage->GetAutoLayout(); } else { pPreviousStandardPage = pActualPage; - USHORT nStandardPageNum = pPreviousStandardPage->GetPageNum() + 2; + sal_uInt16 nStandardPageNum = pPreviousStandardPage->GetPageNum() + 2; pPreviousNotesPage = (SdPage*) GetPage(nStandardPageNum - 1); eNotesLayout = pPreviousNotesPage->GetAutoLayout(); } // Create new standard page and set it up. - pStandardPage = (SdPage*) AllocPage(FALSE); + pStandardPage = (SdPage*) AllocPage(sal_False); // #108658# // Set the size here since else the presobj autolayout @@ -1396,7 +1396,7 @@ USHORT SdDrawDocument::CreatePage ( // User layout of current standard page. pStandardPage->SetLayoutName( pPreviousStandardPage->GetLayoutName() ); - pStandardPage->SetAutoLayout(eStandardLayout, TRUE); + pStandardPage->SetAutoLayout(eStandardLayout, sal_True); pStandardPage->setHeaderFooterSettings( pPreviousStandardPage->getHeaderFooterSettings() ); // transition settings of current page @@ -1411,7 +1411,7 @@ USHORT SdDrawDocument::CreatePage ( pStandardPage->SetTime( pPreviousStandardPage->GetTime() ); // Create new notes page and set it up. - pNotesPage = (SdPage*) AllocPage(FALSE); + pNotesPage = (SdPage*) AllocPage(sal_False); pNotesPage->SetPageKind(PK_NOTES); // Use master page of current page. @@ -1419,7 +1419,7 @@ USHORT SdDrawDocument::CreatePage ( // Use layout of current notes page. pNotesPage->SetLayoutName( pPreviousNotesPage->GetLayoutName() ); - pNotesPage->SetAutoLayout(eNotesLayout, TRUE); + pNotesPage->SetAutoLayout(eNotesLayout, sal_True); pNotesPage->setHeaderFooterSettings( pPreviousNotesPage->getHeaderFooterSettings() ); return InsertPageSet ( @@ -1439,7 +1439,7 @@ USHORT SdDrawDocument::CreatePage ( -USHORT SdDrawDocument::DuplicatePage (USHORT nPageNum) +sal_uInt16 SdDrawDocument::DuplicatePage (sal_uInt16 nPageNum) { PageKind ePageKind = PK_STANDARD; @@ -1448,8 +1448,8 @@ USHORT SdDrawDocument::DuplicatePage (USHORT nPageNum) // Get background flags. SdrLayerAdmin& rLayerAdmin = GetLayerAdmin(); - BYTE aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE); - BYTE aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers(); // Get layout from current page. @@ -1467,15 +1467,15 @@ USHORT SdDrawDocument::DuplicatePage (USHORT nPageNum) -USHORT SdDrawDocument::DuplicatePage ( +sal_uInt16 SdDrawDocument::DuplicatePage ( SdPage* pActualPage, PageKind ePageKind, const String& sStandardPageName, const String& sNotesPageName, AutoLayout eStandardLayout, AutoLayout eNotesLayout, - BOOL bIsPageBack, - BOOL bIsPageObj, + sal_Bool bIsPageBack, + sal_Bool bIsPageObj, const sal_Int32 nInsertPosition) { SdPage* pPreviousStandardPage; @@ -1488,13 +1488,13 @@ USHORT SdDrawDocument::DuplicatePage ( if (ePageKind == PK_NOTES) { pPreviousNotesPage = pActualPage; - USHORT nNotesPageNum = pPreviousNotesPage->GetPageNum() + 2; + sal_uInt16 nNotesPageNum = pPreviousNotesPage->GetPageNum() + 2; pPreviousStandardPage = (SdPage*) GetPage(nNotesPageNum - 3); } else { pPreviousStandardPage = pActualPage; - USHORT nStandardPageNum = pPreviousStandardPage->GetPageNum() + 2; + sal_uInt16 nStandardPageNum = pPreviousStandardPage->GetPageNum() + 2; pPreviousNotesPage = (SdPage*) GetPage(nStandardPageNum - 1); } @@ -1519,23 +1519,23 @@ USHORT SdDrawDocument::DuplicatePage ( -USHORT SdDrawDocument::InsertPageSet ( +sal_uInt16 SdDrawDocument::InsertPageSet ( SdPage* pActualPage, PageKind ePageKind, const String& sStandardPageName, const String& sNotesPageName, AutoLayout eStandardLayout, AutoLayout eNotesLayout, - BOOL bIsPageBack, - BOOL bIsPageObj, + sal_Bool bIsPageBack, + sal_Bool bIsPageObj, SdPage* pStandardPage, SdPage* pNotesPage, sal_Int32 nInsertPosition) { SdPage* pPreviousStandardPage; SdPage* pPreviousNotesPage; - USHORT nStandardPageNum; - USHORT nNotesPageNum; + sal_uInt16 nStandardPageNum; + sal_uInt16 nNotesPageNum; String aStandardPageName = sStandardPageName; String aNotesPageName = sNotesPageName; @@ -1595,9 +1595,9 @@ void SdDrawDocument::SetupNewPage ( SdPage* pPreviousPage, SdPage* pPage, const String& sPageName, - USHORT nInsertionPoint, - BOOL bIsPageBack, - BOOL bIsPageObj) + sal_uInt16 nInsertionPoint, + sal_Bool bIsPageBack, + sal_Bool bIsPageObj) { if (pPreviousPage != NULL) { @@ -1614,8 +1614,8 @@ void SdDrawDocument::SetupNewPage ( if (pPreviousPage != NULL) { SdrLayerAdmin& rLayerAdmin = GetLayerAdmin(); - BYTE aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), FALSE); - BYTE aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); SetOfByte aVisibleLayers = pPreviousPage->TRG_GetMasterPageVisibleLayers(); aVisibleLayers.Set(aBckgrnd, bIsPageBack); aVisibleLayers.Set(aBckgrndObj, bIsPageObj); diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 025700a790fc..7a74c082f7ec 100755 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -80,9 +80,9 @@ using namespace ::com::sun::star; -#define POOL_BUFFER_SIZE (USHORT)32768 -#define BASIC_BUFFER_SIZE (USHORT)8192 -#define DOCUMENT_BUFFER_SIZE (USHORT)32768 +#define POOL_BUFFER_SIZE (sal_uInt16)32768 +#define BASIC_BUFFER_SIZE (sal_uInt16)8192 +#define DOCUMENT_BUFFER_SIZE (sal_uInt16)32768 /************************************************************************* |* @@ -108,24 +108,24 @@ void SdStorageListener::disposing( const lang::EventObject& aEvent ) throw ( uno SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium) { - BOOL bOK = TRUE; + sal_Bool bOK = sal_True; SdDrawDocument* pBookmarkDoc = NULL; String aBookmarkName = rMedium.GetName(); const SfxFilter* pFilter = rMedium.GetFilter(); if ( !pFilter ) { - rMedium.UseInteractionHandler( TRUE ); + rMedium.UseInteractionHandler( sal_True ); SFX_APP()->GetFilterMatcher().GuessFilter( rMedium, &pFilter ); } if ( !pFilter ) { - bOK = FALSE; + bOK = sal_False; } else if ( maBookmarkFile != aBookmarkName && aBookmarkName.Len() ) { - BOOL bCreateGraphicShell = pFilter->GetServiceName().EqualsAscii( "com.sun.star.drawing.DrawingDocument" ); - BOOL bCreateImpressShell = pFilter->GetServiceName().EqualsAscii( "com.sun.star.presentation.PresentationDocument" ); + sal_Bool bCreateGraphicShell = pFilter->GetServiceName().EqualsAscii( "com.sun.star.drawing.DrawingDocument" ); + sal_Bool bCreateImpressShell = pFilter->GetServiceName().EqualsAscii( "com.sun.star.presentation.PresentationDocument" ); if ( bCreateGraphicShell || bCreateImpressShell ) { CloseBookmarkDoc(); @@ -136,10 +136,10 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium) // direkt laden if ( bCreateGraphicShell ) // Draw - mxBookmarkDocShRef = new ::sd::GraphicDocShell(SFX_CREATE_MODE_STANDARD, TRUE); + mxBookmarkDocShRef = new ::sd::GraphicDocShell(SFX_CREATE_MODE_STANDARD, sal_True); else // Impress - mxBookmarkDocShRef = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD, TRUE); + mxBookmarkDocShRef = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD, sal_True); bOK = mxBookmarkDocShRef->DoLoad(&rMedium); if( bOK ) @@ -180,7 +180,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(const String& rBookmarkFile) if (maBookmarkFile != rBookmarkFile && rBookmarkFile.Len()) { - SfxMedium* pMedium = new SfxMedium( rBookmarkFile, STREAM_READ, FALSE ); + SfxMedium* pMedium = new SfxMedium( rBookmarkFile, STREAM_READ, sal_False ); pBookmarkDoc = OpenBookmarkDoc(*pMedium); } else if (mxBookmarkDocShRef.Is()) @@ -197,26 +197,26 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(const String& rBookmarkFile) |* \************************************************************************/ -BOOL SdDrawDocument::InsertBookmark( +sal_Bool SdDrawDocument::InsertBookmark( List* pBookmarkList, // Liste der Namen der einzufuegenden Bookmarks List* pExchangeList, // Liste der zu verwendenen Namen - BOOL bLink, // Bookmarks sollen als Verknuepfung eingefuegt werden - BOOL bReplace, // Aktuellen Seiten (Standard&Notiz) werden ersetzt - USHORT nInsertPos, // Einfuegeposition fuer Seiten - BOOL bNoDialogs, // Keine Dialoge anzeigen + sal_Bool bLink, // Bookmarks sollen als Verknuepfung eingefuegt werden + sal_Bool bReplace, // Aktuellen Seiten (Standard&Notiz) werden ersetzt + sal_uInt16 nInsertPos, // Einfuegeposition fuer Seiten + sal_Bool bNoDialogs, // Keine Dialoge anzeigen ::sd::DrawDocShell* pBookmarkDocSh, // Wenn gesetzt, so ist dieses das Source-Dokument - BOOL bCopy, // Seiten werden kopiert + sal_Bool bCopy, // Seiten werden kopiert Point* pObjPos) // Einfuegeposition fuer Objekte { - BOOL bOK = TRUE; - BOOL bInsertPages = FALSE; + sal_Bool bOK = sal_True; + sal_Bool bInsertPages = sal_False; if (!pBookmarkList) { /********************************************************************** * Alle Seiten werden eingefuegt **********************************************************************/ - bInsertPages = TRUE; + bInsertPages = sal_True; } else { @@ -234,20 +234,20 @@ BOOL SdDrawDocument::InsertBookmark( aBookmarkName = maBookmarkFile; } else - bOK = FALSE; + bOK = sal_False; - for (USHORT nPos = 0; bOK && ( nPos < pBookmarkList->Count() ) && !bInsertPages; nPos++) + for (sal_uInt16 nPos = 0; bOK && ( nPos < pBookmarkList->Count() ) && !bInsertPages; nPos++) { /****************************************************************** * Gibt es in der Bookmark-Liste einen Seitennamen? ******************************************************************/ String aBMPgName (*(String*) pBookmarkList->GetObject(nPos)); - BOOL bIsMasterPage; + sal_Bool bIsMasterPage; if( pBookmarkDoc->GetPageByName( aBMPgName, bIsMasterPage ) != SDRPAGE_NOTFOUND ) { // Seite gefunden - bInsertPages = TRUE; + bInsertPages = sal_True; } } } @@ -256,7 +256,7 @@ BOOL SdDrawDocument::InsertBookmark( { // Zuerst werden alle Seiten-Bookmarks eingefuegt bOK = InsertBookmarkAsPage(pBookmarkList, pExchangeList, bLink, bReplace, - nInsertPos, bNoDialogs, pBookmarkDocSh, bCopy, TRUE, FALSE); + nInsertPos, bNoDialogs, pBookmarkDocSh, bCopy, sal_True, sal_False); } if ( bOK && pBookmarkList ) @@ -289,7 +289,7 @@ SdDrawDocument::InsertBookmarkAsPage_PageFunctorBase::~InsertBookmarkAsPage_Page { } -void SdDrawDocument::IterateBookmarkPages( SdDrawDocument* pBookmarkDoc, List* pBookmarkList, USHORT nBMSdPageCount, +void SdDrawDocument::IterateBookmarkPages( SdDrawDocument* pBookmarkDoc, List* pBookmarkList, sal_uInt16 nBMSdPageCount, SdDrawDocument::InsertBookmarkAsPage_PageFunctorBase& rPageIterator ) { // @@ -319,15 +319,15 @@ void SdDrawDocument::IterateBookmarkPages( SdDrawDocument* pBookmarkDoc, List* p if( !pBookmarkList ) { // simply take master page of nPos'th page in source document - pBMMPage = (SdPage*)(&(pBookmarkDoc->GetSdPage((USHORT)nPos, PK_STANDARD)->TRG_GetMasterPage())); + pBMMPage = (SdPage*)(&(pBookmarkDoc->GetSdPage((sal_uInt16)nPos, PK_STANDARD)->TRG_GetMasterPage())); } else { // fetch nPos'th entry from bookmark list, and determine master page String aBMPgName (*(String*) pBookmarkList->GetObject(nPos)); - BOOL bIsMasterPage; + sal_Bool bIsMasterPage; - USHORT nBMPage = pBookmarkDoc->GetPageByName( aBMPgName, bIsMasterPage ); + sal_uInt16 nBMPage = pBookmarkDoc->GetPageByName( aBMPgName, bIsMasterPage ); if (nBMPage != SDRPAGE_NOTFOUND) { @@ -341,7 +341,7 @@ void SdDrawDocument::IterateBookmarkPages( SdDrawDocument* pBookmarkDoc, List* p // enforce that bookmarked page is a standard page and not already a master page if (pBMPage && pBMPage->GetPageKind()==PK_STANDARD && !pBMPage->IsMasterPage()) { - const USHORT nBMSdPage = (nBMPage - 1) / 2; + const sal_uInt16 nBMSdPage = (nBMPage - 1) / 2; pBMMPage = (SdPage*) (&(pBookmarkDoc->GetSdPage(nBMSdPage, PK_STANDARD)->TRG_GetMasterPage())); } } @@ -359,7 +359,7 @@ class InsertBookmarkAsPage_FindDuplicateLayouts : public SdDrawDocument::InsertB { public: InsertBookmarkAsPage_FindDuplicateLayouts( List* pLayoutsToTransfer, SdDrawDocument* pBookmarkDoc, - List* pBookmarkList, USHORT nBMSdPageCount ) : + List* pBookmarkList, sal_uInt16 nBMSdPageCount ) : mpLayoutsToTransfer(pLayoutsToTransfer), mpBookmarkDoc(pBookmarkDoc), mpBookmarkList(pBookmarkList), mnBMSdPageCount(nBMSdPageCount) {} virtual ~InsertBookmarkAsPage_FindDuplicateLayouts() {}; @@ -368,7 +368,7 @@ private: List* mpLayoutsToTransfer; SdDrawDocument* mpBookmarkDoc; List* mpBookmarkList; - USHORT mnBMSdPageCount; + sal_uInt16 mnBMSdPageCount; }; void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc, SdPage* pBMMPage ) @@ -381,18 +381,18 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc pLayout->Erase( pLayout->SearchAscii( SD_LT_SEPARATOR )); String* pTest = (String*) mpLayoutsToTransfer->First(); - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; while (pTest && !bFound) // found yet? { if (*pLayout == *pTest) - bFound = TRUE; + bFound = sal_True; else pTest = (String*)mpLayoutsToTransfer->Next(); } - const USHORT nMPageCount = rDoc.GetMasterPageCount(); - for (USHORT nMPage = 0; nMPage < nMPageCount && !bFound; nMPage++) + const sal_uInt16 nMPageCount = rDoc.GetMasterPageCount(); + for (sal_uInt16 nMPage = 0; nMPage < nMPageCount && !bFound; nMPage++) { /************************************************************** * Gibt es die Layouts schon im Dokument? @@ -402,7 +402,7 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc aTest.Erase( aTest.SearchAscii( SD_LT_SEPARATOR )); if (aTest == *pLayout) - bFound = TRUE; + bFound = sal_True; } if (!bFound) @@ -426,22 +426,22 @@ private: }; -BOOL SdDrawDocument::InsertBookmarkAsPage( +sal_Bool SdDrawDocument::InsertBookmarkAsPage( List* pBookmarkList, List* pExchangeList, // Liste der zu verwendenen Namen - BOOL bLink, - BOOL bReplace, - USHORT nInsertPos, - BOOL bNoDialogs, + sal_Bool bLink, + sal_Bool bReplace, + sal_uInt16 nInsertPos, + sal_Bool bNoDialogs, ::sd::DrawDocShell* pBookmarkDocSh, - BOOL bCopy, - BOOL bMergeMasterPages, - BOOL bPreservePageNames) + sal_Bool bCopy, + sal_Bool bMergeMasterPages, + sal_Bool bPreservePageNames) { - BOOL bOK = TRUE; - BOOL bContinue = TRUE; - BOOL bScaleObjects = FALSE; - USHORT nReplacedStandardPages = 0; + sal_Bool bOK = sal_True; + sal_Bool bContinue = sal_True; + sal_Bool bScaleObjects = sal_False; + sal_uInt16 nReplacedStandardPages = 0; SdDrawDocument* pBookmarkDoc = NULL; String aBookmarkName; @@ -462,16 +462,16 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( } else { - return FALSE; + return sal_False; } - const USHORT nSdPageCount = GetSdPageCount(PK_STANDARD); - const USHORT nBMSdPageCount = pBookmarkDoc->GetSdPageCount(PK_STANDARD); - const USHORT nMPageCount = GetMasterPageCount(); + const sal_uInt16 nSdPageCount = GetSdPageCount(PK_STANDARD); + const sal_uInt16 nBMSdPageCount = pBookmarkDoc->GetSdPageCount(PK_STANDARD); + const sal_uInt16 nMPageCount = GetMasterPageCount(); if (nSdPageCount==0 || nBMSdPageCount==0 || nMPageCount==0) { - bContinue = bOK = FALSE; + bContinue = bOK = sal_False; return(bContinue); } @@ -481,18 +481,18 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( // Note that the pointers are used later on as general page pointers. SdPage* pRefPage = GetSdPage(0, PK_STANDARD); Size aSize(pRefPage->GetSize()); - INT32 nLeft = pRefPage->GetLftBorder(); - INT32 nRight = pRefPage->GetRgtBorder(); - INT32 nUpper = pRefPage->GetUppBorder(); - INT32 nLower = pRefPage->GetLwrBorder(); + sal_Int32 nLeft = pRefPage->GetLftBorder(); + sal_Int32 nRight = pRefPage->GetRgtBorder(); + sal_Int32 nUpper = pRefPage->GetUppBorder(); + sal_Int32 nLower = pRefPage->GetLwrBorder(); Orientation eOrient = pRefPage->GetOrientation(); SdPage* pNPage = GetSdPage(0, PK_NOTES); Size aNSize(GetSdPage(0, PK_NOTES)->GetSize()); - INT32 nNLeft = pNPage->GetLftBorder(); - INT32 nNRight = pNPage->GetRgtBorder(); - INT32 nNUpper = pNPage->GetUppBorder(); - INT32 nNLower = pNPage->GetLwrBorder(); + sal_Int32 nNLeft = pNPage->GetLftBorder(); + sal_Int32 nNRight = pNPage->GetRgtBorder(); + sal_Int32 nNUpper = pNPage->GetUppBorder(); + sal_Int32 nNLower = pNPage->GetLwrBorder(); Orientation eNOrient = pRefPage->GetOrientation(); // Seitengroesse und -raender an die Werte der letzten @@ -504,7 +504,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( if( !pBookmarkList ) bScaleObjects = pRefPage->IsScaleObjects(); else - bScaleObjects = TRUE; + bScaleObjects = sal_True; } else { @@ -517,7 +517,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( pBMPage->GetLwrBorder() != pRefPage->GetLwrBorder()) { String aStr(SdResId(STR_SCALE_OBJECTS)); - USHORT nBut = QueryBox( NULL, WB_YES_NO_CANCEL, aStr).Execute(); + sal_uInt16 nBut = QueryBox( NULL, WB_YES_NO_CANCEL, aStr).Execute(); bScaleObjects = nBut == RET_YES; bContinue = nBut != RET_CANCEL; @@ -562,7 +562,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( // Wenn Vorlagen kopiert werden muessen, dann muessen auch die // MasterPages kopiert werden! if( pLayout ) - bMergeMasterPages = TRUE; + bMergeMasterPages = sal_True; while (pLayout) { @@ -574,7 +574,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( { if( pUndoMgr ) { - SdMoveStyleSheetsUndoAction* pMovStyles = new SdMoveStyleSheetsUndoAction(this, aCreatedStyles, TRUE); + SdMoveStyleSheetsUndoAction* pMovStyles = new SdMoveStyleSheetsUndoAction(this, aCreatedStyles, sal_True); pUndoMgr->AddUndoAction(pMovStyles); } } @@ -603,17 +603,17 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( nInsertPos = GetPageCount(); } - USHORT nActualInsertPos = nInsertPos; + sal_uInt16 nActualInsertPos = nInsertPos; List aNameList; - std::set<USHORT> aRenameSet; - USHORT nBMSdPage; + std::set<sal_uInt16> aRenameSet; + sal_uInt16 nBMSdPage; for (nBMSdPage=0; nBMSdPage < nBMSdPageCount; nBMSdPage++) { SdPage* pBMPage = pBookmarkDoc->GetSdPage(nBMSdPage, PK_STANDARD); String pName( pBMPage->GetName() ); - BOOL bIsMasterPage; + sal_Bool bIsMasterPage; if (bLink) { @@ -636,8 +636,8 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( 0xFFFF, // Aber alle anderen nActualInsertPos, // An Position einfuegen bMergeMasterPages, // MasterPages mitnehmen - FALSE, // Aber nur die benoetigten MasterPages - TRUE, // Undo-Aktion erzeugen + sal_False, // Aber nur die benoetigten MasterPages + sal_True, // Undo-Aktion erzeugen bCopy); // Seiten kopieren (oder mergen) for (nBMSdPage=0; nBMSdPage < nBMSdPageCount; nBMSdPage++) @@ -677,19 +677,19 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( if (nInsertPos >= GetPageCount()) { // Seiten werden hinten angefuegt - bReplace = FALSE; + bReplace = sal_False; nInsertPos = GetPageCount(); } - USHORT nActualInsertPos = nInsertPos; + sal_uInt16 nActualInsertPos = nInsertPos; // Collect the bookmarked pages. ::std::vector<SdPage*> aBookmarkedPages (pBookmarkList->Count(), NULL); - for (USHORT nPos = 0; nPos < pBookmarkList->Count(); nPos++) + for (sal_uInt16 nPos = 0; nPos < pBookmarkList->Count(); nPos++) { String aPgName(*(String*) pBookmarkList->GetObject(nPos)); - BOOL bIsMasterPage; - USHORT nBMPage = pBookmarkDoc->GetPageByName( aPgName, bIsMasterPage ); + sal_Bool bIsMasterPage; + sal_uInt16 nBMPage = pBookmarkDoc->GetPageByName( aPgName, bIsMasterPage ); if (nBMPage != SDRPAGE_NOTFOUND) { @@ -697,10 +697,10 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( } } - for (USHORT nPos = 0; nPos < pBookmarkList->Count(); nPos++) + for (sal_uInt16 nPos = 0; nPos < pBookmarkList->Count(); nPos++) { pBMPage = aBookmarkedPages[nPos]; - USHORT nBMPage = pBMPage!=NULL ? pBMPage->GetPageNum() : SDRPAGE_NOTFOUND; + sal_uInt16 nBMPage = pBMPage!=NULL ? pBMPage->GetPageNum() : SDRPAGE_NOTFOUND; if (pBMPage && pBMPage->GetPageKind()==PK_STANDARD && !pBMPage->IsMasterPage()) { @@ -713,8 +713,8 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( // #67905# don't change name if source and dest model are the same! // #96029# avoid renaming if replacing the same page String aPgName(*(String*) pBookmarkList->GetObject(nPos)); - BOOL bIsMasterPage; - USHORT nPageSameName = GetPageByName(aPgName, bIsMasterPage); + sal_Bool bIsMasterPage; + sal_uInt16 nPageSameName = GetPageByName(aPgName, bIsMasterPage); if( pBookmarkDoc != this && nPageSameName != SDRPAGE_NOTFOUND && ( !bReplace || @@ -734,8 +734,8 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( nBMPage+1, // Bis Seite (Notizen) nActualInsertPos, // An Position einfuegen bMergeMasterPages, // MasterPages mitnehmen - FALSE, // Aber nur die benoetigten MasterPages - TRUE, // Undo-Aktion erzeugen + sal_False, // Aber nur die benoetigten MasterPages + sal_True, // Undo-Aktion erzeugen bCopy); // Seiten kopieren (oder mergen) if( bReplace ) @@ -834,17 +834,17 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( |* DrawingEngine gleiche Praesentationslayouts nicht erkennen kann. |* Ueberzaehlige MasterPages entfernen. \*************************************************************************/ - USHORT nNewMPageCount = GetMasterPageCount(); + sal_uInt16 nNewMPageCount = GetMasterPageCount(); // rueckwaerts, damit Nummern nicht durcheinander geraten - for (USHORT nPage = nNewMPageCount - 1; nPage >= nMPageCount; nPage--) + for (sal_uInt16 nPage = nNewMPageCount - 1; nPage >= nMPageCount; nPage--) { pRefPage = (SdPage*) GetMasterPage(nPage); String aMPLayout(pRefPage->GetLayoutName()); PageKind eKind = pRefPage->GetPageKind(); // gibt's den schon? - for (USHORT nTest = 0; nTest < nMPageCount; nTest++) + for (sal_uInt16 nTest = 0; nTest < nMPageCount; nTest++) { SdPage* pTest = (SdPage*) GetMasterPage(nTest); String aTest(pTest->GetLayoutName()); @@ -870,8 +870,8 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( // #96029# nInsertPos > 2 is always true when inserting into non-empty models if (nInsertPos > 0) { - USHORT nSdPageStart = (nInsertPos - 1) / 2; - USHORT nSdPageEnd = GetSdPageCount(PK_STANDARD) - nSdPageCount + + sal_uInt16 nSdPageStart = (nInsertPos - 1) / 2; + sal_uInt16 nSdPageEnd = GetSdPageCount(PK_STANDARD) - nSdPageCount + nSdPageStart - 1; const bool bRemoveEmptyPresObj = pBookmarkDoc && (pBookmarkDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) && @@ -882,7 +882,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( nSdPageEnd = nSdPageStart + nReplacedStandardPages - 1; } - for (USHORT nSdPage = nSdPageStart; nSdPage <= nSdPageEnd; nSdPage++) + for (sal_uInt16 nSdPage = nSdPageStart; nSdPage <= nSdPageEnd; nSdPage++) { pRefPage = GetSdPage(nSdPage, PK_STANDARD); @@ -916,7 +916,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( if (bScaleObjects) { Rectangle aBorderRect(nLeft, nUpper, nRight, nLower); - pRefPage->ScaleObjects(aSize, aBorderRect, TRUE); + pRefPage->ScaleObjects(aSize, aBorderRect, sal_True); } pRefPage->SetSize(aSize); pRefPage->SetBorder(nLeft, nUpper, nRight, nLower); @@ -935,7 +935,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( if (bScaleObjects) { Rectangle aBorderRect(nNLeft, nNUpper, nNRight, nNLower); - pRefPage->ScaleObjects(aNSize, aBorderRect, TRUE); + pRefPage->ScaleObjects(aNSize, aBorderRect, sal_True); } pRefPage->SetSize(aNSize); @@ -946,7 +946,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( pRefPage->RemoveEmptyPresentationObjects(); } - for (USHORT nPage = nMPageCount; nPage < nNewMPageCount; nPage++) + for (sal_uInt16 nPage = nMPageCount; nPage < nNewMPageCount; nPage++) { pRefPage = (SdPage*) GetMasterPage(nPage); if (pRefPage->GetPageKind() == PK_STANDARD) @@ -954,7 +954,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( if (bScaleObjects) { Rectangle aBorderRect(nLeft, nUpper, nRight, nLower); - pRefPage->ScaleObjects(aSize, aBorderRect, TRUE); + pRefPage->ScaleObjects(aSize, aBorderRect, sal_True); } pRefPage->SetSize(aSize); pRefPage->SetBorder(nLeft, nUpper, nRight, nLower); @@ -965,7 +965,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( if (bScaleObjects) { Rectangle aBorderRect(nNLeft, nNUpper, nNRight, nNLower); - pRefPage->ScaleObjects(aNSize, aBorderRect, TRUE); + pRefPage->ScaleObjects(aNSize, aBorderRect, sal_True); } pRefPage->SetSize(aNSize); pRefPage->SetBorder(nNLeft, nNUpper, nNRight, nNLower); @@ -978,7 +978,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( } // #91146# Make absolutely sure no double masterpages are there - RemoveUnnecessaryMasterPages(NULL, TRUE, TRUE); + RemoveUnnecessaryMasterPages(NULL, sal_True, sal_True); if( bUndo ) EndUndo(); @@ -993,15 +993,15 @@ BOOL SdDrawDocument::InsertBookmarkAsPage( |* \************************************************************************/ -BOOL SdDrawDocument::InsertBookmarkAsObject( +sal_Bool SdDrawDocument::InsertBookmarkAsObject( List* pBookmarkList, List* pExchangeList, // Liste der zu verwendenen Namen - BOOL /* bLink */, + sal_Bool /* bLink */, ::sd::DrawDocShell* pBookmarkDocSh, Point* pObjPos) { - BOOL bOK = TRUE; - BOOL bOLEObjFound = FALSE; + sal_Bool bOK = sal_True; + sal_Bool bOLEObjFound = sal_False; ::sd::View* pBMView = NULL; SdDrawDocument* pBookmarkDoc = NULL; @@ -1023,7 +1023,7 @@ BOOL SdDrawDocument::InsertBookmarkAsObject( } else { - return FALSE; + return sal_False; } if (!pBookmarkList) @@ -1037,7 +1037,7 @@ BOOL SdDrawDocument::InsertBookmarkAsObject( SdrPage* pPage; SdrPageView* pPV; - for (USHORT nPos = 0; nPos < pBookmarkList->Count(); nPos++) + for (sal_uInt16 nPos = 0; nPos < pBookmarkList->Count(); nPos++) { /****************************************************************** * Namen der Bookmarks aus Liste holen @@ -1053,7 +1053,7 @@ BOOL SdDrawDocument::InsertBookmarkAsObject( if (pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() == OBJ_OLE2) { - bOLEObjFound = TRUE; + bOLEObjFound = sal_True; } if (!pBMView) @@ -1076,7 +1076,7 @@ BOOL SdDrawDocument::InsertBookmarkAsObject( pPV = pBMView->ShowSdrPage(pPage); } - pBMView->MarkObj(pObj, pPV, FALSE); + pBMView->MarkObj(pObj, pPV, sal_False); } } } @@ -1123,7 +1123,7 @@ BOOL SdDrawDocument::InsertBookmarkAsObject( aObjPos = Rectangle(Point(), pPage->GetSize()).Center(); } - ULONG nCountBefore = 0; + sal_uLong nCountBefore = 0; if (pExchangeList) { @@ -1133,13 +1133,13 @@ BOOL SdDrawDocument::InsertBookmarkAsObject( } if (bOLEObjFound) - pBMView->GetDoc()->SetAllocDocSh(TRUE); + pBMView->GetDoc()->SetAllocDocSh(sal_True); SdDrawDocument* pTmpDoc = (SdDrawDocument*) pBMView->GetAllMarkedModel(); bOK = pView->Paste(*pTmpDoc, aObjPos, pPage); if (bOLEObjFound) - pBMView->GetDoc()->SetAllocDocSh(FALSE); + pBMView->GetDoc()->SetAllocDocSh(sal_False); if (!bOLEObjFound) delete pTmpDoc; // Wird ansonsten von der DocShell zerstoert @@ -1151,9 +1151,9 @@ BOOL SdDrawDocument::InsertBookmarkAsObject( if (pExchangeList) { // Anzahl Objekte nach dem Einfuegen bestimmen - ULONG nCount = pPage->GetObjCount(); + sal_uLong nCount = pPage->GetObjCount(); - for (ULONG nObj = nCountBefore; nObj < nCount; nObj++) + for (sal_uLong nObj = nCountBefore; nObj < nCount; nObj++) { // Zuverwendener Name aus Exchange-Liste holen if (pExchangeList->GetCurObject()) @@ -1225,7 +1225,7 @@ void SdDrawDocument::DisposeLoadedModels() FASTBOOL SdDrawDocument::IsReadOnly() const { - return FALSE; + return sal_False; } @@ -1236,7 +1236,7 @@ FASTBOOL SdDrawDocument::IsReadOnly() const |* \************************************************************************/ -void SdDrawDocument::SetAllocDocSh(BOOL bAlloc) +void SdDrawDocument::SetAllocDocSh(sal_Bool bAlloc) { mbAllocDocSh = bAlloc; @@ -1254,7 +1254,7 @@ void SdDrawDocument::SetAllocDocSh(BOOL bAlloc) |* \************************************************************************/ -List* SdDrawDocument::GetCustomShowList(BOOL bCreate) +List* SdDrawDocument::GetCustomShowList(sal_Bool bCreate) { if (!mpCustomShowList && bCreate) { @@ -1330,9 +1330,9 @@ SvStream* SdDrawDocument::GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) if( pRet ) { // try to get some information from stream - const ULONG nStartPos = pRet->Tell(); - const ULONG nEndPos = pRet->Seek( STREAM_SEEK_TO_END ); - const ULONG nStmLen = nEndPos - nStartPos; + const sal_uLong nStartPos = pRet->Tell(); + const sal_uLong nEndPos = pRet->Seek( STREAM_SEEK_TO_END ); + const sal_uLong nStmLen = nEndPos - nStartPos; sal_uChar aTestByte; // try to read one byte @@ -1353,13 +1353,13 @@ SvStream* SdDrawDocument::GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) |* \************************************************************************/ -void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, BOOL bOnlyDuplicatePages, BOOL bUndo) +void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, sal_Bool bOnlyDuplicatePages, sal_Bool bUndo) { ::sd::View* pView = NULL; SfxUndoManager* pUndoMgr = NULL; if( bUndo && !IsUndoEnabled() ) - bUndo = FALSE; + bUndo = sal_False; if (mpDocSh) { @@ -1372,7 +1372,7 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, BOOL bOnl /*********************************************************** * Alle MasterPages pruefen ***********************************************************/ - USHORT nSdMasterPageCount = GetMasterSdPageCount( PK_STANDARD ); + sal_uInt16 nSdMasterPageCount = GetMasterSdPageCount( PK_STANDARD ); for (sal_Int32 nMPage = nSdMasterPageCount - 1; nMPage >= 0; nMPage--) { SdPage* pMaster = pMasterPage; @@ -1380,12 +1380,12 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, BOOL bOnl if (!pMaster) { - pMaster = (SdPage*) GetMasterSdPage( (USHORT) nMPage, PK_STANDARD ); - pNotesMaster = (SdPage*) GetMasterSdPage( (USHORT) nMPage, PK_NOTES ); + pMaster = (SdPage*) GetMasterSdPage( (sal_uInt16) nMPage, PK_STANDARD ); + pNotesMaster = (SdPage*) GetMasterSdPage( (sal_uInt16) nMPage, PK_NOTES ); } else { - for ( USHORT nMPg = 0; nMPg < GetMasterPageCount(); nMPg++ ) + for ( sal_uInt16 nMPg = 0; nMPg < GetMasterPageCount(); nMPg++ ) { if ( pMaster == GetMasterPage( nMPg ) ) { @@ -1402,21 +1402,21 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, BOOL bOnl pNotesMaster ) { // Do not delete master pages that have their precious flag set. - BOOL bDeleteMaster = !pMaster->IsPrecious(); + sal_Bool bDeleteMaster = !pMaster->IsPrecious(); String aLayoutName = pMaster->GetLayoutName(); if(bOnlyDuplicatePages ) { // remove only duplicate pages - bDeleteMaster = FALSE; - for (USHORT i = 0; i < GetMasterSdPageCount( PK_STANDARD ); i++) + bDeleteMaster = sal_False; + for (sal_uInt16 i = 0; i < GetMasterSdPageCount( PK_STANDARD ); i++) { SdPage* pMPg = (SdPage*) GetMasterSdPage( i, PK_STANDARD ); if( pMPg != pMaster && pMPg->GetLayoutName() == aLayoutName ) { // duplicate page found -> remove it - bDeleteMaster = TRUE; + bDeleteMaster = sal_True; } } } @@ -1461,15 +1461,15 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, BOOL bOnl EndUndo(); // schon hier, damit sich Joes Actions ZWISCHEN unsere eigenen schieben // alte Layoutvorlagen loeschen, wenn sie nicht mehr benoetigt werden - BOOL bDeleteOldStyleSheets = TRUE; - for ( USHORT nMPg = 0; + sal_Bool bDeleteOldStyleSheets = sal_True; + for ( sal_uInt16 nMPg = 0; nMPg < GetMasterPageCount() && bDeleteOldStyleSheets; nMPg++ ) { SdPage* pMPg = (SdPage*) GetMasterPage(nMPg); if (pMPg->GetLayoutName() == aLayoutName) { - bDeleteOldStyleSheets = FALSE; + bDeleteOldStyleSheets = sal_False; } } @@ -1516,14 +1516,14 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, BOOL bOnl |* Ist rLayoutName leer, so wird die erste MasterPage genommen \************************************************************************/ -void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, +void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, const String& rLayoutName, SdDrawDocument* pSourceDoc, - BOOL bMaster, - BOOL bCheckMasters) + sal_Bool bMaster, + sal_Bool bCheckMasters) { if( mpDocSh ) - mpDocSh->SetWaitCursor( TRUE ); + mpDocSh->SetWaitCursor( sal_True ); SfxUndoManager* pUndoMgr = mpDocSh->GetUndoManager(); @@ -1550,7 +1550,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, if (pSourceDoc) { List* pReplList = NULL; - BOOL bLayoutReloaded = FALSE; // Wurde ex. Layout wieder geladen? + sal_Bool bLayoutReloaded = sal_False; // Wurde ex. Layout wieder geladen? /********************************************************************* |* LayoutName, Page and Notespage @@ -1568,7 +1568,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, aSearchFor.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR )); aSearchFor.Append( String(SdResId(STR_LAYOUT_OUTLINE))) ; - for (USHORT nMP = 0; nMP < pSourceDoc->GetMasterPageCount(); nMP++) + for (sal_uInt16 nMP = 0; nMP < pSourceDoc->GetMasterPageCount(); nMP++) { SdPage* pMP = (SdPage*) pSourceDoc->GetMasterPage(nMP); @@ -1601,7 +1601,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, pUndoMgr->LeaveListAction(); if( mpDocSh ) - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); DBG_ERROR( "SdDrawDocument::SetMasterPage() failed!" ); @@ -1610,13 +1610,13 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, if (pSourceDoc != this) { - const USHORT nMasterPageCount = GetMasterPageCount(); - for ( USHORT nMPage = 0; nMPage < nMasterPageCount; nMPage++ ) + const sal_uInt16 nMasterPageCount = GetMasterPageCount(); + for ( sal_uInt16 nMPage = 0; nMPage < nMasterPageCount; nMPage++ ) { SdPage* pCheckMaster = (SdPage*)GetMasterPage(nMPage); if( pCheckMaster->GetName() == aNewLayoutName ) { - bLayoutReloaded = TRUE; + bLayoutReloaded = sal_True; break; } } @@ -1647,7 +1647,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, { // Es ist eine gleichnamige Vorlage vorhanden ist: Inhalte ersetzen #ifdef DBG_UTIL - BOOL bTest = + sal_Bool bTest = #endif pMySheet->SetName(pHisSheet->GetName()); DBG_ASSERT(bTest, "StyleSheet-Umbenennung fehlgeschlagen"); @@ -1677,7 +1677,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, pReplData->aNewName = pMySheet->GetName(); String aTemp(pMySheet->GetName()); - USHORT nPos = aTemp.SearchAscii( SD_LT_SEPARATOR ); + sal_uInt16 nPos = aTemp.SearchAscii( SD_LT_SEPARATOR ); aTemp.Erase(0, nPos); aTemp.Insert(aOldLayoutName, 0); pReplData->aName = aTemp; @@ -1707,7 +1707,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, if (rParentOfOld.Len() > 0 && rParentOfNew.Len() == 0) { - for (ULONG i = 0; i < pReplList->Count(); i++) + for (sal_uLong i = 0; i < pReplList->Count(); i++) { StyleReplaceData* pRD = (StyleReplaceData*)pReplList-> GetObject(i); @@ -1732,7 +1732,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, { // UndoAction fuer das Erzeugen und Einfuegen vorn StyleSheets // auf den UndoManager legen - SdMoveStyleSheetsUndoAction* pMovStyles = new SdMoveStyleSheetsUndoAction( this, aCreatedStyles, TRUE); + SdMoveStyleSheetsUndoAction* pMovStyles = new SdMoveStyleSheetsUndoAction( this, aCreatedStyles, sal_True); pUndoMgr->AddUndoAction(pMovStyles); } } @@ -1761,7 +1761,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, // dagegen ersetzt, so muss vor der Position der alten Masterpage // eingefuegt werden, damit ab jetzt beim Suchen (z. B. SdPage:: // SetPresentationLayout) die neue Masterpage zuerst gefunden wird - USHORT nInsertPos = rOldMaster.GetPageNum(); + sal_uInt16 nInsertPos = rOldMaster.GetPageNum(); BegUndo(); if (!bLayoutReloaded) @@ -1792,7 +1792,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, if (bMaster || bLayoutReloaded) { - for (USHORT nPage = 1; nPage < GetPageCount(); nPage++) + for (sal_uInt16 nPage = 1; nPage < GetPageCount(); nPage++) { pPage = (SdPage*) GetPage(nPage); String aTest = pPage->GetLayoutName(); @@ -1821,7 +1821,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, (this, pPage->IsMasterPage() ? aLayoutName : aOldLayoutName, aLayoutName, - eAutoLayout, eAutoLayout, FALSE, pPage); + eAutoLayout, eAutoLayout, sal_False, pPage); pUndoMgr->AddUndoAction(pPLUndoAction); } pPage->SetPresentationLayout(aLayoutName); @@ -1842,7 +1842,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, rOldMaster.GetUppBorder(), rOldMaster.GetRgtBorder(), rOldMaster.GetLwrBorder()); - pMaster->ScaleObjects(aSize, aBorderRect, TRUE); + pMaster->ScaleObjects(aSize, aBorderRect, sal_True); pMaster->SetSize(aSize); pMaster->SetBorder(rOldMaster.GetLftBorder(), rOldMaster.GetUppBorder(), @@ -1856,7 +1856,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, rOldNotesMaster.GetUppBorder(), rOldNotesMaster.GetRgtBorder(), rOldNotesMaster.GetLwrBorder()); - pNotesMaster->ScaleObjects(aSize, aNotesBorderRect, TRUE); + pNotesMaster->ScaleObjects(aSize, aNotesBorderRect, sal_True); pNotesMaster->SetSize(aSize); pNotesMaster->SetBorder(rOldNotesMaster.GetLftBorder(), rOldNotesMaster.GetUppBorder(), @@ -1890,9 +1890,9 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, \********************************************************************/ String aName = String(SdResId(STR_LAYOUT_DEFAULT_NAME)); String aTest; - BOOL bNotANewName = TRUE; - USHORT nCount = 0; - USHORT nMPgCount = GetMasterPageCount(); + sal_Bool bNotANewName = sal_True; + sal_uInt16 nCount = 0; + sal_uInt16 nMPgCount = GetMasterPageCount(); for (nCount = 0; bNotANewName; nCount++) { @@ -1902,15 +1902,15 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, aTest += String::CreateFromInt32( nCount ); // gibt's schon eine, die so heisst? - bNotANewName = FALSE; - for (USHORT nMPg = 1; nMPg < nMPgCount; nMPg++) + bNotANewName = sal_False; + for (sal_uInt16 nMPg = 1; nMPg < nMPgCount; nMPg++) { const SdrPage* pTest = GetMasterPage(nMPg); String aPageLayoutName(pTest->GetLayoutName()); aPageLayoutName.Erase( aPageLayoutName.SearchAscii( SD_LT_SEPARATOR )); if (aPageLayoutName == aTest) - bNotANewName = TRUE; + bNotANewName = sal_True; } } aName = aTest; @@ -1927,7 +1927,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, if( bUndo ) { - SdMoveStyleSheetsUndoAction* pMovStyles = new SdMoveStyleSheetsUndoAction(this, aCreatedStyles, TRUE); + SdMoveStyleSheetsUndoAction* pMovStyles = new SdMoveStyleSheetsUndoAction(this, aCreatedStyles, sal_True); pUndoMgr->AddUndoAction(pMovStyles); } @@ -1938,7 +1938,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, if( bUndo ) BegUndo(); - pMaster = (SdPage*) AllocPage(TRUE); + pMaster = (SdPage*) AllocPage(sal_True); pMaster->SetSize(pSelectedPage->GetSize()); pMaster->SetBorder(pSelectedPage->GetLftBorder(), pSelectedPage->GetUppBorder(), @@ -1953,7 +1953,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, pMaster->SetAutoLayout(AUTOLAYOUT_NONE, true, true); - pNotesMaster = (SdPage*) AllocPage(TRUE); + pNotesMaster = (SdPage*) AllocPage(sal_True); pNotesMaster->SetPageKind(PK_NOTES); pNotesMaster->SetSize(pNotes->GetSize()); pNotesMaster->SetBorder(pNotes->GetLftBorder(), @@ -1978,7 +1978,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, List* pPageList = new List; if (bMaster) { - for (USHORT nPage = 1; nPage < GetPageCount(); nPage++) + for (sal_uInt16 nPage = 1; nPage < GetPageCount(); nPage++) { pPage = (SdPage*) GetPage(nPage); const String s(pPage->GetLayoutName()); @@ -2009,7 +2009,7 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, SdPresentationLayoutUndoAction * pPLUndoAction = new SdPresentationLayoutUndoAction (this, aOldLayoutName, aName, - eOldAutoLayout, eNewAutoLayout, TRUE, + eOldAutoLayout, eNewAutoLayout, sal_True, pPage); pUndoMgr->AddUndoAction(pPLUndoAction); } @@ -2044,14 +2044,14 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum, pUndoMgr->LeaveListAction(); if( mpDocSh ) - mpDocSh->SetWaitCursor( FALSE ); + mpDocSh->SetWaitCursor( sal_False ); } void SdDrawDocument::Merge(SdrModel& rSourceModel, - USHORT nFirstPageNum, USHORT nLastPageNum, - USHORT nDestPos, + sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, + sal_uInt16 nDestPos, FASTBOOL bMergeMasterPages, FASTBOOL bAllMasterPages, FASTBOOL bUndo, FASTBOOL bTreadSourceAsConst) { diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index a58577458a67..60693c986237 100755 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -151,8 +151,8 @@ void SdDrawDocument::CreateLayoutTemplates() // nicht benutzt, nicht benutzerdefiniert // SB hatte wahrscheinlich Probleme mit SFXSTYLEBIT_AUTO, da dann gar nichts // mehr im Gestalter angezeigt wird. Dieses Problem ist zu 364 j behoben worden - // USHORT nMask = SFXSTYLEBIT_ALL & ~(SFXSTYLEBIT_USED | SFXSTYLEBIT_USERDEF); - USHORT nMask = SFXSTYLEBIT_AUTO; + // sal_uInt16 nMask = SFXSTYLEBIT_ALL & ~(SFXSTYLEBIT_USED | SFXSTYLEBIT_USERDEF); + sal_uInt16 nMask = SFXSTYLEBIT_AUTO; String aName(aStdName); pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask)); @@ -196,7 +196,7 @@ void SdDrawDocument::CreateLayoutTemplates() rISet.Put(XFillBitmapItem(pPool,aNullBmp)); // Schattenattribute (Drawing Engine) - rISet.Put(SdrShadowItem(FALSE)); + rISet.Put(SdrShadowItem(sal_False)); rISet.Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY))); rISet.Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz rISet.Put(SdrShadowYDistItem(300)); @@ -230,8 +230,8 @@ void SdDrawDocument::CreateLayoutTemplates() rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CJK ) ); rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CTL ) ); - rISet.Put(SvxContourItem(FALSE, EE_CHAR_OUTLINE )); - rISet.Put(SvxShadowedItem(FALSE, EE_CHAR_SHADOW )); + rISet.Put(SvxContourItem(sal_False, EE_CHAR_OUTLINE )); + rISet.Put(SvxShadowedItem(sal_False, EE_CHAR_SHADOW )); rISet.Put(SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE)); rISet.Put(SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE)); rISet.Put(SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT )); @@ -251,7 +251,7 @@ void SdDrawDocument::CreateLayoutTemplates() rISet.Put( SvxLineSpacingItem( LINE_SPACE_DEFAULT_HEIGHT, EE_PARA_SBL ) ); // #i16874# enable kerning by default but only for new documents - rISet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) ); + rISet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) ); // Bullet // BulletItem und BulletFont fuer Titel und Gliederung @@ -298,7 +298,7 @@ void SdDrawDocument::CreateLayoutTemplates() pISet->Put(XLineStartWidthItem(700)); pISet->Put(XLineEndWidthItem(300)); - pISet->Put(XLineStartCenterItem(TRUE)); + pISet->Put(XLineStartCenterItem(sal_True)); // ---- Objekt mit Schatten ------------------------------------------- @@ -308,7 +308,7 @@ void SdDrawDocument::CreateLayoutTemplates() pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJWITHSHADOW ); pISet = &pSheet->GetItemSet(); - pISet->Put(SdrShadowItem(TRUE)); + pISet->Put(SdrShadowItem(sal_True)); pISet->Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY))); pISet->Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz pISet->Put(SdrShadowYDistItem(300)); @@ -406,7 +406,7 @@ void SdDrawDocument::CreateLayoutTemplates() pISet->Put(XFillStyleItem(XFILL_SOLID)); pISet->Put(XFillColorItem(String(), RGB_Color(COL_CYAN))); - pISet->Put(SdrShadowItem(TRUE)); + pISet->Put(SdrShadowItem(sal_True)); pISet->Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY))); pISet->Put(SdrShadowXDistItem(200)); // 2 mm Schattendistanz pISet->Put(SdrShadowYDistItem(200)); @@ -430,7 +430,7 @@ void SdDrawDocument::CreateLayoutTemplates() Color aOrange4(255, 204, 153); pISet->Put(XFillColorItem(String(), aOrange4)); - pISet->Put(SdrShadowItem(TRUE)); + pISet->Put(SdrShadowItem(sal_True)); pISet->Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY))); pISet->Put(SdrShadowXDistItem(200)); // 2 mm Schattendistanz pISet->Put(SdrShadowYDistItem(200)); @@ -575,7 +575,7 @@ void SdDrawDocument::CreateDefaultCellStyles() // ---- Default ----------------------------------------------- - USHORT nMask = SFXSTYLEBIT_AUTO; + sal_uInt16 nMask = SFXSTYLEBIT_AUTO; OUString aDefaultCellStyleName( RTL_CONSTASCII_USTRINGPARAM("default") ); @@ -626,8 +626,8 @@ void SdDrawDocument::CreateDefaultCellStyles() // rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CJK ) ); // rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CTL ) ); -// rISet.Put(SvxContourItem(FALSE, EE_CHAR_OUTLINE )); -// rISet.Put(SvxShadowedItem(FALSE, EE_CHAR_SHADOW )); +// rISet.Put(SvxContourItem(sal_False, EE_CHAR_OUTLINE )); +// rISet.Put(SvxShadowedItem(sal_False, EE_CHAR_SHADOW )); // rISet.Put(SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE)); // rISet.Put(SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE)); // rISet.Put(SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT )); @@ -645,7 +645,7 @@ void SdDrawDocument::CreateDefaultCellStyles() rISet.Put( SdrTextLowerDistItem( 130 ) ); rISet.Put( SvxLineSpacingItem( LINE_SPACE_DEFAULT_HEIGHT, EE_PARA_SBL ) ); - rISet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) ); + rISet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) ); rISet.Put( SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP) ); rISet.Put( SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_LEFT) ); @@ -757,11 +757,11 @@ void SdDrawDocument::CreateDefaultCellStyles() |* \************************************************************************/ -USHORT SdDrawDocument::GetMasterPageUserCount(SdrPage* pMaster) const +sal_uInt16 SdDrawDocument::GetMasterPageUserCount(SdrPage* pMaster) const { - USHORT nResult = 0; - USHORT nPage; - USHORT nPageCount = GetPageCount(); + sal_uInt16 nResult = 0; + sal_uInt16 nPage; + sal_uInt16 nPageCount = GetPageCount(); for (nPage = 0; nPage < nPageCount; nPage++) { @@ -805,14 +805,14 @@ void SdDrawDocument::StopOnlineSpelling() |* \************************************************************************/ -void SdDrawDocument::StartOnlineSpelling(BOOL bForceSpelling) +void SdDrawDocument::StartOnlineSpelling(sal_Bool bForceSpelling) { if (mbOnlineSpell && (bForceSpelling || mbInitialOnlineSpellingEnabled) && mpDocSh && !mpDocSh->IsReadOnly() ) { StopOnlineSpelling(); - ::sd::Outliner* pOutl = GetInternalOutliner(TRUE); + ::sd::Outliner* pOutl = GetInternalOutliner(sal_True); Reference< XSpellChecker1 > xSpellChecker( LinguMgr::GetSpellChecker() ); if ( xSpellChecker.is() ) @@ -825,7 +825,7 @@ void SdDrawDocument::StartOnlineSpelling(BOOL bForceSpelling) pOutl->SetDefaultLanguage( meLanguage ); mpOnlineSpellingList = new ShapeList; - USHORT nPage; + sal_uInt16 nPage; for ( nPage = 0; nPage < GetPageCount(); nPage++ ) { @@ -876,14 +876,14 @@ void SdDrawDocument::FillOnlineSpellingList(SdPage* pPage) SdrObjListIter aGroupIter(*((SdrObjGroup*)pObj)->GetSubList(), IM_DEEPNOGROUPS); - BOOL bSubTextObjFound = FALSE; + sal_Bool bSubTextObjFound = sal_False; while (aGroupIter.IsMore() && !bSubTextObjFound) { if (aGroupIter.Next()->GetOutlinerParaObject()) { // Textobjekt im Gruppenobjekt gefunden - bSubTextObjFound = TRUE; + bSubTextObjFound = sal_True; } } @@ -945,7 +945,7 @@ IMPL_LINK(SdDrawDocument, OnlineSpellingHdl, Timer*, EMPTYARG ) else { // Spelling wurde initial durchgefuehrt - mbInitialOnlineSpellingEnabled = FALSE; + mbInitialOnlineSpellingEnabled = sal_False; // Suche beenden StopOnlineSpelling(); @@ -967,14 +967,14 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj) { if (pObj && pObj->GetOutlinerParaObject() /* && pObj != pView->GetTextEditObject() */) { - mbHasOnlineSpellErrors = FALSE; - ::sd::Outliner* pOutl = GetInternalOutliner(TRUE); - pOutl->SetUpdateMode(TRUE); + mbHasOnlineSpellErrors = sal_False; + ::sd::Outliner* pOutl = GetInternalOutliner(sal_True); + pOutl->SetUpdateMode(sal_True); Link aEvtHdl = pOutl->GetStatusEventHdl(); pOutl->SetStatusEventHdl(LINK(this, SdDrawDocument, OnlineSpellEventHdl)); - USHORT nOldOutlMode = pOutl->GetMode(); - USHORT nOutlMode = OUTLINERMODE_TEXTOBJECT; + sal_uInt16 nOldOutlMode = pOutl->GetMode(); + sal_uInt16 nOutlMode = OUTLINERMODE_TEXTOBJECT; if (((SdrTextObj*) pObj)->GetObjInventor() == SdrInventor && ((SdrTextObj*) pObj)->GetObjIdentifier() == OBJ_OUTLINETEXT) { @@ -1010,9 +1010,9 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj) } pOutl->SetStatusEventHdl(aEvtHdl); - pOutl->SetUpdateMode(FALSE); + pOutl->SetUpdateMode(sal_False); pOutl->Init( nOldOutlMode ); - mbHasOnlineSpellErrors = FALSE; + mbHasOnlineSpellErrors = sal_False; } } @@ -1057,7 +1057,7 @@ void SdDrawDocument::RemoveObject(SdrObject* pObj, SdPage* /*pPage*/) \************************************************************************/ IMPL_LINK(SdDrawDocument, OnlineSpellEventHdl, EditStatus*, pEditStat) { - ULONG nStat = pEditStat->GetStatusWord(); + sal_uLong nStat = pEditStat->GetStatusWord(); mbHasOnlineSpellErrors = (nStat & EE_STAT_WRONGWORDCHANGED) != 0; return(0); @@ -1075,7 +1075,7 @@ void SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject* delete mpOnlineSearchItem; mpOnlineSearchItem = NULL; - USHORT nCommand = pInfo->nCommand; + sal_uInt16 nCommand = pInfo->nCommand; if (nCommand == SPELLCMD_IGNOREWORD // #91457# restart when add to dictionary takes place, too. @@ -1083,7 +1083,7 @@ void SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject* { if(pObj && pOutl && pObj->ISA(SdrTextObj)) { - BOOL bModified(IsChanged()); + sal_Bool bModified(IsChanged()); ((SdrTextObj*)pObj)->SetOutlinerParaObject(pOutl->CreateParaObject()); SetChanged(bModified); pObj->BroadcastObjectChange(); @@ -1108,9 +1108,9 @@ void SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject* void SdDrawDocument::RestoreLayerNames() { SdrLayerAdmin& rLayerAdmin = GetLayerAdmin(); - USHORT nLayerCount = rLayerAdmin.GetLayerCount(); + sal_uInt16 nLayerCount = rLayerAdmin.GetLayerCount(); - for (USHORT nLayer = 0; nLayer < nLayerCount; nLayer++) + for (sal_uInt16 nLayer = 0; nLayer < nLayerCount; nLayer++) { SdrLayer* pLayer = rLayerAdmin.GetLayer(nLayer); @@ -1148,10 +1148,10 @@ void SdDrawDocument::RestoreLayerNames() |* \************************************************************************/ -String SdDrawDocument::CreatePageNumValue(USHORT nNum) const +String SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const { String aPageNumValue; - BOOL bUpper = FALSE; + sal_Bool bUpper = sal_False; switch (mePageNumType) { @@ -1162,7 +1162,7 @@ String SdDrawDocument::CreatePageNumValue(USHORT nNum) const aPageNumValue += (sal_Unicode)(char)((nNum - 1) % 26 + 'a'); break; case SVX_ROMAN_UPPER: - bUpper = TRUE; + bUpper = sal_True; case SVX_ROMAN_LOWER: aPageNumValue += SvxNumberFormat::CreateRomanString(nNum, bUpper); break; @@ -1190,11 +1190,11 @@ String SdDrawDocument::CreatePageNumValue(USHORT nNum) const void SdDrawDocument::RenameLayoutTemplate(const String& rOldLayoutName, const String& rNewName) { String aOldName(rOldLayoutName); - USHORT nPos = aOldName.SearchAscii( SD_LT_SEPARATOR ); + sal_uInt16 nPos = aOldName.SearchAscii( SD_LT_SEPARATOR ); // erase everything after '~LT~' aOldName.Erase(nPos + sizeof(SD_LT_SEPARATOR) - 1 ); - USHORT nLen = aOldName.Len(); + sal_uInt16 nLen = aOldName.Len(); List aReplList; SfxStyleSheetIterator aIter(mxStyleSheetPool.get(), SD_STYLE_FAMILY_MASTERPAGE); @@ -1231,7 +1231,7 @@ void SdDrawDocument::RenameLayoutTemplate(const String& rOldLayoutName, const St // an allen Seiten, die das jetzt umbeannte Layout benutzen, die // Textobjekte von der Aenderung unterrichten und Layoutnamen setzen - USHORT nPage; + sal_uInt16 nPage; for (nPage = 0; nPage < GetPageCount(); nPage++) { SdPage* pPage = (SdPage*) GetPage(nPage); @@ -1241,7 +1241,7 @@ void SdDrawDocument::RenameLayoutTemplate(const String& rOldLayoutName, const St { pPage->SetLayoutName(aPageLayoutName); - for (ULONG nObj = 0; nObj < pPage->GetObjCount(); nObj++) + for (sal_uLong nObj = 0; nObj < pPage->GetObjCount(); nObj++) { SdrObject* pObj = pPage->GetObj(nObj); @@ -1289,7 +1289,7 @@ void SdDrawDocument::RenameLayoutTemplate(const String& rOldLayoutName, const St pPage->SetLayoutName(aPageLayoutName); pPage->SetName(rNewName); - for (ULONG nObj = 0; nObj < pPage->GetObjCount(); nObj++) + for (sal_uLong nObj = 0; nObj < pPage->GetObjCount(); nObj++) { SdrObject* pObj = pPage->GetObj(nObj); @@ -1356,14 +1356,14 @@ void SdDrawDocument::SetTextDefaults() const aNumberFormat.SetStart(1); aNumberFormat.SetNumAdjust(SVX_ADJUST_LEFT); - SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10, FALSE); + SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10, sal_False); aNumberFormat.SetLSpace( 0 ); aNumberFormat.SetAbsLSpace( 0 ); aNumberFormat.SetFirstLineOffset( 0 ); aNumRule.SetLevel( 0, aNumberFormat ); - for( USHORT i = 1; i < aNumRule.GetLevelCount(); i++ ) + for( sal_uInt16 i = 1; i < aNumRule.GetLevelCount(); i++ ) { const short nLSpace = (i + 1) * 600; aNumberFormat.SetLSpace(nLSpace); @@ -1492,17 +1492,17 @@ void ModifyGuard::init() mpDocShell = mpDoc->GetDocSh(); } - mbIsEnableSetModified = mpDocShell ? mpDocShell->IsEnableSetModified() : FALSE; - mbIsDocumentChanged = mpDoc ? mpDoc->IsChanged() : FALSE; + mbIsEnableSetModified = mpDocShell ? mpDocShell->IsEnableSetModified() : sal_False; + mbIsDocumentChanged = mpDoc ? mpDoc->IsChanged() : sal_False; if( mbIsEnableSetModified ) - mpDocShell->EnableSetModified( FALSE ); + mpDocShell->EnableSetModified( sal_False ); } ModifyGuard::~ModifyGuard() { if( mbIsEnableSetModified ) - mpDocShell->EnableSetModified( TRUE ); + mpDocShell->EnableSetModified( sal_True ); if( mpDoc && (mpDoc->IsChanged() != mbIsDocumentChanged) ) mpDoc->SetChanged(mbIsDocumentChanged); diff --git a/sd/source/core/drawdoc_animations.cxx b/sd/source/core/drawdoc_animations.cxx index 3a994ffc0655..08e90315f1ca 100644..100755 --- a/sd/source/core/drawdoc_animations.cxx +++ b/sd/source/core/drawdoc_animations.cxx @@ -41,7 +41,7 @@ void SdDrawDocument::ReplacePageInCustomShows( const SdPage* pOldPage, const SdP { if ( mpCustomShowList ) { - for (ULONG i = 0; i < mpCustomShowList->Count(); i++) + for (sal_uLong i = 0; i < mpCustomShowList->Count(); i++) { SdCustomShow* pCustomShow = (SdCustomShow*) mpCustomShowList->GetObject(i); if( pNewPage == 0 ) diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx index 61988c886feb..4cddca237ff3 100644..100755 --- a/sd/source/core/pglink.cxx +++ b/sd/source/core/pglink.cxx @@ -106,21 +106,21 @@ void SdPageLink::DataChanged( const String& , List aBookmarkList; aBookmarkList.Insert(&aBookmarkName); - USHORT nInsertPos = pPage->GetPageNum(); - BOOL bLink = TRUE; - BOOL bReplace = TRUE; - BOOL bNoDialogs = FALSE; - BOOL bCopy = FALSE; + sal_uInt16 nInsertPos = pPage->GetPageNum(); + sal_Bool bLink = sal_True; + sal_Bool bReplace = sal_True; + sal_Bool bNoDialogs = sal_False; + sal_Bool bCopy = sal_False; if( pDoc->pDocLockedInsertingLinks ) { // resolving links while loading pDoc - bNoDialogs = TRUE; - bCopy = TRUE; + bNoDialogs = sal_True; + bCopy = sal_True; } pDoc->InsertBookmarkAsPage(&aBookmarkList, NULL, bLink, bReplace, - nInsertPos, bNoDialogs, NULL, bCopy, TRUE, TRUE); + nInsertPos, bNoDialogs, NULL, bCopy, sal_True, sal_True); if( !pDoc->pDocLockedInsertingLinks ) pDoc->CloseBookmarkDoc(); diff --git a/sd/source/core/sdattr.cxx b/sd/source/core/sdattr.cxx index 4b394a137d56..130158bfc892 100644..100755 --- a/sd/source/core/sdattr.cxx +++ b/sd/source/core/sdattr.cxx @@ -42,7 +42,7 @@ TYPEINIT1_AUTOFACTORY( DiaEffectItem, SfxEnumItem ); DiaEffectItem::DiaEffectItem( presentation::FadeEffect eFE ) : - SfxEnumItem( ATTR_DIA_EFFECT, (USHORT)eFE ) + SfxEnumItem( ATTR_DIA_EFFECT, (sal_uInt16)eFE ) { } @@ -59,7 +59,7 @@ SfxPoolItem* DiaEffectItem::Clone( SfxItemPool* ) const } -SfxPoolItem* DiaEffectItem::Create( SvStream& rIn, USHORT ) const +SfxPoolItem* DiaEffectItem::Create( SvStream& rIn, sal_uInt16 ) const { return new DiaEffectItem( rIn ); } @@ -73,7 +73,7 @@ TYPEINIT1_AUTOFACTORY( DiaSpeedItem, SfxEnumItem ); DiaSpeedItem::DiaSpeedItem( FadeSpeed eFS ) : - SfxEnumItem( ATTR_DIA_SPEED, (USHORT)eFS ) + SfxEnumItem( ATTR_DIA_SPEED, (sal_uInt16)eFS ) { } @@ -90,7 +90,7 @@ SfxPoolItem* DiaSpeedItem::Clone( SfxItemPool* ) const } -SfxPoolItem* DiaSpeedItem::Create( SvStream& rIn, USHORT ) const +SfxPoolItem* DiaSpeedItem::Create( SvStream& rIn, sal_uInt16 ) const { return new DiaSpeedItem( rIn ); } @@ -103,7 +103,7 @@ SfxPoolItem* DiaSpeedItem::Create( SvStream& rIn, USHORT ) const TYPEINIT1_AUTOFACTORY( DiaAutoItem, SfxEnumItem ); DiaAutoItem::DiaAutoItem( PresChange eChange ) : - SfxEnumItem( ATTR_DIA_AUTO, (USHORT)eChange ) + SfxEnumItem( ATTR_DIA_AUTO, (sal_uInt16)eChange ) { } @@ -120,7 +120,7 @@ SfxPoolItem* DiaAutoItem::Clone( SfxItemPool* ) const } -SfxPoolItem* DiaAutoItem::Create( SvStream& rIn, USHORT ) const +SfxPoolItem* DiaAutoItem::Create( SvStream& rIn, sal_uInt16 ) const { return new DiaAutoItem( rIn ); } @@ -133,7 +133,7 @@ SfxPoolItem* DiaAutoItem::Create( SvStream& rIn, USHORT ) const TYPEINIT1_AUTOFACTORY( DiaTimeItem, SfxUInt32Item ); -DiaTimeItem::DiaTimeItem( UINT32 nValue ) : +DiaTimeItem::DiaTimeItem( sal_uInt32 nValue ) : SfxUInt32Item( ATTR_DIA_TIME, nValue ) { } diff --git a/sd/source/core/sdiocmpt.cxx b/sd/source/core/sdiocmpt.cxx index 5231aaf261ba..84a2e1517ace 100644..100755 --- a/sd/source/core/sdiocmpt.cxx +++ b/sd/source/core/sdiocmpt.cxx @@ -35,12 +35,12 @@ ////////////////////////////////////////////////////////////////////////////// -old_SdrDownCompat::old_SdrDownCompat(SvStream& rNewStream, UINT16 nNewMode) +old_SdrDownCompat::old_SdrDownCompat(SvStream& rNewStream, sal_uInt16 nNewMode) : rStream(rNewStream), nSubRecSiz(0), nSubRecPos(0), nMode(nNewMode), - bOpen(FALSE) + bOpen(sal_False) { OpenSubRecord(); } @@ -77,7 +77,7 @@ void old_SdrDownCompat::OpenSubRecord() Write(); } - bOpen = TRUE; + bOpen = sal_True; } void old_SdrDownCompat::CloseSubRecord() @@ -85,11 +85,11 @@ void old_SdrDownCompat::CloseSubRecord() if(rStream.GetError()) return; - UINT32 nAktPos(rStream.Tell()); + sal_uInt32 nAktPos(rStream.Tell()); if(nMode == STREAM_READ) { - UINT32 nReadAnz(nAktPos - nSubRecPos); + sal_uInt32 nReadAnz(nAktPos - nSubRecPos); if(nReadAnz != nSubRecSiz) { rStream.Seek(nSubRecPos + nSubRecSiz); @@ -103,7 +103,7 @@ void old_SdrDownCompat::CloseSubRecord() rStream.Seek(nAktPos); } - bOpen = FALSE; + bOpen = sal_False; } /************************************************************************* @@ -112,7 +112,7 @@ void old_SdrDownCompat::CloseSubRecord() |* \************************************************************************/ -SdIOCompat::SdIOCompat(SvStream& rNewStream, USHORT nNewMode, UINT16 nVer) +SdIOCompat::SdIOCompat(SvStream& rNewStream, sal_uInt16 nNewMode, sal_uInt16 nVer) : old_SdrDownCompat(rNewStream, nNewMode), nVersion(nVer) { if (nNewMode == STREAM_WRITE) diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index e045437d37b1..7b54e1ce361e 100755 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -99,20 +99,20 @@ TYPEINIT2( SdPage, FmFormPage, SdrObjUserCall ); |* \************************************************************************/ -SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, BOOL bMasterPage) +SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, sal_Bool bMasterPage) : FmFormPage(rNewDoc, pBasic, bMasterPage) , SdrObjUserCall() , mePageKind(PK_STANDARD) , meAutoLayout(AUTOLAYOUT_NONE) -, mbSelected(FALSE) +, mbSelected(sal_False) , mePresChange(PRESCHANGE_MANUAL) , mnTime(1) -, mbSoundOn(FALSE) -, mbExcluded(FALSE) -, mbLoopSound(FALSE) -, mbStopSound(FALSE) -, mbScaleObjects(TRUE) -, mbBackgroundFullSize( FALSE ) +, mbSoundOn(sal_False) +, mbExcluded(sal_False) +, mbLoopSound(sal_False) +, mbStopSound(sal_False) +, mbScaleObjects(sal_True) +, mbBackgroundFullSize( sal_False ) , meCharSet(gsl_getSystemTextEncoding()) , mnPaperBin(PAPERBIN_PRINTER_SETTINGS) , mpPageLink(NULL) @@ -196,7 +196,7 @@ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int nIndex, bool bFuzzySearc case PRESOBJ_CALC: case PRESOBJ_IMAGE: case PRESOBJ_MEDIA: - bFound = TRUE; + bFound = sal_True; break; default: break; @@ -249,7 +249,7 @@ void SdPage::EnsureMasterPageDefaultBackground() /** creates a presentation object with the given PresObjKind on this page. A user call will be set */ -SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rectangle& rRect, BOOL /* bInsert */ ) +SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const Rectangle& rRect, sal_Bool /* bInsert */ ) { sd::UndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0; const bool bUndo = pUndoManager && pUndoManager->isInListAction() && IsInserted(); @@ -267,7 +267,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec if (mbMaster) { - pSdrObj->SetNotVisibleAsMaster(TRUE); + pSdrObj->SetNotVisibleAsMaster(sal_True); } } break; @@ -278,7 +278,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec if (mbMaster) { - pSdrObj->SetNotVisibleAsMaster(TRUE); + pSdrObj->SetNotVisibleAsMaster(sal_True); } } break; @@ -289,7 +289,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec if (mbMaster) { - pSdrObj->SetNotVisibleAsMaster(TRUE); + pSdrObj->SetNotVisibleAsMaster(sal_True); } } break; @@ -365,7 +365,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec // #i105146# We want no content to be displayed for PK_HANDOUT, // so just never set a page as content pSdrObj = new SdrPageObj(0); -// pSdrObj->SetResizeProtect(TRUE); +// pSdrObj->SetResizeProtect(sal_True); } break; @@ -389,7 +389,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec pSdrObj = new SdrPageObj(); } - pSdrObj->SetResizeProtect(TRUE); + pSdrObj->SetResizeProtect(sal_True); } break; @@ -419,7 +419,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec // #96243# Tell the object EARLY that it is vertical to have the // defaults for AutoGrowWidth/Height reversed if(bVertical) - ((SdrTextObj*)pSdrObj)->SetVerticalWriting(TRUE); + ((SdrTextObj*)pSdrObj)->SetVerticalWriting(sal_True); SfxItemSet aTempAttr( ((SdDrawDocument*) pModel)->GetPool() ); if( bVertical ) @@ -435,9 +435,9 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec // #96243# potential problem: This action was still NOT // adapted for vertical text. This sure needs to be done. if(bVertical) - aTempAttr.Put(SdrTextAutoGrowWidthItem(FALSE)); + aTempAttr.Put(SdrTextAutoGrowWidthItem(sal_False)); else - aTempAttr.Put(SdrTextAutoGrowHeightItem(FALSE)); + aTempAttr.Put(SdrTextAutoGrowHeightItem(sal_False)); } // check if we need another vertical adjustement than the default @@ -465,7 +465,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec { SdrOutliner* pOutliner = ( (SdDrawDocument*) GetModel() )->GetInternalOutliner(); - USHORT nOutlMode = pOutliner->GetMode(); + sal_uInt16 nOutlMode = pOutliner->GetMode(); pOutliner->Init( OUTLINERMODE_TEXTOBJECT ); pOutliner->SetStyleSheet( 0, NULL ); pOutliner->SetVertical( bVertical ); @@ -511,22 +511,22 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec // Hintergrundobjekte der MasterPage pSdrObj->SetLayer( rLayerAdmin. - GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), FALSE) ); + GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False) ); } // Objekt am StyleSheet anmelden // #95114# Set style only when one was found (as in 5.2) - // pSdrObj->NbcSetStyleSheet( GetStyleSheetForPresObj(eObjKind), FALSE ); + // pSdrObj->NbcSetStyleSheet( GetStyleSheetForPresObj(eObjKind), sal_False ); if( mePageKind != PK_HANDOUT ) { SfxStyleSheet* pSheetForPresObj = GetStyleSheetForPresObj(eObjKind); if(pSheetForPresObj) - pSdrObj->SetStyleSheet(pSheetForPresObj, FALSE); + pSdrObj->SetStyleSheet(pSheetForPresObj, sal_False); } if (eObjKind == PRESOBJ_OUTLINE) { - for (USHORT nLevel = 1; nLevel < 10; nLevel++) + for (sal_uInt16 nLevel = 1; nLevel < 10; nLevel++) { String aName(maLayoutName); aName += sal_Unicode( ' ' ); @@ -545,7 +545,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec eObjKind == PRESOBJ_GRAPHIC ) { SfxItemSet aSet( ((SdDrawDocument*) pModel)->GetPool() ); - aSet.Put( SdrTextContourFrameItem( TRUE ) ); + aSet.Put( SdrTextContourFrameItem( sal_True ) ); aSet.Put( SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ) ); pSdrObj->SetMergedItemSet(aSet); @@ -582,7 +582,7 @@ SfxStyleSheet* SdPage::GetStyleSheetForMasterPageBackground() const { String aName(GetLayoutName()); String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR )); - USHORT nPos = aName.Search(aSep); + sal_uInt16 nPos = aName.Search(aSep); if (nPos != STRING_NOTFOUND) { @@ -601,7 +601,7 @@ SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind) const { String aName(GetLayoutName()); String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR )); - USHORT nPos = aName.Search(aSep); + sal_uInt16 nPos = aName.Search(aSep); if (nPos != STRING_NOTFOUND) { nPos = nPos + aSep.Len(); @@ -733,9 +733,9 @@ void SdPage::Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectang { // MasterPage-Objekt wurde veraendert, daher // Objekte auf allen Seiten anpassen - USHORT nPageCount = ((SdDrawDocument*) pModel)->GetSdPageCount(mePageKind); + sal_uInt16 nPageCount = ((SdDrawDocument*) pModel)->GetSdPageCount(mePageKind); - for (USHORT i = 0; i < nPageCount; i++) + for (sal_uInt16 i = 0; i < nPageCount; i++) { SdPage* pLoopPage = ((SdDrawDocument*) pModel)->GetSdPage(i, mePageKind); @@ -765,7 +765,7 @@ void SdPage::Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectang |* \************************************************************************/ -void SdPage::CreateTitleAndLayout(BOOL bInit, BOOL bCreate ) +void SdPage::CreateTitleAndLayout(sal_Bool bInit, sal_Bool bCreate ) { sd::UndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0; const bool bUndo = pUndoManager && pUndoManager->isInListAction() && IsInserted(); @@ -814,7 +814,7 @@ void SdPage::CreateTitleAndLayout(BOOL bInit, BOOL bCreate ) while( iter != aAreas.end() ) { - SdrPageObj* pPageObj = static_cast<SdrPageObj*>(pMasterPage->CreatePresObj(PRESOBJ_HANDOUT, FALSE, (*iter++), TRUE) ); + SdrPageObj* pPageObj = static_cast<SdrPageObj*>(pMasterPage->CreatePresObj(PRESOBJ_HANDOUT, sal_False, (*iter++), sal_True) ); // #i105146# We want no content to be displayed for PK_HANDOUT, // so just never set a page as content pPageObj->SetReferencedPage(0L); @@ -866,17 +866,17 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert) if( eObjKind == PRESOBJ_TITLE ) { Rectangle aTitleRect( GetTitleRect() ); - return CreatePresObj(PRESOBJ_TITLE, FALSE, aTitleRect, bInsert); + return CreatePresObj(PRESOBJ_TITLE, sal_False, aTitleRect, bInsert); } else if( eObjKind == PRESOBJ_OUTLINE ) { Rectangle aLayoutRect( GetLayoutRect() ); - return CreatePresObj( PRESOBJ_OUTLINE, FALSE, aLayoutRect, bInsert); + return CreatePresObj( PRESOBJ_OUTLINE, sal_False, aLayoutRect, bInsert); } else if( eObjKind == PRESOBJ_NOTES ) { Rectangle aLayoutRect( GetLayoutRect() ); - return CreatePresObj( PRESOBJ_NOTES, FALSE, aLayoutRect, bInsert); + return CreatePresObj( PRESOBJ_NOTES, sal_False, aLayoutRect, bInsert); } else if( (eObjKind == PRESOBJ_FOOTER) || (eObjKind == PRESOBJ_DATETIME) || (eObjKind == PRESOBJ_SLIDENUMBER) || (eObjKind == PRESOBJ_HEADER ) ) { @@ -901,21 +901,21 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert) Point aPos( long(nLftBorder+(aPageSize.Width()*0.05)), Y ); Size aSize( W1, H ); Rectangle aRect( aPos, aSize ); - return CreatePresObj( PRESOBJ_DATETIME, FALSE, aRect, bInsert ); + return CreatePresObj( PRESOBJ_DATETIME, sal_False, aRect, bInsert ); } else if( eObjKind == PRESOBJ_FOOTER ) { Point aPos( long(nLftBorder+ aPageSize.Width() * 0.342), Y ); Size aSize( W2, H ); Rectangle aRect( aPos, aSize ); - return CreatePresObj( PRESOBJ_FOOTER, FALSE, aRect, bInsert ); + return CreatePresObj( PRESOBJ_FOOTER, sal_False, aRect, bInsert ); } else if( eObjKind == PRESOBJ_SLIDENUMBER ) { Point aPos( long(nLftBorder+(aPageSize.Width()*0.717)), Y ); Size aSize( W1, H ); Rectangle aRect( aPos, aSize ); - return CreatePresObj( PRESOBJ_SLIDENUMBER, FALSE, aRect, bInsert ); + return CreatePresObj( PRESOBJ_SLIDENUMBER, sal_False, aRect, bInsert ); } else { @@ -946,25 +946,25 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert) { Point aPos( X1, Y1 ); Rectangle aRect( aPos, aSize ); - return CreatePresObj( PRESOBJ_HEADER, FALSE, aRect, bInsert ); + return CreatePresObj( PRESOBJ_HEADER, sal_False, aRect, bInsert ); } else if( eObjKind == PRESOBJ_DATETIME ) { Point aPos( X2, Y1 ); Rectangle aRect( aPos, aSize ); - return CreatePresObj( PRESOBJ_DATETIME, FALSE, aRect, bInsert ); + return CreatePresObj( PRESOBJ_DATETIME, sal_False, aRect, bInsert ); } else if( eObjKind == PRESOBJ_FOOTER ) { Point aPos( X1, Y2 ); Rectangle aRect( aPos, aSize ); - return CreatePresObj( PRESOBJ_FOOTER, FALSE, aRect, bInsert ); + return CreatePresObj( PRESOBJ_FOOTER, sal_False, aRect, bInsert ); } else if( eObjKind == PRESOBJ_SLIDENUMBER ) { Point aPos( X2, Y2 ); Rectangle aRect( aPos, aSize ); - return CreatePresObj( PRESOBJ_SLIDENUMBER, FALSE, aRect, bInsert ); + return CreatePresObj( PRESOBJ_SLIDENUMBER, sal_False, aRect, bInsert ); } DBG_ERROR("SdPage::CreateDefaultPresObj() - this should not happen!"); @@ -1299,7 +1299,7 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle* rRe break; case 6: // title, 4 shapes { - ULONG nX = long (aLayoutPos.X()); + sal_uLong nX = long (aLayoutPos.X()); aLayoutSize.Height() = long (aLayoutSize.Height() * 0.477); aLayoutSize.Width() = long (aLayoutSize.Width() * 0.488); @@ -1359,7 +1359,7 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle* rRe } case 11: // title, 6 shapes { - ULONG nX = long (aLayoutPos.X()); + sal_uLong nX = long (aLayoutPos.X()); aLayoutSize.Height() = long (aLayoutSize.Height() * 0.477); aLayoutSize.Width() = long (aLayoutSize.Width() * 0.322); @@ -1548,7 +1548,7 @@ void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescripto } } -void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bCreate ) +void SdPage::SetAutoLayout(AutoLayout eLayout, sal_Bool bInit, sal_Bool bCreate ) { sd::ScopeLockGuard aGuard( maLockAutoLayoutArrangement ); @@ -1635,7 +1635,7 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bCreate ) |* \************************************************************************/ -void SdPage::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason) +void SdPage::NbcInsertObject(SdrObject* pObj, sal_uLong nPos, const SdrInsertReason* pReason) { FmFormPage::NbcInsertObject(pObj, nPos, pReason); @@ -1660,7 +1660,7 @@ void SdPage::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* |* \************************************************************************/ -SdrObject* SdPage::RemoveObject(ULONG nObjNum) +SdrObject* SdPage::RemoveObject(sal_uLong nObjNum) { onRemoveObject(GetObj( nObjNum )); return FmFormPage::RemoveObject(nObjNum); @@ -1672,7 +1672,7 @@ SdrObject* SdPage::RemoveObject(ULONG nObjNum) |* \************************************************************************/ -SdrObject* SdPage::NbcRemoveObject(ULONG nObjNum) +SdrObject* SdPage::NbcRemoveObject(sal_uLong nObjNum) { onRemoveObject(GetObj( nObjNum )); return FmFormPage::NbcRemoveObject(nObjNum); @@ -1680,7 +1680,7 @@ SdrObject* SdPage::NbcRemoveObject(ULONG nObjNum) // #95876# Also overload ReplaceObject methods to realize when // objects are removed with this mechanism instead of RemoveObject -SdrObject* SdPage::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum) +SdrObject* SdPage::NbcReplaceObject(SdrObject* pNewObj, sal_uLong nObjNum) { onRemoveObject(GetObj( nObjNum )); return FmFormPage::NbcReplaceObject(pNewObj, nObjNum); @@ -1688,7 +1688,7 @@ SdrObject* SdPage::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum) // #95876# Also overload ReplaceObject methods to realize when // objects are removed with this mechanism instead of RemoveObject -SdrObject* SdPage::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum) +SdrObject* SdPage::ReplaceObject(SdrObject* pNewObj, sal_uLong nObjNum) { onRemoveObject(GetObj( nObjNum )); return FmFormPage::ReplaceObject(pNewObj, nObjNum); @@ -1748,7 +1748,7 @@ void SdPage::SetSize(const Size& aSize) |* \************************************************************************/ -void SdPage::SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 nLwr) +void SdPage::SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 nLwr) { if (nLft != GetLftBorder() || nUpp != GetUppBorder() || nRgt != GetRgtBorder() || nLwr != GetLwrBorder() ) @@ -1764,7 +1764,7 @@ void SdPage::SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 nLwr) |* \************************************************************************/ -void SdPage::SetLftBorder(INT32 nBorder) +void SdPage::SetLftBorder(sal_Int32 nBorder) { if (nBorder != GetLftBorder() ) { @@ -1779,7 +1779,7 @@ void SdPage::SetLftBorder(INT32 nBorder) |* \************************************************************************/ -void SdPage::SetRgtBorder(INT32 nBorder) +void SdPage::SetRgtBorder(sal_Int32 nBorder) { if (nBorder != GetRgtBorder() ) { @@ -1794,7 +1794,7 @@ void SdPage::SetRgtBorder(INT32 nBorder) |* \************************************************************************/ -void SdPage::SetUppBorder(INT32 nBorder) +void SdPage::SetUppBorder(sal_Int32 nBorder) { if (nBorder != GetUppBorder() ) { @@ -1809,7 +1809,7 @@ void SdPage::SetUppBorder(INT32 nBorder) |* \************************************************************************/ -void SdPage::SetLwrBorder(INT32 nBorder) +void SdPage::SetLwrBorder(sal_Int32 nBorder) { if (nBorder != GetLwrBorder() ) { @@ -1823,7 +1823,7 @@ void SdPage::SetLwrBorder(INT32 nBorder) |* \************************************************************************/ -void SdPage::SetBackgroundFullSize( BOOL bIn ) +void SdPage::SetBackgroundFullSize( sal_Bool bIn ) { if( bIn != mbBackgroundFullSize ) { @@ -1842,7 +1842,7 @@ void SdPage::SetBackgroundFullSize( BOOL bIn ) |* \************************************************************************/ -void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect, BOOL bScaleAllObj) +void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect, sal_Bool bScaleAllObj) { sd::ScopeLockGuard aGuard( maLockAutoLayoutArrangement ); @@ -1850,10 +1850,10 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR SdrObject* pObj = NULL; Point aRefPnt(0, 0); Size aNewPageSize(rNewPageSize); - INT32 nLeft = rNewBorderRect.Left(); - INT32 nRight = rNewBorderRect.Right(); - INT32 nUpper = rNewBorderRect.Top(); - INT32 nLower = rNewBorderRect.Bottom(); + sal_Int32 nLeft = rNewBorderRect.Left(); + sal_Int32 nRight = rNewBorderRect.Right(); + sal_Int32 nUpper = rNewBorderRect.Top(); + sal_Int32 nLower = rNewBorderRect.Bottom(); // Negative Werte stehen fuer nicht zu aendernde Werte // -> aktuelle Werte verwenden @@ -1900,11 +1900,11 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR Fraction aFractX = Fraction(aNewPageSize.Width(), nOldWidth); Fraction aFractY = Fraction(aNewPageSize.Height(), nOldHeight); - ULONG nObjCnt = (mbScaleObjects ? GetObjCount() : 0); + sal_uLong nObjCnt = (mbScaleObjects ? GetObjCount() : 0); - for (ULONG nObj = 0; nObj < nObjCnt; nObj++) + for (sal_uLong nObj = 0; nObj < nObjCnt; nObj++) { - BOOL bIsPresObjOnMaster = FALSE; + sal_Bool bIsPresObjOnMaster = sal_False; // Alle Objekte pObj = GetObj(nObj); @@ -1912,7 +1912,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR if (mbMaster && IsPresObj(pObj)) { // Es ist ein Praesentationsobjekt auf der MasterPage - bIsPresObjOnMaster = TRUE; + bIsPresObjOnMaster = sal_True; } if (pObj) @@ -1942,9 +1942,9 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR /********************************************************** * Praesentationsvorlage: Texthoehe anpassen **********************************************************/ - USHORT nIndexTitle = 0; - USHORT nIndexOutline = 0; - USHORT nIndexNotes = 0; + sal_uInt16 nIndexTitle = 0; + sal_uInt16 nIndexOutline = 0; + sal_uInt16 nIndexNotes = 0; if (pObj == GetPresObj(PRESOBJ_TITLE, nIndexTitle)) { @@ -1955,7 +1955,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR SfxItemSet& rSet = pTitleSheet->GetItemSet(); SvxFontHeightItem& rOldHgt = (SvxFontHeightItem&) rSet.Get(EE_CHAR_FONTHEIGHT); - ULONG nFontHeight = rOldHgt.GetHeight(); + sal_uLong nFontHeight = rOldHgt.GetHeight(); nFontHeight = long(nFontHeight * (double) aFractY); rSet.Put(SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT)); @@ -1983,7 +1983,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR String aName(GetLayoutName()); aName += sal_Unicode( ' ' ); - for (USHORT i=1; i<=9; i++) + for (sal_uInt16 i=1; i<=9; i++) { String sLayoutName(aName); sLayoutName += String::CreateFromInt32( (sal_Int32)i ); @@ -1995,7 +1995,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR SfxItemSet aTempSet(pOutlineSheet->GetItemSet()); SvxFontHeightItem& rOldHgt = (SvxFontHeightItem&) aTempSet.Get(EE_CHAR_FONTHEIGHT); - ULONG nFontHeight = rOldHgt.GetHeight(); + sal_uLong nFontHeight = rOldHgt.GetHeight(); nFontHeight = long(nFontHeight * (double) aFractY); aTempSet.Put(SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT)); @@ -2016,7 +2016,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR } // Bullet anpassen - ((SdStyleSheet*) pOutlineSheet)->AdjustToFontHeight(aTempSet, FALSE); + ((SdStyleSheet*) pOutlineSheet)->AdjustToFontHeight(aTempSet, sal_False); // Sonderbehandlung: die INVALIDS auf NULL-Pointer // zurueckgesetzen (sonst landen INVALIDs oder @@ -2045,8 +2045,8 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR if (pNotesSheet) { - ULONG nHeight = pObj->GetLogicRect().GetSize().Height(); - ULONG nFontHeight = (ULONG) (nHeight * 0.0741); + sal_uLong nHeight = pObj->GetLogicRect().GetSize().Height(); + sal_uLong nFontHeight = (sal_uLong) (nHeight * 0.0741); SfxItemSet& rSet = pNotesSheet->GetItemSet(); rSet.Put( SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT )); rSet.Put( SvxFontHeightItem(nFontHeight, 100, EE_CHAR_FONTHEIGHT_CJK )); @@ -2063,8 +2063,8 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR /****************************************************** * Normales Textobjekt: Texthoehe anpassen ******************************************************/ - ULONG nScriptType = pObj->GetOutlinerParaObject()->GetTextObject().GetScriptType(); - USHORT nWhich = EE_CHAR_FONTHEIGHT; + sal_uLong nScriptType = pObj->GetOutlinerParaObject()->GetTextObject().GetScriptType(); + sal_uInt16 nWhich = EE_CHAR_FONTHEIGHT; if ( nScriptType == SCRIPTTYPE_ASIAN ) nWhich = EE_CHAR_FONTHEIGHT_CJK; else if ( nScriptType == SCRIPTTYPE_COMPLEX ) @@ -2126,15 +2126,15 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj, if(pOutlParaObj) { // Text umsetzen - ::sd::Outliner* pOutl = pModel->GetInternalOutliner( TRUE ); + ::sd::Outliner* pOutl = pModel->GetInternalOutliner( sal_True ); pOutl->Clear(); pOutl->SetText( *pOutlParaObj ); pOutlParaObj = pOutl->CreateParaObject(); pNewObj->SetOutlinerParaObject( pOutlParaObj ); pOutl->Clear(); - pNewObj->SetEmptyPresObj(FALSE); + pNewObj->SetEmptyPresObj(sal_False); - for (USHORT nLevel = 1; nLevel < 10; nLevel++) + for (sal_uInt16 nLevel = 1; nLevel < 10; nLevel++) { // Neue Vorlage zuweisen String aName(rPage.GetLayoutName()); @@ -2192,7 +2192,7 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj, pOutlParaObj = pOutl->CreateParaObject(); pNewObj->SetOutlinerParaObject( pOutlParaObj ); pOutl->Clear(); - pNewObj->SetEmptyPresObj(FALSE); + pNewObj->SetEmptyPresObj(sal_False); // Linken Einzug zuruecksetzen SfxItemSet aSet(pModel->GetPool(), EE_PARA_LRSPACE, EE_PARA_LRSPACE ); @@ -2208,7 +2208,7 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj, SfxStyleSheet* pSheet = rPage.GetStyleSheetForPresObj(PRESOBJ_TEXT); if (pSheet) - pNewObj->SetStyleSheet(pSheet, TRUE); + pNewObj->SetStyleSheet(pSheet, sal_True); // Remove subtitle shape from page if( bUndo ) @@ -2268,7 +2268,7 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, if( bUndo ) { pUndoManager->AddUndoAction( pModel->GetSdrUndoFactory().CreateUndoGeoObject( *pObj ) ); - pUndoManager->AddUndoAction( pModel->GetSdrUndoFactory().CreateUndoAttrObject( *pObj, TRUE, TRUE ) ); + pUndoManager->AddUndoAction( pModel->GetSdrUndoFactory().CreateUndoAttrObject( *pObj, sal_True, sal_True ) ); pUndoManager->AddUndoAction( new UndoObjectUserCall( *pObj ) ); } @@ -2300,13 +2300,13 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, SfxItemSet aTempAttr( ((SdDrawDocument*) pModel)->GetPool() ); SdrTextMinFrameHeightItem aMinHeight( aRect.GetSize().Height() ); aTempAttr.Put( aMinHeight ); - aTempAttr.Put( SdrTextAutoGrowHeightItem(FALSE) ); + aTempAttr.Put( SdrTextAutoGrowHeightItem(sal_False) ); pTextObject->SetMergedItemSet(aTempAttr); pTextObject->SetLogicRect(aRect); // switch on AutoGrowHeight SfxItemSet aAttr( ((SdDrawDocument*) pModel)->GetPool() ); - aAttr.Put( SdrTextAutoGrowHeightItem(TRUE) ); + aAttr.Put( SdrTextAutoGrowHeightItem(sal_True) ); pTextObject->SetMergedItemSet(aAttr); } @@ -2317,13 +2317,13 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, SfxItemSet aTempAttr( ((SdDrawDocument*) pModel)->GetPool() ); SdrTextMinFrameWidthItem aMinWidth( aRect.GetSize().Width() ); aTempAttr.Put( aMinWidth ); - aTempAttr.Put( SdrTextAutoGrowWidthItem(FALSE) ); + aTempAttr.Put( SdrTextAutoGrowWidthItem(sal_False) ); pTextObject->SetMergedItemSet(aTempAttr); pTextObject->SetLogicRect(aRect); // switch on AutoGrowWidth SfxItemSet aAttr( ((SdDrawDocument*) pModel)->GetPool() ); - aAttr.Put( SdrTextAutoGrowWidthItem(TRUE) ); + aAttr.Put( SdrTextAutoGrowWidthItem(sal_True) ); pTextObject->SetMergedItemSet(aAttr); } } @@ -2344,8 +2344,8 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind, if( bVertical && (( eObjKind == PRESOBJ_TITLE) || (eObjKind == PRESOBJ_OUTLINE))) { SfxItemSet aNewSet(pObj->GetMergedItemSet()); - aNewSet.Put( SdrTextAutoGrowWidthItem(TRUE) ); - aNewSet.Put( SdrTextAutoGrowHeightItem(FALSE) ); + aNewSet.Put( SdrTextAutoGrowWidthItem(sal_True) ); + aNewSet.Put( SdrTextAutoGrowHeightItem(sal_False) ); if( eObjKind == PRESOBJ_OUTLINE ) { aNewSet.Put( SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP) ); @@ -2430,14 +2430,14 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO pOutl->SetRefDevice( SD_MOD()->GetRefDevice( *( (SdDrawDocument*) GetModel() )->GetDocSh() ) ); pOutl->SetEditTextObjectPool(pPool); pOutl->SetStyleSheetPool((SfxStyleSheetPool*)GetModel()->GetStyleSheetPool()); - pOutl->EnableUndo(FALSE); - pOutl->SetUpdateMode( FALSE ); + pOutl->EnableUndo(sal_False); + pOutl->SetUpdateMode( sal_False ); } - USHORT nOutlMode = pOutl->GetMode(); + sal_uInt16 nOutlMode = pOutl->GetMode(); Size aPaperSize = pOutl->GetPaperSize(); - BOOL bUpdateMode = pOutl->GetUpdateMode(); - pOutl->SetUpdateMode(FALSE); + sal_Bool bUpdateMode = pOutl->GetUpdateMode(); + pOutl->SetUpdateMode(sal_False); pOutl->SetParaAttribs( 0, pOutl->GetEmptyItemSet() ); // #95114# Always set the object's StyleSheet at the Outliner to @@ -2577,7 +2577,7 @@ void SdPage::SetLayoutName(String aName) if( mbMaster ) { String aSep( RTL_CONSTASCII_USTRINGPARAM(SD_LT_SEPARATOR) ); - USHORT nPos = maLayoutName.Search( aSep ); + sal_uInt16 nPos = maLayoutName.Search( aSep ); if ( nPos != STRING_NOTFOUND ) { FmFormPage::SetName(maLayoutName.Copy(0, nPos)); @@ -2600,7 +2600,7 @@ const String& SdPage::GetName() const if ((mePageKind == PK_STANDARD || mePageKind == PK_NOTES) && !mbMaster) { // default name for handout pages - USHORT nNum = (GetPageNum() + 1) / 2; + sal_uInt16 nNum = (GetPageNum() + 1) / 2; aCreatedPageName = String(SdResId(STR_PAGE)); aCreatedPageName += sal_Unicode( ' ' ); @@ -2911,7 +2911,7 @@ bool SdPage::RestoreDefaultText( SdrObject* pObj ) if (aString.Len()) { - BOOL bVertical = FALSE; + sal_Bool bVertical = sal_False; OutlinerParaObject* pOldPara = pTextObj->GetOutlinerParaObject(); if( pOldPara ) bVertical = pOldPara->IsVertical(); // is old para object vertical? @@ -2937,8 +2937,8 @@ bool SdPage::RestoreDefaultText( SdrObject* pObj ) } pTextObj->SetTextEditOutliner( NULL ); // to make stylesheet settings work - pTextObj->NbcSetStyleSheet( GetStyleSheetForPresObj(ePresObjKind), TRUE ); - pTextObj->SetEmptyPresObj(TRUE); + pTextObj->NbcSetStyleSheet( GetStyleSheetForPresObj(ePresObjKind), sal_True ); + pTextObj->SetEmptyPresObj(sal_True); bRet = true; } } @@ -2996,7 +2996,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument& rModel, AutoLayout eLayout, }; sal_uInt16* pOffsets = aOffsets[0]; - USHORT nColCnt = 0, nRowCnt = 0; + sal_uInt16 nColCnt = 0, nRowCnt = 0; switch ( eLayout ) { case AUTOLAYOUT_HANDOUT1: diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index ac6acb35abbc..164576553031 100644..100755 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -76,20 +76,20 @@ extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString& |* - Die entsprechenden StyleSheets muessen bereits im |* im StyleSheetPool sein. |* -|* bReplaceStyleSheets = TRUE : Benannte StyleSheets werden ausgetauscht -|* FALSE: Alle StyleSheets werden neu zugewiesen +|* bReplaceStyleSheets = sal_True : Benannte StyleSheets werden ausgetauscht +|* sal_False: Alle StyleSheets werden neu zugewiesen |* -|* bSetMasterPage = TRUE : MasterPage suchen und zuweisen +|* bSetMasterPage = sal_True : MasterPage suchen und zuweisen |* -|* bReverseOrder = FALSE: MasterPages von vorn nach hinten suchen -|* TRUE : MasterPages von hinten nach vorn suchen (fuer Undo-Action) +|* bReverseOrder = sal_False: MasterPages von vorn nach hinten suchen +|* sal_True : MasterPages von hinten nach vorn suchen (fuer Undo-Action) |* \************************************************************************/ void SdPage::SetPresentationLayout(const String& rLayoutName, - BOOL bReplaceStyleSheets, - BOOL bSetMasterPage, - BOOL bReverseOrder) + sal_Bool bReplaceStyleSheets, + sal_Bool bSetMasterPage, + sal_Bool bReverseOrder) { /********************************************************************* |* Layoutname der Seite @@ -106,8 +106,8 @@ void SdPage::SetPresentationLayout(const String& rLayoutName, { SdPage* pMaster; SdPage* pFoundMaster = 0; - USHORT nMaster = 0; - USHORT nMasterCount = pModel->GetMasterPageCount(); + sal_uInt16 nMaster = 0; + sal_uInt16 nMasterCount = pModel->GetMasterPageCount(); if( !bReverseOrder ) { @@ -153,11 +153,11 @@ void SdPage::SetPresentationLayout(const String& rLayoutName, List aOutlineStyles; List aOldOutlineStyles; List aReplList; - BOOL bListsFilled = FALSE; + sal_Bool bListsFilled = sal_False; - ULONG nObjCount = GetObjCount(); + sal_uLong nObjCount = GetObjCount(); - for (ULONG nObj = 0; nObj < nObjCount; nObj++) + for (sal_uLong nObj = 0; nObj < nObjCount; nObj++) { SdrTextObj* pObj = (SdrTextObj*) GetObj(nObj); @@ -207,7 +207,7 @@ void SdPage::SetPresentationLayout(const String& rLayoutName, } } - bListsFilled = TRUE; + bListsFilled = sal_True; } SfxStyleSheet* pSheet = (SfxStyleSheet*)aOutlineStyles.First(); @@ -247,18 +247,18 @@ void SdPage::SetPresentationLayout(const String& rLayoutName, SfxStyleSheet* pSheet = GetStyleSheetForPresObj(PRESOBJ_TITLE); if (pSheet) - pObj->SetStyleSheet(pSheet, TRUE); + pObj->SetStyleSheet(pSheet, sal_True); } else { SfxStyleSheet* pSheet = GetStyleSheetForPresObj(GetPresObjKind(pObj)); if (pSheet) - pObj->SetStyleSheet(pSheet, TRUE); + pObj->SetStyleSheet(pSheet, sal_True); } } - for (ULONG i = 0; i < aReplList.Count(); i++) + for (sal_uLong i = 0; i < aReplList.Count(); i++) { delete (StyleReplaceData*) aReplList.GetObject(i); } @@ -318,7 +318,7 @@ void SdPage::SetModel(SdrModel* pNewModel) FASTBOOL SdPage::IsReadOnly() const { - return FALSE; + return sal_False; } /************************************************************************* @@ -393,7 +393,7 @@ SdPage::SdPage(const SdPage& rSrcPage) while((pObj = rSrcPage.maPresentationShapeList.getNextShape(pObj)) != 0) InsertPresObj(GetObj(pObj->GetOrdNum()), rSrcPage.GetPresObjKind(pObj)); - mbSelected = FALSE; + mbSelected = sal_False; mnTransitionType = rSrcPage.mnTransitionType; mnTransitionSubtype = rSrcPage.mnTransitionSubtype; mbTransitionDirection = rSrcPage.mbTransitionDirection; diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 205e007d9e97..1d0bc3138997 100755 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -122,7 +122,7 @@ SdStyleSheetPool::~SdStyleSheetPool() // ---------------------------------------------------------- -SfxStyleSheetBase* SdStyleSheetPool::Create(const String& rName, SfxStyleFamily eFamily, USHORT _nMask ) +SfxStyleSheetBase* SdStyleSheetPool::Create(const String& rName, SfxStyleFamily eFamily, sal_uInt16 _nMask ) { return new SdStyleSheet(rName, *this, eFamily, _nMask); } @@ -158,7 +158,7 @@ List* SdStyleSheetPool::CreateOutlineSheetList (const String& rLayoutName) aName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR )); aName += String(SdResId(STR_LAYOUT_OUTLINE)); List* pList = new List; - for (USHORT nSheet = 1; nSheet < 10; nSheet++) + for (sal_uInt16 nSheet = 1; nSheet < 10; nSheet++) { String aFullName(aName); aFullName.Append( sal_Unicode( ' ' )); @@ -213,7 +213,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo SfxStyleSheetBase* pParent = NULL; SvxLRSpaceItem aSvxLRSpaceItem( EE_PARA_LRSPACE ); SvxULSpaceItem aSvxULSpaceItem( EE_PARA_ULSPACE ); - USHORT nLevel; + sal_uInt16 nLevel; for( nLevel = 1; nLevel < 10; nLevel++) { @@ -248,15 +248,15 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rSet.Put( SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE ) ); rSet.Put( SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE ) ); rSet.Put( SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ) ); - rSet.Put( SvxShadowedItem(FALSE, EE_CHAR_SHADOW ) ); - rSet.Put( SvxContourItem(FALSE, EE_CHAR_OUTLINE ) ); + rSet.Put( SvxShadowedItem(sal_False, EE_CHAR_SHADOW ) ); + rSet.Put( SvxContourItem(sal_False, EE_CHAR_OUTLINE ) ); rSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK ) ); rSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF) ); rSet.Put( SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR) ); rSet.Put( XLineStyleItem(XLINE_NONE) ); rSet.Put( XFillStyleItem(XFILL_NONE) ); // #i16874# enable kerning by default but only for new documents - rSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) ); + rSet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) ); if( nLevel == 1 ) { @@ -265,10 +265,10 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo } } - ULONG nFontSize = 20; + sal_uLong nFontSize = 20; short nFirstIndent = -600; -// USHORT nIndent = nLevel * 1200; - USHORT nLower = 100; +// sal_uInt16 nIndent = nLevel * 1200; + sal_uInt16 nLower = 100; switch (nLevel) { @@ -303,7 +303,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo } // FontSize - nFontSize = (USHORT)((nFontSize * 2540L) / 72); // Pt --> 1/100 mm + nFontSize = (sal_uInt16)((nFontSize * 2540L) / 72); // Pt --> 1/100 mm SfxItemSet& rOutlineSet = pSheet->GetItemSet(); rOutlineSet.Put( SvxFontHeightItem( nFontSize, 100, EE_CHAR_FONTHEIGHT ) ); rOutlineSet.Put( SvxFontHeightItem( nFontSize, 100, EE_CHAR_FONTHEIGHT_CJK ) ); @@ -314,7 +314,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo aSvxLRSpaceItem.SetTxtFirstLineOfst(nFirstIndent); aSvxLRSpaceItem.SetTxtLeft(nIndent); aSvxLRSpaceItem.SetRight(0); - aSvxLRSpaceItem.SetBulletFI(TRUE); + aSvxLRSpaceItem.SetBulletFI(sal_True); pSheet->GetItemSet().Put(aSvxLRSpaceItem); */ // Zeilendurchschuss (Abstand nach unten) @@ -387,8 +387,8 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rTitleSet.Put(SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE )); rTitleSet.Put(SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE )); rTitleSet.Put(SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT )); - rTitleSet.Put(SvxShadowedItem(FALSE, EE_CHAR_SHADOW )); - rTitleSet.Put(SvxContourItem(FALSE, EE_CHAR_OUTLINE )); + rTitleSet.Put(SvxShadowedItem(sal_False, EE_CHAR_SHADOW )); + rTitleSet.Put(SvxContourItem(sal_False, EE_CHAR_OUTLINE )); rTitleSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK ) ); rTitleSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF ) ); rTitleSet.Put(SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR )); @@ -396,7 +396,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rTitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) ); // rTitleSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) ); // #i16874# enable kerning by default but only for new documents - rTitleSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) ); + rTitleSet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) ); aBulletFont.SetSize(Size(0,1552)); // 44 pt PutNumBulletItem( pSheet, aBulletFont ); @@ -433,8 +433,8 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rSubtitleSet.Put(SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE )); rSubtitleSet.Put(SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE )); rSubtitleSet.Put(SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT )); - rSubtitleSet.Put(SvxShadowedItem(FALSE, EE_CHAR_SHADOW )); - rSubtitleSet.Put(SvxContourItem(FALSE, EE_CHAR_OUTLINE )); + rSubtitleSet.Put(SvxShadowedItem(sal_False, EE_CHAR_SHADOW )); + rSubtitleSet.Put(SvxContourItem(sal_False, EE_CHAR_OUTLINE )); rSubtitleSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK ) ); rSubtitleSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF ) ); rSubtitleSet.Put(SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR )); @@ -442,7 +442,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rSubtitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) ); // rSubtitleSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) ); // #i16874# enable kerning by default but only for new documents - rSubtitleSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) ); + rSubtitleSet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) ); aSvxLRSpaceItem.SetTxtLeft(0); rSubtitleSet.Put(aSvxLRSpaceItem); @@ -482,15 +482,15 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rNotesSet.Put( SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE ) ); rNotesSet.Put( SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE ) ); rNotesSet.Put( SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ) ); - rNotesSet.Put( SvxShadowedItem(FALSE, EE_CHAR_SHADOW ) ); - rNotesSet.Put( SvxContourItem(FALSE, EE_CHAR_OUTLINE ) ); + rNotesSet.Put( SvxShadowedItem(sal_False, EE_CHAR_SHADOW ) ); + rNotesSet.Put( SvxContourItem(sal_False, EE_CHAR_OUTLINE ) ); rNotesSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK ) ); rNotesSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF) ); rNotesSet.Put( SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR ) ); // rNotesSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) ); rNotesSet.Put( SvxLRSpaceItem( 0, 0, 600, -600, EE_PARA_LRSPACE ) ); // #i16874# enable kerning by default but only for new documents - rNotesSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) ); + rNotesSet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) ); /* #i35937# SvxNumBulletItem aNumBullet( (const SvxNumBulletItem&) rNotesSet.Get(EE_PARA_NUMBULLET) ); @@ -517,12 +517,12 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUNDOBJECTS ); pSheet->SetParent(String()); SfxItemSet& rBackgroundObjectsSet = pSheet->GetItemSet(); - rBackgroundObjectsSet.Put(SdrShadowItem(FALSE)); + rBackgroundObjectsSet.Put(SdrShadowItem(sal_False)); rBackgroundObjectsSet.Put(SdrShadowColorItem(String(), Color(COL_GRAY))); rBackgroundObjectsSet.Put(SdrShadowXDistItem(300)); // 3 mm Schattendistanz rBackgroundObjectsSet.Put(SdrShadowYDistItem(300)); // #i16874# enable kerning by default but only for new documents - rBackgroundObjectsSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) ); + rBackgroundObjectsSet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) ); } /************************************************************************** @@ -542,7 +542,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo rBackgroundSet.Put(XLineStyleItem(XLINE_NONE)); rBackgroundSet.Put(XFillStyleItem(XFILL_NONE)); // #i16874# enable kerning by default but only for new documents - rBackgroundSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) ); + rBackgroundSet.Put( SvxAutoKernItem( sal_True, EE_CHAR_PAIRKERNING ) ); } DBG_ASSERT( !bCheck || !bCreated, "missing layout style sheets detected!" ); @@ -743,7 +743,7 @@ List* SdStyleSheetPool::CreateLayoutSheetNames(const String& rLayoutName) const String aName(SdResId(STR_LAYOUT_OUTLINE)); String* pName = NULL; - for (USHORT nLevel = 1; nLevel < 10; nLevel++) + for (sal_uInt16 nLevel = 1; nLevel < 10; nLevel++) { pName = new String(aName); pName->Append( sal_Unicode( ' ' )); @@ -786,7 +786,7 @@ void SdStyleSheetPool::CreateLayoutSheetList(const String& rLayoutName, SdStyleS { String aLayoutNameWithSep(rLayoutName); aLayoutNameWithSep.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR )); - USHORT nLen = aLayoutNameWithSep.Len(); + sal_uInt16 nLen = aLayoutNameWithSep.Len(); SfxStyleSheetIterator aIter(this, SD_STYLE_FAMILY_MASTERPAGE); SfxStyleSheetBase* pSheet = aIter.First(); @@ -812,8 +812,8 @@ void SdStyleSheetPool::CreatePseudosIfNecessary() SfxStyleSheetBase* pSheet = NULL; SfxStyleSheetBase* pParent = NULL; - //USHORT nUsedMask = SFXSTYLEBIT_ALL & ~SFXSTYLEBIT_USERDEF; - USHORT nUsedMask = SFXSTYLEBIT_USED; + //sal_uInt16 nUsedMask = SFXSTYLEBIT_ALL & ~SFXSTYLEBIT_USERDEF; + sal_uInt16 nUsedMask = SFXSTYLEBIT_USED; aName = String(SdResId(STR_PSEUDOSHEET_TITLE)); if( (pSheet = Find(aName, SD_STYLE_FAMILY_PSEUDO)) == 0 ) @@ -863,7 +863,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary() pParent = NULL; SetSearchMask(SD_STYLE_FAMILY_PSEUDO); aName = String(SdResId(STR_PSEUDOSHEET_OUTLINE)); - for (USHORT nLevel = 1; nLevel < 10; nLevel++) + for (sal_uInt16 nLevel = 1; nLevel < 10; nLevel++) { String aLevelName(aName); aLevelName.Append( sal_Unicode( ' ' )); @@ -905,12 +905,12 @@ void SdStyleSheetPool::UpdateStdNames() if( !pStyle->IsUserDefined() ) { String aOldName = pStyle->GetName(); - ULONG nHelpId = pStyle->GetHelpId( aHelpFile ); + sal_uLong nHelpId = pStyle->GetHelpId( aHelpFile ); SfxStyleFamily eFam = pStyle->GetFamily(); - BOOL bHelpKnown = TRUE; + sal_Bool bHelpKnown = sal_True; String aNewName; - USHORT nNameId = 0; + sal_uInt16 nNameId = 0; switch( nHelpId ) { case HID_STANDARD_STYLESHEET_NAME: nNameId = STR_STANDARD_STYLESHEET_NAME; break; @@ -953,7 +953,7 @@ void SdStyleSheetPool::UpdateStdNames() default: // 0 oder falsche (alte) HelpId - bHelpKnown = FALSE; + bHelpKnown = sal_False; } if( bHelpKnown ) { @@ -994,7 +994,7 @@ void SdStyleSheetPool::UpdateStdNames() if ( pEraseList ) { // Styles, welche nicht umbenannt werden konnten, muessen entfernt werden - for ( ULONG i = 0; i < pEraseList->Count(); i++ ) + for ( sal_uLong i = 0; i < pEraseList->Count(); i++ ) { SfxStyleSheetBase* pEraseSheet = ( SfxStyleSheetBase* ) pEraseList->GetObject( i ); Remove( pEraseSheet ); @@ -1012,7 +1012,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, Font& rBulletFont ) { String aHelpFile; - ULONG nHelpId = pSheet->GetHelpId( aHelpFile ); + sal_uLong nHelpId = pSheet->GetHelpId( aHelpFile ); SfxItemSet& rSet = pSheet->GetItemSet(); switch ( nHelpId ) @@ -1028,13 +1028,13 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, aNumberFormat.SetStart(1); aNumberFormat.SetNumAdjust(SVX_ADJUST_LEFT); - SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10 , FALSE); + SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE, 10 , sal_False); aNumberFormat.SetLSpace( 0 ); aNumberFormat.SetAbsLSpace( 0 ); aNumberFormat.SetFirstLineOffset( 0 ); aNumRule.SetLevel( 0, aNumberFormat ); - for( USHORT i = 1; i < aNumRule.GetLevelCount(); i++ ) + for( sal_uInt16 i = 1; i < aNumRule.GetLevelCount(); i++ ) { const short nLSpace = (i + 1) * 600; aNumberFormat.SetLSpace(nLSpace); @@ -1058,8 +1058,8 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, if(pDefaultRule) { - SvxNumRule aNumRule(pDefaultRule->GetFeatureFlags(), 10, FALSE); - for(USHORT i=0; i < aNumRule.GetLevelCount(); i++) + SvxNumRule aNumRule(pDefaultRule->GetFeatureFlags(), 10, sal_False); + for(sal_uInt16 i=0; i < aNumRule.GetLevelCount(); i++) { SvxNumberFormat aFrmt( pDefaultRule->GetLevel(i) ); aFrmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); @@ -1085,8 +1085,8 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, aNumberFormat.SetNumAdjust(SVX_ADJUST_LEFT); SvxNumRule aNumRule( NUM_BULLET_REL_SIZE|NUM_BULLET_COLOR|NUM_CHAR_TEXT_DISTANCE|NUM_SYMBOL_ALIGNMENT, - 10, FALSE ); - for( UINT16 i = 0; i < aNumRule.GetLevelCount(); i++ ) + 10, sal_False ); + for( sal_uInt16 i = 0; i < aNumRule.GetLevelCount(); i++ ) { aNumberFormat.SetBulletChar( 0x25CF ); // StarBats: 0xF000 + 34 aNumberFormat.SetBulletRelSize(45); @@ -1095,7 +1095,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, aNumberFormat.SetAbsLSpace(nLSpace); short nFirstLineOffset = -600; - ULONG nFontSize = 20; + sal_uLong nFontSize = 20; switch(i) { case 0: @@ -1130,7 +1130,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet, } aNumberFormat.SetFirstLineOffset(nFirstLineOffset); - nFontSize = (USHORT)((nFontSize * 2540L) / 72); // Pt --> 1/100 mm + nFontSize = (sal_uInt16)((nFontSize * 2540L) / 72); // Pt --> 1/100 mm rBulletFont.SetSize(Size(0,846)); // 24 pt aNumberFormat.SetBulletFont(&rBulletFont); aNumRule.SetLevel( i, aNumberFormat ); @@ -1158,10 +1158,10 @@ Font SdStyleSheetPool::GetBulletFont() const aBulletFont.SetOverline(UNDERLINE_NONE); aBulletFont.SetStrikeout(STRIKEOUT_NONE); aBulletFont.SetItalic(ITALIC_NONE); - aBulletFont.SetOutline(FALSE); - aBulletFont.SetShadow(FALSE); + aBulletFont.SetOutline(sal_False); + aBulletFont.SetShadow(sal_False); aBulletFont.SetColor(Color(COL_AUTO)); - aBulletFont.SetTransparent(TRUE); + aBulletFont.SetTransparent(sal_True); return aBulletFont; } @@ -1411,10 +1411,10 @@ SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet* pSheet ) { SdStyleSheetVector aResult; - USHORT nListenerCount = pSheet->GetListenerCount(); + sal_uInt16 nListenerCount = pSheet->GetListenerCount(); if (nListenerCount > 0) { - for (USHORT n = 0; n < nListenerCount; n++) + for (sal_uInt16 n = 0; n < nListenerCount; n++) { SdStyleSheet* pChild = dynamic_cast< SdStyleSheet* >( pSheet->GetListener(n) ); if(pChild && pChild->GetParent() == pSheet->GetName()) diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 51d1375c9984..f5d3a70f6c73 100755 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -132,7 +132,7 @@ void ModifyListenerForewarder::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /* mpStyleSheet->notifyModifyListener(); } -SdStyleSheet::SdStyleSheet(const OUString& rDisplayName, SfxStyleSheetBasePool& _rPool, SfxStyleFamily eFamily, USHORT _nMask) +SdStyleSheet::SdStyleSheet(const OUString& rDisplayName, SfxStyleSheetBasePool& _rPool, SfxStyleFamily eFamily, sal_uInt16 _nMask) : SdStyleSheetBase( UniString( rDisplayName ), _rPool, eFamily, _nMask) , ::cppu::BaseMutex() , msApiName( rDisplayName ) @@ -170,7 +170,7 @@ rtl::OUString SdStyleSheet::GetApiName() const } -void SdStyleSheet::Load (SvStream& rIn, USHORT nVersion) +void SdStyleSheet::Load (SvStream& rIn, sal_uInt16 nVersion) { SfxStyleSheetBase::Load(rIn, nVersion); @@ -200,9 +200,9 @@ void SdStyleSheet::Store(SvStream& rOut) |* \************************************************************************/ -BOOL SdStyleSheet::SetParent(const String& rParentName) +sal_Bool SdStyleSheet::SetParent(const String& rParentName) { - BOOL bResult = FALSE; + sal_Bool bResult = sal_False; if (SfxStyleSheet::SetParent(rParentName)) { @@ -214,7 +214,7 @@ BOOL SdStyleSheet::SetParent(const String& rParentName) SfxStyleSheetBase* pStyle = rPool.Find(rParentName, nFamily); if (pStyle) { - bResult = TRUE; + bResult = sal_True; SfxItemSet& rParentSet = pStyle->GetItemSet(); GetItemSet().SetParent(&rParentSet); Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) ); @@ -222,14 +222,14 @@ BOOL SdStyleSheet::SetParent(const String& rParentName) } else { - bResult = TRUE; + bResult = sal_True; GetItemSet().SetParent(NULL); Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) ); } } else { - bResult = TRUE; + bResult = sal_True; } } return bResult; @@ -248,7 +248,7 @@ SfxItemSet& SdStyleSheet::GetItemSet() // ggfs. das ItemSet 'on demand' anlegen if (!pSet) { - USHORT nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, + sal_uInt16 nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, XATTR_FILL_FIRST, XATTR_FILL_LAST, SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, @@ -276,7 +276,7 @@ SfxItemSet& SdStyleSheet::GetItemSet() { if (!pSet) { - USHORT nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, + sal_uInt16 nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, XATTR_FILL_FIRST, XATTR_FILL_LAST, SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, @@ -313,7 +313,7 @@ SfxItemSet& SdStyleSheet::GetItemSet() { if (!pSet) { - USHORT nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, + sal_uInt16 nWhichPairTable[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, XATTR_FILL_FIRST, XATTR_FILL_LAST, SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, @@ -346,14 +346,14 @@ SfxItemSet& SdStyleSheet::GetItemSet() |* \************************************************************************/ -BOOL SdStyleSheet::IsUsed() const +sal_Bool SdStyleSheet::IsUsed() const { - BOOL bResult = FALSE; + sal_Bool bResult = sal_False; - USHORT nListenerCount = GetListenerCount(); + sal_uInt16 nListenerCount = GetListenerCount(); if (nListenerCount > 0) { - for (USHORT n = 0; n < nListenerCount; n++) + for (sal_uInt16 n = 0; n < nListenerCount; n++) { SfxListener* pListener = GetListener(n); if( pListener == this ) @@ -472,7 +472,7 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const else { String aOutlineStr(SdResId(STR_PSEUDOSHEET_OUTLINE)); - USHORT nPos = aName.Search(aOutlineStr); + sal_uInt16 nPos = aName.Search(aOutlineStr); if (nPos != STRING_NOTFOUND) { String aNumStr(aName.Copy(aOutlineStr.Len())); @@ -534,7 +534,7 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const else { String aOutlineStr((SdResId(STR_LAYOUT_OUTLINE))); - USHORT nPos = aStyleName.Search(aOutlineStr); + sal_uInt16 nPos = aStyleName.Search(aOutlineStr); if (nPos != STRING_NOTFOUND) { String aNumStr(aStyleName.Copy(aOutlineStr.Len())); @@ -565,7 +565,7 @@ void SdStyleSheet::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) // bekommt, sorgt er dafuer, dass das eigentlich gemeinte StyleSheet // broadcastet SfxSimpleHint* pSimple = PTR_CAST(SfxSimpleHint, &rHint); - ULONG nId = pSimple == NULL ? 0 : pSimple->GetId(); + sal_uLong nId = pSimple == NULL ? 0 : pSimple->GetId(); if (nId == SFX_HINT_DATACHANGED && nFamily == SD_STYLE_FAMILY_PSEUDO) { SdStyleSheet* pRealStyle = GetRealStyleSheet(); @@ -580,11 +580,11 @@ void SdStyleSheet::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) |* berechnet, dass das Verhaeltnis zur Fonthoehe so ist wie im StyleSheet. |* |* bOnlyMissingItems legt fest, ob lediglich nicht gesetzte Items ergaenzt -|* (TRUE) oder explizit gesetzte Items ueberschreiben werden sollen (FALSE) +|* (sal_True) oder explizit gesetzte Items ueberschreiben werden sollen (sal_False) |* \************************************************************************/ -void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, BOOL bOnlyMissingItems) +void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingItems) { // Bulletbreite und Texteinzug an neue Fonthoehe // anpassen, wenn sie nicht explizit gesetzt wurden @@ -602,15 +602,15 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, BOOL bOnlyMissingItems) rSet.GetItemState(EE_CHAR_FONTHEIGHT) == SFX_ITEM_SET) { const SfxItemSet* pCurSet = &GetItemSet(); - UINT32 nNewHeight = ((SvxFontHeightItem&)rSet.Get(EE_CHAR_FONTHEIGHT)).GetHeight(); - UINT32 nOldHeight = ((SvxFontHeightItem&)pCurSet->Get(EE_CHAR_FONTHEIGHT)).GetHeight(); + sal_uInt32 nNewHeight = ((SvxFontHeightItem&)rSet.Get(EE_CHAR_FONTHEIGHT)).GetHeight(); + sal_uInt32 nOldHeight = ((SvxFontHeightItem&)pCurSet->Get(EE_CHAR_FONTHEIGHT)).GetHeight(); if (rSet.GetItemState(EE_PARA_BULLET) != SFX_ITEM_SET || !bOnlyMissingItems) { const SvxBulletItem& rBItem = (const SvxBulletItem&)pCurSet->Get(EE_PARA_BULLET); double fBulletFraction = double(rBItem.GetWidth()) / nOldHeight; SvxBulletItem aNewBItem(rBItem); - aNewBItem.SetWidth((UINT32)(fBulletFraction * nNewHeight)); + aNewBItem.SetWidth((sal_uInt32)(fBulletFraction * nNewHeight)); rSet.Put(aNewBItem); } @@ -619,7 +619,7 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, BOOL bOnlyMissingItems) const SvxLRSpaceItem& rLRItem = (const SvxLRSpaceItem&)pCurSet->Get(EE_PARA_LRSPACE); double fIndentFraction = double(rLRItem.GetTxtLeft()) / nOldHeight; SvxLRSpaceItem aNewLRItem(rLRItem); - aNewLRItem.SetTxtLeft((USHORT)(fIndentFraction * nNewHeight)); + aNewLRItem.SetTxtLeft((sal_uInt16)(fIndentFraction * nNewHeight)); double fFirstIndentFraction = double(rLRItem.GetTxtFirstLineOfst()) / nOldHeight; aNewLRItem.SetTxtFirstLineOfst((short)(fFirstIndentFraction * nNewHeight)); rSet.Put(aNewLRItem); @@ -630,9 +630,9 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, BOOL bOnlyMissingItems) const SvxULSpaceItem& rULItem = (const SvxULSpaceItem&)pCurSet->Get(EE_PARA_ULSPACE); SvxULSpaceItem aNewULItem(rULItem); double fLowerFraction = double(rULItem.GetLower()) / nOldHeight; - aNewULItem.SetLower((USHORT)(fLowerFraction * nNewHeight)); + aNewULItem.SetLower((sal_uInt16)(fLowerFraction * nNewHeight)); double fUpperFraction = double(rULItem.GetUpper()) / nOldHeight; - aNewULItem.SetUpper((USHORT)(fUpperFraction * nNewHeight)); + aNewULItem.SetUpper((sal_uInt16)(fUpperFraction * nNewHeight)); rSet.Put(aNewULItem); } } @@ -640,35 +640,35 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, BOOL bOnlyMissingItems) // -------------------------------------------------------------------- -BOOL SdStyleSheet::HasFollowSupport() const +sal_Bool SdStyleSheet::HasFollowSupport() const { - return FALSE; + return sal_False; } // -------------------------------------------------------------------- -BOOL SdStyleSheet::HasParentSupport() const +sal_Bool SdStyleSheet::HasParentSupport() const { - return TRUE; + return sal_True; } // -------------------------------------------------------------------- -BOOL SdStyleSheet::HasClearParentSupport() const +sal_Bool SdStyleSheet::HasClearParentSupport() const { - return TRUE; + return sal_True; } // -------------------------------------------------------------------- -BOOL SdStyleSheet::SetName( const UniString& rName ) +sal_Bool SdStyleSheet::SetName( const UniString& rName ) { return SfxStyleSheet::SetName( rName ); } // -------------------------------------------------------------------- -void SdStyleSheet::SetHelpId( const String& r, ULONG nId ) +void SdStyleSheet::SetHelpId( const String& r, sal_uLong nId ) { SfxStyleSheet::SetHelpId( r, nId ); @@ -1342,7 +1342,7 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyN case XATTR_LINESTART: case XATTR_LINEDASH: { - NameOrIndex* pItem = (NameOrIndex*)rStyleSet.GetItem((USHORT)pEntry->nWID); + NameOrIndex* pItem = (NameOrIndex*)rStyleSet.GetItem((sal_uInt16)pEntry->nWID); if( ( pItem == NULL ) || ( pItem->GetName().Len() == 0) ) eState = PropertyState_DEFAULT_VALUE; } diff --git a/sd/source/core/undo/undomanager.cxx b/sd/source/core/undo/undomanager.cxx index f3fe9b11c2bd..5b7ed22e3a9e 100644..100755 --- a/sd/source/core/undo/undomanager.cxx +++ b/sd/source/core/undo/undomanager.cxx @@ -32,14 +32,14 @@ using namespace sd; -UndoManager::UndoManager( USHORT nMaxUndoActionCount /* = 20 */ ) +UndoManager::UndoManager( sal_uInt16 nMaxUndoActionCount /* = 20 */ ) : SfxUndoManager( nMaxUndoActionCount ) , mnListLevel( 0 ) , mpLinkedUndoManager(NULL) { } -void UndoManager::EnterListAction(const UniString &rComment, const UniString& rRepeatComment, USHORT nId /* =0 */) +void UndoManager::EnterListAction(const UniString &rComment, const UniString& rRepeatComment, sal_uInt16 nId /* =0 */) { if( !isInUndo() ) { @@ -65,7 +65,7 @@ void UndoManager::LeaveListAction() } } -void UndoManager::AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg /* = FALSE */ ) +void UndoManager::AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg /* = sal_False */ ) { if( !isInUndo() ) { @@ -79,13 +79,13 @@ void UndoManager::AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg /* = FALS } -BOOL UndoManager::Undo( USHORT nCount ) +sal_Bool UndoManager::Undo( sal_uInt16 nCount ) { ScopeLockGuard aGuard( maIsInUndoLock ); return SfxUndoManager::Undo( nCount ); } -BOOL UndoManager::Redo( USHORT nCount ) +sal_Bool UndoManager::Redo( sal_uInt16 nCount ) { ScopeLockGuard aGuard( maIsInUndoLock ); return SfxUndoManager::Redo( nCount ); diff --git a/sd/source/core/undo/undoobjects.cxx b/sd/source/core/undo/undoobjects.cxx index ef47e7da2bae..e1e2565f33d6 100644..100755 --- a/sd/source/core/undo/undoobjects.cxx +++ b/sd/source/core/undo/undoobjects.cxx @@ -244,7 +244,7 @@ void UndoObjectSetText::Redo() if( mpUndoAnimation ) mpUndoAnimation->Redo(); SdrUndoObjSetText::Redo(); - mxSdrObject->SetEmptyPresObj(mbNewEmptyPresObj ? TRUE : FALSE ); + mxSdrObject->SetEmptyPresObj(mbNewEmptyPresObj ? sal_True : sal_False ); } } @@ -347,7 +347,7 @@ void UndoAutoLayoutPosAndSize::Redo() { SdPage* pPage = static_cast< SdPage* >( mxPage.get() ); if( pPage ) - pPage->SetAutoLayout( pPage->GetAutoLayout(), FALSE, FALSE ); + pPage->SetAutoLayout( pPage->GetAutoLayout(), sal_False, sal_False ); } ////////////////////////////////////////////////////////////////////////////// @@ -402,7 +402,7 @@ void UndoGeoObject::Redo() ////////////////////////////////////////////////////////////////////////////// UndoAttrObject::UndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText ) -: SdrUndoAttrObj( rObject, bStyleSheet1 ? TRUE : FALSE, bSaveText ? TRUE : FALSE ) +: SdrUndoAttrObj( rObject, bStyleSheet1 ? sal_True : sal_False, bSaveText ? sal_True : sal_False ) , mxPage( rObject.GetPage() ) , mxSdrObject( &rObject ) { diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index 7d28e5285f40..af93b1f97504 100644..100755 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -67,8 +67,8 @@ using namespace ::com::sun::star::frame; // - Typedefs - // ------------ -typedef UINT32 ( __LOADONCALLAPI *ImportCGM )( ::rtl::OUString&, Reference< XModel >&, UINT32, Reference< XStatusIndicator >& ); -typedef BOOL ( __LOADONCALLAPI *ExportCGM )( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); +typedef sal_uInt32 ( __LOADONCALLAPI *ImportCGM )( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& ); +typedef sal_Bool ( __LOADONCALLAPI *ExportCGM )( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* ); // --------------- // - SdPPTFilter - @@ -96,7 +96,7 @@ sal_Bool SdCGMFilter::Import() { ImportCGM FncImportCGM = reinterpret_cast< ImportCGM >( pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii( "ImportCGM" ) ) ); ::rtl::OUString aFileURL( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); - UINT32 nRetValue; + sal_uInt32 nRetValue; if( mrDocument.GetPageCount() == 0L ) mrDocument.CreateFirstPages(); @@ -106,7 +106,7 @@ sal_Bool SdCGMFilter::Import() if( nRetValue ) { - bRet = TRUE; + bRet = sal_True; if( ( nRetValue &~0xff000000 ) != 0xffffff ) // maybe the backgroundcolor is already white { // so we must not set a master page @@ -116,7 +116,7 @@ sal_Bool SdCGMFilter::Import() if(pSdPage) { // set PageFill to given color - const Color aColor((BYTE)(nRetValue >> 16), (BYTE)(nRetValue >> 8), (BYTE)(nRetValue >> 16)); + const Color aColor((sal_uInt8)(nRetValue >> 16), (sal_uInt8)(nRetValue >> 8), (sal_uInt8)(nRetValue >> 16)); pSdPage->getSdrPageProperties().PutItem(XFillColorItem(String(), aColor)); pSdPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_SOLID)); } diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index c4c2aa3dbee6..292db06bb472 100755 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -92,31 +92,31 @@ using namespace com::sun::star; static PHLayout pPHLayout[] = { - { EPP_LAYOUT_TITLESLIDE, { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x10, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, TRUE, TRUE }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, TRUE, FALSE, FALSE }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE }, - { EPP_LAYOUT_RIGHTCOLUMN2ROWS, { 0x0d, 0x0e, 0x13, 0x13, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_LEFTCOLUMN2ROWS, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_TOPROW2COLUMN, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_4OBJECTS, { 0x0d, 0x13, 0x13, 0x13, 0x13, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, TRUE, FALSE, FALSE }, - { EPP_LAYOUT_ONLYTITLE, { 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, TRUE, FALSE, FALSE }, - { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, FALSE, FALSE, FALSE }, - { EPP_LAYOUT_TITLERIGHT2BODIESLEFT, { 0x11, 0x12, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x11, 0x12, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_TITLERIGHTBODYLEFT, { 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x11, 0x12, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, TRUE, TRUE, FALSE }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x12, TRUE, TRUE, FALSE } + { EPP_LAYOUT_TITLESLIDE, { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x10, sal_True, sal_True, sal_False }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_True, sal_True, sal_False }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, sal_True, sal_True, sal_False }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_True, sal_True, sal_True }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, sal_True, sal_True, sal_False }, + { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_False, sal_False, sal_False }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, sal_True, sal_True, sal_False }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, sal_True, sal_True, sal_False }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, sal_True, sal_False, sal_False }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, sal_True, sal_True, sal_False }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_False, sal_False }, + { EPP_LAYOUT_RIGHTCOLUMN2ROWS, { 0x0d, 0x0e, 0x13, 0x13, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, + { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, + { EPP_LAYOUT_LEFTCOLUMN2ROWS, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, + { EPP_LAYOUT_TOPROW2COLUMN, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, + { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, + { EPP_LAYOUT_4OBJECTS, { 0x0d, 0x13, 0x13, 0x13, 0x13, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_False, sal_False }, + { EPP_LAYOUT_ONLYTITLE, { 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_True, sal_False, sal_False }, + { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_False, sal_False, sal_False }, + { EPP_LAYOUT_TITLERIGHT2BODIESLEFT, { 0x11, 0x12, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x11, 0x12, sal_True, sal_True, sal_False }, + { EPP_LAYOUT_TITLERIGHTBODYLEFT, { 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x11, 0x12, sal_True, sal_True, sal_False }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, sal_True, sal_True, sal_False }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x12, sal_True, sal_True, sal_False } }; //============================ PPTWriter ================================== @@ -134,7 +134,7 @@ PPTWriter::PPTWriter( SvStorageRef& rSvStorage, meLatestPageType ( NORMAL ), mXModel ( rXModel ), mXStatusIndicator ( rXStatInd ), - mbStatusIndicator ( FALSE ), + mbStatusIndicator ( sal_False ), mpCurUserStrm ( NULL ), mpStrm ( NULL ), mpPicStrm ( NULL ), @@ -158,10 +158,10 @@ PPTWriter::PPTWriter( SvStorageRef& rSvStorage, if ( !ImplGetPageByIndex( 0, NOTICE ) ) return; - INT32 nWidth = 21000; + sal_Int32 nWidth = 21000; if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ) ) ) mAny >>= nWidth; - INT32 nHeight = 29700; + sal_Int32 nHeight = 29700; if ( ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ) ) ) mAny >>= nHeight; @@ -186,7 +186,7 @@ PPTWriter::PPTWriter( SvStorageRef& rSvStorage, if ( mXStatusIndicator.is() ) { - mbStatusIndicator = TRUE; + mbStatusIndicator = sal_True; mnStatMaxValue = ( mnPages + mnMasterPages ) * 5; mXStatusIndicator->start( String( RTL_CONSTASCII_USTRINGPARAM( "PowerPoint Export" ) ), mnStatMaxValue + ( mnStatMaxValue >> 3 ) ); @@ -254,7 +254,7 @@ PPTWriter::PPTWriter( SvStorageRef& rSvStorage, if ( !ImplCreateDocumentSummaryInformation( nCnvrtFlags ) ) return; - mbStatus = TRUE; + mbStatus = sal_True; }; @@ -288,7 +288,7 @@ PPTWriter::~PPTWriter() // --------------------------------------------------------------------------------------------- -static inline sal_uInt32 PPTtoEMU( INT32 nPPT ) +static inline sal_uInt32 PPTtoEMU( sal_Int32 nPPT ) { return (sal_uInt32)( (double)nPPT * 1587.5 ); } @@ -299,7 +299,7 @@ sal_Bool PPTWriter::ImplCreateCurrentUserStream() { mpCurUserStrm = mrStg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "Current User" ) ) ); if ( !mpCurUserStrm ) - return FALSE; + return sal_False; char pUserName[] = "Current User"; sal_uInt32 nLenOfUserName = strlen( pUserName ); sal_uInt32 nSizeOfRecord = 0x14 + ( ( nLenOfUserName + 4 ) & ~ 3 ); @@ -322,7 +322,7 @@ sal_Bool PPTWriter::ImplCreateCurrentUserStream() *mpCurUserStrm << (sal_uInt8)0; // pad bytes }; mpCurUserStrm->Seek( nEditPos ); - return TRUE; + return sal_True; }; // --------------------------------------------------------------------------------------------- @@ -529,9 +529,9 @@ sal_Bool PPTWriter::ImplCreateDocument() mpPptEscherEx->AddAtom( 40, EPP_DocumentAtom, 1 ); *mpStrm << nWidth // Slide Size in Master coordinates X << nHeight // " " " " " Y - << (INT32)maNotesPageSize.Width // Notes Page Size X - << (INT32)maNotesPageSize.Height // " " " Y - << (INT32)1 << (INT32)2; // the scale used when the Powerpoint document is embedded. the default is 1:2 + << (sal_Int32)maNotesPageSize.Width // Notes Page Size X + << (sal_Int32)maNotesPageSize.Height // " " " Y + << (sal_Int32)1 << (sal_Int32)2; // the scale used when the Powerpoint document is embedded. the default is 1:2 mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTESMASTER_PERSIST_KEY, mpStrm->Tell() ); *mpStrm << (sal_uInt32)0 // Reference to NotesMaster ( 0 if none ); << (sal_uInt32)0 // Reference to HandoutMaster ( 0 if none ); @@ -565,12 +565,12 @@ sal_Bool PPTWriter::ImplCreateDocument() mpPptEscherEx->InsertPersistOffset( EPP_MAINSLIDE_PERSIST_KEY | i, mpStrm->Tell() ); *mpStrm << (sal_uInt32)0 // psrReference - logical reference to the slide persist object ( EPP_MAINSLIDE_PERSIST_KEY ) << (sal_uInt32)4 // flags - only bit 3 used, if set then slide contains shapes other than placeholders - << (INT32)0 // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects - << (INT32)i + 0x100 // slideId - Unique slide identifier, used for OLE link monikers for example + << (sal_Int32)0 // numberTexts - number of placeholder texts stored with the persist object. Allows to display outline view without loading the slide persist objects + << (sal_Int32)i + 0x100 // slideId - Unique slide identifier, used for OLE link monikers for example << (sal_uInt32)0; // reserved, usualy 0 if ( !ImplGetPageByIndex( i, NORMAL ) ) // sehr aufregend: noch einmal ueber alle seiten - return FALSE; + return sal_False; ImplSetCurrentStyleSheet( ImplGetMasterIndex( NORMAL ) ); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > @@ -594,8 +594,8 @@ sal_Bool PPTWriter::ImplCreateDocument() mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTES_PERSIST_KEY | i, mpStrm->Tell() ); *mpStrm << (sal_uInt32)0 << (sal_uInt32)4 - << (INT32)0 - << (INT32)i + 0x100 + << (sal_Int32)0 + << (sal_Int32)i + 0x100 << (sal_uInt32)0; } mpPptEscherEx->CloseContainer(); // EPP_SlideListWithText @@ -615,7 +615,7 @@ sal_Bool PPTWriter::ImplCreateDocument() { ::rtl::OUString aCustomShow; sal_uInt32 nPenColor = 0x1000000; - INT32 nRestartTime = 0x7fffffff; + sal_Int32 nRestartTime = 0x7fffffff; sal_Int16 nStartSlide = 0; sal_Int16 nEndSlide = 0; sal_uInt32 nFlags = 0; // Bit 0: Auto advance @@ -750,8 +750,8 @@ sal_Bool PPTWriter::ImplCreateDocument() { mpPptEscherEx->BeginAtom(); - INT32 nSlideCount = aXIC->getCount(); - for ( INT32 j = 0; j < nSlideCount; j++ ) // Anzahl der Slides + sal_Int32 nSlideCount = aXIC->getCount(); + for ( sal_Int32 j = 0; j < nSlideCount; j++ ) // Anzahl der Slides { mAny = aXIC->getByIndex( j ); if ( mAny.getValue() ) @@ -796,7 +796,7 @@ sal_Bool PPTWriter::ImplCreateDocument() } mpPptEscherEx->AddAtom( 0, EPP_EndDocument ); mpPptEscherEx->CloseContainer(); // EPP_Document - return TRUE; + return sal_True; }; // --------------------------------------------------------------------------------------------- @@ -880,7 +880,7 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm ) rStrm << (sal_uInt32)( nCurrentOfs - ( nParaOfs + 4 ) ); rStrm << nParaCount; rStrm.Seek( nCurrentOfs ); - return TRUE; + return sal_True; } PHLayout& PPTWriter::ImplGetLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const @@ -905,14 +905,14 @@ PHLayout& PPTWriter::ImplGetLayout( const ::com::sun::star::uno::Reference< ::c sal_Bool PPTWriter::ImplCreateMaster( sal_uInt32 nPageNum ) { if ( !ImplGetPageByIndex( nPageNum, MASTER ) ) - return FALSE; + return sal_False; ImplSetCurrentStyleSheet( nPageNum ); if ( !ImplGetPropertyValue( mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Background" ) ) ) ) // Backgroundshape laden - return FALSE; + return sal_False; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet; if ( !( mAny >>= aXBackgroundPropSet ) ) - return FALSE; + return sal_False; sal_uInt32 nFillColor = 0xffffff; sal_uInt32 nFillBackColor = 0x000000; @@ -949,7 +949,7 @@ sal_Bool PPTWriter::ImplCreateMaster( sal_uInt32 nPageNum ) mpPptEscherEx->PtReplaceOrInsert( EPP_Persist_MainMaster | nPageNum, mpStrm->Tell() ); mpPptEscherEx->OpenContainer( EPP_MainMaster ); mpPptEscherEx->AddAtom( 24, EPP_SlideAtom, 2 ); - *mpStrm << (INT32)EPP_LAYOUT_TITLEANDBODYSLIDE // slide layout -> title and body slide + *mpStrm << (sal_Int32)EPP_LAYOUT_TITLEANDBODYSLIDE // slide layout -> title and body slide << (sal_uInt8)1 << (sal_uInt8)2 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 << (sal_uInt8)0 // placeholderID << (sal_uInt32)0 // master ID ( ist gleich null bei einer masterpage ) << (sal_uInt32)0 // notes ID ( ist gleich null wenn keine notizen vorhanden ) @@ -984,8 +984,8 @@ sal_Bool PPTWriter::ImplCreateMaster( sal_uInt32 nPageNum ) mpPptEscherEx->BeginAtom(); - sal_Bool bFirst = TRUE; - sal_Bool bSimpleText = FALSE; + sal_Bool bFirst = sal_True; + sal_Bool bSimpleText = sal_False; *mpStrm << (sal_uInt16)5; // paragraph count @@ -993,13 +993,13 @@ sal_Bool PPTWriter::ImplCreateMaster( sal_uInt32 nPageNum ) { if ( nInstance >= EPP_TEXTTYPE_CenterBody ) { - bFirst = FALSE; - bSimpleText = TRUE; + bFirst = sal_False; + bSimpleText = sal_True; *mpStrm << nLev; } mpStyleSheet->mpParaSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet ); mpStyleSheet->mpCharSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet ); - bFirst = FALSE; + bFirst = sal_False; } mpPptEscherEx->EndAtom( EPP_TxMasterStyleAtom, 0, nInstance ); } @@ -1011,7 +1011,7 @@ sal_Bool PPTWriter::ImplCreateMaster( sal_uInt32 nPageNum ) mpPptEscherEx->OpenContainer( ESCHER_DgContainer ); mpPptEscherEx->EnterGroup(0,0); - ImplWritePage( pPHLayout[ 0 ], aSolverContainer, MASTER, TRUE ); // Die Shapes der Seite werden im PPT Dok. erzeugt + ImplWritePage( pPHLayout[ 0 ], aSolverContainer, MASTER, sal_True ); // Die Shapes der Seite werden im PPT Dok. erzeugt mpPptEscherEx->LeaveGroup(); ImplWriteBackground( aXBackgroundPropSet ); @@ -1028,7 +1028,7 @@ sal_Bool PPTWriter::ImplCreateMaster( sal_uInt32 nPageNum ) ImplProgTagContainer( mpStrm, &aBuExMasterStream ); } mpPptEscherEx->CloseContainer(); // EPP_MainMaster - return TRUE; + return sal_True; }; // --------------------------------------------------------------------------------------------- @@ -1036,30 +1036,30 @@ sal_Bool PPTWriter::ImplCreateMaster( sal_uInt32 nPageNum ) sal_Bool PPTWriter::ImplCreateMainNotes() { if ( !ImplGetPageByIndex( 0, NOTICE ) ) - return FALSE; + return sal_False; ImplSetCurrentStyleSheet( 0 ); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPageTarget > aXMasterPageTarget( mXDrawPage, ::com::sun::star::uno::UNO_QUERY ); if ( !aXMasterPageTarget.is() ) - return FALSE; + return sal_False; mXDrawPage = aXMasterPageTarget->getMasterPage(); if ( !mXDrawPage.is() ) - return FALSE; + return sal_False; mXPropSet = ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > ( mXDrawPage, ::com::sun::star::uno::UNO_QUERY ); if ( !mXPropSet.is() ) - return FALSE; + return sal_False; mXShapes = ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > ( mXDrawPage, ::com::sun::star::uno::UNO_QUERY ); if ( !mXShapes.is() ) - return FALSE; + return sal_False; EscherSolverContainer aSolverContainer; @@ -1072,7 +1072,7 @@ sal_Bool PPTWriter::ImplCreateMainNotes() mpPptEscherEx->OpenContainer( ESCHER_DgContainer ); mpPptEscherEx->EnterGroup(0,0); - ImplWritePage( pPHLayout[ 20 ], aSolverContainer, NOTICE, TRUE ); + ImplWritePage( pPHLayout[ 20 ], aSolverContainer, NOTICE, sal_True ); mpPptEscherEx->LeaveGroup(); mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -1096,7 +1096,7 @@ sal_Bool PPTWriter::ImplCreateMainNotes() mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 ); *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2; mpPptEscherEx->CloseContainer(); // EPP_Notes - return TRUE; + return sal_True; } // --------------------------------------------------------------------------------------------- @@ -1193,7 +1193,7 @@ sal_Bool PPTWriter::ImplCreateSlide( sal_uInt32 nPageNum ) ::com::sun::star::uno::Any aAny; if ( !ImplGetPageByIndex( nPageNum, NORMAL ) ) - return FALSE; + return sal_False; sal_uInt32 nMasterID = ImplGetMasterIndex( NORMAL ); ImplSetCurrentStyleSheet( nMasterID ); nMasterID |= 0x80000000; @@ -1247,7 +1247,7 @@ sal_Bool PPTWriter::ImplCreateSlide( sal_uInt32 nPageNum ) aAny >>= bVisible; if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Change" ) ) ) ) { - switch ( *(INT32*)aAny.getValue() ) + switch ( *(sal_Int32*)aAny.getValue() ) { case 1 : // automatisch mnDiaMode++; @@ -1281,7 +1281,7 @@ sal_Bool PPTWriter::ImplCreateSlide( sal_uInt32 nPageNum ) aAny >>= bLoopSound; - sal_Bool bNeedsSSSlideInfoAtom = ( bVisible == FALSE ) + sal_Bool bNeedsSSSlideInfoAtom = ( bVisible == sal_False ) || ( mnDiaMode == 2 ) || ( bIsSound ) || ( bStopSound ) @@ -1291,7 +1291,7 @@ sal_Bool PPTWriter::ImplCreateSlide( sal_uInt32 nPageNum ) sal_uInt8 nDirection = 0; sal_uInt8 nTransitionType = 0; sal_uInt16 nBuildFlags = 1; // advange by mouseclick - INT32 nSlideTime = 0; // muss noch !!! + sal_Int32 nSlideTime = 0; // muss noch !!! sal_uInt8 nSpeed = 1; if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Speed" ) ) ) ) @@ -1493,7 +1493,7 @@ sal_Bool PPTWriter::ImplCreateSlide( sal_uInt32 nPageNum ) } if ( mnDiaMode == 2 ) // automatic ? nBuildFlags |= 0x400; - if ( bVisible == FALSE ) + if ( bVisible == sal_False ) nBuildFlags |= 4; if ( bIsSound ) nBuildFlags |= 16; @@ -1503,7 +1503,7 @@ sal_Bool PPTWriter::ImplCreateSlide( sal_uInt32 nPageNum ) nBuildFlags |= 256; if ( GetPropertyValue( aAny, mXPagePropSet, String( RTL_CONSTASCII_USTRINGPARAM( "Duration" ) ) ) )// duration of this slide - nSlideTime = *(INT32*)aAny.getValue() << 10; // in ticks + nSlideTime = *(sal_Int32*)aAny.getValue() << 10; // in ticks mpPptEscherEx->AddAtom( 16, EPP_SSSlideInfoAtom ); @@ -1522,7 +1522,7 @@ sal_Bool PPTWriter::ImplCreateSlide( sal_uInt32 nPageNum ) mpPptEscherEx->OpenContainer( EPP_PPDrawing ); mpPptEscherEx->OpenContainer( ESCHER_DgContainer ); mpPptEscherEx->EnterGroup(0,0); - ImplWritePage( rLayout, aSolverContainer, NORMAL, FALSE, nPageNum ); // Die Shapes der Seite werden im PPT Dok. erzeugt + ImplWritePage( rLayout, aSolverContainer, NORMAL, sal_False, nPageNum ); // Die Shapes der Seite werden im PPT Dok. erzeugt mpPptEscherEx->LeaveGroup(); if ( bHasBackground ) @@ -1632,7 +1632,7 @@ sal_Bool PPTWriter::ImplCreateSlide( sal_uInt32 nPageNum ) } */ mpPptEscherEx->CloseContainer(); // EPP_Slide - return TRUE; + return sal_True; }; // --------------------------------------------------------------------------------------------- @@ -1640,7 +1640,7 @@ sal_Bool PPTWriter::ImplCreateSlide( sal_uInt32 nPageNum ) sal_Bool PPTWriter::ImplCreateNotes( sal_uInt32 nPageNum ) { if ( !ImplGetPageByIndex( nPageNum, NOTICE ) ) - return FALSE; + return sal_False; ImplSetCurrentStyleSheet( ImplGetMasterIndex( NORMAL ) ); @@ -1659,7 +1659,7 @@ sal_Bool PPTWriter::ImplCreateNotes( sal_uInt32 nPageNum ) mpPptEscherEx->OpenContainer( ESCHER_DgContainer ); mpPptEscherEx->EnterGroup(0,0); - ImplWritePage( pPHLayout[ 20 ], aSolverContainer, NOTICE, FALSE ); // Die Shapes der Seite werden im PPT Dok. erzeugt + ImplWritePage( pPHLayout[ 20 ], aSolverContainer, NOTICE, sal_False ); // Die Shapes der Seite werden im PPT Dok. erzeugt mpPptEscherEx->LeaveGroup(); mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -1683,7 +1683,7 @@ sal_Bool PPTWriter::ImplCreateNotes( sal_uInt32 nPageNum ) mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 ); *mpStrm << (sal_uInt32)0xffffff << (sal_uInt32)0x000000 << (sal_uInt32)0x808080 << (sal_uInt32)0x000000 << (sal_uInt32)0x99cc00 << (sal_uInt32)0xcc3333 << (sal_uInt32)0xffcccc << (sal_uInt32)0xb2b2b2; mpPptEscherEx->CloseContainer(); // EPP_Notes - return TRUE; + return sal_True; }; void PPTWriter::ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet ) @@ -1788,13 +1788,13 @@ void PPTWriter::ImplWriteOLE( sal_uInt32 nCnvrtFlags ) ::uno::Reference < embed::XEmbeddedObject > xObj( ( (SdrOle2Obj*) pSdrObj )->GetObjRef() ); if( xObj.is() ) { - SvStorageRef xTempStorage( new SvStorage( new SvMemoryStream(), TRUE ) ); + SvStorageRef xTempStorage( new SvStorage( new SvMemoryStream(), sal_True ) ); aOleExport.ExportOLEObject( xObj, *xTempStorage ); //TODO/MBA: testing String aPersistStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SVEXT_PERSIST_STREAM ) ) ); SvMemoryStream aStream; - SvStorageRef xCleanStorage( new SvStorage( FALSE, aStream ) ); + SvStorageRef xCleanStorage( new SvStorage( sal_False, aStream ) ); xTempStorage->CopyTo( xCleanStorage ); // SJ: #99809# create a dummy content stream, the dummy content is necessary for ppt, but not for // doc files, so we can't share code. @@ -1820,7 +1820,7 @@ void PPTWriter::ImplWriteOLE( sal_uInt32 nCnvrtFlags ) { String aName; ::com::sun::star::awt::Size aSize; - SvStorageRef xDest( new SvStorage( new SvMemoryStream(), TRUE ) ); + SvStorageRef xDest( new SvStorage( new SvMemoryStream(), sal_True ) ); sal_Bool bOk = SvxMSConvertOCXControls::WriteOCXStream( xDest, pPtr->xControlModel, aSize, aName ); if ( bOk ) pStrm = xDest->CreateMemoryStream(); @@ -1954,7 +1954,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() *mpCurUserStrm << (sal_uInt32)nPos; // offset to current edit setzen mpPptEscherEx->AddAtom( 28, EPP_UserEditAtom ); - *mpStrm << (INT32)0x100 // last slide ID + *mpStrm << (sal_Int32)0x100 // last slide ID << (sal_uInt32)0x03000dbc // minor and major app version that did the save << (sal_uInt32)0 // offset last save, 0 after a full save << nPersistOfs // File offset to persist pointers for this save operation @@ -1963,7 +1963,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() << (sal_Int16)EPP_LastViewTypeSlideView // last view type << (sal_Int16)0x12; // padword - return TRUE; + return sal_True; } // --------------------------------------------------------------------------------------------- @@ -2077,7 +2077,7 @@ PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBull rBuProv ( rProv ), mnInstance ( nInstance ) { - sal_Bool bHasBullet = FALSE; + sal_Bool bHasBullet = sal_False; sal_uInt16 nUpperDist = 0; sal_uInt16 nBulletChar = 0x2022; @@ -2097,7 +2097,7 @@ PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBull case EPP_TEXTTYPE_HalfBody : case EPP_TEXTTYPE_QuarterBody : { - bHasBullet = TRUE; + bHasBullet = sal_True; nUpperDist = 0x14; } break; @@ -2163,7 +2163,7 @@ PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBull rLev.mnAsianSettings = 2; rLev.mnBiDi = 0; - rLev.mbExtendedBulletsUsed = FALSE; + rLev.mbExtendedBulletsUsed = sal_False; rLev.mnBulletId = 0xffff; rLev.mnBulletStart = 0; rLev.mnMappedNumType = 0; @@ -2242,7 +2242,7 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co { PPTExParaLevel& rLevel = maParaLevel[ i ]; if ( i ) - aParagraphObj.ImplGetNumberingLevel( rBuProv, i, FALSE ); + aParagraphObj.ImplGetNumberingLevel( rBuProv, i, sal_False ); // rLevel.mbIsBullet = ( ( aParagraphObj.nBulletFlags & 1 ) != 0 ); rLevel.mnTextOfs = aParagraphObj.nTextOfs; rLevel.mnBulletOfs = (sal_uInt16)aParagraphObj.nBulletOfs; @@ -2375,7 +2375,7 @@ sal_Bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLev switch ( eAttr ) { - case ParaAttr_BulletOn : return ( rPara.mbIsBullet ) ? ( nValue ) ? FALSE : TRUE : ( nValue ) ? TRUE : FALSE; + case ParaAttr_BulletOn : return ( rPara.mbIsBullet ) ? ( nValue ) ? sal_False : sal_True : ( nValue ) ? sal_True : sal_False; case ParaAttr_BuHardFont : case ParaAttr_BulletFont : return ( rPara.mnBulletFont != nValue ); case ParaAttr_BuHardColor : @@ -2399,7 +2399,7 @@ sal_Bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLev case CharAttr_Embossed : nFlag = 512; break; case CharAttr_Font : return ( rChar.mnFont != nValue ); case CharAttr_AsianOrComplexFont : return ( rChar.mnAsianOrComplexFont != nValue ); - case CharAttr_Symbol : return TRUE; + case CharAttr_Symbol : return sal_True; case CharAttr_FontHeight : return ( rChar.mnFontHeight != nValue ); case CharAttr_FontColor : return ( rChar.mnFontColor != nValue ); case CharAttr_Escapement : return ( rChar.mnEscapement != nValue ); @@ -2413,7 +2413,7 @@ sal_Bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLev else return ( ( nValue & nFlag ) != 0 ); } - return TRUE; + return sal_True; } sal_uInt32 PPTExStyleSheet::SizeOfTxCFStyleAtom() const @@ -2452,29 +2452,29 @@ void PPTExStyleSheet::WriteTxCFStyleAtom( SvStream& rSt ) // - exported function - // --------------------- -extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI ExportPPT( SvStorageRef& rSvStorage, +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI ExportPPT( SvStorageRef& rSvStorage, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rXModel, ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rXStatInd, SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) { PPTWriter* pPPTWriter; - BOOL bStatus = FALSE; + sal_Bool bStatus = sal_False; pPPTWriter = new PPTWriter( rSvStorage, rXModel, rXStatInd, pVBA, nCnvrtFlags ); if ( pPPTWriter ) { - bStatus = ( pPPTWriter->IsValid() == TRUE ); + bStatus = ( pPPTWriter->IsValid() == sal_True ); delete pPPTWriter; } return bStatus; } -extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool __LOADONCALLAPI SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas ) { - SvStorageRef xDest( new SvStorage( new SvMemoryStream(), TRUE ) ); - SvxImportMSVBasic aMSVBas( rDocShell, *xDest, FALSE, FALSE ); - aMSVBas.SaveOrDelMSVBAStorage( TRUE, String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); + SvStorageRef xDest( new SvStorage( new SvMemoryStream(), sal_True ) ); + SvxImportMSVBasic aMSVBas( rDocShell, *xDest, sal_False, sal_False ); + aMSVBas.SaveOrDelMSVBAStorage( sal_True, String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); SvStorageRef xOverhead = xDest->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) ) @@ -2485,7 +2485,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI SaveVBA( SfxObjectShell& rD SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead2") ) ); if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) ) { - UINT32 nLen = xTemp->GetSize(); + sal_uInt32 nLen = xTemp->GetSize(); if ( nLen ) { char* pTemp = new char[ nLen ]; @@ -2494,14 +2494,14 @@ extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI SaveVBA( SfxObjectShell& rD xTemp->Seek( STREAM_SEEK_TO_BEGIN ); xTemp->Read( pTemp, nLen ); pBas = new SvMemoryStream( pTemp, nLen, STREAM_READ ); - pBas->ObjectOwnsMemory( TRUE ); - return TRUE; + pBas->ObjectOwnsMemory( sal_True ); + return sal_True; } } } } } - return FALSE; + return sal_False; } diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index b64affc9881b..288e9bb03380 100755 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -147,9 +147,9 @@ struct PHLayout sal_uInt8 nTypeOfTitle; sal_uInt8 nTypeOfOutliner; - BOOL bTitlePossible; - BOOL bOutlinerPossible; - BOOL bSecOutlinerPossible; + sal_Bool bTitlePossible; + sal_Bool bOutlinerPossible; + sal_Bool bSecOutlinerPossible; }; struct SOParagraph @@ -180,12 +180,12 @@ struct SOParagraph SOParagraph() { nDepth = 0; - bExtendedParameters = FALSE; + bExtendedParameters = sal_False; nParaFlags = 0; nBulletFlags = 0; nBulletOfs = 0; nTextOfs = 0; - bExtendedBulletsUsed = FALSE; + bExtendedBulletsUsed = sal_False; nBulletId = 0xffff; bNumberingIsNumber = sal_True; }; @@ -518,7 +518,7 @@ class PropStateValue : public PropValue ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertyState > mXPropState; - sal_Bool ImplGetPropertyValue( const String& rString, sal_Bool bGetPropertyState = TRUE ); + sal_Bool ImplGetPropertyValue( const String& rString, sal_Bool bGetPropertyState = sal_True ); }; @@ -537,7 +537,7 @@ class PortionObj : public PropStateValue sal_uInt32 ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, String& rURL ); sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); - void ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue = FALSE ); + void ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue = sal_False ); public : @@ -580,7 +580,7 @@ struct ParaFlags sal_Bool bFirstParagraph : 1; sal_Bool bLastParagraph : 1; - ParaFlags() { bFirstParagraph = TRUE; bLastParagraph = FALSE; }; + ParaFlags() { bFirstParagraph = sal_True; bLastParagraph = sal_False; }; }; class ParagraphObj : public List, public PropStateValue, public SOParagraph @@ -596,8 +596,8 @@ class ParagraphObj : public List, public PropStateValue, public SOParagraph void ImplConstruct( const ParagraphObj& rParagraphObj ); void ImplClear(); sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); - void ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = FALSE ); - void ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = FALSE ); + void ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = sal_False ); + void ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = sal_False ); public : @@ -795,7 +795,7 @@ class PPTWriter : public GroupTable, public PropValue, public PPTExBulletProvide sal_Bool ImplInitSOIface(); sal_Bool ImplSetCurrentStyleSheet( sal_uInt32 nPageNum ); sal_Bool ImplGetPageByIndex( sal_uInt32 nIndex, PageType ); - sal_Bool ImplGetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup = FALSE ); + sal_Bool ImplGetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup = sal_False ); sal_uInt32 ImplGetMasterIndex( PageType ePageType ); void ImplFlipBoundingBox( EscherPropertyContainer& rPropOpt ); sal_Bool ImplGetText(); diff --git a/sd/source/filter/eppt/epptdef.hxx b/sd/source/filter/eppt/epptdef.hxx index 7d23fee19344..ef18b952af09 100644..100755 --- a/sd/source/filter/eppt/epptdef.hxx +++ b/sd/source/filter/eppt/epptdef.hxx @@ -132,7 +132,7 @@ #define EPP_PST_ExtendedParagraphMasterAtom 4013 #define EPP_PST_ExtendedPresRuleContainer 4014 // consist of 4012, 4015, #define EPP_PST_ExtendedParagraphHeaderAtom 4015 // the instance of this atom indices the current presobj - // the first UINT32 in this atom indices the current slideId + // the first sal_uInt32 in this atom indices the current slideId #define EPP_FontEnityAtom 4023 #define EPP_FontEmbedData 4024 diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 7372cbdcf5d3..a54bb8f1c6d0 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -298,14 +298,14 @@ sal_Bool GroupTable::GetNextGroupEntry() mnIndex = mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mnCurrentPos++; if ( mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mnCount > mnIndex ) - return TRUE; + return sal_True; delete ( mpGroupEntry[ --mnCurrentGroupEntry ] ); if ( mnCurrentGroupEntry ) mnGroupsClosed++; } - return FALSE; + return sal_False; } // --------------------------------------------------------------------------------------------- @@ -852,10 +852,10 @@ sal_Bool PPTWriter::ImplCloseDocument() if ( nOldPos ) { mpStrm->Seek( nOldPos ); - return TRUE; + return sal_True; } } - return FALSE; + return sal_False; } // --------------------------------------------------------------------------------------------- @@ -938,7 +938,7 @@ sal_Bool PropValue::ImplGetPropertyValue( const ::com::sun::star::uno::Reference sal_Bool PropStateValue::ImplGetPropertyValue( const String& rString, sal_Bool bGetPropertyState ) { ePropState = ::com::sun::star::beans::PropertyState_AMBIGUOUS_VALUE; - sal_Bool bRetValue = TRUE; + sal_Bool bRetValue = sal_True; #ifdef UNX ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > aXPropSetInfo( mXPropSet->getPropertySetInfo() ); @@ -949,7 +949,7 @@ sal_Bool PropStateValue::ImplGetPropertyValue( const String& rString, sal_Bool b { mAny = mXPropSet->getPropertyValue( rString ); if ( !mAny.hasValue() ) - bRetValue = FALSE; + bRetValue = sal_False; else if ( bGetPropertyState ) ePropState = mXPropState->getPropertyState( rString ); else @@ -957,7 +957,7 @@ sal_Bool PropStateValue::ImplGetPropertyValue( const String& rString, sal_Bool b } catch( ::com::sun::star::uno::Exception& ) { - bRetValue = FALSE; + bRetValue = sal_False; } return bRetValue; } @@ -966,7 +966,7 @@ sal_Bool PropStateValue::ImplGetPropertyValue( const String& rString, sal_Bool b sal_Bool PPTWriter::ImplInitSOIface() { - while( TRUE ) + while( sal_True ) { mXDrawPagesSupplier = ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPagesSupplier > @@ -990,9 +990,9 @@ sal_Bool PPTWriter::ImplInitSOIface() if ( !ImplGetPageByIndex( 0, NORMAL ) ) break; - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } // --------------------------------------------------------------------------------------------- @@ -1012,7 +1012,7 @@ sal_Bool PPTWriter::ImplSetCurrentStyleSheet( sal_uInt32 nPageNum ) sal_Bool PPTWriter::ImplGetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) { - while( TRUE ) + while( sal_True ) { if ( ePageType != meLatestPageType ) { @@ -1023,7 +1023,7 @@ sal_Bool PPTWriter::ImplGetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) { mXDrawPages = mXDrawPagesSupplier->getDrawPages(); if( !mXDrawPages.is() ) - return FALSE; + return sal_False; } break; @@ -1031,7 +1031,7 @@ sal_Bool PPTWriter::ImplGetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) { mXDrawPages = mXMasterPagesSupplier->getMasterPages(); if( !mXDrawPages.is() ) - return FALSE; + return sal_False; } break; default: @@ -1094,18 +1094,18 @@ sal_Bool PPTWriter::ImplGetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) } } } - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } // --------------------------------------------------------------------------------------------- sal_Bool PPTWriter::ImplGetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup ) { - while(TRUE) + while(sal_True) { - if ( ( bGroup == FALSE ) || ( GetCurrentGroupLevel() == 0 ) ) + if ( ( bGroup == sal_False ) || ( GetCurrentGroupLevel() == 0 ) ) { ::com::sun::star::uno::Any aAny( mXShapes->getByIndex( nIndex ) ); aAny >>= mXShape; @@ -1131,7 +1131,7 @@ sal_Bool PPTWriter::ImplGetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup ) sal_uInt16 nPos = mType.Search( (const char*)"Shape" ); mType.Erase( nPos, 5 ); - mbPresObj = mbEmptyPresObj = FALSE; + mbPresObj = mbEmptyPresObj = sal_False; if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsPresentationObject" ) ) ) ) mAny >>= mbPresObj; @@ -1143,9 +1143,9 @@ sal_Bool PPTWriter::ImplGetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup ) ? *((sal_Int32*)aAny.getValue() ) : 0; - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } // ----------------------------------------------------------------------- @@ -1320,14 +1320,14 @@ sal_Bool PPTWriter::ImplGetStyleSheets() void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) { - sal_Bool bFirstParagraph = TRUE; + sal_Bool bFirstParagraph = sal_True; sal_uInt32 nCharCount; sal_uInt32 nPropertyFlags = 0; sal_uInt16 nDepth = 0; sal_Int16 nLineSpacing; int nInstance = rTextObj.GetInstance(); - for ( ParagraphObj* pPara = rTextObj.First() ; pPara; pPara = rTextObj.Next(), bFirstParagraph = FALSE ) + for ( ParagraphObj* pPara = rTextObj.First() ; pPara; pPara = rTextObj.Next(), bFirstParagraph = sal_False ) { PortionObj* pPortion = (PortionObj*)pPara->First(); nCharCount = pPara->Count(); @@ -1719,13 +1719,13 @@ PortionObj::PortionObj( const ::com::sun::star::uno::Reference< ::com::sun::star mnFont ( 0 ), mnAsianOrComplexFont( 0xffff ), mnTextSize ( 0 ), - mbLastPortion ( TRUE ), + mbLastPortion ( sal_True ), mpText ( NULL ), mpFieldEntry ( NULL ) { mXPropSet = rXPropSet; - ImplGetPortionValues( rFontCollection, FALSE ); + ImplGetPortionValues( rFontCollection, sal_False ); } PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRange, @@ -1740,7 +1740,7 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text { String aString( rXTextRange->getString() ); String aURL; - BOOL bRTL_endingParen = FALSE; + sal_Bool bRTL_endingParen = sal_False; mnTextSize = aString.Len(); if ( bLast ) @@ -1770,14 +1770,14 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text mpFieldEntry->aFieldUrl = aURL; } } - sal_Bool bSymbol = FALSE; + sal_Bool bSymbol = sal_False; - if ( bPropSetsValid && ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSet" ) ), FALSE ) ) + if ( bPropSetsValid && ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "CharFontCharSet" ) ), sal_False ) ) { sal_Int16 nCharset; mAny >>= nCharset; if ( nCharset == ::com::sun::star::awt::CharSet::SYMBOL ) - bSymbol = TRUE; + bSymbol = sal_True; } if ( mpFieldEntry && ( nFieldType & 0x800000 ) ) // placeholder ? { @@ -1795,7 +1795,7 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text if ( bLast && pText[ aString.Len() - 1 ] == sal_Unicode(')') && rFontCollection.GetScriptDirection( aString ) == com::sun::star::i18n::ScriptDirection::RIGHT_TO_LEFT ) { mnTextSize++; - bRTL_endingParen = TRUE; + bRTL_endingParen = sal_True; } mpText = new sal_uInt16[ mnTextSize ]; sal_uInt16 nChar; @@ -1855,7 +1855,7 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text mpText[ mnTextSize - 1 ] = 0xd; if ( bPropSetsValid ) - ImplGetPortionValues( rFontCollection, TRUE ); + ImplGetPortionValues( rFontCollection, sal_True ); } } @@ -2157,7 +2157,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com xFieldPropSet( aXTextField, ::com::sun::star::uno::UNO_QUERY ); if ( xFieldPropSet.is() ) { - String aFieldKind( aXTextField->getPresentation( TRUE ) ); + String aFieldKind( aXTextField->getPresentation( sal_True ) ); if ( aFieldKind == String( RTL_CONSTASCII_USTRINGPARAM( "Date" ) ) ) { if ( GetPropertyValue( aAny, xFieldPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "IsFix" ) ) ), sal_True ) @@ -2300,13 +2300,13 @@ ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun:: { mXPropSet = rXPropSet; - bExtendedParameters = FALSE; + bExtendedParameters = sal_False; nDepth = 0; nBulletFlags = 0; nParaFlags = 0; - ImplGetParagraphValues( rProv, FALSE ); + ImplGetParagraphValues( rProv, sal_False ); } ParagraphObj::ParagraphObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContent, @@ -2316,7 +2316,7 @@ ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun:: mbFirstParagraph ( aParaFlags.bFirstParagraph ), mbLastParagraph ( aParaFlags.bLastParagraph ) { - bExtendedParameters = FALSE; + bExtendedParameters = sal_False; nDepth = 0; nBulletFlags = 0; @@ -2355,7 +2355,7 @@ ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun:: } } } - ImplGetParagraphValues( rProv, TRUE );// + ImplGetParagraphValues( rProv, sal_True );// } } @@ -2470,7 +2470,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 sal_Int32 nPropertyCount = aPropertySequence.getLength(); if ( nPropertyCount ) { - bExtendedParameters = TRUE; + bExtendedParameters = sal_True; nBulletRealSize = 100; nMappedNumType = 0; @@ -2565,7 +2565,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 { nBulletId = rBuProv.GetId( aUniqueId, aBuGraSize ); if ( nBulletId != 0xffff ) - bExtendedBulletsUsed = TRUE; + bExtendedBulletsUsed = sal_True; } } } @@ -2657,7 +2657,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 { if ( nNumberingType != SVX_NUM_CHAR_SPECIAL ) { - bExtendedBulletsUsed = TRUE; + bExtendedBulletsUsed = sal_True; if ( nNumberingDepth & 1 ) cBulletId = 0x2013; // defaulting bullet characters for ppt97 else if ( nNumberingDepth == 4 ) @@ -2934,8 +2934,8 @@ ImplTextObj::ImplTextObj( int nInstance ) mnTextSize = 0; mnInstance = nInstance; mpList = new List; - mbHasExtendedBullets = FALSE; - mbFixedCellHeightUsed = FALSE; + mbHasExtendedBullets = sal_False; + mbFixedCellHeightUsed = sal_False; } ImplTextObj::~ImplTextObj() @@ -2967,11 +2967,11 @@ TextObj::TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSim if ( aAny >>= aXParagraph ) { if ( !aXTextParagraphE->hasMoreElements() ) - aParaFlags.bLastParagraph = TRUE; + aParaFlags.bLastParagraph = sal_True; ParagraphObj* pPara = new ParagraphObj( aXParagraph, aParaFlags, rFontCollection, rProv ); mpImplTextObj->mbHasExtendedBullets |= pPara->bExtendedBulletsUsed; mpImplTextObj->mpList->Insert( pPara, LIST_APPEND ); - aParaFlags.bFirstParagraph = FALSE; + aParaFlags.bFirstParagraph = sal_False; } } } @@ -3084,7 +3084,7 @@ void PPTWriter::ImplAdjustFirstLineLineSpacing( TextObj& rTextObj, EscherPropert { Outliner aOutliner( &pModel->GetItemPool(), pParaObj->GetOutlinerMode() ); aOutliner.SetText( *pParaObj ); - ULONG nTextHeight = aOutliner.GetLineHeight( 0, 0 ); + sal_uLong nTextHeight = aOutliner.GetLineHeight( 0, 0 ); if ( nTextHeight ) { } @@ -3417,12 +3417,12 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt, sal_uInt32 nSoundRef = 0; // 0 if storage is from clipboard. Otherwise index(ID) in SoundCollection list. sal_uInt32 nDelayTime = 0; // delay before playing object sal_uInt16 nSlideCount = 1; // number of slides to play object - UINT8 nBuildType = 1; // type of build - UINT8 nFlyMethod = 0; // animation effect( fly, zoom, appear, etc ) - UINT8 nFlyDirection = 0; // Animation direction( left, right, up, down, etc ) - UINT8 nAfterEffect = 0; // what to do after build - UINT8 nSubEffect = 0; // build by word or letter - UINT8 nOleVerb = 0; // Determines object's class (sound, video, other) + sal_uInt8 nBuildType = 1; // type of build + sal_uInt8 nFlyMethod = 0; // animation effect( fly, zoom, appear, etc ) + sal_uInt8 nFlyDirection = 0; // Animation direction( left, right, up, down, etc ) + sal_uInt8 nAfterEffect = 0; // what to do after build + sal_uInt8 nSubEffect = 0; // build by word or letter + sal_uInt8 nOleVerb = 0; // Determines object's class (sound, video, other) if ( eAe == ::com::sun::star::presentation::AnimationEffect_NONE ) { @@ -3902,8 +3902,8 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt, } } } - sal_Bool bDimHide = FALSE; - sal_Bool bDimPrevious = FALSE; + sal_Bool bDimHide = sal_False; + sal_Bool bDimPrevious = sal_False; if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "DimHide" ) ) ) ) mAny >>= bDimHide; if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "DimPrevious" ) ) ) ) @@ -4099,7 +4099,7 @@ sal_Bool PPTWriter::ImplGetEffect( const ::com::sun::star::uno::Reference< ::com if ( GetPropertyValue( aAny, rPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "SoundOn" ) ) ) ) aAny >>= bIsSound; else - bIsSound = FALSE; + bIsSound = sal_False; sal_Bool bHasEffect = ( ( eEffect != ::com::sun::star::presentation::AnimationEffect_NONE ) || ( eTextEffect != ::com::sun::star::presentation::AnimationEffect_NONE ) @@ -4199,16 +4199,16 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a nIndices = nInstance = nLastPer = nShapeCount = nEffectCount = 0; - sal_Bool bIsTitlePossible = TRUE; // bei mehr als einem title geht powerpoint in die knie + sal_Bool bIsTitlePossible = sal_True; // bei mehr als einem title geht powerpoint in die knie sal_uInt32 nOutlinerCount = 0; // die gliederungsobjekte muessen dem layout entsprechen, sal_uInt32 nPrevTextStyle = 0; // es darf nicht mehr als zwei geben nOlePictureId = 0; - sal_Bool bAdditionalText = FALSE; + sal_Bool bAdditionalText = sal_False; - sal_Bool bSecOutl = FALSE; + sal_Bool bSecOutl = sal_False; sal_uInt32 nPObjects = 0; SvMemoryStream* pClientTextBox = NULL; @@ -4234,7 +4234,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a nGroups = GetGroupsClosed(); for ( sal_uInt32 i = 0; i < nGroups; i++, mpPptEscherEx->LeaveGroup() ) ; - if ( ImplGetShapeByIndex( GetCurrentGroupIndex(), TRUE ) ) + if ( ImplGetShapeByIndex( GetCurrentGroupIndex(), sal_True ) ) { sal_Bool bIsSound; sal_Bool bMediaClickAction = sal_False; @@ -4452,7 +4452,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a mpPptEscherEx->EnterGroup( 0,0 ); nGroupLevel = mpPptEscherEx->GetGroupLevel(); bNeedText = sal_False; - bAdditionalText = TRUE; + bAdditionalText = sal_True; mnTextSize = 0; } mnAngle = 0; @@ -4537,7 +4537,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a ::com::sun::star::awt::Size aSize; String aControlName; - SvStorageRef xTemp( new SvStorage( new SvMemoryStream(), TRUE ) ); + SvStorageRef xTemp( new SvStorage( new SvMemoryStream(), sal_True ) ); if ( SvxMSConvertOCXControls::WriteOCXStream( xTemp, aXControlModel, aSize, aControlName ) ) { String aUserName( xTemp->GetUserName() ); @@ -4569,7 +4569,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a if ( ( nStringLen > 1 ) && ( ( xCompObj->Tell() + nStringLen ) < nStreamLen ) ) { // i think that the OleIdentifier will follow ByteString aTemp; - sal_Char* p = aTemp.AllocBuffer( (USHORT)(nStringLen - 1) ); + sal_Char* p = aTemp.AllocBuffer( (sal_uInt16)(nStringLen - 1) ); xCompObj->Read( p, nStringLen - 1 ); aOleIdentifier = String( aTemp, gsl_getSystemTextEncoding() ); } @@ -4611,7 +4611,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } *pTmp++ = 0; *pTmp = 0; - aPropOpt.AddOpt( ESCHER_Prop_wzName, TRUE, nBufSize, pBuf, nBufSize ); + aPropOpt.AddOpt( ESCHER_Prop_wzName, sal_True, nBufSize, pBuf, nBufSize ); } } else if ( mType == "drawing.Connector" ) @@ -4643,7 +4643,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { aTextRefPoint = ::com::sun::star::awt::Point( maRect.Left(), maRect.Top() ); mnTextSize = 0; - bAdditionalText = TRUE; + bAdditionalText = sal_True; mpPptEscherEx->EnterGroup( &maRect,0 ); } mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -4664,7 +4664,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { mpPptEscherEx->EnterGroup( 0,0 ); nGroupLevel = mpPptEscherEx->GetGroupLevel(); - bAdditionalText = TRUE; + bAdditionalText = sal_True; mnTextSize = 0; } mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -4683,7 +4683,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { mpPptEscherEx->EnterGroup( 0,0 ); nGroupLevel = mpPptEscherEx->GetGroupLevel(); - bAdditionalText = TRUE; + bAdditionalText = sal_True; mnTextSize = 0; } mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -4702,7 +4702,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { mpPptEscherEx->EnterGroup( 0,0 ); nGroupLevel = mpPptEscherEx->GetGroupLevel(); - bAdditionalText = TRUE; + bAdditionalText = sal_True; mnTextSize = 0; } mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -4721,7 +4721,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { mpPptEscherEx->EnterGroup( 0,0 ); nGroupLevel = mpPptEscherEx->GetGroupLevel(); - bAdditionalText = TRUE; + bAdditionalText = sal_True; mnTextSize = 0; } mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -4791,7 +4791,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a else nPlaceHolderAtom = EPP_PLACEHOLDER_NOTESBODY; } - ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE ); + ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); } else if ( mType == "presentation.TitleText" ) { @@ -4807,7 +4807,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } else if ( rLayout.bTitlePossible && bIsTitlePossible ) { - bIsTitlePossible = FALSE; + bIsTitlePossible = sal_False; ImplGetText(); TextObj aTextObj( mXText, EPP_TEXTTYPE_Title, maFontCollection, (PPTExBulletProvider&)*this ); @@ -4888,12 +4888,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } } else - mbPresObj = FALSE; + mbPresObj = sal_False; } if ( !mbPresObj ) { mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE ); + ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); } } else if ( ( mType == "presentation.Outliner" ) || ( mType == "presentation.Subtitle" ) ) @@ -4986,12 +4986,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } } else - mbPresObj = FALSE; + mbPresObj = sal_False; } if ( !mbPresObj ) { mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE ); + ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); } } else if ( ( mType == "drawing.Page" ) || ( mType == "presentation.Page" ) ) @@ -5003,7 +5003,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a else nPlaceHolderAtom = EPP_PLACEHOLDER_NOTESSLIDEIMAGE; } - ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE ); + ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); } else if ( mType == "drawing.Frame" ) { @@ -5094,7 +5094,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { mbPresObj = sal_False; mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE ); + ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); } } else if ( mType == "presentation.Footer" ) @@ -5105,7 +5105,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { mbPresObj = sal_False; mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE ); + ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); } } else if ( mType == "presentation.DateTime" ) @@ -5116,7 +5116,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { mbPresObj = sal_False; mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE ); + ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); } } else if ( mType == "presentation.SlideNumber" ) @@ -5127,7 +5127,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { mbPresObj = sal_False; mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, TRUE ); + ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); } } else if ( ( (sal_Char)'3' == mType.GetChar( 8 ) ) && ( (char)'D' == mType.GetChar( 9 ) ) ) // drawing.3D @@ -5313,9 +5313,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a if ( !pClientTextBox ) pClientTextBox = new SvMemoryStream( 0x200, 0x200 ); - if ( mbEmptyPresObj == FALSE ) + if ( mbEmptyPresObj == sal_False ) { - if ( ( ePageType == NORMAL ) && ( bMasterPage == FALSE ) ) + if ( ( ePageType == NORMAL ) && ( bMasterPage == sal_False ) ) { sal_uInt32 nTextType = EPP_TEXTTYPE_Body; if ( mnTextStyle == EPP_TEXTSTYLE_BODY ) @@ -5417,7 +5417,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a if ( bAdditionalText ) { - bAdditionalText = FALSE; + bAdditionalText = sal_False; ::com::sun::star::uno::Any aAny; EscherPropertyContainer aPropOpt; @@ -5433,7 +5433,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a double fDist = hypot( maRect.GetWidth(), maRect.GetHeight() ); maRect = Rectangle( Point( aTextRefPoint.X, aTextRefPoint.Y ), Point( (sal_Int32)( aTextRefPoint.X + fDist ), aTextRefPoint.Y - 1 ) ); - ImplCreateTextShape( aPropOpt, aSolverContainer, FALSE ); + ImplCreateTextShape( aPropOpt, aSolverContainer, sal_False ); aPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x60006 ); // Size Shape To Fit Text if ( mnAngle < 0 ) mnAngle = ( 36000 + mnAngle ) % 36000; @@ -5442,7 +5442,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } else { - ImplCreateTextShape( aPropOpt, aSolverContainer, FALSE ); + ImplCreateTextShape( aPropOpt, aSolverContainer, sal_False ); if ( mnAngle < 0 ) mnAngle = ( 36000 + mnAngle ) % 36000; else @@ -5577,10 +5577,10 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc mpPptEscherEx->OpenContainer( ESCHER_SpgrContainer ); mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); mpPptEscherEx->AddAtom( 16, ESCHER_Spgr, 1 ); - *mpStrm << (INT32)maRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden - << (INT32)maRect.Top() - << (INT32)maRect.Right() - << (INT32)maRect.Bottom(); + *mpStrm << (sal_Int32)maRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden + << (sal_Int32)maRect.Top() + << (sal_Int32)maRect.Right() + << (sal_Int32)maRect.Bottom(); sal_uInt32 nShapeId = mpPptEscherEx->GenerateShapeId(); mpPptEscherEx->AddShape( ESCHER_ShpInst_Min, 0x201, nShapeId ); // Flags: Group | Patriarch @@ -5630,7 +5630,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc if ( nRowCount ) { SvMemoryStream aMemStrm; - aMemStrm.ObjectOwnsMemory( FALSE ); + aMemStrm.ObjectOwnsMemory( sal_False ); aMemStrm << nRowCount << nRowCount << (sal_uInt16)4; diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx index 9ef58c082b6e..b4aa5926e68a 100755 --- a/sd/source/filter/eppt/escherex.cxx +++ b/sd/source/filter/eppt/escherex.cxx @@ -52,7 +52,7 @@ sal_uInt32 PptEscherEx::DrawingGroupContainerSize() void PptEscherEx::WriteDrawingGroupContainer( SvStream& rSt ) { - UINT32 nSize = DrawingGroupContainerSize(); + sal_uInt32 nSize = DrawingGroupContainerSize(); rSt << (sal_uInt32)( 0xf | ( 1035 << 16 ) ) // EPP_PPDrawingGroup << (sal_uInt32)( nSize - 8 ); @@ -63,7 +63,7 @@ void PptEscherEx::WriteDrawingGroupContainer( SvStream& rSt ) sal_uInt32 PptEscherEx::ImplDggContainerSize() { - UINT32 nSize; + sal_uInt32 nSize; nSize = mxGlobal->GetDggAtomSize(); nSize += mxGlobal->GetBlibStoreContainerSize(); @@ -131,7 +131,7 @@ sal_uInt32 PptEscherEx::ImplSplitMenuColorsAtomSize() void PptEscherEx::ImplWriteSplitMenuColorsAtom( SvStream& rSt ) { - UINT32 nSize = ImplSplitMenuColorsAtomSize(); + sal_uInt32 nSize = ImplSplitMenuColorsAtomSize(); if ( nSize ) { rSt << (sal_uInt32)( ( ESCHER_SplitMenuColors << 16 ) | ( ESCHER_SPLIT_MENU_COLORS_COUNT << 4 ) ) @@ -152,9 +152,9 @@ PptEscherEx::~PptEscherEx() // --------------------------------------------------------------------------------------------- -void PptEscherEx::OpenContainer( UINT16 n_EscherContainer, int nRecInstance ) +void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance ) { - *mpOutStrm << (UINT16)( ( nRecInstance << 4 ) | 0xf ) << n_EscherContainer << (UINT32)0; + *mpOutStrm << (sal_uInt16)( ( nRecInstance << 4 ) | 0xf ) << n_EscherContainer << (sal_uInt32)0; mOffsets.push_back( mpOutStrm->Tell() - 4 ); mRecTypes.push_back( n_EscherContainer ); @@ -164,12 +164,12 @@ void PptEscherEx::OpenContainer( UINT16 n_EscherContainer, int nRecInstance ) { if ( !mbEscherDg ) { - mbEscherDg = TRUE; + mbEscherDg = sal_True; mnCurrentDg = mxGlobal->GenerateDrawingId(); AddAtom( 8, ESCHER_Dg, 0, mnCurrentDg ); PtReplaceOrInsert( ESCHER_Persist_Dg | mnCurrentDg, mpOutStrm->Tell() ); - *mpOutStrm << (UINT32)0 // The number of shapes in this drawing - << (UINT32)0; // The last MSOSPID given to an SP in this DG + *mpOutStrm << (sal_uInt32)0 // The number of shapes in this drawing + << (sal_uInt32)0; // The last MSOSPID given to an SP in this DG } } break; @@ -178,7 +178,7 @@ void PptEscherEx::OpenContainer( UINT16 n_EscherContainer, int nRecInstance ) { if ( mbEscherDg ) { - mbEscherSpgr = TRUE; + mbEscherSpgr = sal_True; } } break; @@ -203,7 +203,7 @@ void PptEscherEx::CloseContainer() */ if ( ( mRecTypes.back() != ESCHER_SpgrContainer ) || ( mnGroupLevel < 12 ) ) { - UINT32 nSize, nPos = mpOutStrm->Tell(); + sal_uInt32 nSize, nPos = mpOutStrm->Tell(); nSize = ( nPos - mOffsets.back() ) - 4; mpOutStrm->Seek( mOffsets.back() ); *mpOutStrm << nSize; @@ -214,7 +214,7 @@ void PptEscherEx::CloseContainer() { if ( mbEscherDg ) { - mbEscherDg = FALSE; + mbEscherDg = sal_False; if ( DoSeek( ESCHER_Persist_Dg | mnCurrentDg ) ) *mpOutStrm << mxGlobal->GetDrawingShapeCount( mnCurrentDg ) << mxGlobal->GetLastShapeId( mnCurrentDg ); } @@ -225,7 +225,7 @@ void PptEscherEx::CloseContainer() { if ( mbEscherSpgr ) { - mbEscherSpgr = FALSE; + mbEscherSpgr = sal_False; } } @@ -259,10 +259,10 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie OpenContainer( ESCHER_SpContainer ); AddAtom( 16, ESCHER_Spgr, 1 ); PtReplaceOrInsert( ESCHER_Persist_Grouping_Snap | mnGroupLevel, mpOutStrm->Tell() ); - *mpOutStrm << (INT32)aRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden - << (INT32)aRect.Top() - << (INT32)aRect.Right() - << (INT32)aRect.Bottom(); + *mpOutStrm << (sal_Int32)aRect.Left() // Bounding box fuer die Gruppierten shapes an die sie attached werden + << (sal_Int32)aRect.Top() + << (sal_Int32)aRect.Right() + << (sal_Int32)aRect.Bottom(); nShapeId = GenerateShapeId(); if ( !mnGroupLevel ) @@ -274,7 +274,7 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie { AddAtom( 8, ESCHER_ClientAnchor ); PtReplaceOrInsert( ESCHER_Persist_Grouping_Logic | mnGroupLevel, mpOutStrm->Tell() ); - *mpOutStrm << (INT16)aRect.Top() << (INT16)aRect.Left() << (INT16)aRect.Right() << (INT16)aRect.Bottom(); + *mpOutStrm << (sal_Int16)aRect.Top() << (sal_Int16)aRect.Left() << (sal_Int16)aRect.Right() << (sal_Int16)aRect.Bottom(); } else { diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx index 739ef6300d1c..f65de369ab03 100644..100755 --- a/sd/source/filter/eppt/escherex.hxx +++ b/sd/source/filter/eppt/escherex.hxx @@ -30,7 +30,7 @@ #include <filter/msfilter/escherex.hxx> // --------------------------------------------------------------------------------------------- -// Werte fuer den ULONG im PPT_PST_TextHeaderAtom +// Werte fuer den sal_uLong im PPT_PST_TextHeaderAtom enum PPT_TextHeader { PPTTH_TITLE, @@ -62,12 +62,12 @@ class PptEscherEx : public EscherEx PptEscherEx( SvStream& rOut ); ~PptEscherEx(); - void OpenContainer( UINT16 n_EscherContainer, int nRecInstance = 0 ); + void OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance = 0 ); void CloseContainer(); sal_uInt32 EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClientData ); - UINT32 DrawingGroupContainerSize(); + sal_uInt32 DrawingGroupContainerSize(); void WriteDrawingGroupContainer( SvStream& rSt ); using EscherEx::EnterGroup; diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 0d91df41500f..74cdcb41d9ae 100644..100755 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -107,7 +107,7 @@ using namespace ::sfx2; class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper1< com::sun::star::task::XInteractionHandler > { com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > m_xInter; - USHORT nFilterError; + sal_uInt16 nFilterError; public: @@ -118,7 +118,7 @@ class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper1< com::sun: ~SdGRFFilter_ImplInteractionHdl(); - USHORT GetErrorCode() const { return nFilterError; }; + sal_uInt16 GetErrorCode() const { return nFilterError; }; virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& ) throw( com::sun::star::uno::RuntimeException ); @@ -136,7 +136,7 @@ void SdGRFFilter_ImplInteractionHdl::handle( const com::sun::star::uno::Referenc com::sun::star::drawing::GraphicFilterRequest aErr; if ( xRequest->getRequest() >>= aErr ) - nFilterError = (USHORT)aErr.ErrCode; + nFilterError = (sal_uInt16)aErr.ErrCode; else m_xInter->handle( xRequest ); } @@ -159,9 +159,9 @@ SdGRFFilter::~SdGRFFilter() // ----------------------------------------------------------------------------- -void SdGRFFilter::HandleGraphicFilterError( USHORT nFilterError, ULONG nStreamError ) +void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong nStreamError ) { - USHORT nId; + sal_uInt16 nId; switch( nFilterError ) { @@ -208,14 +208,14 @@ sal_Bool SdGRFFilter::Import() Graphic aGraphic; const String aFileName( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); - const USHORT nFilter = pGraphicFilter->GetImportFormatNumberForTypeName( mrMedium.GetFilter()->GetTypeName() ); + const sal_uInt16 nFilter = pGraphicFilter->GetImportFormatNumberForTypeName( mrMedium.GetFilter()->GetTypeName() ); sal_Bool bRet = sal_False; // ggf. Filterdialog ausfuehren if ( !pGraphicFilter->HasImportDialog( nFilter ) || pGraphicFilter->DoImportDialog( NULL, nFilter ) ) { SvStream* pIStm = mrMedium.GetInStream(); - USHORT nReturn = pIStm ? pGraphicFilter->ImportGraphic( aGraphic, aFileName, *pIStm, nFilter ) : 1; + sal_uInt16 nReturn = pIStm ? pGraphicFilter->ImportGraphic( aGraphic, aFileName, *pIStm, nFilter ) : 1; if( nReturn ) HandleGraphicFilterError( nReturn, pGraphicFilter->GetLastError().nStreamError ); @@ -313,7 +313,7 @@ sal_Bool SdGRFFilter::Export() if ( pSet && pGraphicFilter && xSource.is() ) { const String aTypeName( mrMedium.GetFilter()->GetTypeName() ); - const USHORT nFilter = pGraphicFilter->GetExportFormatNumberForTypeName( aTypeName ); + const sal_uInt16 nFilter = pGraphicFilter->GetExportFormatNumberForTypeName( aTypeName ); if ( nFilter != GRFILTER_FORMAT_NOTFOUND ) { uno::Reference< task::XInteractionHandler > mXInteractionHandler; @@ -480,11 +480,11 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su GraphicFilter& rGF = *GraphicFilter::GetGraphicFilter(); Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY); OUString aDefaultFormatName; - USHORT nCount = rGF.GetExportFormatCount(); + sal_uInt16 nCount = rGF.GetExportFormatCount(); std::map< OUString, OUString > aMimeTypeMap; - for ( USHORT i = 0; i < nCount; i++ ) + for ( sal_uInt16 i = 0; i < nCount; i++ ) { const OUString aExportFormatName( rGF.GetExportFormatName( i ) ); const OUString aFilterMimeType( rGF.GetExportFormatMediaType( i ) ); @@ -497,7 +497,7 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su if( aDefaultFormatName.getLength() == 0 ) { nCount = rGF.GetImportFormatCount(); - for( USHORT i = 0; i < nCount; i++ ) + for( sal_uInt16 i = 0; i < nCount; i++ ) { const OUString aFilterMimeType( rGF.GetImportFormatMediaType( i ) ); if( aMimeType == aFilterMimeType ) diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 9de46771e14c..0b187abd7cb7 100755 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -160,9 +160,9 @@ public: EasyFile(); ~EasyFile(); - ULONG createStream( const String& rUrl, SvStream*& rpStr ); - ULONG createFileName( const String& rUrl, String& rFileName ); - ULONG close(); + sal_uLong createStream( const String& rUrl, SvStream*& rpStr ); + sal_uLong createFileName( const String& rUrl, String& rFileName ); + sal_uLong close(); }; // ********************************************************************* @@ -357,7 +357,7 @@ String HtmlState::SetLink( const String& aLink, const String& aTarget ) // class HtmlExport Methoden // ********************************************************************* -static String getParagraphStyle( SdrOutliner* pOutliner, USHORT nPara ) +static String getParagraphStyle( SdrOutliner* pOutliner, sal_uInt16 nPara ) { SfxItemSet aParaSet( pOutliner->GetParaAttribs( nPara ) ); @@ -440,7 +440,7 @@ HtmlExport::~HtmlExport() // ------------------------------------------------------------------ if(mpImageFiles && mpHTMLFiles && mpPageNames && mpTextFiles) { - for ( USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++) + for ( sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++) { delete mpImageFiles[nSdPage]; delete mpHTMLFiles[nSdPage]; @@ -491,7 +491,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams xub_StrLen nPos = aTmp.Search( '%' ); if(nPos != STRING_NOTFOUND) aTmp.Erase(nPos,1); - mnCompression = (INT16)aTmp.ToInt32(); + mnCompression = (sal_Int16)aTmp.ToInt32(); } } else if( pParams->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Width" ) ) ) @@ -670,7 +670,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams break; } */ - mnHeightPixel = (USHORT)(mnWidthPixel/dRatio); + mnHeightPixel = (sal_uInt16)(mnWidthPixel/dRatio); //------------------------------------------------------------------ // Ziel ausklamuestern... @@ -682,8 +682,8 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams maIndex = aINetURLObj.GetLastName(); mnSdPageCount = mpDoc->GetSdPageCount( PK_STANDARD ); -// USHORT nHiddenSlides = 0; - for( USHORT nPage = 0; nPage < mnSdPageCount; nPage++ ) +// sal_uInt16 nHiddenSlides = 0; + for( sal_uInt16 nPage = 0; nPage < mnSdPageCount; nPage++ ) { pPage = mpDoc->GetSdPage( nPage, PK_STANDARD ); @@ -724,7 +724,7 @@ void HtmlExport::ExportHtml() if( mbDownload ) { // Separator such und Extension ausblenden - USHORT nSepPos = maDocFileName.Search( sal_Unicode('.') ); + sal_uInt16 nSepPos = maDocFileName.Search( sal_Unicode('.') ); if(nSepPos != STRING_NOTFOUND) maDocFileName.Erase(nSepPos); @@ -734,7 +734,7 @@ void HtmlExport::ExportHtml() ////// - USHORT nProgrCount = mnSdPageCount; + sal_uInt16 nProgrCount = mnSdPageCount; nProgrCount += mbImpress?mnSdPageCount:0; nProgrCount += mbContentsPage?1:0; nProgrCount += (mbFrames && mbNotes)?mnSdPageCount:0; @@ -834,8 +834,8 @@ void HtmlExport::SetDocColors( SdPage* pPage ) if(pSheet) { SfxItemSet& rSet = pSheet->GetItemSet(); - if(rSet.GetItemState(EE_CHAR_COLOR,TRUE) == SFX_ITEM_ON) - maTextColor = ((SvxColorItem*)rSet.GetItem(EE_CHAR_COLOR,TRUE))->GetValue(); + if(rSet.GetItemState(EE_CHAR_COLOR,sal_True) == SFX_ITEM_ON) + maTextColor = ((SvxColorItem*)rSet.GetItem(EE_CHAR_COLOR,sal_True))->GetValue(); } // Standard Hintergrundfarbe aus Background der MasterPage der ersten Seite @@ -850,7 +850,7 @@ void HtmlExport::SetDocColors( SdPage* pPage ) /////////////////////////////////////////////////////////////////////// -void HtmlExport::InitProgress( USHORT nProgrCount ) +void HtmlExport::InitProgress( sal_uInt16 nProgrCount ) { String aStr(SdResId(STR_CREATE_PAGES)); mpProgress = new SfxProgress( mpDocSh, aStr, nProgrCount ); @@ -889,7 +889,7 @@ void HtmlExport::ExportWebCast() mnPagesWritten = 0; InitProgress( mnSdPageCount + 9 ); - mpDocSh->SetWaitCursor( TRUE ); + mpDocSh->SetWaitCursor( sal_True ); CreateFileNames(); @@ -1031,7 +1031,7 @@ bool HtmlExport::CreateImagesForPresPages() aDescriptor[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FilterData") ); aDescriptor[2].Value <<= aFilterData; - for (USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++) + for (sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++) { SdPage* pPage = maPages[ nSdPage ]; @@ -1061,11 +1061,11 @@ bool HtmlExport::CreateImagesForPresPages() // ===================================================================== SdrTextObj* HtmlExport::GetLayoutTextObject(SdrPage* pPage) { - ULONG nObjectCount = pPage->GetObjCount(); + sal_uLong nObjectCount = pPage->GetObjCount(); SdrObject* pObject = NULL; SdrTextObj* pResult = NULL; - for (ULONG nObject = 0; nObject < nObjectCount; nObject++) + for (sal_uLong nObject = 0; nObject < nObjectCount; nObject++) { pObject = pPage->GetObj(nObject); if (pObject->GetObjInventor() == SdrInventor && @@ -1101,7 +1101,7 @@ bool HtmlExport::CreateHtmlTextForPresPages() SdrOutliner* pOutliner = mpDoc->GetInternalOutliner(); - for(USHORT nSdPage = 0; nSdPage < mnSdPageCount && bOk; nSdPage++) + for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount && bOk; nSdPage++) { SdPage* pPage = maPages[ nSdPage ]; @@ -1169,7 +1169,7 @@ bool HtmlExport::CreateHtmlTextForPresPages() the given filename */ bool HtmlExport::WriteHtml( const String& rFileName, bool bAddExtension, const String& rHtmlData ) { - ULONG nErr = 0; + sal_uLong nErr = 0; String aFileName( rFileName ); if( bAddExtension ) @@ -1239,19 +1239,19 @@ String HtmlExport::CreateTextForPage( SdrOutliner* pOutliner, pOutliner->Clear(); pOutliner->SetText( *pOPO ); - ULONG nCount = pOutliner->GetParagraphCount(); + sal_uLong nCount = pOutliner->GetParagraphCount(); Paragraph* pPara = NULL; sal_Int16 nActDepth = -1; String aParaText; - for (ULONG nPara = 0; nPara < nCount; nPara++) + for (sal_uLong nPara = 0; nPara < nCount; nPara++) { pPara = pOutliner->GetParagraph(nPara); if(pPara == 0) continue; - const sal_Int16 nDepth = (USHORT) pOutliner->GetDepth( (USHORT) nPara ); + const sal_Int16 nDepth = (sal_uInt16) pOutliner->GetDepth( (sal_uInt16) nPara ); aParaText = ParagraphToHTMLString(pOutliner,nPara,rBackgroundColor); if(aParaText.Len() == 0) @@ -1336,8 +1336,8 @@ String HtmlExport::CreateTextForNotesPage( SdrOutliner* pOutliner, pOutliner->Clear(); pOutliner->SetText( *pOPO ); - ULONG nCount = pOutliner->GetParagraphCount(); - for (ULONG nPara = 0; nPara < nCount; nPara++) + sal_uLong nCount = pOutliner->GetParagraphCount(); + for (sal_uLong nPara = 0; nPara < nCount; nPara++) { aStr.AppendAscii("<p style=\""); aStr.Append( getParagraphStyle( pOutliner, nPara ) ); @@ -1354,7 +1354,7 @@ String HtmlExport::CreateTextForNotesPage( SdrOutliner* pOutliner, // ===================================================================== // Wandelt einen Paragraphen des Outliners in Html // ===================================================================== -String HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, const Color& rBackgroundColor ) +String HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, sal_uLong nPara, const Color& rBackgroundColor ) { String aStr; @@ -1364,7 +1364,7 @@ String HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, c // TODO: MALTE!!! EditEngine& rEditEngine = *(EditEngine*)&pOutliner->GetEditEngine(); bool bOldUpdateMode = rEditEngine.GetUpdateMode(); - rEditEngine.SetUpdateMode(TRUE); + rEditEngine.SetUpdateMode(sal_True); Paragraph* pPara = pOutliner->GetParagraph(nPara); if(NULL == pPara) @@ -1372,15 +1372,15 @@ String HtmlExport::ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, c HtmlState aState( (mbUserAttr || mbDocColors) ? maTextColor : Color(COL_BLACK) ); SvUShorts aPortionList; - rEditEngine.GetPortions( (USHORT) nPara, aPortionList ); - USHORT nPortionCount = aPortionList.Count(); + rEditEngine.GetPortions( (sal_uInt16) nPara, aPortionList ); + sal_uInt16 nPortionCount = aPortionList.Count(); - USHORT nPos1 = 0; - for( USHORT nPortion = 0; nPortion < nPortionCount; nPortion++ ) + sal_uInt16 nPos1 = 0; + for( sal_uInt16 nPortion = 0; nPortion < nPortionCount; nPortion++ ) { - USHORT nPos2 = aPortionList.GetObject(nPortion); + sal_uInt16 nPos2 = aPortionList.GetObject(nPortion); - ESelection aSelection( (USHORT) nPara, nPos1, (USHORT) nPara, nPos2); + ESelection aSelection( (sal_uInt16) nPara, nPos1, (sal_uInt16) nPara, nPos2); SfxItemSet aSet( rEditEngine.GetAttribs( aSelection ) ); @@ -1497,7 +1497,7 @@ bool HtmlExport::CreateHtmlForPresPages() List aClickableObjects; - for(USHORT nSdPage = 0; nSdPage < mnSdPageCount && bOk; nSdPage++) + for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount && bOk; nSdPage++) { // Klickbare Objekte finden (auch auf der Masterpage) und // in Liste stellen. In umgekehrter Zeichenreihenfolge in @@ -1515,8 +1515,8 @@ bool HtmlExport::CreateHtmlForPresPages() while (!bMasterDone) { - // TRUE = rueckwaerts - SdrObjListIter aIter(*pPage, IM_DEEPWITHGROUPS, TRUE); + // sal_True = rueckwaerts + SdrObjListIter aIter(*pPage, IM_DEEPWITHGROUPS, sal_True); SdrObject* pObject = aIter.Next(); while (pObject) @@ -1544,7 +1544,7 @@ bool HtmlExport::CreateHtmlForPresPages() else bMasterDone = true; } - ULONG nClickableObjectCount = aClickableObjects.Count(); + sal_uLong nClickableObjectCount = aClickableObjects.Count(); // HTML Head String aStr(maHTMLHeader); @@ -1557,7 +1557,7 @@ bool HtmlExport::CreateHtmlForPresPages() pPage = maPages[ nSdPage ]; if( meMode == PUBLISH_KIOSK ) { - ULONG nSecs = 0; + sal_uLong nSecs = 0; bool bEndless = false; if( !mbAutoSlide ) { @@ -1638,7 +1638,7 @@ bool HtmlExport::CreateHtmlForPresPages() { aStr.AppendAscii( "<map name=\"map0\">\r\n" ); - for (ULONG nObject = 0; nObject < nClickableObjectCount; nObject++) + for (sal_uLong nObject = 0; nObject < nClickableObjectCount; nObject++) { SdrObject* pObject = (SdrObject*)aClickableObjects.GetObject(nObject); SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObject); @@ -1648,7 +1648,7 @@ bool HtmlExport::CreateHtmlForPresPages() Point aLogPos(aRect.TopLeft()); bool bIsSquare = aRect.GetWidth() == aRect.GetHeight(); - ULONG nPageWidth = pPage->GetSize().Width() - pPage->GetLftBorder() - + sal_uLong nPageWidth = pPage->GetSize().Width() - pPage->GetLftBorder() - pPage->GetRgtBorder(); // das BoundRect bezieht sich auf den physikalischen @@ -1670,17 +1670,17 @@ bool HtmlExport::CreateHtmlForPresPages() if (pIMapInfo) { const ImageMap& rIMap = pIMapInfo->GetImageMap(); - UINT16 nAreaCount = rIMap.GetIMapObjectCount(); - for (UINT16 nArea = 0; nArea < nAreaCount; nArea++) + sal_uInt16 nAreaCount = rIMap.GetIMapObjectCount(); + for (sal_uInt16 nArea = 0; nArea < nAreaCount; nArea++) { IMapObject* pArea = rIMap.GetIMapObject(nArea); - UINT16 nType = pArea->GetType(); + sal_uInt16 nType = pArea->GetType(); String aURL( pArea->GetURL() ); // ggfs. Seiten- oder Objektnamen umwandeln in den // Namen der entsprechenden HTML-Datei - BOOL bIsMasterPage; - USHORT nPgNum = mpDoc->GetPageByName( aURL, bIsMasterPage ); + sal_Bool bIsMasterPage; + sal_uInt16 nPgNum = mpDoc->GetPageByName( aURL, bIsMasterPage ); SdrObject* pObj = NULL; if (nPgNum == SDRPAGE_NOTFOUND) @@ -1724,9 +1724,9 @@ bool HtmlExport::CreateHtmlForPresPages() aCenter.X() = (long)(aCenter.X() * fLogicToPixel); aCenter.Y() = (long)(aCenter.Y() * fLogicToPixel); - ULONG nCircleRadius = (((IMapCircleObject*)pArea)-> + sal_uLong nCircleRadius = (((IMapCircleObject*)pArea)-> GetRadius(false)); - nCircleRadius = (ULONG)(nCircleRadius * fLogicToPixel); + nCircleRadius = (sal_uLong)(nCircleRadius * fLogicToPixel); aStr += CreateHTMLCircleArea(nCircleRadius, aCenter.X(), aCenter.Y(), aURL); @@ -1764,8 +1764,8 @@ bool HtmlExport::CreateHtmlForPresPages() { case presentation::ClickAction_BOOKMARK: { - BOOL bIsMasterPage; - USHORT nPgNum = mpDoc->GetPageByName( pInfo->GetBookmark(), bIsMasterPage ); + sal_Bool bIsMasterPage; + sal_uInt16 nPgNum = mpDoc->GetPageByName( pInfo->GetBookmark(), bIsMasterPage ); SdrObject* pObj = NULL; if( nPgNum == SDRPAGE_NOTFOUND ) @@ -1787,25 +1787,25 @@ bool HtmlExport::CreateHtmlForPresPages() case presentation::ClickAction_PREVPAGE: { - ULONG nPage = nSdPage; + sal_uLong nPage = nSdPage; if (nSdPage == 0) nPage = 0; else nPage = nSdPage - 1; - aHRef = CreatePageURL( (USHORT) nPage); + aHRef = CreatePageURL( (sal_uInt16) nPage); } break; case presentation::ClickAction_NEXTPAGE: { - ULONG nPage = nSdPage; + sal_uLong nPage = nSdPage; if (nSdPage == mnSdPageCount - 1) nPage = mnSdPageCount - 1; else nPage = nSdPage + 1; - aHRef = CreatePageURL( (USHORT) nPage); + aHRef = CreatePageURL( (sal_uInt16) nPage); } break; @@ -1916,7 +1916,7 @@ bool HtmlExport::CreateContentPage() aStr += RESTOHTML(STR_HTMLEXP_CONTENTS); aStr.AppendAscii( "</h3>" ); - for(USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++) + for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++) { String aPageName = *mpPageNames[nSdPage]; aStr.AppendAscii( "<div align=\"left\">" ); @@ -2000,7 +2000,7 @@ bool HtmlExport::CreateNotesPages() bool bOk = true; SdrOutliner* pOutliner = mpDoc->GetInternalOutliner(); - for( USHORT nSdPage = 0; bOk && nSdPage < mnSdPageCount; nSdPage++ ) + for( sal_uInt16 nSdPage = 0; bOk && nSdPage < mnSdPageCount; nSdPage++ ) { SdPage* pPage = maNotesPages[nSdPage]; if( mbDocColors ) @@ -2056,7 +2056,7 @@ bool HtmlExport::CreateOutlinePages() aStr += CreateBodyTag(); SdrOutliner* pOutliner = mpDoc->GetInternalOutliner(); - for(USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++) + for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++) { SdPage* pPage = maPages[ nSdPage ]; @@ -2109,7 +2109,7 @@ void HtmlExport::CreateFileNames() mbHeader = false; // Ueberschrift auf Uebersichtsseite? - for (USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++) + for (sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++) { String* pName; if(nSdPage == 0 && !mbContentsPage && !mbFrames ) @@ -2185,7 +2185,7 @@ String HtmlExport::getDocumentTitle() } } - for( UINT16 i = 0; i < mDocTitle.Len(); i++ ) + for( sal_uInt16 i = 0; i < mDocTitle.Len(); i++ ) if( mDocTitle.GetChar(i) == (sal_Unicode)0xff) mDocTitle.SetChar(i, sal_Unicode(' ') ); } @@ -2195,7 +2195,7 @@ String HtmlExport::getDocumentTitle() mDocTitle = maDocFileName; int nDot = mDocTitle.Search( '.' ); if( nDot > 0 ) - mDocTitle.Erase( (USHORT)nDot ); + mDocTitle.Erase( (sal_uInt16)nDot ); } mbHeader = true; } @@ -2577,7 +2577,7 @@ bool HtmlExport::CreateNavBarFrames() // ==================================================================== // Buttonleiste fuer Standard ausgeben // ==================================================================== -String HtmlExport::CreateNavBar( USHORT nSdPage, bool bIsText ) const +String HtmlExport::CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const { // Navigationsleiste vorbereiten String aStrNavFirst( SdResId(STR_HTMLEXP_FIRSTPAGE) ); @@ -2754,8 +2754,8 @@ String HtmlExport::CreateLink( const String& aLink, // Erzeugt ein Image-tag // ===================================================================== String HtmlExport::CreateImage( const String& aImage, const String& aAltText, - INT16 nWidth, - INT16 nHeight ) const + sal_Int16 nWidth, + sal_Int16 nHeight ) const { String aStr( RTL_CONSTASCII_USTRINGPARAM("<img src=\"")); aStr += StringToURL(aImage); @@ -2810,9 +2810,9 @@ String HtmlExport::ColorToHTMLString( Color aColor ) // ===================================================================== // Area fuer Kreis erzeugen; es werden Pixelkoordinaten erwartet // ===================================================================== -String HtmlExport::CreateHTMLCircleArea( ULONG nRadius, - ULONG nCenterX, - ULONG nCenterY, +String HtmlExport::CreateHTMLCircleArea( sal_uLong nRadius, + sal_uLong nCenterX, + sal_uLong nCenterY, const String& rHRef ) const { String aStr( RTL_CONSTASCII_USTRINGPARAM("<area shape=\"circle\" alt=\"\" coords=\"" )); @@ -2909,7 +2909,7 @@ String HtmlExport::StringToHTMLString( const String& rString ) // ===================================================================== // Erzeugt die URL einer bestimmten Seite // ===================================================================== -String HtmlExport::CreatePageURL( USHORT nPgNum ) +String HtmlExport::CreatePageURL( sal_uInt16 nPgNum ) { if(mbFrames) { @@ -2932,7 +2932,7 @@ bool HtmlExport::CopyScript( const String& rPath, const String& rSource, const S meEC.SetContext( STR_HTMLEXP_ERROR_OPEN_FILE, rSource ); - ULONG nErr = 0; + sal_uLong nErr = 0; SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ); if( pIStm ) @@ -3006,7 +3006,7 @@ static const char * ASP_Scripts[] = { "common.inc", "webcast.asp", "show.asp", " /** erzeugt und speichert die f�r WebShow ben�tigte ASP Scripte */ bool HtmlExport::CreateASPScripts() { - for( USHORT n = 0; n < (sizeof( ASP_Scripts ) / sizeof(char *)); n++ ) + for( sal_uInt16 n = 0; n < (sizeof( ASP_Scripts ) / sizeof(char *)); n++ ) { String aScript; @@ -3027,7 +3027,7 @@ static const char *PERL_Scripts[] = { "webcast.pl", "common.pl", "editpic.pl", " /** erzeugt und speichert die f�r WebShow ben�tigte PERL Scripte */ bool HtmlExport::CreatePERLScripts() { - for( USHORT n = 0; n < (sizeof( PERL_Scripts ) / sizeof(char *)); n++ ) + for( sal_uInt16 n = 0; n < (sizeof( PERL_Scripts ) / sizeof(char *)); n++ ) { String aScript; aScript.AssignAscii( PERL_Scripts[n] ); @@ -3048,7 +3048,7 @@ bool HtmlExport::CreatePERLScripts() bool HtmlExport::CreateImageFileList() { String aStr; - for( USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++) + for( sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++) { aStr += String::CreateFromInt32( nSdPage + 1 ); aStr.Append(sal_Unicode(';')); @@ -3076,7 +3076,7 @@ bool HtmlExport::CreateImageNumberFile() meEC.SetContext( STR_HTMLEXP_ERROR_CREATE_FILE, aFileName ); EasyFile aFile; SvStream* pStr; - ULONG nErr = aFile.createStream(aFull, pStr); + sal_uLong nErr = aFile.createStream(aFull, pStr); if(nErr == 0) { *pStr << (const char *)"1"; @@ -3254,9 +3254,9 @@ EasyFile::~EasyFile() } // ===================================================================== -ULONG EasyFile::createStream( const String& rUrl, SvStream* &rpStr ) +sal_uLong EasyFile::createStream( const String& rUrl, SvStream* &rpStr ) { - ULONG nErr = 0; + sal_uLong nErr = 0; if(bOpen) nErr = close(); @@ -3294,9 +3294,9 @@ ULONG EasyFile::createStream( const String& rUrl, SvStream* &rpStr ) } // ===================================================================== -ULONG EasyFile::createFileName( const String& rURL, String& rFileName ) +sal_uLong EasyFile::createFileName( const String& rURL, String& rFileName ) { - ULONG nErr = 0; + sal_uLong nErr = 0; if( bOpen ) nErr = close(); @@ -3319,9 +3319,9 @@ ULONG EasyFile::createFileName( const String& rURL, String& rFileName ) } // ===================================================================== -ULONG EasyFile::close() +sal_uLong EasyFile::close() { - ULONG nErr = 0; + sal_uLong nErr = 0; delete pOStm; pOStm = NULL; @@ -3355,7 +3355,7 @@ HtmlErrorContext::HtmlErrorContext(Window *_pWin) // ===================================================================== -BOOL HtmlErrorContext::GetString( ULONG, String& rCtxStr ) +sal_Bool HtmlErrorContext::GetString( sal_uLong, String& rCtxStr ) { DBG_ASSERT( mnResId != 0, "No error context set" ); if( mnResId == 0 ) @@ -3371,7 +3371,7 @@ BOOL HtmlErrorContext::GetString( ULONG, String& rCtxStr ) // ===================================================================== -void HtmlErrorContext::SetContext( USHORT nResId, const String& rURL ) +void HtmlErrorContext::SetContext( sal_uInt16 nResId, const String& rURL ) { mnResId = nResId; maURL1 = rURL; @@ -3380,7 +3380,7 @@ void HtmlErrorContext::SetContext( USHORT nResId, const String& rURL ) // ===================================================================== -void HtmlErrorContext::SetContext( USHORT nResId, const String& rURL1, const String& rURL2 ) +void HtmlErrorContext::SetContext( sal_uInt16 nResId, const String& rURL1, const String& rURL2 ) { mnResId = nResId; maURL1 = rURL1; diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 43bc12419f84..6c766ed19fe3 100755 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -78,7 +78,7 @@ class View; class HtmlErrorContext : public ErrorContext { private: - USHORT mnResId; + sal_uInt16 mnResId; String maURL1; String maURL2; @@ -86,10 +86,10 @@ public: HtmlErrorContext(Window *pWin=0); ~HtmlErrorContext() {}; - virtual BOOL GetString( ULONG nErrId, String& rCtxStr ); + virtual sal_Bool GetString( sal_uLong nErrId, String& rCtxStr ); - void SetContext( USHORT nResId, const String& rURL ); - void SetContext( USHORT nResId, const String& rURL1, const String& rURL2 ); + void SetContext( sal_uInt16 nResId, const String& rURL ); + void SetContext( sal_uInt16 nResId, const String& rURL1, const String& rURL2 ); }; // ===================================================================== @@ -110,12 +110,12 @@ class HtmlExport HtmlPublishMode meMode; SfxProgress* mpProgress; bool mbImpress; - USHORT mnSdPageCount; - USHORT mnPagesWritten; + sal_uInt16 mnSdPageCount; + sal_uInt16 mnPagesWritten; bool mbContentsPage; - INT16 mnButtonThema; - UINT16 mnWidthPixel; - UINT16 mnHeightPixel; + sal_Int16 mnButtonThema; + sal_uInt16 mnWidthPixel; + sal_uInt16 mnHeightPixel; PublishingFormat meFormat; bool mbHeader; bool mbNotes; @@ -126,14 +126,14 @@ class HtmlExport String maAuthor; String maHomePage; String maInfo; - INT16 mnCompression; + sal_Int16 mnCompression; String maDocFileName; String maFramePage; String mDocTitle; bool mbDownload; bool mbAutoSlide; - UINT32 mnSlideDuration; + sal_uInt32 mnSlideDuration; bool mbSlideSound; bool mbHiddenSlides; bool mbEndless; @@ -191,30 +191,30 @@ class HtmlExport String CreateLink( const String& aLink, const String& aText, const String& aTarget = String()) const; - String CreateImage( const String& aImage, const String& aAltText, INT16 nWidth = -1, INT16 nHeight = -1 ) const; - String CreateNavBar( USHORT nSdPage, bool bIsText ) const; + String CreateImage( const String& aImage, const String& aAltText, sal_Int16 nWidth = -1, sal_Int16 nHeight = -1 ) const; + String CreateNavBar( sal_uInt16 nSdPage, bool bIsText ) const; String CreateBodyTag() const; - String ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, const Color& rBackgroundColor ); + String ParagraphToHTMLString( SdrOutliner* pOutliner, sal_uLong nPara, const Color& rBackgroundColor ); String TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState, const Color& rBackgroundColor ); String CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor ); String CreateTextForPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor ); String CreateTextForNotesPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor ); - String CreateHTMLCircleArea( ULONG nRadius, ULONG nCenterX, - ULONG nCenterY, const String& rHRef ) const; + String CreateHTMLCircleArea( sal_uLong nRadius, sal_uLong nCenterX, + sal_uLong nCenterY, const String& rHRef ) const; String CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPoly, Size aShift, double fFactor, const String& rHRef ) const; String CreateHTMLRectArea( const Rectangle& rRect, const String& rHRef ) const; - String CreatePageURL( USHORT nPgNum ); + String CreatePageURL( sal_uInt16 nPgNum ); String InsertSound( const String& rSoundFile ); bool CopyFile( const String& rSourceFile, const String& rDestPath ); bool CopyScript( const String& rPath, const String& rSource, const String& rDest, bool bUnix = false ); - void InitProgress( USHORT nProgrCount ); + void InitProgress( sal_uInt16 nProgrCount ); void ResetProgress(); String WriteMetaCharset() const; diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 7bd1fde5c091..769053277fa6 100755 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -76,7 +76,7 @@ using namespace com::sun::star::beans; extern void InterpolateFixedBitmap( FixedBitmap * pBitmap ); // Kennung fuer die Config Datei mit den Html Einstellungen -const UINT16 nMagic = (UINT16)0x1977; +const sal_uInt16 nMagic = (sal_uInt16)0x1977; // Key fuer die soffice.ini #define KEY_QUALITY "JPG-EXPORT-QUALITY" @@ -108,39 +108,39 @@ public: String m_aURL; // special Kiosk options - BOOL m_bAutoSlide; - UINT32 m_nSlideDuration; - BOOL m_bEndless; + sal_Bool m_bAutoSlide; + sal_uInt32 m_nSlideDuration; + sal_Bool m_bEndless; // special HTML options - BOOL m_bContentPage; - BOOL m_bNotes; + sal_Bool m_bContentPage; + sal_Bool m_bNotes; // misc options - UINT16 m_nResolution; + sal_uInt16 m_nResolution; String m_aCompression; PublishingFormat m_eFormat; - BOOL m_bSlideSound; - BOOL m_bHiddenSlides; + sal_Bool m_bSlideSound; + sal_Bool m_bHiddenSlides; // titel page information String m_aAuthor; String m_aEMail; String m_aWWW; String m_aMisc; - BOOL m_bDownload; - BOOL m_bCreated; // not used + sal_Bool m_bDownload; + sal_Bool m_bCreated; // not used // buttons and colorscheme - INT16 m_nButtonThema; - BOOL m_bUserAttr; + sal_Int16 m_nButtonThema; + sal_Bool m_bUserAttr; Color m_aBackColor; Color m_aTextColor; Color m_aLinkColor; Color m_aVLinkColor; Color m_aALinkColor; - BOOL m_bUseAttribs; - BOOL m_bUseColor; + sal_Bool m_bUseAttribs; + sal_Bool m_bUseColor; SdPublishingDesign(); @@ -155,8 +155,8 @@ public: SdPublishingDesign::SdPublishingDesign() { m_eMode = PUBLISH_HTML; - m_bContentPage = TRUE; - m_bNotes = TRUE; + m_bContentPage = sal_True; + m_bNotes = sal_True; m_eFormat = FORMAT_PNG; @@ -174,13 +174,13 @@ SdPublishingDesign::SdPublishingDesign() m_aAuthor += sal_Unicode(' '); m_aAuthor += (String)aUserOptions.GetLastName(); m_aEMail = aUserOptions.GetEmail(); - m_bDownload = FALSE; -//-/ m_bCreated = TRUE; + m_bDownload = sal_False; +//-/ m_bCreated = sal_True; m_nButtonThema = -1; - m_bUserAttr = FALSE; - m_bUseAttribs = TRUE; - m_bUseColor = TRUE; + m_bUserAttr = sal_False; + m_bUseAttribs = sal_True; + m_bUseColor = sal_True; m_aBackColor = COL_WHITE; m_aTextColor = COL_BLACK; @@ -190,12 +190,12 @@ SdPublishingDesign::SdPublishingDesign() m_eScript = SCRIPT_ASP; - m_bAutoSlide = TRUE; + m_bAutoSlide = sal_True; m_nSlideDuration = 15; - m_bEndless = TRUE; + m_bEndless = sal_True; - m_bSlideSound = TRUE; - m_bHiddenSlides = FALSE; + m_bSlideSound = sal_True; + m_bHiddenSlides = sal_False; } // ===================================================================== @@ -270,7 +270,7 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) { SdIOCompat aIO(rIn, STREAM_READ); - UINT16 nTemp16; + sal_uInt16 nTemp16; rIn.ReadByteString( rDesign.m_aDesignName, RTL_TEXTENCODING_UTF8 ); rIn >> nTemp16; @@ -322,12 +322,12 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) // Name rOut.WriteByteString( rDesign.m_aDesignName, RTL_TEXTENCODING_UTF8 ); - rOut << (UINT16)rDesign.m_eMode; + rOut << (sal_uInt16)rDesign.m_eMode; rOut << rDesign.m_bContentPage; rOut << rDesign.m_bNotes; rOut << rDesign.m_nResolution; rOut.WriteByteString( rDesign.m_aCompression, RTL_TEXTENCODING_UTF8 ); - rOut << (UINT16)rDesign.m_eFormat; + rOut << (sal_uInt16)rDesign.m_eFormat; rOut.WriteByteString( rDesign.m_aAuthor, RTL_TEXTENCODING_UTF8 ); rOut.WriteByteString( rDesign.m_aEMail, RTL_TEXTENCODING_UTF8 ); rOut.WriteByteString( rDesign.m_aWWW, RTL_TEXTENCODING_UTF8 ); @@ -344,7 +344,7 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) rOut << rDesign.m_bUseAttribs; rOut << rDesign.m_bUseColor; - rOut << (UINT16)rDesign.m_eScript; + rOut << (sal_uInt16)rDesign.m_eScript; rOut.WriteByteString( rDesign.m_aURL, RTL_TEXTENCODING_UTF8 ); rOut.WriteByteString( rDesign.m_aCGI, RTL_TEXTENCODING_UTF8 ); @@ -391,8 +391,8 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType) , aNextPageButton(this,SdResId(BUT_NEXT)) , aFinishButton(this,SdResId(BUT_FINISH)) , aAssistentFunc(NOOFPAGES) -, m_bButtonsDirty(TRUE) -, m_bDesignListDirty(FALSE) +, m_bButtonsDirty(sal_True) +, m_bDesignListDirty(sal_False) , m_pDesign(NULL) { m_bImpress = eDocType == DOCUMENT_TYPE_IMPRESS; @@ -435,7 +435,7 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType) pPage3_Png->SetClickHdl(LINK(this,SdPublishingDlg, GfxFormatHdl)); pPage3_Gif->SetClickHdl(LINK(this,SdPublishingDlg, GfxFormatHdl)); pPage3_Jpg->SetClickHdl(LINK(this,SdPublishingDlg, GfxFormatHdl)); - pPage3_Quality->Enable(FALSE); + pPage3_Quality->Enable(sal_False); pPage3_Resolution_1->SetClickHdl(LINK(this,SdPublishingDlg, ResolutionHdl )); pPage3_Resolution_2->SetClickHdl(LINK(this,SdPublishingDlg, ResolutionHdl )); @@ -467,7 +467,7 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType) pPage5_Buttons->SetLineCount( 4 ); pPage5_Buttons->SetExtraSpacing( 1 ); - for( UINT16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ ) + for( sal_uInt16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ ) { SdPublishingDesign *pDesign = (SdPublishingDesign*) m_pDesignList->GetObject(nIndex); @@ -491,7 +491,7 @@ SdPublishingDlg::~SdPublishingDlg() { if( m_pDesignList ) { - for( UINT16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ ) + for( sal_uInt16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ ) delete (SdPublishingDesign*)m_pDesignList->GetObject(nIndex); } @@ -795,8 +795,8 @@ void SdPublishingDlg::SetDefaults() SdPublishingDesign aDefault; SetDesign(&aDefault); - pPage1_NewDesign->Check(TRUE); - pPage1_OldDesign->Check(FALSE); + pPage1_NewDesign->Check(sal_True); + pPage1_OldDesign->Check(sal_False); UpdatePage(); } @@ -984,8 +984,8 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton ) { if(pButton == pPage1_NewDesign) { - pPage1_NewDesign->Check(TRUE); // wegen DesignDeleteHdl - pPage1_OldDesign->Check(FALSE); + pPage1_NewDesign->Check(sal_True); // wegen DesignDeleteHdl + pPage1_OldDesign->Check(sal_False); pPage1_Designs->Disable(); pPage1_DelDesign->Disable(); m_pDesign = NULL; @@ -995,14 +995,14 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton ) } else { - pPage1_NewDesign->Check(FALSE); + pPage1_NewDesign->Check(sal_False); pPage1_Designs->Enable(); pPage1_DelDesign->Enable(); if(pPage1_Designs->GetSelectEntryCount() == 0) pPage1_Designs->SelectEntryPos(0); - USHORT nPos = pPage1_Designs->GetSelectEntryPos(); + sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos(); m_pDesign = (SdPublishingDesign*)m_pDesignList->GetObject(nPos); DBG_ASSERT(m_pDesign, "Kein Design? Das darf nicht sein! (CL)"); @@ -1018,7 +1018,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton ) // ===================================================================== IMPL_LINK( SdPublishingDlg, DesignSelectHdl, ListBox *, EMPTYARG ) { - USHORT nPos = pPage1_Designs->GetSelectEntryPos(); + sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos(); m_pDesign = (SdPublishingDesign*)m_pDesignList->GetObject(nPos); DBG_ASSERT(m_pDesign, "Kein Design? Das darf nicht sein! (CL)"); @@ -1035,7 +1035,7 @@ IMPL_LINK( SdPublishingDlg, DesignSelectHdl, ListBox *, EMPTYARG ) // ===================================================================== IMPL_LINK( SdPublishingDlg, DesignDeleteHdl, PushButton *, EMPTYARG ) { - USHORT nPos = pPage1_Designs->GetSelectEntryPos(); + sal_uInt16 nPos = pPage1_Designs->GetSelectEntryPos(); SdPublishingDesign* pDesign = (SdPublishingDesign*) m_pDesignList->GetObject(nPos); DBG_ASSERT(pDesign, "Kein Design? Das darf nicht sein! (CL)"); @@ -1051,7 +1051,7 @@ IMPL_LINK( SdPublishingDlg, DesignDeleteHdl, PushButton *, EMPTYARG ) delete pDesign; - m_bDesignListDirty = TRUE; + m_bDesignListDirty = sal_True; UpdatePage(); @@ -1063,7 +1063,7 @@ IMPL_LINK( SdPublishingDlg, DesignDeleteHdl, PushButton *, EMPTYARG ) // ===================================================================== IMPL_LINK( SdPublishingDlg, WebServerHdl, RadioButton *, pButton ) { - BOOL bASP = pButton == pPage2_ASP; + sal_Bool bASP = pButton == pPage2_ASP; pPage2_ASP->Check( bASP ); pPage2_PERL->Check( !bASP ); @@ -1093,7 +1093,7 @@ IMPL_LINK( SdPublishingDlg, BaseHdl, RadioButton *, EMPTYARG ) if(pButton == pPage3_Standard) pPage3_Frames->Check( pButton == pPage3 ); else - pPage3_Standard->Check(FALSE); + pPage3_Standard->Check(sal_False); */ UpdatePage(); @@ -1142,7 +1142,7 @@ IMPL_LINK( SdPublishingDlg, ResolutionHdl, RadioButton *, pButton ) IMPL_LINK( SdPublishingDlg, ButtonsHdl, ValueSet *, EMPTYARG ) { // wird eine Bitmap Schaltflaeche gewaehlt, TexOnly ausschalten - pPage5_TextOnly->Check(FALSE); + pPage5_TextOnly->Check(sal_False); return 0; } @@ -1184,7 +1184,7 @@ IMPL_LINK( SdPublishingDlg, ColorHdl, PushButton *, pButton) m_aALinkColor = aDlg.GetColor(); } - pPage6_User->Check(TRUE); + pPage6_User->Check(sal_True); pPage6_Preview->SetColors( m_aBackColor, m_aTextColor, m_aLinkColor, m_aVLinkColor, m_aALinkColor ); pPage6_Preview->Invalidate(); @@ -1206,19 +1206,19 @@ IMPL_LINK( SdPublishingDlg, FinishHdl, OKButton *, EMPTYARG ) SdPublishingDesign* pDesign = new SdPublishingDesign(); GetDesign(pDesign); - BOOL bSave = FALSE; + sal_Bool bSave = sal_False; if(pPage1_OldDesign->IsChecked() && m_pDesign) { // aenderungen?? if(!(*pDesign == *m_pDesign)) - bSave = TRUE; + bSave = sal_True; } else { SdPublishingDesign aDefaultDesign; if(!(aDefaultDesign == *pDesign)) - bSave = TRUE; + bSave = sal_True; } if(bSave) @@ -1227,10 +1227,10 @@ IMPL_LINK( SdPublishingDlg, FinishHdl, OKButton *, EMPTYARG ) if(m_pDesign) aName = m_pDesign->m_aDesignName; - BOOL bRetry; + sal_Bool bRetry; do { - bRetry = FALSE; + bRetry = sal_False; SdDesignNameDlg aDlg(this, aName ); @@ -1239,7 +1239,7 @@ IMPL_LINK( SdPublishingDlg, FinishHdl, OKButton *, EMPTYARG ) pDesign->m_aDesignName = aDlg.GetDesignName(); SdPublishingDesign* pSameNameDes = NULL; - UINT16 nIndex; + sal_uInt16 nIndex; for( nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ ) { pSameNameDes = (SdPublishingDesign*) @@ -1264,7 +1264,7 @@ IMPL_LINK( SdPublishingDlg, FinishHdl, OKButton *, EMPTYARG ) if(!bRetry) { m_pDesignList->Insert(pDesign); - m_bDesignListDirty = TRUE; + m_bDesignListDirty = sal_True; pDesign = NULL; } } @@ -1334,7 +1334,7 @@ void SdPublishingDlg::UpdatePage() pPage2_Index_txt->Show(); pPage2_Index->Show(); - BOOL bPerl = pPage2_PERL->IsChecked(); + sal_Bool bPerl = pPage2_PERL->IsChecked(); pPage2_Index->Enable(bPerl); pPage2_Index_txt->Enable(bPerl); pPage2_URL_txt->Enable(bPerl); @@ -1363,7 +1363,7 @@ void SdPublishingDlg::UpdatePage() pPage2_Duration_txt->Show(); pPage2_Duration->Show(); pPage2_Endless->Show(); - BOOL bAuto = pPage2_ChgAuto->IsChecked(); + sal_Bool bAuto = pPage2_ChgAuto->IsChecked(); pPage2_Duration->Enable(bAuto); pPage2_Endless->Enable(bAuto); } @@ -1441,14 +1441,14 @@ void SdPublishingDlg::LoadPreviewButtons() { if( mpButtonSet->getPreview( nSet, aButtonNames, aImage ) ) { - pPage5_Buttons->InsertItem( (USHORT)nSet+1, aImage ); + pPage5_Buttons->InsertItem( (sal_uInt16)nSet+1, aImage ); if( nHeight < aImage.GetSizePixel().Height() ) nHeight = aImage.GetSizePixel().Height(); } } pPage5_Buttons->SetItemHeight( nHeight ); - m_bButtonsDirty = FALSE; + m_bButtonsDirty = sal_False; } } @@ -1581,7 +1581,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign ) pDesign->m_aEMail = pPage4_Email->GetText(); pDesign->m_aWWW = pPage4_WWW->GetText(); pDesign->m_aMisc = pPage4_Misc->GetText(); - pDesign->m_bDownload = m_bImpress?pPage4_Download->IsChecked():FALSE; + pDesign->m_bDownload = m_bImpress?pPage4_Download->IsChecked():sal_False; //-/ pDesign->m_bCreated = pPage4_Created->IsChecked(); if(pPage5_TextOnly->IsChecked()) @@ -1603,7 +1603,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign ) pDesign->m_aURL = pPage2_URL->GetText(); pDesign->m_bAutoSlide = pPage2_ChgAuto->IsChecked(); - pDesign->m_nSlideDuration = (UINT32)pPage2_Duration->GetTime().GetMSFromTime() / 1000; + pDesign->m_nSlideDuration = (sal_uInt32)pPage2_Duration->GetTime().GetMSFromTime() / 1000; pDesign->m_bEndless = pPage2_Endless->IsChecked(); } @@ -1620,9 +1620,9 @@ IMPL_LINK( SdPublishingDlg, LastPageHdl, PushButton *, EMPTYARG ) // ===================================================================== // Designs laden // ===================================================================== -BOOL SdPublishingDlg::Load() +sal_Bool SdPublishingDlg::Load() { - m_bDesignListDirty = FALSE; + m_bDesignListDirty = sal_False; m_pDesignList = new List(); @@ -1643,25 +1643,25 @@ BOOL SdPublishingDlg::Load() return sal_False; } - SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE, TRUE ); + SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE, sal_True ); SvStream* pStream = aMedium.GetInStream(); if( !pStream ) - return( FALSE ); + return( sal_False ); - UINT16 aCheck; + sal_uInt16 aCheck; *pStream >> aCheck; if(aCheck != nMagic) - return FALSE; + return sal_False; SdIOCompat aIO(*pStream, STREAM_READ); - UINT16 nDesigns; + sal_uInt16 nDesigns; *pStream >> nDesigns; - for( UINT16 nIndex = 0; + for( sal_uInt16 nIndex = 0; pStream->GetError() == SVSTREAM_OK && nIndex < nDesigns; nIndex++ ) { @@ -1677,29 +1677,29 @@ BOOL SdPublishingDlg::Load() // ===================================================================== // Designs speichern // ===================================================================== -BOOL SdPublishingDlg::Save() +sal_Bool SdPublishingDlg::Save() { INetURLObject aURL( SvtPathOptions().GetUserConfigPath() ); aURL.Append( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "designs.sod" ) ) ); - SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, FALSE ); + SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC, sal_False ); aMedium.IsRemote(); SvStream* pStream = aMedium.GetOutStream(); if( !pStream ) - return( FALSE ); + return( sal_False ); - UINT16 aCheck = nMagic; + sal_uInt16 aCheck = nMagic; *pStream << aCheck; // damit SdIOCompat vor dem Stream destruiert wird { SdIOCompat aIO(*pStream, STREAM_WRITE, 0); - UINT16 nDesigns = (UINT16) m_pDesignList->Count(); + sal_uInt16 nDesigns = (sal_uInt16) m_pDesignList->Count(); *pStream << nDesigns; - for( UINT16 nIndex = 0; + for( sal_uInt16 nIndex = 0; pStream->GetError() == SVSTREAM_OK && nIndex < nDesigns; nIndex++ ) { diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index 25ac858ca319..9deae616d7cb 100755 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -164,7 +164,7 @@ bool Ppt97Animation::HasAfterEffect_DimAfterEffect() const return m_aAtom.nAfterEffect == 3; } #endif -UINT32 Ppt97Animation::GetSoundRef() const +sal_uInt32 Ppt97Animation::GetSoundRef() const { return m_aAtom.nSoundRef; } diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx index c68ba9a19382..37302195e218 100755 --- a/sd/source/filter/ppt/ppt97animations.hxx +++ b/sd/source/filter/ppt/ppt97animations.hxx @@ -40,22 +40,22 @@ class Ppt97AnimationInfoAtom friend class Ppt97Animation; //-- member - UINT32 nDimColor; - UINT32 nFlags; // 0x0004: time instead of click - UINT32 nSoundRef; - INT32 nDelayTime; // 1/1000 sec - UINT16 nOrderID; - UINT16 nSlideCount; - UINT8 nBuildType; - UINT8 nFlyMethod; - UINT8 nFlyDirection; - UINT8 nAfterEffect; //nAfterEffect: 0: none; 1: change color; 2: dim on next effect; 3: dim after effect; - UINT8 nSubEffect; - UINT8 nOLEVerb; + sal_uInt32 nDimColor; + sal_uInt32 nFlags; // 0x0004: time instead of click + sal_uInt32 nSoundRef; + sal_Int32 nDelayTime; // 1/1000 sec + sal_uInt16 nOrderID; + sal_uInt16 nSlideCount; + sal_uInt8 nBuildType; + sal_uInt8 nFlyMethod; + sal_uInt8 nFlyDirection; + sal_uInt8 nAfterEffect; //nAfterEffect: 0: none; 1: change color; 2: dim on next effect; 3: dim after effect; + sal_uInt8 nSubEffect; + sal_uInt8 nOLEVerb; // unknown, because whole size needs to be 28 - UINT8 nUnknown1; - UINT8 nUnknown2; + sal_uInt8 nUnknown1; + sal_uInt8 nUnknown2; //-- methods void ReadStream( SvStream& rIn ); @@ -106,7 +106,7 @@ public: //public methods bool HasParagraphEffect() const; bool HasSoundEffect() const; sal_Int32 GetDimColor() const; - UINT32 GetSoundRef() const; + sal_uInt32 GetSoundRef() const; bool HasAnimateAssociatedShape() const; //true if the shape should be animated in addition to the text //set methods diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 6a5ce08bc912..8cc46a2eb46f 100755 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -155,7 +155,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvSto SfxItemSet& rSet = pSheet->GetItemSet(); // if autokerning is set in style, override it, ppt has no autokerning - if( rSet.GetItemState( EE_CHAR_PAIRKERNING, FALSE ) == SFX_ITEM_SET ) + if( rSet.GetItemState( EE_CHAR_PAIRKERNING, sal_False ) == SFX_ITEM_SET ) rSet.ClearItem( EE_CHAR_PAIRKERNING ); } } @@ -177,7 +177,7 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage : SdrPowerPointImport ( rParam, rMedium.GetBaseURL() ) , mrMed ( rMedium ) , mrStorage ( rStorage_ ) -, mbDocumentFound ( FALSE ) +, mbDocumentFound ( sal_False ) , mnFilterOptions ( 0 ) { mpDoc = pDocument; @@ -185,22 +185,22 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage { mbDocumentFound = SeekToDocument( &maDocHd ); // maDocHd = the latest DocumentHeader while ( SeekToRec( rStCtrl, PPT_PST_Document, nStreamLen, &maDocHd ) ) - mbDocumentFound = TRUE; + mbDocumentFound = sal_True; - UINT32 nDggContainerOfs = 0; + sal_uInt32 nDggContainerOfs = 0; if ( mbDocumentFound ) { - ULONG nPosMerk = rStCtrl.Tell(); + sal_uLong nPosMerk = rStCtrl.Tell(); pStData = rStorage_.OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "Pictures" ) ), STREAM_STD_READ ); rStCtrl.Seek( maDocHd.GetRecBegFilePos() + 8 ); - ULONG nDocLen = maDocHd.GetRecEndFilePos(); + sal_uLong nDocLen = maDocHd.GetRecEndFilePos(); DffRecordHeader aPPDGHd; if ( SeekToRec( rStCtrl, PPT_PST_PPDrawingGroup, nDocLen, &aPPDGHd ) ) { - ULONG nPPDGLen = aPPDGHd.GetRecEndFilePos(); + sal_uLong nPPDGLen = aPPDGHd.GetRecEndFilePos(); if ( SeekToRec( rStCtrl, DFF_msofbtDggContainer, nPPDGLen, NULL ) ) nDggContainerOfs = rStCtrl.Tell(); } @@ -252,7 +252,7 @@ ImplSdPPTImport::~ImplSdPPTImport() sal_Bool ImplSdPPTImport::Import() { if ( !bOk ) - return FALSE; + return sal_False; pSdrModel->setLock( sal_True ); pSdrModel->EnableUndo(false); @@ -264,8 +264,8 @@ sal_Bool ImplSdPPTImport::Import() ((EditEngine&)rOutl.GetEditEngine()).SetControlWord( nControlWord ); SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin(); - mnBackgroundLayerID = rAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRND )), FALSE ); - mnBackgroundObjectsLayerID = rAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRNDOBJ )), FALSE ); + mnBackgroundLayerID = rAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRND )), sal_False ); + mnBackgroundObjectsLayerID = rAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRNDOBJ )), sal_False ); ::sd::DrawDocShell* pDocShell = mpDoc->GetDocSh(); if ( pDocShell ) @@ -277,11 +277,11 @@ sal_Bool ImplSdPPTImport::Import() { PropItem aPropItem; - UINT32 nType, nPropSize, nPropCount; + sal_uInt32 nType, nPropSize, nPropCount; pDInfoSec2->Read(); - BYTE aPropSetGUID[ 16 ] = + sal_uInt8 aPropSetGUID[ 16 ] = { 0x02, 0xd5, 0xcd, 0xd5, 0x9c, 0x2e, 0x1b, 0x10, 0x93, 0x97, 0x08, 0x00, 0x2b, 0x2c, 0xf9, 0xae }; @@ -294,14 +294,14 @@ sal_Bool ImplSdPPTImport::Import() if ( ( nType == VT_I4 ) || ( nType == VT_UI4 ) ) { // examine PID_HEADINGPAIR to get the correct entry for PID_DOCPARTS - UINT32 nSlideCount, nVecCount; + sal_uInt32 nSlideCount, nVecCount; aPropItem >> nSlideCount; if ( nSlideCount && pSection->GetProperty( PID_HEADINGPAIR, aPropItem ) ) { - UINT32 nSlideTitleIndex = 0, nSlideTitleCount = 0; - UINT32 nFontIndex, nFontCount = 0; - UINT32 nDesignTemplateIndex, nDesignTemplateCount = 0; - UINT32 i, nTemp, nEntryCount = 0; + sal_uInt32 nSlideTitleIndex = 0, nSlideTitleCount = 0; + sal_uInt32 nFontIndex, nFontCount = 0; + sal_uInt32 nDesignTemplateIndex, nDesignTemplateCount = 0; + sal_uInt32 i, nTemp, nEntryCount = 0; String aUString; @@ -314,7 +314,7 @@ sal_Bool ImplSdPPTImport::Import() for ( i = 0; i < nVecCount; i++ ) { - if ( !aPropItem.Read( aUString, VT_EMPTY, FALSE ) ) + if ( !aPropItem.Read( aUString, VT_EMPTY, sal_False ) ) break; aPropItem >> nType; if ( ( nType != VT_I4 ) && ( nType != VT_UI4 ) ) @@ -353,7 +353,7 @@ sal_Bool ImplSdPPTImport::Import() } for ( i = 0; i < nSlideTitleCount; i++ ) { - if ( !aPropItem.Read( aUString, nType, FALSE ) ) + if ( !aPropItem.Read( aUString, nType, sal_False ) ) break; String* pString = new String( aUString ); if ( pString->EqualsAscii( "No Slide Title" )) @@ -378,7 +378,7 @@ sal_Bool ImplSdPPTImport::Import() } } - BYTE aUserPropSetGUID[ 16 ] = + sal_uInt8 aUserPropSetGUID[ 16 ] = { 0x05, 0xd5, 0xcd, 0xd5, 0x9c, 0x2e, 0x1b, 0x10, 0x93, 0x97, 0x08, 0x00, 0x2b, 0x2c, 0xf9, 0xae }; @@ -388,7 +388,7 @@ sal_Bool ImplSdPPTImport::Import() Dictionary aDict; if ( pSection->GetDictionary( aDict ) ) { - UINT32 nPropId = aDict.GetProperty( rtl::OUString::createFromAscii("_PID_HLINKS" )); + sal_uInt32 nPropId = aDict.GetProperty( rtl::OUString::createFromAscii("_PID_HLINKS" )); if ( nPropId ) { if ( pSection->GetProperty( nPropId, aPropItem ) ) @@ -402,7 +402,7 @@ sal_Bool ImplSdPPTImport::Import() if ( ! ( nPropCount % 6 ) ) { - UINT32 i; + sal_uInt32 i; nPropCount /= 6; // 6 propertys a hyperlink @@ -509,7 +509,7 @@ sal_Bool ImplSdPPTImport::Import() { pHyperlink->aConvSubString = String( SdResId( STR_PAGE ) ); pHyperlink->aConvSubString.Append( sal_Unicode( ' ' ) ); - pHyperlink->aConvSubString.Append( mpDoc->CreatePageNumValue( (USHORT)nPageNumber + 1 ) ); + pHyperlink->aConvSubString.Append( mpDoc->CreatePageNumValue( (sal_uInt16)nPageNumber + 1 ) ); } } } @@ -534,7 +534,7 @@ sal_Bool ImplSdPPTImport::Import() DffRecordHeader aHyperHd; if ( SeekToRec( rStCtrl, PPT_PST_ExObjList, maDocHd.GetRecEndFilePos(), &aHyperHd ) ) { - UINT32 nExObjHyperListLen = aHyperHd.GetRecEndFilePos(); + sal_uInt32 nExObjHyperListLen = aHyperHd.GetRecEndFilePos(); for ( void* pPtr = aHyperList.First(); pPtr; pPtr = aHyperList.Next() ) { DffRecordHeader aHyperE; @@ -568,24 +568,24 @@ sal_Bool ImplSdPPTImport::Import() SfxProgress* pStbMgr = new SfxProgress( pDocShell, String( SdResId( STR_POWERPOINT_IMPORT ) ), pMasterPages->Count() + pSlidePages->Count() + pNotePages->Count() ); - UINT32 nImportedPages = 0; + sal_uInt32 nImportedPages = 0; { - UINT16 nMasterAnz = GetPageCount( PPT_MASTERPAGE ); + sal_uInt16 nMasterAnz = GetPageCount( PPT_MASTERPAGE ); - for ( USHORT nMasterNum = 0; nMasterNum < nMasterAnz; nMasterNum++ ) + for ( sal_uInt16 nMasterNum = 0; nMasterNum < nMasterAnz; nMasterNum++ ) { SetPageNum( nMasterNum, PPT_MASTERPAGE ); - SdPage* pPage = (SdPage*)MakeBlancPage( TRUE ); + SdPage* pPage = (SdPage*)MakeBlancPage( sal_True ); if ( pPage ) { - BOOL bNotesMaster = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bNotesMaster; - BOOL bStarDrawFiller = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bStarDrawFiller; + sal_Bool bNotesMaster = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bNotesMaster; + sal_Bool bStarDrawFiller = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bStarDrawFiller; PageKind ePgKind = ( bNotesMaster ) ? PK_NOTES : PK_STANDARD; pPage->SetPageKind( ePgKind ); pSdrModel->InsertMasterPage( (SdrPage*)pPage ); if ( bNotesMaster && bStarDrawFiller ) - ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_NOTES, TRUE ); + ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_NOTES, sal_True ); if ( nMasterNum ) { boost::optional< sal_Int16 > oStartNumbering; @@ -645,9 +645,9 @@ sal_Bool ImplSdPPTImport::Import() ///////////////////// if ( pPage->GetPageKind() == PK_STANDARD ) { - UINT32 nTitleInstance = TSS_TYPE_PAGETITLE; - UINT32 nOutlinerInstance = TSS_TYPE_BODY; -// BOOL bSwapStyleSheet = pSlideLayout->eLayout == PPT_LAYOUT_TITLEMASTERSLIDE; + sal_uInt32 nTitleInstance = TSS_TYPE_PAGETITLE; + sal_uInt32 nOutlinerInstance = TSS_TYPE_BODY; +// sal_Bool bSwapStyleSheet = pSlideLayout->eLayout == PPT_LAYOUT_TITLEMASTERSLIDE; // if ( bSwapStyleSheet ) // { // nTitleInstance = TSS_TYPE_TITLE; @@ -669,7 +669,7 @@ sal_Bool ImplSdPPTImport::Import() //////////////////////// // outlinerstylesheet // //////////////////////// - UINT16 nLevel; + sal_uInt16 nLevel; PPTParagraphObj* pParagraphs[ 9 ]; PPTParagraphObj* pPreviousPara = NULL; @@ -750,7 +750,7 @@ sal_Bool ImplSdPPTImport::Import() ((SdPage*)pNotesClone)->SetLayoutName( aLayoutName ); } } - else if ( ( pPersist->bStarDrawFiller == FALSE ) ) + else if ( ( pPersist->bStarDrawFiller == sal_False ) ) { PptSlidePersistEntry* pE = pPersist; while( ( pE->aSlideAtom.nFlags & 4 ) && pE->aSlideAtom.nMasterId ) @@ -761,7 +761,7 @@ sal_Bool ImplSdPPTImport::Import() else pE = (*pList)[ nNextMaster ]; } - SdrObject* pObj = ImportPageBackgroundObject( *pMPage, pE->nBackgroundOffset, TRUE ); // import background + SdrObject* pObj = ImportPageBackgroundObject( *pMPage, pE->nBackgroundOffset, sal_True ); // import background if ( pObj ) pMPage->NbcInsertObject( pObj ); @@ -897,24 +897,24 @@ sal_Bool ImplSdPPTImport::Import() // importing slide pages // //////////////////////////////////// { - UINT32 nFPosMerk = rStCtrl.Tell(); + sal_uInt32 nFPosMerk = rStCtrl.Tell(); PptPageKind ePageKind = eAktPageKind; - UINT16 nPageNum = nAktPageNum; + sal_uInt16 nPageNum = nAktPageNum; - SdPage* pHandoutPage = (SdPage*)MakeBlancPage( FALSE ); + SdPage* pHandoutPage = (SdPage*)MakeBlancPage( sal_False ); pHandoutPage->SetPageKind( PK_HANDOUT ); pSdrModel->InsertPage( pHandoutPage ); - USHORT nPageAnz = GetPageCount( PPT_SLIDEPAGE ); + sal_uInt16 nPageAnz = GetPageCount( PPT_SLIDEPAGE ); if ( nPageAnz ) { - for ( USHORT nPage = 0; nPage < nPageAnz; nPage++ ) + for ( sal_uInt16 nPage = 0; nPage < nPageAnz; nPage++ ) { sal_Bool bNewAnimationsUsed = sal_False; mePresChange = PRESCHANGE_SEMIAUTO; SetPageNum( nPage, PPT_SLIDEPAGE ); - SdPage* pPage = (SdPage*)MakeBlancPage( FALSE ); + SdPage* pPage = (SdPage*)MakeBlancPage( sal_False ); PptSlidePersistEntry* pMasterPersist = NULL; if ( HasMasterPage( nPage, PPT_SLIDEPAGE ) ) // try to get the LayoutName from the masterpage { @@ -993,7 +993,7 @@ sal_Bool ImplSdPPTImport::Import() // creating the corresponding note page eAktPageKind = PPT_NOTEPAGE; - SdPage* pNotesPage = (SdPage*)MakeBlancPage( FALSE ); + SdPage* pNotesPage = (SdPage*)MakeBlancPage( sal_False ); sal_uInt16 nNotesMasterNum = GetMasterPageIndex( nPage, PPT_SLIDEPAGE ) + 1; sal_uInt32 nNotesPageId = GetNotesPageId( nPage ); if ( nNotesPageId ) @@ -1017,13 +1017,13 @@ sal_Bool ImplSdPPTImport::Import() pSdrModel->InsertPage( pNotesPage ); // SJ: #i29625# because of form controls, the ImportPage( pNotesPage, pMasterPersist2 ); // page must be inserted before importing SetHeaderFooterPageSettings( pNotesPage, pMasterPersist2 ); - pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, FALSE ); + pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, sal_False ); } else { pNotesPage->SetPageKind( PK_NOTES ); pNotesPage->TRG_SetMasterPage(*pSdrModel->GetMasterPage(nNotesMasterNum)); - pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, TRUE ); + pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, sal_True ); pSdrModel->InsertPage( pNotesPage ); SdrObject* pPageObj = pNotesPage->GetPresObj( PRESOBJ_PAGE, 1 ); if ( pPageObj ) @@ -1039,7 +1039,7 @@ sal_Bool ImplSdPPTImport::Import() { // Das kann bei Dokumentvorlagen vorkommen eAktPageKind = PPT_SLIDEPAGE; - SdrPage* pPage = MakeBlancPage( FALSE ); + SdrPage* pPage = MakeBlancPage( sal_False ); pSdrModel->InsertPage( pPage ); // #i37397#, trying to set the title master for the first page @@ -1064,10 +1064,10 @@ sal_Bool ImplSdPPTImport::Import() ((SdPage*)pPage)->TRG_SetMasterPage( *((SdPage*)pFoundMaster) ); ((SdPage*)pPage)->SetLayoutName( ((SdPage*)pFoundMaster)->GetLayoutName() ); } - ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_TITLE, TRUE, TRUE ); + ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_TITLE, sal_True, sal_True ); eAktPageKind = PPT_NOTEPAGE; - SdrPage* pNPage = MakeBlancPage( FALSE ); + SdrPage* pNPage = MakeBlancPage( sal_False ); pSdrModel->InsertPage( pNPage ); } SetPageNum( nPageNum, ePageKind ); @@ -1095,7 +1095,7 @@ sal_Bool ImplSdPPTImport::Import() case PPT_LAYOUT_TITLEANDBODYSLIDE : { eAutoLayout = AUTOLAYOUT_ENUM; - USHORT nID1 = pSlideLayout->aPlaceholderId[ 1 ]; + sal_uInt16 nID1 = pSlideLayout->aPlaceholderId[ 1 ]; switch ( nID1 ) { case PPT_PLACEHOLDER_BODY : @@ -1123,8 +1123,8 @@ sal_Bool ImplSdPPTImport::Import() case PPT_LAYOUT_2COLUMNSANDTITLE : { eAutoLayout = AUTOLAYOUT_2TEXT; - USHORT nID1 = pSlideLayout->aPlaceholderId[ 1 ]; - USHORT nID2 = pSlideLayout->aPlaceholderId[ 2 ]; + sal_uInt16 nID1 = pSlideLayout->aPlaceholderId[ 1 ]; + sal_uInt16 nID2 = pSlideLayout->aPlaceholderId[ 2 ]; if ( nID1 == PPT_PLACEHOLDER_BODY && nID2 == PPT_PLACEHOLDER_GRAPH ) eAutoLayout = AUTOLAYOUT_TEXTCHART; else if ( nID1 == PPT_PLACEHOLDER_GRAPH && nID2 == PPT_PLACEHOLDER_BODY ) @@ -1149,8 +1149,8 @@ sal_Bool ImplSdPPTImport::Import() case PPT_LAYOUT_2ROWSANDTITLE : { eAutoLayout = AUTOLAYOUT_2TEXT; - USHORT nID1 = pSlideLayout->aPlaceholderId[ 1 ]; - USHORT nID2 = pSlideLayout->aPlaceholderId[ 2 ]; + sal_uInt16 nID1 = pSlideLayout->aPlaceholderId[ 1 ]; + sal_uInt16 nID2 = pSlideLayout->aPlaceholderId[ 2 ]; if ( nID1 == PPT_PLACEHOLDER_BODY && nID2 == PPT_PLACEHOLDER_OBJECT ) eAutoLayout = AUTOLAYOUT_TEXTOVEROBJ; else if ( nID1 == PPT_PLACEHOLDER_OBJECT && nID2 == PPT_PLACEHOLDER_BODY ) @@ -1197,17 +1197,17 @@ sal_Bool ImplSdPPTImport::Import() break; } if ( eAutoLayout != AUTOLAYOUT_NONE ) - pPage->SetAutoLayout( eAutoLayout, FALSE ); + pPage->SetAutoLayout( eAutoLayout, sal_False ); } } ////////////////////////////////////////////////////////////// // Handzettel-MasterPage: Autolayout setzen // ////////////////////////////////////////////////////////////// SdPage* pHandoutMPage = mpDoc->GetMasterSdPage( 0, PK_HANDOUT ); - pHandoutMPage->SetAutoLayout( AUTOLAYOUT_HANDOUT6, TRUE, TRUE ); + pHandoutMPage->SetAutoLayout( AUTOLAYOUT_HANDOUT6, sal_True, sal_True ); } - UINT32 nSlideCount = GetPageCount(); + sal_uInt32 nSlideCount = GetPageCount(); for ( i = 0; ( i < nSlideCount) && ( i < maSlideNameList.Count() ); i++ ) { SdPage* pPage = mpDoc->GetSdPage( i, PK_STANDARD ); @@ -1301,22 +1301,22 @@ sal_Bool ImplSdPPTImport::Import() if ( SeekToRec( rStCtrl, PPT_PST_NamedShowSlides, aCuHeader.GetRecEndFilePos(), &aContent ) ) { PptSlidePersistList* pPageList = GetPageList( PPT_SLIDEPAGE ); - UINT32 nSCount = aContent.nRecLen >> 2; + sal_uInt32 nSCount = aContent.nRecLen >> 2; if ( pPageList && nSCount ) { - List* pList = mpDoc->GetCustomShowList( TRUE ); + List* pList = mpDoc->GetCustomShowList( sal_True ); if ( pList ) { SdCustomShow* pSdCustomShow = new SdCustomShow( mpDoc ); if ( pSdCustomShow ) { pSdCustomShow->SetName( aCuShow ); - UINT32 nFound = 0; - for ( UINT32 nS = 0; nS < nSCount; nS++ ) + sal_uInt32 nFound = 0; + for ( sal_uInt32 nS = 0; nS < nSCount; nS++ ) { - UINT32 nPageNumber; + sal_uInt32 nPageNumber; rStCtrl >> nPageNumber; - USHORT nPage = pPageList->FindPage( nPageNumber ); + sal_uInt16 nPage = pPageList->FindPage( nPageNumber ); if ( nPage != PPTSLIDEPERSIST_ENTRY_NOTFOUND ) { SdPage* pPage = mpDoc->GetSdPage( nPage, PK_STANDARD ); @@ -1357,7 +1357,7 @@ sal_Bool ImplSdPPTImport::Import() >> nEndSlide; sal_Unicode nChar; - for ( UINT32 i2 = 0; i2 < 32; i2++ ) + for ( sal_uInt32 i2 = 0; i2 < 32; i2++ ) { rStCtrl >> nChar; if ( nChar ) @@ -1374,7 +1374,7 @@ sal_Bool ImplSdPPTImport::Import() if ( aCustomShow.Len() ) { void* pPtr; - List* pList = mpDoc->GetCustomShowList( FALSE ); + List* pList = mpDoc->GetCustomShowList( sal_False ); if ( pList ) { for ( pPtr = pList->First(); pPtr; pPtr = pList->Next() ) @@ -1434,7 +1434,7 @@ void ImplSdPPTImport::SetHeaderFooterPageSettings( SdPage* pPage, const PptSlide bool bVisible = pHFE->IsToDisplay( i ); if ( ( eAktPageKind == PPT_SLIDEPAGE ) && ( rSlidePersist.aSlideAtom.aLayout.eLayout == PPT_LAYOUT_TITLESLIDE ) - && ( aDocAtom.bTitlePlaceholdersOmitted == TRUE ) ) + && ( aDocAtom.bTitlePlaceholdersOmitted == sal_True ) ) { bVisible = sal_False; } @@ -1519,7 +1519,7 @@ bool Ppt97AnimationStlSortHelper::operator()( const std::pair< SdrObject*, Ppt97 void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimationsUsed ) { - ULONG nFilePosMerk = rStCtrl.Tell(); + sal_uLong nFilePosMerk = rStCtrl.Tell(); // PageKind an der Seite setzen (bisher nur PK_STANDARD oder PK_NOTES) if ( pPage->GetPageKind() == PK_STANDARD ) @@ -1535,7 +1535,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat if(pPage->TRG_HasMasterPage()) { SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); - aVisibleLayers.Set(mnBackgroundObjectsLayerID, FALSE); + aVisibleLayers.Set(mnBackgroundObjectsLayerID, sal_False); pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); } } @@ -1543,11 +1543,11 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat DffRecordHeader aPageRecHd; if ( pPage && SeekToAktPage( &aPageRecHd ) ) { - ULONG nPageRecEnd = aPageRecHd.GetRecEndFilePos(); + sal_uLong nPageRecEnd = aPageRecHd.GetRecEndFilePos(); - BOOL bTryTwice = ( eAktPageKind == PPT_SLIDEPAGE ); - BOOL bSSSlideInfoAtom = FALSE; - while ( TRUE ) + sal_Bool bTryTwice = ( eAktPageKind == PPT_SLIDEPAGE ); + sal_Bool bSSSlideInfoAtom = sal_False; + while ( sal_True ) { while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < nPageRecEnd ) ) { @@ -1557,7 +1557,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat { case PPT_PST_SSSlideInfoAtom: { - bSSSlideInfoAtom = TRUE; + bSSSlideInfoAtom = sal_True; if ( eAktPageKind == PPT_MASTERPAGE ) { if ( pActualSlidePersist ) @@ -1810,10 +1810,10 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat // pPage->SetPresChange( mePresChange ); if ( nBuildFlags & 4 ) - pPage->SetExcluded( TRUE ); // Dia nicht anzeigen + pPage->SetExcluded( sal_True ); // Dia nicht anzeigen if ( nBuildFlags & 16 ) { // Dia mit Soundeffekt - pPage->SetSound( TRUE ); + pPage->SetSound( sal_True ); String aSoundFile( ReadSound( nSoundRef ) ); pPage->SetSoundFile( aSoundFile ); } @@ -1827,19 +1827,19 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat } aHd.SeekToEndOfRecord( rStCtrl ); } - if ( bTryTwice && ( bSSSlideInfoAtom == FALSE ) ) + if ( bTryTwice && ( bSSSlideInfoAtom == sal_False ) ) { - bTryTwice = FALSE; + bTryTwice = sal_False; if ( HasMasterPage( nAktPageNum, eAktPageKind ) ) { - USHORT nMasterNum = GetMasterPageIndex( nAktPageNum, eAktPageKind ); + sal_uInt16 nMasterNum = GetMasterPageIndex( nAktPageNum, eAktPageKind ); PptSlidePersistList* pPageList = GetPageList( PPT_MASTERPAGE ); if ( pPageList && ( nMasterNum < pPageList->Count() ) ) { PptSlidePersistEntry* pE = (*pPageList)[ nMasterNum ]; if ( pE ) { - UINT32 nOfs = pE->aPersistAtom.nReserved; + sal_uInt32 nOfs = pE->aPersistAtom.nReserved; if ( nOfs ) { rStCtrl.Seek( nOfs ); @@ -1898,31 +1898,31 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat // /////////////////////////////////////////////////////////////////////////// -String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const +String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const { String aRetval; - UINT32 nPosMerk = rStCtrl.Tell(); + sal_uInt32 nPosMerk = rStCtrl.Tell(); DffRecordHeader aDocHd; if ( SeekToDocument( &aDocHd ) ) { - UINT32 nSoundLen = aDocHd.GetRecEndFilePos(); + sal_uInt32 nSoundLen = aDocHd.GetRecEndFilePos(); DffRecordHeader aSoundBlockRecHd; if( SeekToRec( rStCtrl, PPT_PST_SoundCollection, nSoundLen, &aSoundBlockRecHd ) ) { - UINT32 nDataLen = aSoundBlockRecHd.GetRecEndFilePos(); + sal_uInt32 nDataLen = aSoundBlockRecHd.GetRecEndFilePos(); DffRecordHeader aSoundRecHd; - BOOL bRefStrValid = FALSE; - BOOL bDone = FALSE; + sal_Bool bRefStrValid = sal_False; + sal_Bool bDone = sal_False; while( !bDone && SeekToRec( rStCtrl, PPT_PST_Sound, nDataLen, &aSoundRecHd ) ) { - UINT32 nStrLen = aSoundRecHd.GetRecEndFilePos(); + sal_uInt32 nStrLen = aSoundRecHd.GetRecEndFilePos(); String aRefStr; - UINT32 nPosMerk2 = rStCtrl.Tell(); + sal_uInt32 nPosMerk2 = rStCtrl.Tell(); if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 2 ) ) { if ( ReadString( aRefStr ) ) - bRefStrValid = TRUE; + bRefStrValid = sal_True; } if ( bRefStrValid ) { @@ -1932,7 +1932,7 @@ String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 0 ) ) { ReadString( aRetval ); - bDone = TRUE; + bDone = sal_True; } } } @@ -1941,13 +1941,13 @@ String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const // ueberpruefen, ob diese Sound-Datei schon // existiert. Wenn nicht, exportiere diese // in unser lokales Sound-Verzeichnis. - BOOL bSoundExists = FALSE; + sal_Bool bSoundExists = sal_False; List* pSoundList = new List(); GalleryExplorer::FillObjList( GALLERY_THEME_SOUNDS, *pSoundList ); GalleryExplorer::FillObjList( GALLERY_THEME_USERSOUNDS, *pSoundList ); - for( ULONG n = 0; ( n < pSoundList->Count() ) && !bSoundExists; n++ ) + for( sal_uLong n = 0; ( n < pSoundList->Count() ) && !bSoundExists; n++ ) { INetURLObject aURL( *(String*)pSoundList->GetObject( n ) ); String aSoundName( aURL.GetName() ); @@ -1955,7 +1955,7 @@ String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const if( aSoundName == aRetval ) { aRetval = *(String*)pSoundList->GetObject( n ); - bSoundExists = TRUE; + bSoundExists = sal_True; } } @@ -1974,8 +1974,8 @@ String ImplSdPPTImport::ReadSound(UINT32 nSoundRef) const INetURLObject aGalleryUserSound( aGalleryDir.GetToken( aGalleryDir.GetTokenCount( ';' ) - 1 ) ); aGalleryUserSound.Append( aRetval ); - UINT32 nSoundDataLen = aSoundDataRecHd.nRecLen; - UINT8* pBuf = new UINT8[ nSoundDataLen ]; + sal_uInt32 nSoundDataLen = aSoundDataRecHd.nRecLen; + sal_uInt8* pBuf = new sal_uInt8[ nSoundDataLen ]; rStCtrl.Read( pBuf, nSoundDataLen ); SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aGalleryUserSound.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC ); @@ -2247,7 +2247,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj { pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ); if ( pSheet ) - ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, TRUE ); + ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True ); DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for titleobject (SJ)" ); } break; @@ -2255,7 +2255,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj { pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TEXT ); if ( pSheet ) - ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, TRUE ); + ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True ); DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for subtitleobject (SJ)" ); } break; @@ -2263,7 +2263,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj case TSS_TYPE_HALFBODY : case TSS_TYPE_QUARTERBODY : { - for ( UINT16 nLevel = 9; nLevel; nLevel-- ) + for ( sal_uInt16 nLevel = 9; nLevel; nLevel-- ) { String aName( pPage->GetLayoutName() ); aName.Append( (sal_Unicode)( ' ' ) ); @@ -2275,7 +2275,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj } DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for outlinerobject (SJ)" ); if ( pSheet ) - ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, TRUE ); + ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True ); ppStyleSheetAry = &pStyleSheetAry[ 0 ]; } break; @@ -2286,7 +2286,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj { pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ); if ( pSheet ) - ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, TRUE ); + ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True ); DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for titleobject (SJ)" ); } else @@ -2294,7 +2294,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_NOTES ); DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for notesobj (SJ)" ); if ( pSheet ) - ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, TRUE ); + ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True ); } } break; @@ -2329,8 +2329,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj { if ( !bIsHeaderFooter ) { - pText->SetNotVisibleAsMaster( TRUE ); - pText->SetEmptyPresObj( TRUE ); + pText->SetNotVisibleAsMaster( sal_True ); + pText->SetEmptyPresObj( sal_True ); } pText->SetUserCall( pPage ); pPage->InsertPresObj( pText, ePresKind ); @@ -2353,13 +2353,13 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj rItemSet.Put( (SdrTextVertAdjustItem&)pText->GetMergedItem( SDRATTR_TEXT_VERTADJUST ) ); rItemSet.Put( (SdrTextHorzAdjustItem&)pText->GetMergedItem( SDRATTR_TEXT_HORZADJUST ) ); } - pText->NbcSetStyleSheet( pSheet2, FALSE ); + pText->NbcSetStyleSheet( pSheet2, sal_False ); } SfxItemSet aTempAttr( mpDoc->GetPool() ); SdrTextMinFrameHeightItem aMinHeight( pText->GetLogicRect().GetSize().Height() ); aTempAttr.Put( aMinHeight ); - SdrTextAutoGrowHeightItem aAutoGrowHeight( FALSE ); + SdrTextAutoGrowHeightItem aAutoGrowHeight( sal_False ); aTempAttr.Put( aAutoGrowHeight ); pText->SetMergedItemSet(aTempAttr); } @@ -2373,8 +2373,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj const PptSlideLayoutAtom* pSlideLayout = GetSlideLayoutAtom(); if ( pSlideLayout || ( eAktPageKind == PPT_NOTEPAGE ) ) { - INT16 nPlaceholderId = pPlaceHolder->nPlaceholderId; - UINT16 i = 0; + sal_Int16 nPlaceholderId = pPlaceHolder->nPlaceholderId; + sal_uInt16 i = 0; if ( eAktPageKind == PPT_SLIDEPAGE ) { for ( ; i < 8; i++ ) @@ -2445,14 +2445,14 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj } else { - SdrObject* pPresObj = pPage->CreatePresObj( ePresObjKind, bVertical, pText->GetLogicRect(), TRUE ); + SdrObject* pPresObj = pPage->CreatePresObj( ePresObjKind, bVertical, pText->GetLogicRect(), sal_True ); pPresObj->SetUserCall( pPage ); SfxItemSet aSet( pSdrModel->GetItemPool() ); ApplyAttributes( rStCtrl, aSet ); pPresObj->SetMergedItemSet(aSet); - if ( ( eAktPageKind != PPT_NOTEPAGE ) && ( pSlideLayout->aPlacementId[ i ] != (ULONG)-1 ) ) + if ( ( eAktPageKind != PPT_NOTEPAGE ) && ( pSlideLayout->aPlacementId[ i ] != (sal_uLong)-1 ) ) { SdrObject* pTitleObj = ((SdPage&)pPage->TRG_GetMasterPage()).GetPresObj( PRESOBJ_TITLE ); SdrObject* pOutlineObj = ((SdPage&)pPage->TRG_GetMasterPage()).GetPresObj( PRESOBJ_OUTLINE ); @@ -2598,21 +2598,21 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi pProcessData->pPage->InsertPresObj( pObj, PRESOBJ_PAGE ); } - BOOL bInhabitanceChecked = FALSE; - BOOL bAnimationInfoFound = FALSE; + sal_Bool bInhabitanceChecked = sal_False; + sal_Bool bAnimationInfoFound = sal_False; DffRecordHeader aMasterShapeHd; if ( maShapeRecords.SeekToContent( rSt, DFF_msofbtClientData, SEEK_FROM_CURRENT_AND_RESTART ) ) { DffRecordHeader& rHdClientData = *maShapeRecords.Current(); - while( TRUE ) + while( sal_True ) { - UINT32 nClientDataLen = rHdClientData.GetRecEndFilePos(); + sal_uInt32 nClientDataLen = rHdClientData.GetRecEndFilePos(); DffRecordHeader aHd; do { rSt >> aHd; - UINT32 nHdRecEnd = aHd.GetRecEndFilePos(); + sal_uInt32 nHdRecEnd = aHd.GetRecEndFilePos(); switch ( aHd.nRecType ) { case PPT_PST_AnimationInfo : @@ -2656,14 +2656,14 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi maAnimations[pObj] = pAnimation; - bAnimationInfoFound = TRUE; + bAnimationInfoFound = sal_True; } } } break; case PPT_PST_InteractiveInfo: { - UINT32 nFilePosMerk2 = rSt.Tell(); + sal_uInt32 nFilePosMerk2 = rSt.Tell(); String aMacroName; if(SeekToRec( rSt, PPT_PST_CString, nHdRecEnd, NULL, 0 ) ) @@ -2725,7 +2725,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi if ( bInhabitanceChecked || bAnimationInfoFound ) break; - bInhabitanceChecked = TRUE; + bInhabitanceChecked = sal_True; if ( ! ( IsProperty( DFF_Prop_hspMaster ) && SeekToShape( rSt, pData, GetPropertyValue( DFF_Prop_hspMaster ) ) ) ) break; rSt >> aMasterShapeHd; diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx index 24e300bd79e9..2e2e9f7a866e 100644..100755 --- a/sd/source/filter/ppt/pptin.hxx +++ b/sd/source/filter/ppt/pptin.hxx @@ -61,7 +61,7 @@ class ImplSdPPTImport : public SdrPowerPointImport // SvStream* mpPicStream; DffRecordHeader maDocHd; List maSlideNameList; - BOOL mbDocumentFound; + sal_Bool mbDocumentFound; sal_uInt32 mnFilterOptions; SdDrawDocument* mpDoc; PresChange mePresChange; diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 10b0b152b8f4..1823652bf3c2 100755 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -933,9 +933,9 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any if( aString.getLength() >= 7 && aString[0] == '#' ) { Color aColor; - aColor.SetRed( (UINT8)(lcl_gethex( aString[1] ) * 16 + lcl_gethex( aString[2] )) ); - aColor.SetGreen( (UINT8)(lcl_gethex( aString[3] ) * 16 + lcl_gethex( aString[4] )) ); - aColor.SetBlue( (UINT8)(lcl_gethex( aString[5] ) * 16 + lcl_gethex( aString[6] )) ); + aColor.SetRed( (sal_uInt8)(lcl_gethex( aString[1] ) * 16 + lcl_gethex( aString[2] )) ); + aColor.SetGreen( (sal_uInt8)(lcl_gethex( aString[3] ) * 16 + lcl_gethex( aString[4] )) ); + aColor.SetBlue( (sal_uInt8)(lcl_gethex( aString[5] ) * 16 + lcl_gethex( aString[6] )) ); rValue <<= (sal_Int32)aColor.GetColor(); bRet = true; } @@ -944,9 +944,9 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any aString = aString.copy( 4, aString.getLength() - 5 ); Color aColor; sal_Int32 index = 0; - aColor.SetRed( (UINT8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() ); - aColor.SetGreen( (UINT8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() ); - aColor.SetRed( (UINT8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() ); + aColor.SetRed( (sal_uInt8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() ); + aColor.SetGreen( (sal_uInt8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() ); + aColor.SetRed( (sal_uInt8)aString.getToken( 0, (sal_Unicode)',', index ).toInt32() ); rValue <<= (sal_Int32)aColor.GetColor(); bRet = true; } @@ -1843,7 +1843,7 @@ Any AnimationImporter::implGetColorAny( sal_Int32 nMode, sal_Int32 nA, sal_Int3 dump( "rgb(%ld", nA ); dump( ",%ld", nB ); dump( ",%ld)", nC ); - Color aColor( (UINT8)nA, (UINT8)nB, (UINT8)nC ); + Color aColor( (sal_uInt8)nA, (sal_uInt8)nB, (sal_uInt8)nC ); return makeAny( (sal_Int32)aColor.GetRGBColor() ); } case 1: // hsl @@ -1861,7 +1861,7 @@ Any AnimationImporter::implGetColorAny( sal_Int32 nMode, sal_Int32 nA, sal_Int3 case 2: // index { Color aColor; - mpPPTImport->GetColorFromPalette((USHORT)nA, aColor ); + mpPPTImport->GetColorFromPalette((sal_uInt16)nA, aColor ); dump( "index(%ld", nA ); dump( " [%ld", (sal_Int32)aColor.GetRed() ); dump( ",%ld", (sal_Int32)aColor.GetGreen() ); @@ -3082,9 +3082,9 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An const EditTextObject& rEditTextObject = pOPO->GetTextObject(); - const USHORT nParaCount = rEditTextObject.GetParagraphCount(); + const sal_uInt16 nParaCount = rEditTextObject.GetParagraphCount(); - USHORT nPara = 0; + sal_uInt16 nPara = 0; while( (nPara < nParaCount) && (begin > 0) ) { @@ -3259,11 +3259,11 @@ void AnimationImporter::dump_atom_header( const Atom* pAtom, bool bOpen, bool bA // -------------------------------------------------------------------- -void AnimationImporter::dump( UINT32 nLen, bool bNewLine ) +void AnimationImporter::dump( sal_uInt32 nLen, bool bNewLine ) { char * faul = "0123456789abcdef"; - UINT32 i = 0; + sal_uInt32 i = 0; int b = 0; sal_Int8 nData; diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index b77c2563fc03..e1aa21df8091 100644 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx @@ -102,7 +102,7 @@ static xub_StrLen lcl_getMaxSafeStrLen(sal_uInt32 nSize) return static_cast< xub_StrLen >( nSize ); } -BOOL PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign ) +sal_Bool PropItem::Read( String& rString, sal_uInt32 nStringType, sal_Bool bAlign ) { sal_uInt32 i, nItemSize, nType, nItemPos; sal_Bool bRetValue = sal_False; @@ -254,7 +254,7 @@ void Dictionary::AddProperty( sal_uInt32 nId, const String& rString ) // ----------------------------------------------------------------------- -UINT32 Dictionary::GetProperty( const String& rString ) +sal_uInt32 Dictionary::GetProperty( const String& rString ) { for ( Dict* pDict = (Dict*)First(); pDict; pDict = (Dict*)Next() ) { diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx index 603dbe33ce32..2cace13cd7ad 100755 --- a/sd/source/filter/ppt/propread.hxx +++ b/sd/source/filter/ppt/propread.hxx @@ -128,13 +128,13 @@ class Dictionary : protected List { friend class Section; - void AddProperty( UINT32 nId, const String& rString ); + void AddProperty( sal_uInt32 nId, const String& rString ); public : Dictionary(){}; ~Dictionary(); Dictionary& operator=( Dictionary& rDictionary ); - UINT32 GetProperty( const String& rPropName ); + sal_uInt32 GetProperty( const String& rPropName ); }; // ------------------------------------------------------------------------ @@ -145,7 +145,7 @@ class Section : private List protected: - BYTE aFMTID[ 16 ]; + sal_uInt8 aFMTID[ 16 ]; void AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBufSize ); @@ -181,7 +181,7 @@ class PropRead : private List ~PropRead(); PropRead& operator=( PropRead& rPropRead ); - const Section* GetSection( const BYTE* pFMTID ); + const Section* GetSection( const sal_uInt8* pFMTID ); sal_Bool IsValid() const { return mbStatus; }; void Read(); }; diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index e64cace3c696..f68a84ad9f7c 100644..100755 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -51,7 +51,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::task; using namespace ::com::sun::star::frame; -typedef BOOL ( __LOADONCALLAPI *ExportPPT )( SvStorageRef&, +typedef sal_Bool ( __LOADONCALLAPI *ExportPPT )( SvStorageRef&, Reference< XModel > &, Reference< XStatusIndicator > &, SvMemoryStream*, sal_uInt32 nCnvrtFlags ); @@ -59,7 +59,7 @@ typedef BOOL ( __LOADONCALLAPI *ExportPPT )( SvStorageRef&, typedef sal_Bool ( SAL_CALL *ImportPPT )( const ::rtl::OUString&, Sequence< PropertyValue >*, SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& ); -typedef BOOL ( __LOADONCALLAPI *SaveVBA )( SfxObjectShell&, SvMemoryStream*& ); +typedef sal_Bool ( __LOADONCALLAPI *SaveVBA )( SfxObjectShell&, SvMemoryStream*& ); // --------------- // - SdPPTFilter - @@ -83,7 +83,7 @@ SdPPTFilter::~SdPPTFilter() sal_Bool SdPPTFilter::Import() { sal_Bool bRet = sal_False; - SotStorageRef pStorage = new SotStorage( mrMedium.GetInStream(), FALSE ); + SotStorageRef pStorage = new SotStorage( mrMedium.GetInStream(), sal_False ); if( !pStorage->GetError() ) { /* check if there is a dualstorage, then the @@ -142,7 +142,7 @@ sal_Bool SdPPTFilter::Export() { if( mxModel.is() ) { - SotStorageRef xStorRef = new SotStorage( mrMedium.GetOutStream(), FALSE ); + SotStorageRef xStorRef = new SotStorage( mrMedium.GetOutStream(), sal_False ); ExportPPT PPTExport = reinterpret_cast<ExportPPT>(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("ExportPPT") )); /* !!! diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index cb130f059960..0ebc716e863b 100644..100755 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -173,7 +173,7 @@ struct XML_SERVICES const sal_Char* mpSettings; }; -XML_SERVICES* getServices( bool bImport, bool bDraw, ULONG nStoreVer ) +XML_SERVICES* getServices( bool bImport, bool bDraw, sal_uLong nStoreVer ) { static XML_SERVICES gServices[] = { @@ -196,7 +196,7 @@ XML_SERVICES* getServices( bool bImport, bool bDraw, ULONG nStoreVer ) // - SdXMLWrapper - // ---------------- -SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress, SdXMLFilterMode eFilterMode, ULONG nStoreVer ) : +SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress, SdXMLFilterMode eFilterMode, sal_uLong nStoreVer ) : SdFilter( rMedium, rDocShell, bShowProgress ), meFilterMode( eFilterMode ), mnStoreVer( nStoreVer ) { } @@ -842,12 +842,12 @@ sal_Bool SdXMLFilter::Export() SvXMLEmbeddedObjectHelper* pObjectHelper = NULL; SvXMLGraphicHelper* pGraphicHelper = NULL; - sal_Bool bDocRet = FALSE; + sal_Bool bDocRet = sal_False; if( !mxModel.is() ) { DBG_ERROR("Got NO Model in XMLExport"); - return FALSE; + return sal_False; } sal_Bool bLocked = mxModel->hasControllersLocked(); @@ -861,7 +861,7 @@ sal_Bool SdXMLFilter::Export() if( !xServiceInfo.is() || !xServiceInfo->supportsService( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GenericDrawingDocument" ) ) ) ) { DBG_ERROR( "Model is no DrawingDocument in XMLExport" ); - return FALSE; + return sal_False; } uno::Reference< lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() ); @@ -869,7 +869,7 @@ sal_Bool SdXMLFilter::Export() if( !xServiceFactory.is() ) { DBG_ERROR( "got no service manager" ); - return FALSE; + return sal_False; } uno::Reference< uno::XInterface > xWriter( xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" ) ) ) ); @@ -877,7 +877,7 @@ sal_Bool SdXMLFilter::Export() if( !xWriter.is() ) { DBG_ERROR( "com.sun.star.xml.sax.Writer service missing" ); - return FALSE; + return sal_False; } uno::Reference<xml::sax::XDocumentHandler> xHandler( xWriter, uno::UNO_QUERY ); @@ -964,7 +964,7 @@ sal_Bool SdXMLFilter::Export() pObjectHelper = SvXMLEmbeddedObjectHelper::Create( xStorage, *mrDocShell.GetDoc()->GetPersist(), EMBEDDEDOBJECTHELPER_MODE_WRITE, sal_False ); xObjectResolver = pObjectHelper; - pGraphicHelper = SvXMLGraphicHelper::Create( xStorage, GRAPHICHELPER_MODE_WRITE, FALSE ); + pGraphicHelper = SvXMLGraphicHelper::Create( xStorage, GRAPHICHELPER_MODE_WRITE, sal_False ); xGrfResolver = pGraphicHelper; } diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 034a0bc5e863..674bee67da56 100644..100755 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -151,7 +151,7 @@ void AccessibleDocumentViewBase::Init (void) pWindow->AddChildEventListener (maWindowLink); - USHORT nCount = pWindow->GetChildCount(); + sal_uInt16 nCount = pWindow->GetChildCount(); for (sal_uInt16 i=0; i<nCount; i++) { Window* pChildWindow = pWindow->GetChild (i); diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx index 97ec7b3ddee1..09a45cdcdae4 100755 --- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx @@ -109,12 +109,12 @@ namespace accessibility return *( const_cast< AccessibleOutlineEditSource* > (this) ); } - BOOL AccessibleOutlineEditSource::IsValid() const + sal_Bool AccessibleOutlineEditSource::IsValid() const { if( mpOutliner && mpOutlinerView ) { // Our view still on outliner? - ULONG nCurrView, nViews; + sal_uLong nCurrView, nViews; for( nCurrView=0, nViews=mpOutliner->GetViewCount(); nCurrView<nViews; ++nCurrView ) { diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index 510f0233667c..19d618ffd20b 100755 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -479,7 +479,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground (void) { ThrowIfDisposed (); svtools::ColorConfig aColorConfig; - UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; + sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; return static_cast<sal_Int32>(nColor); } @@ -490,7 +490,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground (void) throw (::com::sun::star::uno::RuntimeException) { ThrowIfDisposed (); - UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); + sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); return static_cast<sal_Int32>(nColor); } diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 91c09b55697d..852b5427e053 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -106,8 +106,8 @@ private: ::Window* mpWindow; sal_Int32 mnFocusedIndex; bool mbModelChangeLocked; - ULONG mnUpdateChildrenUserEventId; - ULONG mnSelectionChangeUserEventId; + sal_uLong mnUpdateChildrenUserEventId; + sal_uLong mnSelectionChangeUserEventId; void UpdateChildren (void); }; @@ -570,7 +570,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground (void) { ThrowIfDisposed(); svtools::ColorConfig aColorConfig; - UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; + sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; return static_cast<sal_Int32>(nColor); } @@ -581,7 +581,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground (void) throw (RuntimeException) { ThrowIfDisposed(); - UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); + sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); return static_cast<sal_Int32>(nColor); } diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx index ced9852b74c3..71e4c74dd70f 100755 --- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx +++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx @@ -548,7 +548,7 @@ sal_Int32 SAL_CALL AccessibleTreeNode::getForeground (void) { ThrowIfDisposed(); svtools::ColorConfig aColorConfig; - UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; + sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; return static_cast<sal_Int32>(nColor); } @@ -559,7 +559,7 @@ sal_Int32 SAL_CALL AccessibleTreeNode::getBackground (void) throw (RuntimeException) { ThrowIfDisposed(); - UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); + sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); return static_cast<sal_Int32>(nColor); } diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index f76b84d29826..430f3f7f6a9e 100755 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -97,7 +97,7 @@ public: virtual void MouseButtonUp( const MouseEvent& rMEvt ); - USHORT InsertCategory( const XubString& rStr, USHORT nPos = LISTBOX_APPEND ); + sal_uInt16 InsertCategory( const XubString& rStr, sal_uInt16 nPos = LISTBOX_APPEND ); void SetDoubleClickLink( const Link& rDoubleClickHdl ) { maDoubleClickHdl = rDoubleClickHdl; } @@ -112,7 +112,7 @@ private: CategoryListBox::CategoryListBox( Window* pParent, const ResId& rResId ) : ListBox( pParent, rResId ) { - EnableUserDraw( TRUE ); + EnableUserDraw( sal_True ); SetDoubleClickHdl( LINK( this, CategoryListBox, implDoubleClickHdl ) ); } @@ -120,9 +120,9 @@ CategoryListBox::~CategoryListBox() { } -USHORT CategoryListBox::InsertCategory( const XubString& rStr, USHORT nPos /* = LISTBOX_APPEND */ ) +sal_uInt16 CategoryListBox::InsertCategory( const XubString& rStr, sal_uInt16 nPos /* = LISTBOX_APPEND */ ) { - USHORT n = ListBox::InsertEntry( rStr, nPos ); + sal_uInt16 n = ListBox::InsertEntry( rStr, nPos ); if( n != LISTBOX_ENTRY_NOTFOUND ) ListBox::SetEntryFlags( n, ListBox::GetEntryFlags(n) | LISTBOX_ENTRY_FLAG_DISABLE_SELECTION ); @@ -131,7 +131,7 @@ USHORT CategoryListBox::InsertCategory( const XubString& rStr, USHORT nPos /* = void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt ) { - const USHORT nItem = rUDEvt.GetItemId(); + const sal_uInt16 nItem = rUDEvt.GetItemId(); if( ListBox::GetEntryFlags(nItem) & LISTBOX_ENTRY_FLAG_DISABLE_SELECTION ) { @@ -157,7 +157,7 @@ void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt ) } else { - DrawEntry( rUDEvt, TRUE, TRUE ); + DrawEntry( rUDEvt, sal_True, sal_True ); } } @@ -219,9 +219,9 @@ private: CustomAnimationCreateDialog* mpParent; - USHORT mnCurvePathPos; - USHORT mnPolygonPathPos; - USHORT mnFreeformPathPos; + sal_uInt16 mnCurvePathPos; + sal_uInt16 mnPolygonPathPos; + sal_uInt16 mnFreeformPathPos; }; @@ -270,7 +270,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, Cus FreeResource(); - USHORT nFirstEffect = LISTBOX_ENTRY_NOTFOUND; + sal_uInt16 nFirstEffect = LISTBOX_ENTRY_NOTFOUND; if( nTabId == MOTIONPATH ) { @@ -302,7 +302,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, Cus CustomAnimationPresetPtr pDescriptor = (*aIter++); if( pDescriptor.get() && (bHasText || !pDescriptor->isTextOnly() ) ) { - USHORT nPos = mpLBEffects->InsertEntry( pDescriptor->getLabel() ); + sal_uInt16 nPos = mpLBEffects->InsertEntry( pDescriptor->getLabel() ); mpLBEffects->SetEntryData( nPos, static_cast<void*>( new CustomAnimationPresetPtr( pDescriptor ) ) ); if( nFirstEffect == LISTBOX_ENTRY_NOTFOUND ) @@ -345,7 +345,7 @@ IMPL_LINK( CustomAnimationCreateTabPage, implDoubleClickHdl, Control*, pControl if( pControl == mpLBEffects ) { if( mpLBEffects->GetSelectEntryCount() ) - mpParent->EndDialog( TRUE ); + mpParent->EndDialog( sal_True ); } return 0; } @@ -360,7 +360,7 @@ void CustomAnimationCreateTabPage::onSelectEffect() CustomAnimationPresetPtr pPreset( *p ); const double fDuration = pPreset->getDuration(); - USHORT nPos = 0xffff; + sal_uInt16 nPos = 0xffff; if( fDuration == 5.0 ) nPos = 0; @@ -387,7 +387,7 @@ void CustomAnimationCreateTabPage::onSelectEffect() void CustomAnimationCreateTabPage::clearEffects() { - USHORT nPos = mpLBEffects->GetEntryCount(); + sal_uInt16 nPos = mpLBEffects->GetEntryCount(); while( nPos-- ) delete static_cast< CustomAnimationPresetPtr* >( mpLBEffects->GetEntryData( nPos ) ); @@ -414,7 +414,7 @@ PathKind CustomAnimationCreateTabPage::getCreatePathKind() const if( mpLBEffects->GetSelectEntryCount() == 1 ) { - const USHORT nPos = mpLBEffects->GetSelectEntryPos(); + const sal_uInt16 nPos = mpLBEffects->GetSelectEntryPos(); if( nPos == mnCurvePathPos ) { eKind = CURVE; @@ -436,7 +436,7 @@ PathKind CustomAnimationCreateTabPage::getCreatePathKind() const double CustomAnimationCreateTabPage::getDuration() const { - USHORT nPos = mpCBSpeed->GetSelectEntryPos(); + sal_uInt16 nPos = mpCBSpeed->GetSelectEntryPos(); if( (nPos == 0xffff) || !mpCBSpeed->IsEnabled() ) { CustomAnimationPresetPtr pPreset = getSelectedPreset(); @@ -458,7 +458,7 @@ double CustomAnimationCreateTabPage::getDuration() const void CustomAnimationCreateTabPage::setDuration( double fDuration ) { - USHORT nPos = 0; + sal_uInt16 nPos = 0; if( fDuration < 2.0f ) { if( fDuration < 1.0f ) @@ -492,12 +492,12 @@ bool CustomAnimationCreateTabPage::getIsPreview() const void CustomAnimationCreateTabPage::setIsPreview( bool bIsPreview ) { - mpCBXPReview->Check( bIsPreview ? TRUE : FALSE ); + mpCBXPReview->Check( bIsPreview ? sal_True : sal_False ); } bool CustomAnimationCreateTabPage::select( const OUString& rsPresetId ) { - USHORT nPos = mpLBEffects->GetEntryCount(); + sal_uInt16 nPos = mpLBEffects->GetEntryCount(); while( nPos-- ) { void* pEntryData = mpLBEffects->GetEntryData( nPos ); diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 7f942562b951..4beb1a7d8e0b 100755 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -132,7 +132,7 @@ public: virtual Control* getControl(); private: - std::map< USHORT, rtl::OUString > maPropertyValues; + std::map< sal_uInt16, rtl::OUString > maPropertyValues; ListBox* mpControl; }; @@ -172,7 +172,7 @@ void PresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId ) while( aIter != aEnd ) { - USHORT nPos = mpControl->InsertEntry( rPresets.getUINameForProperty( (*aIter) ) ); + sal_uInt16 nPos = mpControl->InsertEntry( rPresets.getUINameForProperty( (*aIter) ) ); if( (*aIter) == aPropertyValue ) mpControl->SelectEntryPos( nPos ); maPropertyValues[nPos] = (*aIter++); @@ -180,7 +180,7 @@ void PresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId ) } else { - mpControl->Enable( FALSE ); + mpControl->Enable( sal_False ); } } } @@ -244,7 +244,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, con if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - bKillTable = TRUE; + bKillTable = sal_True; } sal_Int32 nColor = 0; @@ -253,7 +253,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, con for ( long i = 0; i < pColorTable->Count(); i++ ) { XColorEntry* pEntry = pColorTable->GetColor(i); - USHORT nPos = mpControl->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); + sal_uInt16 nPos = mpControl->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); if( pEntry->GetColor().GetRGBColor() == (sal_uInt32)nColor ) mpControl->SelectEntryPos( nPos ); } @@ -335,7 +335,7 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, Window* pParent, const if(!pFontList) { - pFontList = new FontList( Application::GetDefaultDevice(), NULL, FALSE ); + pFontList = new FontList( Application::GetDefaultDevice(), NULL, sal_False ); bMustDelete = true; } @@ -594,7 +594,7 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window mpMetric->SetMax( 100 ); mpMenu = new PopupMenu(); - for( USHORT i = 25; i < 101; i += 25 ) + for( sal_uInt16 i = 25; i < 101; i += 25 ) { String aStr( String::CreateFromInt32( i ) ); aStr += sal_Unicode('%'); @@ -624,7 +624,7 @@ TransparencyPropertyBox::~TransparencyPropertyBox() void TransparencyPropertyBox::updateMenu() { sal_Int64 nValue = mpMetric->GetValue(); - for( USHORT i = 25; i < 101; i += 25 ) + for( sal_uInt16 i = 25; i < 101; i += 25 ) mpMenu->CheckItem( i, nValue == i ); } @@ -1264,10 +1264,10 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - bKillTable = TRUE; + bKillTable = sal_True; } - mpCLBDimColor->SetUpdateMode( FALSE ); + mpCLBDimColor->SetUpdateMode( sal_False ); for ( long i = 0; i < pColorTable->Count(); i++ ) { @@ -1275,7 +1275,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con mpCLBDimColor->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } - mpCLBDimColor->SetUpdateMode( TRUE ); + mpCLBDimColor->SetUpdateMode( sal_True ); if ( bKillTable ) delete pColorTable; @@ -1400,7 +1400,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con sal_Bool bHasAfterEffect = sal_False; pSet->getPropertyValue( nHandleHasAfterEffect ) >>= bHasAfterEffect; - USHORT nPos = 0; + sal_uInt16 nPos = 0; if( bHasAfterEffect ) { nPos++; @@ -1414,7 +1414,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con sal_Int32 nColor = 0; aDimColor >>= nColor; Color aColor( nColor ); - USHORT nColorPos = mpCLBDimColor->GetEntryPos( aColor ); + sal_uInt16 nColorPos = mpCLBDimColor->GetEntryPos( aColor ); if ( LISTBOX_ENTRY_NOTFOUND != nColorPos ) mpCLBDimColor->SelectEntryPos( nColorPos ); else @@ -1439,7 +1439,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con { if( pSet->getPropertyState( nHandleIterateType ) != STLPropertyState_AMBIGUOUS) { - USHORT nPos = LISTBOX_ENTRY_NOTFOUND; + sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND; sal_Int32 nIterateType = 0; pSet->getPropertyValue( nHandleIterateType ) >>= nIterateType; @@ -1462,16 +1462,16 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con } else { - mpFTTextAnim->Enable( FALSE ); - mpLBTextAnim->Enable( FALSE ); - mpMFTextDelay->Enable( FALSE ); - mpFTTextDelay->Enable( FALSE ); + mpFTTextAnim->Enable( sal_False ); + mpLBTextAnim->Enable( sal_False ); + mpMFTextDelay->Enable( sal_False ); + mpFTTextDelay->Enable( sal_False ); } if( pSet->getPropertyState( nHandleSoundURL ) != STLPropertyState_AMBIGUOUS ) { - USHORT nPos = 0; + sal_uInt16 nPos = 0; const Any aValue( pSet->getPropertyValue( nHandleSoundURL ) ); @@ -1488,20 +1488,20 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con { const String aTmp( aSoundURL ); - ULONG i; + sal_uLong i; for( i = 0; i < maSoundList.Count(); i++ ) { String* pString = (String*)maSoundList.GetObject( i ); if( *pString == aTmp ) { - nPos = (USHORT)i+2; + nPos = (sal_uInt16)i+2; break; } } if( nPos == 0 ) { - nPos = (USHORT)maSoundList.Count()+2; + nPos = (sal_uInt16)maSoundList.Count()+2; maSoundList.Insert( new String( aTmp ), LIST_APPEND ); INetURLObject aURL( aTmp ); nPos = mpLBSound->InsertEntry( aURL.GetBase(), nPos ); @@ -1549,7 +1549,7 @@ CustomAnimationEffectTabPage::~CustomAnimationEffectTabPage() void CustomAnimationEffectTabPage::updateControlStates() { - USHORT nPos = mpLBAfterEffect->GetSelectEntryPos(); + sal_uInt16 nPos = mpLBAfterEffect->GetSelectEntryPos(); mpCLBDimColor->Enable( nPos == 1 ); mpFTDimColor->Enable( nPos == 1 ); @@ -1568,7 +1568,7 @@ IMPL_LINK( CustomAnimationEffectTabPage, implSelectHdl, Control*, pControl ) { if( pControl == mpLBAfterEffect ) { - USHORT nPos = static_cast<ListBox*>( mpLBAfterEffect )->GetSelectEntryPos(); + sal_uInt16 nPos = static_cast<ListBox*>( mpLBAfterEffect )->GetSelectEntryPos(); if( nPos == 1 ) { if( mpCLBDimColor->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ) @@ -1582,7 +1582,7 @@ IMPL_LINK( CustomAnimationEffectTabPage, implSelectHdl, Control*, pControl ) } else if( pControl == mpLBSound ) { - USHORT nPos = mpLBSound->GetSelectEntryPos(); + sal_uInt16 nPos = mpLBSound->GetSelectEntryPos(); if( nPos == (mpLBSound->GetEntryCount() - 1) ) { openSoundFileDialog(); @@ -1648,7 +1648,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleDecelerate, makeAny( fTemp ) ); } - USHORT nPos = mpLBAfterEffect->GetSelectEntryPos(); + sal_uInt16 nPos = mpLBAfterEffect->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { sal_Bool bAfterEffect = nPos != 0; @@ -1759,7 +1759,7 @@ void CustomAnimationEffectTabPage::fillSoundListBox() mpLBSound->InsertEntry( String( SdResId( STR_CUSTOMANIMATION_NO_SOUND ) ) ); mpLBSound->InsertEntry( String( SdResId( STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND ) ) ); - for( ULONG i = 0; i < maSoundList.Count(); i++ ) + for( sal_uLong i = 0; i < maSoundList.Count(); i++ ) { String* pString = (String*)maSoundList.GetObject( i ); INetURLObject aURL( *pString ); @@ -1834,8 +1834,8 @@ void CustomAnimationEffectTabPage::openSoundFileDialog() String aStr; aStr += sal_Unicode('%'); aStrWarning.SearchAndReplace( aStr , aFile ); WarningBox aWarningBox( NULL, WB_3DLOOK | WB_RETRY_CANCEL, aStrWarning ); - aWarningBox.SetModalInputMode (TRUE); - bQuitLoop = aWarningBox.Execute()==RET_RETRY ? FALSE : TRUE; + aWarningBox.SetModalInputMode (sal_True); + bQuitLoop = aWarningBox.Execute()==RET_RETRY ? sal_False : sal_True; bValidSoundFile=false; } @@ -1850,12 +1850,12 @@ void CustomAnimationEffectTabPage::openSoundFileDialog() if( !bValidSoundFile ) nPos = 0; - mpLBSound->SelectEntryPos( (USHORT) nPos ); + mpLBSound->SelectEntryPos( (sal_uInt16) nPos ); } void CustomAnimationEffectTabPage::onSoundPreview() { - const USHORT nPos = mpLBSound->GetSelectEntryPos(); + const sal_uInt16 nPos = mpLBSound->GetSelectEntryPos(); if( nPos >= 2 ) try { @@ -1928,7 +1928,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, { sal_Int16 nStart = 0; pSet->getPropertyValue( nHandleStart ) >>= nStart; - USHORT nPos = 0; + sal_uInt16 nPos = 0; switch( nStart ) { case EffectNodeType::WITH_PREVIOUS: nPos = 1; break; @@ -1959,7 +1959,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, } else { - USHORT nPos = LISTBOX_ENTRY_NOTFOUND; + sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND; if( fDuration == 5.0 ) nPos = 0; @@ -1988,7 +1988,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, if( aRepeatCount.hasValue() ) aRepeatCount >>= fRepeat; - USHORT nPos = LISTBOX_ENTRY_NOTFOUND; + sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND; if( fRepeat == 0 ) nPos = 0; @@ -2023,7 +2023,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, sal_Int16 nFill = 0; if( pSet->getPropertyValue( nHandleRewind ) >>= nFill ) { - mpCBXRewind->Check( (nFill == AnimationFill::REMOVE) ? TRUE : FALSE ); + mpCBXRewind->Check( (nFill == AnimationFill::REMOVE) ? sal_True : sal_False ); } else { @@ -2065,7 +2065,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, } String aDescription( getShapeDescription( xShape, true ) ); - USHORT nPos = mpLBTrigger->InsertEntry( aDescription ); + sal_uInt16 nPos = mpLBTrigger->InsertEntry( aDescription ); mpLBTrigger->SetEntryData( nPos, (void*)nShape ); if( xShape == xTrigger ) @@ -2082,8 +2082,8 @@ IMPL_LINK( CustomAnimationDurationTabPage, implControlHdl, Control*, pControl ) { if( pControl == mpLBTrigger.get() ) { - mpRBClickSequence->Check( FALSE ); - mpRBInteractive->Check( TRUE ); + mpRBClickSequence->Check( sal_False ); + mpRBInteractive->Check( sal_True ); } return 0; @@ -2091,7 +2091,7 @@ IMPL_LINK( CustomAnimationDurationTabPage, implControlHdl, Control*, pControl ) void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) { - USHORT nPos = mpLBStart->GetSelectEntryPos(); + sal_uInt16 nPos = mpLBStart->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { sal_Int16 nStart; @@ -2291,7 +2291,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent, { sal_Int32 nTextGrouping = 0; if( pSet->getPropertyValue( nHandleTextGrouping ) >>= nTextGrouping ) - maLBGroupText.SelectEntryPos( (USHORT)(nTextGrouping + 1) ); + maLBGroupText.SelectEntryPos( (sal_uInt16)(nTextGrouping + 1) ); } if( pSet->getPropertyState( nHandleHasVisibleShape ) != STLPropertyState_AMBIGUOUS ) @@ -2323,7 +2323,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent, } else { - maCBXAnimateForm.Enable( FALSE ); + maCBXAnimateForm.Enable( sal_False ); } maCBXReverse.SetState( STATE_DONTKNOW ); @@ -2345,7 +2345,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent, sal_Int32 nPos = 6; while( (nPos > 2) && (nPos > nMaxParaDepth) ) { - maLBGroupText.RemoveEntry( (USHORT)nPos ); + maLBGroupText.RemoveEntry( (sal_uInt16)nPos ); nPos--; } } @@ -2355,7 +2355,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent, void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet ) { - USHORT nPos = maLBGroupText.GetSelectEntryPos(); + sal_uInt16 nPos = maLBGroupText.GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { sal_Int32 nTextGrouping = nPos - 1; @@ -2404,7 +2404,7 @@ void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet ) void CustomAnimationTextAnimTabPage::updateControlStates() { - USHORT nPos = maLBGroupText.GetSelectEntryPos(); + sal_uInt16 nPos = maLBGroupText.GetSelectEntryPos(); maCBXGroupAuto.Enable( nPos > 1 ); maMFGroupAuto.Enable( nPos > 1 ); @@ -2412,12 +2412,12 @@ void CustomAnimationTextAnimTabPage::updateControlStates() if( !mbHasVisibleShapes && nPos > 0 ) { - maCBXAnimateForm.Check(FALSE); - maCBXAnimateForm.Enable(FALSE); + maCBXAnimateForm.Check(sal_False); + maCBXAnimateForm.Enable(sal_False); } else { - maCBXAnimateForm.Enable(TRUE); + maCBXAnimateForm.Enable(sal_True); } } @@ -2429,7 +2429,7 @@ IMPL_LINK( CustomAnimationTextAnimTabPage, implSelectHdl, Control*, EMPTYARG ) // -------------------------------------------------------------------- -CustomAnimationDialog::CustomAnimationDialog( Window* pParent, STLPropertySet* pSet, USHORT nPage /* = 0 */ ) +CustomAnimationDialog::CustomAnimationDialog( Window* pParent, STLPropertySet* pSet, sal_uInt16 nPage /* = 0 */ ) : TabDialog( pParent, SdResId( DLG_CUSTOMANIMATION ) ), mpSet( pSet ), mpResultSet( 0 ) { mpTabControl = new TabControl( this, SdResId( 1 ) ); diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index e732f4a0e731..cf479d874470 100644..100755 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -158,7 +158,7 @@ class STLPropertySet; class CustomAnimationDialog : public TabDialog { public: - CustomAnimationDialog( Window* pParent, STLPropertySet* pSet, USHORT nPage = 0 ); + CustomAnimationDialog( Window* pParent, STLPropertySet* pSet, sal_uInt16 nPage = 0 ); ~CustomAnimationDialog(); STLPropertySet* getDefaultSet() { return mpSet; } diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 8dbb9fd95c41..a80617e17eb0 100755 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -214,10 +214,10 @@ static OUString getDescription( const Any& rTarget, bool bWithText = true ) class CustomAnimationListEntryItem : public SvLBoxString { public: - CustomAnimationListEntryItem( SvLBoxEntry*,USHORT nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent ); + CustomAnimationListEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent ); virtual ~CustomAnimationListEntryItem(); void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* ); - void Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* ); + void Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); SvLBoxItem* Create() const; void Clone( SvLBoxItem* pSource ); @@ -229,7 +229,7 @@ private: // -------------------------------------------------------------------- -CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvLBoxEntry* pEntry, USHORT nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent ) +CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvLBoxEntry* pEntry, sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent ) : SvLBoxString( pEntry, nFlags, aDescription ) , mpParent( pParent ) , maDescription( aDescription ) @@ -258,7 +258,7 @@ void CustomAnimationListEntryItem::InitViewData( SvLBox* pView, SvLBoxEntry* pEn // -------------------------------------------------------------------- -void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, USHORT, SvLBoxEntry* pEntry ) +void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* pEntry ) { const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); @@ -279,7 +279,7 @@ void CustomAnimationListEntryItem::Paint( const Point& rPos, SvLBox& rDev, USHOR aPos.X() += 19; - USHORT nImage; + sal_uInt16 nImage; switch( mpEffect->getPresetClass() ) { case EffectPresetClass::ENTRANCE: nImage = IMG_CUSTOMANIMATION_ENTRANCE_EFFECT; break; @@ -365,11 +365,11 @@ CustomAnimationListEntry::~CustomAnimationListEntry() class CustomAnimationTriggerEntryItem : public SvLBoxString { public: - CustomAnimationTriggerEntryItem( SvLBoxEntry*,USHORT nFlags, OUString aDescription, CustomAnimationList* pParent ); + CustomAnimationTriggerEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription, CustomAnimationList* pParent ); virtual ~CustomAnimationTriggerEntryItem(); - virtual USHORT IsA(); + virtual sal_uInt16 IsA(); void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* ); - void Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* ); + void Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); SvLBoxItem* Create() const; void Clone( SvLBoxItem* pSource ); @@ -380,7 +380,7 @@ private: // -------------------------------------------------------------------- -CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvLBoxEntry* pEntry, USHORT nFlags, OUString aDescription, CustomAnimationList* pParent ) +CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvLBoxEntry* pEntry, sal_uInt16 nFlags, OUString aDescription, CustomAnimationList* pParent ) : SvLBoxString( pEntry, nFlags, aDescription ), mpParent( pParent ), maDescription( aDescription ) { } @@ -393,9 +393,9 @@ CustomAnimationTriggerEntryItem::~CustomAnimationTriggerEntryItem() // -------------------------------------------------------------------- -USHORT CustomAnimationTriggerEntryItem::IsA() +sal_uInt16 CustomAnimationTriggerEntryItem::IsA() { - return (USHORT)-1; + return (sal_uInt16)-1; } // -------------------------------------------------------------------- @@ -419,7 +419,7 @@ void CustomAnimationTriggerEntryItem::InitViewData( SvLBox* pView, SvLBoxEntry* // -------------------------------------------------------------------- -void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvLBox& rDev, USHORT, SvLBoxEntry* ) +void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* ) { Size aSize( rDev.GetOutputSizePixel().Width(), static_cast< SvTreeListBox* >(&rDev)->GetEntryHeight() ); @@ -487,7 +487,7 @@ CustomAnimationList::CustomAnimationList( ::Window* pParent, const ResId& rResId // -------------------------------------------------------------------- -const Image& CustomAnimationList::getImage( USHORT nId, bool bHighContrast ) +const Image& CustomAnimationList::getImage( sal_uInt16 nId, bool bHighContrast ) { DBG_ASSERT( (nId >= IMG_CUSTOMANIMATION_ON_CLICK) && (nId <= IMG_CUSTOMANIMATION_MEDIA_STOP), "sd::CustomAnimationList::getImage(), illegal index!" ); @@ -819,7 +819,7 @@ void CustomAnimationList::onSelectionChanged( Any aSelection ) { try { - SelectAll(FALSE); + SelectAll(sal_False); if( aSelection.hasValue() ) { @@ -917,7 +917,7 @@ EffectSequence CustomAnimationList::getSelection() const // -------------------------------------------------------------------- -BOOL CustomAnimationList::DoubleClickHdl() +sal_Bool CustomAnimationList::DoubleClickHdl() { mpController->onDoubleClick(); return false; @@ -967,7 +967,7 @@ PopupMenu* CustomAnimationList::CreateContextMenu() // -------------------------------------------------------------------- -void CustomAnimationList::ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ) +void CustomAnimationList::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) { mpController->onContextMenu( nSelectedPopupEntry ); } diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index 66b1e2c6a436..185c1a6dbb5c 100755 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -46,7 +46,7 @@ class ICustomAnimationListController public: virtual void onSelect() = 0; virtual void onDoubleClick() = 0; - virtual void onContextMenu( USHORT nSelectedPopupEntry ) = 0; + virtual void onContextMenu( sal_uInt16 nSelectedPopupEntry ) = 0; virtual ~ICustomAnimationListController() {} }; @@ -83,12 +83,12 @@ public: // overrides virtual void SelectHdl(); - virtual BOOL DoubleClickHdl(); + virtual sal_Bool DoubleClickHdl(); virtual void Paint( const Rectangle& rRect ); virtual PopupMenu* CreateContextMenu( void ); - virtual void ExcecuteContextMenuAction( USHORT nSelectedPopupEntry ); + virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ); virtual void KeyInput( const KeyEvent& rKEvt ); @@ -97,7 +97,7 @@ public: virtual void notify_change(); - const Image& getImage( USHORT nId, bool bHighContrast ); + const Image& getImage( sal_uInt16 nId, bool bHighContrast ); bool isExpanded( const CustomAnimationEffectPtr& pEffect ) const; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 8b96e08b4a8c..29bde1e8ac96 100644..100755 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -729,15 +729,15 @@ void CustomAnimationPane::updateControls() if( !mxView.is() ) { - mpPBAddEffect->Enable( FALSE ); - mpPBChangeEffect->Enable( FALSE ); - mpPBRemoveEffect->Enable( FALSE ); - mpFLEffect->Enable( FALSE ); - mpFTStart->Enable( FALSE ); - mpLBStart->Enable( FALSE ); - mpPBPropertyMore->Enable( FALSE ); - mpLBProperty->Enable( FALSE ); - mpFTProperty->Enable( FALSE ); + mpPBAddEffect->Enable( sal_False ); + mpPBChangeEffect->Enable( sal_False ); + mpPBRemoveEffect->Enable( sal_False ); + mpFLEffect->Enable( sal_False ); + mpFTStart->Enable( sal_False ); + mpLBStart->Enable( sal_False ); + mpPBPropertyMore->Enable( sal_False ); + mpLBProperty->Enable( sal_False ); + mpFTProperty->Enable( sal_False ); mpCustomAnimationList->clear(); return; } @@ -818,15 +818,15 @@ void CustomAnimationPane::updateControls() else { mpLBProperty->setSubControl( 0 ); - mpFTProperty->Enable( FALSE ); - mpLBProperty->Enable( FALSE ); - mpPBPropertyMore->Enable( FALSE ); + mpFTProperty->Enable( sal_False ); + mpLBProperty->Enable( sal_False ); + mpPBPropertyMore->Enable( sal_False ); } // // --- // - USHORT nPos = 0xffff; + sal_uInt16 nPos = 0xffff; sal_Int16 nNodeType = pEffect->getNodeType(); switch( nNodeType ) @@ -862,19 +862,19 @@ void CustomAnimationPane::updateControls() mpCBSpeed->SelectEntryPos( nPos ); } - mpPBPropertyMore->Enable( TRUE ); + mpPBPropertyMore->Enable( sal_True ); - mpFTChangeOrder->Enable( TRUE ); + mpFTChangeOrder->Enable( sal_True ); } else { mpLBProperty->setSubControl( 0 ); - mpFTProperty->Enable( FALSE ); - mpLBProperty->Enable( FALSE ); - mpPBPropertyMore->Enable( FALSE ); - mpFTSpeed->Enable(FALSE); - mpCBSpeed->Enable(FALSE); - mpFTChangeOrder->Enable( FALSE ); + mpFTProperty->Enable( sal_False ); + mpLBProperty->Enable( sal_False ); + mpPBPropertyMore->Enable( sal_False ); + mpFTSpeed->Enable(sal_False); + mpCBSpeed->Enable(sal_False); + mpFTChangeOrder->Enable( sal_False ); mpLBStart->SetNoSelection(); mpCBSpeed->SetNoSelection(); mpFLEffect->SetText( maStrModify ); @@ -1061,7 +1061,7 @@ void CustomAnimationPane::onDoubleClick() showOptions(); } -void CustomAnimationPane::onContextMenu( USHORT nSelectedPopupEntry ) +void CustomAnimationPane::onContextMenu( sal_uInt16 nSelectedPopupEntry ) { switch( nSelectedPopupEntry ) { @@ -1747,7 +1747,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper } } -void CustomAnimationPane::showOptions( USHORT nPage /* = 0 */ ) +void CustomAnimationPane::showOptions( sal_uInt16 nPage /* = 0 */ ) { STLPropertySet* pSet = createSelectionSet(); @@ -1943,7 +1943,7 @@ void CustomAnimationPane::onChange( bool bCreate ) { if( bCreate ) { - mpCustomAnimationList->SelectAll( FALSE ); + mpCustomAnimationList->SelectAll( sal_False ); // gather shapes from the selection std::vector< Any >::iterator aIter( aTargets.begin() ); @@ -2002,7 +2002,7 @@ void CustomAnimationPane::onChange( bool bCreate ) void CustomAnimationPane::createPath( PathKind eKind, std::vector< Any >& rTargets, double fDuration) { - USHORT nSID = 0; + sal_uInt16 nSID = 0; switch( eKind ) { @@ -2071,7 +2071,7 @@ void CustomAnimationPane::onChangeStart() if( mpLBStart->GetSelectEntryCount() == 1 ) { sal_Int16 nNodeType; - USHORT nPos= mpLBStart->GetSelectEntryPos(); + sal_uInt16 nPos= mpLBStart->GetSelectEntryPos(); switch( nPos ) { case 0: nNodeType = EffectNodeType::ON_CLICK; break; @@ -2157,7 +2157,7 @@ void CustomAnimationPane::onChangeSpeed() double fDuration; - USHORT nPos= mpCBSpeed->GetSelectEntryPos(); + sal_uInt16 nPos= mpCBSpeed->GetSelectEntryPos(); switch( nPos ) { @@ -2435,7 +2435,7 @@ void CustomAnimationPane::markShapesFromSelectedEffects() Reference< XShape > xShape( pEffect->getTargetShape() ); SdrObject* pObj = GetSdrObjectFromXShape( xShape ); if( pObj ) - pView->MarkObj(pObj, pView->GetSdrPageView(), FALSE, FALSE); + pView->MarkObj(pObj, pView->GetSdrPageView(), sal_False, sal_False); } } } diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 7343bc547f32..33dd25ebaf66 100644..100755 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -95,7 +95,7 @@ public: // ICustomAnimationListController virtual void onSelect(); virtual void onDoubleClick(); - virtual void onContextMenu( USHORT nSelectedPopupEntry ); + virtual void onContextMenu( sal_uInt16 nSelectedPopupEntry ); void addUndo(); @@ -109,7 +109,7 @@ private: void updateMotionPathTags(); void markShapesFromSelectedEffects(); - void showOptions( USHORT nPage = 0 ); + void showOptions( sal_uInt16 nPage = 0 ); void moveSelection( bool bUp ); void onPreview( bool bForcePreview ); diff --git a/sd/source/ui/animations/DialogListBox.cxx b/sd/source/ui/animations/DialogListBox.cxx index e1fe8d5d3918..83e4cbdd4d65 100644..100755 --- a/sd/source/ui/animations/DialogListBox.cxx +++ b/sd/source/ui/animations/DialogListBox.cxx @@ -279,7 +279,7 @@ void DialogListBox::StateChanged( StateChangedType nType ) } else if ( ( nType == STATE_CHANGE_UPDATEMODE ) || ( nType == STATE_CHANGE_DATA ) ) { - BOOL bUpdate = IsUpdateMode(); + sal_Bool bUpdate = IsUpdateMode(); mpChild->SetUpdateMode( bUpdate ); if ( bUpdate && IsReallyVisible() ) ImplCheckScrollBars(); diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index fe34f0138db2..82858cf06572 100755 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -133,9 +133,9 @@ struct TransitionEffect mfDuration = 2.0; mnTime = 0; mePresChange = PRESCHANGE_MANUAL; - mbSoundOn = FALSE; - mbLoopSound = FALSE; - mbStopSound = FALSE; + mbSoundOn = sal_False; + mbLoopSound = sal_False; + mbStopSound = sal_False; mbEffectAmbiguous = false; mbDurationAmbiguous = false; @@ -184,12 +184,12 @@ struct TransitionEffect { if( mbStopSound ) { - rOutPage.SetStopSound( TRUE ); - rOutPage.SetSound( FALSE ); + rOutPage.SetStopSound( sal_True ); + rOutPage.SetSound( sal_False ); } else { - rOutPage.SetStopSound( FALSE ); + rOutPage.SetStopSound( sal_False ); rOutPage.SetSound( mbSoundOn ); rOutPage.SetSoundFile( maSound ); } @@ -223,9 +223,9 @@ struct TransitionEffect // other settings double mfDuration; - ULONG mnTime; + sal_uLong mnTime; PresChange mePresChange; - BOOL mbSoundOn; + sal_Bool mbSoundOn; String maSound; bool mbLoopSound; bool mbStopSound; @@ -839,7 +839,7 @@ void SlideTransitionPane::updateControls() if( lcl_findSoundInList( maSoundList, aEffect.maSound, nPos )) { // skip first three entries - maLB_SOUND.SelectEntryPos( (USHORT)nPos + 3 ); + maLB_SOUND.SelectEntryPos( (sal_uInt16)nPos + 3 ); maCurrentSoundFile = aEffect.maSound; } } @@ -860,8 +860,8 @@ void SlideTransitionPane::updateControls() if( aEffect.mbPresChangeAmbiguous ) { - maRB_ADVANCE_ON_MOUSE.Check( FALSE ); - maRB_ADVANCE_AUTO.Check( FALSE ); + maRB_ADVANCE_ON_MOUSE.Check( sal_False ); + maRB_ADVANCE_AUTO.Check( sal_False ); } else { @@ -890,7 +890,7 @@ void SlideTransitionPane::updateControlState() maPB_APPLY_TO_ALL.Enable( mbHasSelection ); maPB_PLAY.Enable( mbHasSelection ); -// maPB_SLIDE_SHOW.Enable( TRUE ); +// maPB_SLIDE_SHOW.Enable( sal_True ); maCB_AUTO_PREVIEW.Enable( mbHasSelection ); } @@ -964,7 +964,7 @@ void SlideTransitionPane::openSoundFileDialog() String aStr( sal_Unicode( '%' )); aStrWarning.SearchAndReplace( aStr , aFile ); WarningBox aWarningBox( NULL, WB_3DLOOK | WB_RETRY_CANCEL, aStrWarning ); - aWarningBox.SetModalInputMode (TRUE); + aWarningBox.SetModalInputMode (sal_True); bQuitLoop = (aWarningBox.Execute() != RET_RETRY); bValidSoundFile = false; @@ -973,7 +973,7 @@ void SlideTransitionPane::openSoundFileDialog() if( bValidSoundFile ) // skip first three entries in list - maLB_SOUND.SelectEntryPos( (USHORT)nPos + 3 ); + maLB_SOUND.SelectEntryPos( (sal_uInt16)nPos + 3 ); } if( ! bValidSoundFile ) @@ -982,7 +982,7 @@ void SlideTransitionPane::openSoundFileDialog() { tSoundListType::size_type nPos = 0; if( lcl_findSoundInList( maSoundList, maCurrentSoundFile, nPos )) - maLB_SOUND.SelectEntryPos( (USHORT)nPos + 3 ); + maLB_SOUND.SelectEntryPos( (sal_uInt16)nPos + 3 ); else maLB_SOUND.SelectEntryPos( 0 ); // NONE } diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 30992f913705..c6105919e645 100644..100755 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -135,7 +135,7 @@ bool PathDragMove::BeginSdrDrag() } } Show(); - return TRUE; + return sal_True; } bool PathDragMove::EndSdrDrag(bool /*bCopy*/) @@ -143,7 +143,7 @@ bool PathDragMove::EndSdrDrag(bool /*bCopy*/) Hide(); if( mxTag.is() ) mxTag->MovePath( DragStat().GetDX(), DragStat().GetDY() ); - return TRUE; + return sal_True; } // -------------------------------------------------------------------- @@ -203,7 +203,7 @@ bool PathDragResize::EndSdrDrag(bool /*bCopy*/) pPathObj->SetPathPoly( aDragPoly ); } } - return TRUE; + return sal_True; } // -------------------------------------------------------------------- @@ -266,7 +266,7 @@ public: SdPathHdl( const SmartTagReference& xTag, SdrPathObj* mpPathObj ); virtual ~SdPathHdl(); virtual void CreateB2dIAObject(); - virtual BOOL IsFocusHdl() const; + virtual sal_Bool IsFocusHdl() const; virtual Pointer GetSdrDragPointer() const; virtual bool isMarkable() const; @@ -331,9 +331,9 @@ void SdPathHdl::CreateB2dIAObject() // -------------------------------------------------------------------- -BOOL SdPathHdl::IsFocusHdl() const +sal_Bool SdPathHdl::IsFocusHdl() const { - return FALSE; + return sal_False; } // -------------------------------------------------------------------- @@ -401,7 +401,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con aStartArrow.setClosed(true); mpPathObj->SetMergedItem(XLineStartItem(aEmpty,::basegfx::B2DPolyPolygon(aStartArrow))); mpPathObj->SetMergedItem(XLineStartWidthItem(400)); - mpPathObj->SetMergedItem(XLineStartCenterItem(TRUE)); + mpPathObj->SetMergedItem(XLineStartCenterItem(sal_True)); updatePathAttributes(); @@ -449,7 +449,7 @@ void MotionPathTag::updatePathAttributes() aEndArrow.setClosed(true); mpPathObj->SetMergedItem(XLineEndItem(aEmpty,::basegfx::B2DPolyPolygon(aEndArrow))); mpPathObj->SetMergedItem(XLineEndWidthItem(400)); - mpPathObj->SetMergedItem(XLineEndCenterItem(TRUE)); + mpPathObj->SetMergedItem(XLineEndCenterItem(sal_True)); } else { @@ -584,7 +584,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) if( pHdl && !rMEvt.IsRight() ) { mrView.BrkAction(); - const USHORT nDrgLog = (USHORT)pOut->PixelToLogic(Size(DRGPIX,0)).Width(); + const sal_uInt16 nDrgLog = (sal_uInt16)pOut->PixelToLogic(Size(DRGPIX,0)).Width(); rtl::Reference< MotionPathTag > xTag( this ); SdrDragMethod* pDragMethod; @@ -625,7 +625,7 @@ bool MotionPathTag::KeyInput( const KeyEvent& rKEvt ) if( !mpPathObj ) return false; - USHORT nCode = rKEvt.GetKeyCode().GetCode(); + sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); switch( nCode ) { case KEY_DELETE: @@ -799,13 +799,13 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt ) if(mrView.IsDragObj()) { FASTBOOL bWasNoSnap = mrView.GetDragStat().IsNoSnap(); - BOOL bWasSnapEnabled = mrView.IsSnapEnabled(); + sal_Bool bWasSnapEnabled = mrView.IsSnapEnabled(); // switch snapping off if(!bWasNoSnap) - ((SdrDragStat&)mrView.GetDragStat()).SetNoSnap(TRUE); + ((SdrDragStat&)mrView.GetDragStat()).SetNoSnap(sal_True); if(bWasSnapEnabled) - mrView.SetSnapEnabled(FALSE); + mrView.SetSnapEnabled(sal_False); mrView.MovAction(aEndPoint); mrView.EndDragObj(); @@ -829,7 +829,7 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt ) // -------------------------------------------------------------------- -ULONG MotionPathTag::GetMarkablePointCount() const +sal_uLong MotionPathTag::GetMarkablePointCount() const { if( mpPathObj && isSelected() ) { @@ -843,7 +843,7 @@ ULONG MotionPathTag::GetMarkablePointCount() const // -------------------------------------------------------------------- -ULONG MotionPathTag::GetMarkedPointCount() const +sal_uLong MotionPathTag::GetMarkedPointCount() const { if( mpMark ) { @@ -858,9 +858,9 @@ ULONG MotionPathTag::GetMarkedPointCount() const // -------------------------------------------------------------------- -BOOL MotionPathTag::MarkPoint(SdrHdl& rHdl, BOOL bUnmark ) +sal_Bool MotionPathTag::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark ) { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; if( mpPathObj && mrView.IsPointMarkable( rHdl ) && (rHdl.GetKind() != HDL_SMARTTAG) ) { SmartHdl* pSmartHdl = dynamic_cast< SmartHdl* >( &rHdl ); @@ -872,7 +872,7 @@ BOOL MotionPathTag::MarkPoint(SdrHdl& rHdl, BOOL bUnmark ) { pPts->ForceSort(); mrView.MarkListHasChanged(); - bRet=TRUE; + bRet=sal_True; } } } @@ -881,16 +881,16 @@ BOOL MotionPathTag::MarkPoint(SdrHdl& rHdl, BOOL bUnmark ) // -------------------------------------------------------------------- -BOOL MotionPathTag::MarkPoints(const Rectangle* pRect, BOOL bUnmark ) +sal_Bool MotionPathTag::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark ) { - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; if( mpPathObj && isSelected() ) { sal_Int32 nHdlNum = mrView.GetHdlList().GetHdlCount() - 1; while( nHdlNum > 0 ) { - SmartHdl* pHdl = dynamic_cast< SmartHdl* >( mrView.GetHdl( sal::static_int_cast< ULONG >( nHdlNum-- ) ) ); + SmartHdl* pHdl = dynamic_cast< SmartHdl* >( mrView.GetHdl( sal::static_int_cast< sal_uLong >( nHdlNum-- ) ) ); if( pHdl && (pHdl->getTag().get() == this) && mrView.IsPointMarkable(*pHdl) && pHdl->IsSelected()==bUnmark) { @@ -898,7 +898,7 @@ BOOL MotionPathTag::MarkPoints(const Rectangle* pRect, BOOL bUnmark ) if( pRect==NULL || pRect->IsInside(aPos)) { if( mrView.MarkPointHelper(pHdl,mpMark,bUnmark) ) - bChgd=TRUE; + bChgd=sal_True; } } } @@ -981,7 +981,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) if( isSelected() ) { - mrView.GetSdrPageView()->SetHasMarkedObj(TRUE); + mrView.GetSdrPageView()->SetHasMarkedObj(sal_True); if( !mrView.IsFrameDragSingles() ) { @@ -1004,7 +1004,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) rHandlerList.AddHdl( pSmartHdl ); - const bool bSelected= pMrkPnts && pMrkPnts->Exist(sal::static_int_cast< USHORT >(nHandle)); + const bool bSelected= pMrkPnts && pMrkPnts->Exist(sal::static_int_cast< sal_uInt16 >(nHandle)); pSmartHdl->SetSelected(bSelected); if( mrView.IsPlusHandlesAlwaysVisible() || bSelected ) @@ -1017,7 +1017,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) { pPlusHdl->SetObj(mpPathObj); pPlusHdl->SetPageView(mrView.GetSdrPageView()); - pPlusHdl->SetPlusHdl(TRUE); + pPlusHdl->SetPlusHdl(sal_True); rHandlerList.AddHdl(pPlusHdl); } } @@ -1030,10 +1030,10 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) if(!aRect.IsEmpty()) { - ULONG nCount = rHandlerList.GetHdlCount(); + sal_uLong nCount = rHandlerList.GetHdlCount(); - BOOL bWdt0=aRect.Left()==aRect.Right(); - BOOL bHgt0=aRect.Top()==aRect.Bottom(); + sal_Bool bWdt0=aRect.Left()==aRect.Right(); + sal_Bool bHgt0=aRect.Top()==aRect.Bottom(); if (bWdt0 && bHgt0) { rHandlerList.AddHdl(new SmartHdl( xThis, mpPathObj, aRect.TopLeft(),HDL_UPLFT)); @@ -1115,7 +1115,7 @@ void MotionPathTag::selectionChanged() if( mrView.GetViewShell() && mrView.GetViewShell()->GetViewFrame() ) { SfxBindings& rBindings = mrView.GetViewShell()->GetViewFrame()->GetBindings(); - rBindings.InvalidateAll(TRUE); + rBindings.InvalidateAll(sal_True); } } // -------------------------------------------------------------------- @@ -1159,7 +1159,7 @@ void MotionPathTag::DeleteMarkedPoints() } } -BOOL MotionPathTag::IsDeleteMarkedPointsPossible() const +sal_Bool MotionPathTag::IsDeleteMarkedPointsPossible() const { return mpPathObj && isSelected() && (GetMarkedPointCount() != 0); } @@ -1175,12 +1175,12 @@ bool MotionPathTag::IsRipUpAtMarkedPointsPossible() const return false; } -BOOL MotionPathTag::IsSetMarkedSegmentsKindPossible() const +sal_Bool MotionPathTag::IsSetMarkedSegmentsKindPossible() const { if( mpPathObj ) return mrView.IsSetMarkedSegmentsKindPossible(); else - return FALSE; + return sal_False; } SdrPathSegmentKind MotionPathTag::GetMarkedSegmentsKind() const @@ -1210,12 +1210,12 @@ void MotionPathTag::SetMarkedSegmentsKind(SdrPathSegmentKind eKind) } } -BOOL MotionPathTag::IsSetMarkedPointsSmoothPossible() const +sal_Bool MotionPathTag::IsSetMarkedPointsSmoothPossible() const { if( mpPathObj ) return mrView.IsSetMarkedPointsSmoothPossible(); else - return FALSE; + return sal_False; } SdrPathSmoothKind MotionPathTag::GetMarkedPointsSmooth() const @@ -1264,7 +1264,7 @@ void MotionPathTag::SetMarkedPointsSmooth(SdrPathSmoothKind eKind) } } -void MotionPathTag::CloseMarkedObjects(BOOL /*bToggle*/, BOOL /*bOpen*/ ) +void MotionPathTag::CloseMarkedObjects(sal_Bool /*bToggle*/, sal_Bool /*bOpen*/ ) { // not supported for motion path } diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx index 1413636fca2b..1e286e0e760e 100644..100755 --- a/sd/source/ui/animations/motionpathtag.hxx +++ b/sd/source/ui/animations/motionpathtag.hxx @@ -64,11 +64,11 @@ public: virtual bool KeyInput( const KeyEvent& rKEvt ); // callbacks from sdr view - virtual ULONG GetMarkablePointCount() const; - virtual ULONG GetMarkedPointCount() const; - virtual BOOL MarkPoint(SdrHdl& rHdl, BOOL bUnmark=FALSE); + virtual sal_uLong GetMarkablePointCount() const; + virtual sal_uLong GetMarkedPointCount() const; + virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); virtual void CheckPossibilities(); - virtual BOOL MarkPoints(const Rectangle* pRect, BOOL bUnmark); + virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark); const CustomAnimationEffectPtr& getEffect() const { return mpEffect; } @@ -76,20 +76,20 @@ public: // IPolyPolygonEditorController virtual void DeleteMarkedPoints(); - virtual BOOL IsDeleteMarkedPointsPossible() const; + virtual sal_Bool IsDeleteMarkedPointsPossible() const; virtual void RipUpAtMarkedPoints(); virtual bool IsRipUpAtMarkedPointsPossible() const; - virtual BOOL IsSetMarkedSegmentsKindPossible() const; + virtual sal_Bool IsSetMarkedSegmentsKindPossible() const; virtual SdrPathSegmentKind GetMarkedSegmentsKind() const; virtual void SetMarkedSegmentsKind(SdrPathSegmentKind eKind); - virtual BOOL IsSetMarkedPointsSmoothPossible() const; + virtual sal_Bool IsSetMarkedPointsSmoothPossible() const; virtual SdrPathSmoothKind GetMarkedPointsSmooth() const; virtual void SetMarkedPointsSmooth(SdrPathSmoothKind eKind); - virtual void CloseMarkedObjects(BOOL bToggle, BOOL bOpen ); + virtual void CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen ); virtual bool IsOpenCloseMarkedObjectsPossible() const; virtual SdrObjClosedKind GetMarkedObjectsClosedState() const; diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 1e64617edab8..cea71438ee4f 100755 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -196,7 +196,7 @@ AnnotationManagerImpl::AnnotationManagerImpl( ViewShellBase& rViewShellBase ) { SdOptions* pOptions = SD_MOD()->GetSdOptions(mpDoc->GetDocumentType()); if( pOptions ) - mbShowAnnotations = pOptions->IsShowComments() == TRUE; + mbShowAnnotations = pOptions->IsShowComments() == sal_True; } // -------------------------------------------------------------------- @@ -338,7 +338,7 @@ void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq) if( pArgs ) { const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == pArgs->GetItemState( SID_DELETEALLBYAUTHOR_POSTIT, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( SID_DELETEALLBYAUTHOR_POSTIT, sal_True, &pPoolItem ) ) { OUString sAuthor( (( const SfxStringItem* ) pPoolItem )->GetValue() ); DeleteAnnotationsByAuthor( sAuthor ); @@ -354,7 +354,7 @@ void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq) if( pArgs ) { const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == pArgs->GetItemState( SID_DELETE_POSTIT, TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( SID_DELETE_POSTIT, sal_True, &pPoolItem ) ) ( ( const SfxUnoAnyItem* ) pPoolItem )->GetValue() >>= xAnnotation; } } @@ -458,7 +458,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) if( pArgs ) { const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == pArgs->GetItemState( rReq.GetSlot(), TRUE, &pPoolItem ) ) + if( SFX_ITEM_SET == pArgs->GetItemState( rReq.GetSlot(), sal_True, &pPoolItem ) ) ( ( const SfxUnoAnyItem* ) pPoolItem )->GetValue() >>= xAnnotation; } @@ -469,7 +469,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) std::auto_ptr< ::Outliner > pOutliner( new ::Outliner(GetAnnotationPool(),OUTLINERMODE_TEXTOBJECT) ); mpDoc->SetCalcFieldValueHdl( pOutliner.get() ); - pOutliner->SetUpdateMode( TRUE ); + pOutliner->SetUpdateMode( sal_True ); String aStr(SdResId(STR_ANNOTATION_REPLY)); OUString sAuthor( xAnnotation->getAuthor() ); @@ -489,8 +489,8 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) aStr.Append( sQuote ); aStr.Append( String(RTL_CONSTASCII_USTRINGPARAM("\"\n") ) ); - USHORT nParaCount = aStr.GetTokenCount( '\n' ); - for( USHORT nPara = 0; nPara < nParaCount; nPara++ ) + sal_uInt16 nParaCount = aStr.GetTokenCount( '\n' ); + for( sal_uInt16 nPara = 0; nPara < nParaCount; nPara++ ) pOutliner->Insert( aStr.GetToken( nPara, '\n' ), LIST_APPEND, -1 ); if( pOutliner->GetParagraphCount() > 1 ) @@ -499,7 +499,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) aAnswerSet.Put(SvxPostureItem(ITALIC_NORMAL,EE_CHAR_ITALIC)); ESelection aSel; - aSel.nEndPara = (USHORT)pOutliner->GetParagraphCount()-2; + aSel.nEndPara = (sal_uInt16)pOutliner->GetParagraphCount()-2; aSel.nEndPos = pOutliner->GetText( pOutliner->GetParagraph( aSel.nEndPara ) ).Len(); pOutliner->QuickSetAttribs( aAnswerSet, aSel ); @@ -721,7 +721,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) ::boost::shared_ptr<DrawViewShell> pDrawViewShell(::boost::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell())); if (pDrawViewShell.get() != NULL) { - pDrawViewShell->ChangeEditMode(pPage->IsMasterPage() ? EM_MASTERPAGE : EM_PAGE, FALSE); + pDrawViewShell->ChangeEditMode(pPage->IsMasterPage() ? EM_MASTERPAGE : EM_PAGE, sal_False); pDrawViewShell->SwitchPage((pPage->GetPageNum() - 1) >> 1); SfxDispatcher* pDispatcher = getDispatcher( mrBase ); @@ -749,7 +749,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward) WB_YES_NO | WB_DEF_YES, String(SdResId(nStringId))); aQuestionBox.SetImage (QueryBox::GetStandardImage()); - USHORT nBoxResult = aQuestionBox.Execute(); + sal_uInt16 nBoxResult = aQuestionBox.Execute(); if(nBoxResult != BUTTONID_YES) break; } @@ -777,7 +777,7 @@ void AnnotationManagerImpl::onTagDeselected( AnnotationTag& rTag ) // -------------------------------------------------------------------- -void AnnotationManagerImpl::SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit /* = FALSE */ ) +void AnnotationManagerImpl::SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit /* = sal_False */ ) { mxSelectedAnnotation = xAnnotation; @@ -1021,7 +1021,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation aStr.SearchAndReplaceAscii("%1", aReplace); pMenu->SetItemText( SID_DELETEALLBYAUTHOR_POSTIT, aStr ); pMenu->EnableItem( SID_REPLYTO_POSTIT, (sAuthor != sCurrentAuthor) && !bReadOnly ); - pMenu->EnableItem( SID_DELETE_POSTIT, (xAnnotation.is() && !bReadOnly) ? TRUE : FALSE ); + pMenu->EnableItem( SID_DELETE_POSTIT, (xAnnotation.is() && !bReadOnly) ? sal_True : sal_False ); pMenu->EnableItem( SID_DELETEALLBYAUTHOR_POSTIT, !bReadOnly ); pMenu->EnableItem( SID_DELETEALL_POSTIT, !bReadOnly ); @@ -1029,11 +1029,11 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation { if( pAnnotationWindow->IsProtected() || bReadOnly ) { - pMenu->EnableItem( SID_ATTR_CHAR_WEIGHT, FALSE ); - pMenu->EnableItem( SID_ATTR_CHAR_POSTURE, FALSE ); - pMenu->EnableItem( SID_ATTR_CHAR_UNDERLINE, FALSE ); - pMenu->EnableItem( SID_ATTR_CHAR_STRIKEOUT, FALSE ); - pMenu->EnableItem( SID_PASTE, FALSE ); + pMenu->EnableItem( SID_ATTR_CHAR_WEIGHT, sal_False ); + pMenu->EnableItem( SID_ATTR_CHAR_POSTURE, sal_False ); + pMenu->EnableItem( SID_ATTR_CHAR_UNDERLINE, sal_False ); + pMenu->EnableItem( SID_ATTR_CHAR_STRIKEOUT, sal_False ); + pMenu->EnableItem( SID_PASTE, sal_False ); } else { @@ -1069,14 +1069,14 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation pMenu->EnableItem( SID_COPY, pAnnotationWindow->getView()->HasSelection() ); } - USHORT nId = 0; + sal_uInt16 nId = 0; // set slot images Reference< ::com::sun::star::frame::XFrame > xFrame( mrBase.GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface() ); if( xFrame.is() ) { const bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); - for( USHORT nPos = 0; nPos < pMenu->GetItemCount(); nPos++ ) + for( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); nPos++ ) { nId = pMenu->GetItemId( nPos ); if( pMenu->IsItemEnabled( nId ) ) diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 70b95c2a509b..af88c852ff73 100755 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -79,7 +79,7 @@ public: void SelectNextAnnotation(bool bForeward); - void SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit = FALSE ); + void SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit = sal_False ); void GetSelectedAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ); void InsertAnnotation(); @@ -135,7 +135,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > mxSelectedAnnotation; bool mbShowAnnotations; - ULONG mnUpdateTagsEvent; + sal_uLong mnUpdateTagsEvent; Font maFont; }; diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 6439245a94c0..f73ff0377102 100644..100755 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -161,7 +161,7 @@ bool AnnotationDragMove::EndSdrDrag(bool /*bCopy*/) Hide(); if( mxTag.is() ) mxTag->Move( DragStat().GetDX(), DragStat().GetDY() ); - return TRUE; + return sal_True; } void AnnotationDragMove::CancelSdrDrag() @@ -177,7 +177,7 @@ public: AnnotationHdl( const SmartTagReference& xTag, const Reference< XAnnotation >& xAnnotation, const Point& rPnt ); virtual ~AnnotationHdl(); virtual void CreateB2dIAObject(); - virtual BOOL IsFocusHdl() const; + virtual sal_Bool IsFocusHdl() const; virtual Pointer GetSdrDragPointer() const; virtual bool isMarkable() const; @@ -250,10 +250,10 @@ void AnnotationHdl::CreateB2dIAObject() pOverlayObject = new ::sdr::overlay::OverlayAnimatedBitmapEx(aPosition, aBitmapEx, aBitmapEx2, nBlinkTime, 0, 0, 0, 0 ); /* - (UINT16)(aBitmapEx.GetSizePixel().Width() - 1) >> 1, - (UINT16)(aBitmapEx.GetSizePixel().Height() - 1) >> 1, - (UINT16)(aBitmapEx2.GetSizePixel().Width() - 1) >> 1, - (UINT16)(aBitmapEx2.GetSizePixel().Height() - 1) >> 1); + (sal_uInt16)(aBitmapEx.GetSizePixel().Width() - 1) >> 1, + (sal_uInt16)(aBitmapEx.GetSizePixel().Height() - 1) >> 1, + (sal_uInt16)(aBitmapEx2.GetSizePixel().Width() - 1) >> 1, + (sal_uInt16)(aBitmapEx2.GetSizePixel().Height() - 1) >> 1); */ } else @@ -273,9 +273,9 @@ void AnnotationHdl::CreateB2dIAObject() // -------------------------------------------------------------------- -BOOL AnnotationHdl::IsFocusHdl() const +sal_Bool AnnotationHdl::IsFocusHdl() const { - return TRUE; + return sal_True; } // -------------------------------------------------------------------- @@ -377,7 +377,7 @@ bool AnnotationTag::KeyInput( const KeyEvent& rKEvt ) if( !mxAnnotation.is() ) return false; - USHORT nCode = rKEvt.GetKeyCode().GetCode(); + sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); switch( nCode ) { case KEY_DELETE: @@ -517,31 +517,31 @@ void AnnotationTag::CheckPossibilities() // -------------------------------------------------------------------- -ULONG AnnotationTag::GetMarkablePointCount() const +sal_uLong AnnotationTag::GetMarkablePointCount() const { return 0; } // -------------------------------------------------------------------- -ULONG AnnotationTag::GetMarkedPointCount() const +sal_uLong AnnotationTag::GetMarkedPointCount() const { return 0; } // -------------------------------------------------------------------- -BOOL AnnotationTag::MarkPoint(SdrHdl& /*rHdl*/, BOOL /*bUnmark*/ ) +sal_Bool AnnotationTag::MarkPoint(SdrHdl& /*rHdl*/, sal_Bool /*bUnmark*/ ) { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; return bRet; } // -------------------------------------------------------------------- -BOOL AnnotationTag::MarkPoints(const Rectangle* /*pRect*/, BOOL /*bUnmark*/ ) +sal_Bool AnnotationTag::MarkPoints(const Rectangle* /*pRect*/, sal_Bool /*bUnmark*/ ) { - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; return bChgd; } @@ -638,7 +638,7 @@ BitmapEx AnnotationTag::CreateAnnotationBitmap( bool bSelected ) const int BORDER_Y = 4; // pixels maSize = Size( aVDev.GetTextWidth( sAuthor ) + 2*BORDER_X, aVDev.GetTextHeight() + 2*BORDER_Y ); - aVDev.SetOutputSizePixel( maSize, FALSE ); + aVDev.SetOutputSizePixel( maSize, sal_False ); Color aBorderColor( maColor ); @@ -692,7 +692,7 @@ void AnnotationTag::OpenPopup( bool bEdit ) mpAnnotationWindow->InitControls(); mpAnnotationWindow->setAnnotation(mxAnnotation); - USHORT nArrangeIndex = 0; + sal_uInt16 nArrangeIndex = 0; Point aPopupPos( FloatingWindow::CalcFloatingPosition( mpAnnotationWindow.get(), aRect, FLOATWIN_POPUPMODE_RIGHT, nArrangeIndex ) ); Size aPopupSize( 320, 240 ); @@ -760,7 +760,7 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent*, pEvent) if( pHdl ) { mrView.BrkAction(); - const USHORT nDrgLog = (USHORT)pWindow->PixelToLogic(Size(DRGPIX,0)).Width(); + const sal_uInt16 nDrgLog = (sal_uInt16)pWindow->PixelToLogic(Size(DRGPIX,0)).Width(); rtl::Reference< AnnotationTag > xTag( this ); @@ -776,7 +776,7 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent*, pEvent) } } } - return TRUE; + return sal_True; } IMPL_LINK( AnnotationTag, ClosePopupHdl, void *, EMPTYARG ) diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx index ea0d57fd3e3e..cce7e73eb6f3 100644..100755 --- a/sd/source/ui/annotations/annotationtag.hxx +++ b/sd/source/ui/annotations/annotationtag.hxx @@ -60,11 +60,11 @@ public: virtual bool Command( const CommandEvent& rCEvt ); // callbacks from sdr view - virtual ULONG GetMarkablePointCount() const; - virtual ULONG GetMarkedPointCount() const; - virtual BOOL MarkPoint(SdrHdl& rHdl, BOOL bUnmark=FALSE); + virtual sal_uLong GetMarkablePointCount() const; + virtual sal_uLong GetMarkedPointCount() const; + virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); virtual void CheckPossibilities(); - virtual BOOL MarkPoints(const Rectangle* pRect, BOOL bUnmark); + virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark); void Move( int nDX, int nDY ); bool OnMove( const KeyEvent& rKEvt ); @@ -96,7 +96,7 @@ private: int mnIndex; const Font& mrFont; Size maSize; - ULONG mnClosePopupEvent; + sal_uLong mnClosePopupEvent; ::Window* mpListenWindow; Point maMouseDownPos; }; diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index a4642bb68096..c84bf7d76aa3 100755 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -114,11 +114,11 @@ extern OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAn extern SfxItemPool* GetAnnotationPool(); extern com::sun::star::util::DateTime getCurrentDateTime(); -Color ColorFromAlphaColor(UINT8 aTransparency, Color &aFront, Color &aBack ) +Color ColorFromAlphaColor(sal_uInt8 aTransparency, Color &aFront, Color &aBack ) { - return Color((UINT8)(aFront.GetRed() * aTransparency/(double)255 + aBack.GetRed() * (1-aTransparency/(double)255)), - (UINT8)(aFront.GetGreen() * aTransparency/(double)255 + aBack.GetGreen() * (1-aTransparency/(double)255)), - (UINT8)(aFront.GetBlue() * aTransparency/(double)255 + aBack.GetBlue() * (1-aTransparency/(double)255))); + return Color((sal_uInt8)(aFront.GetRed() * aTransparency/(double)255 + aBack.GetRed() * (1-aTransparency/(double)255)), + (sal_uInt8)(aFront.GetGreen() * aTransparency/(double)255 + aBack.GetGreen() * (1-aTransparency/(double)255)), + (sal_uInt8)(aFront.GetBlue() * aTransparency/(double)255 + aBack.GetBlue() * (1-aTransparency/(double)255))); } /************ AnnotationTextWindow **********************************/ @@ -160,7 +160,7 @@ void AnnotationTextWindow::Paint( const Rectangle& rRect) void AnnotationTextWindow::KeyInput( const KeyEvent& rKeyEvt ) { const KeyCode& rKeyCode = rKeyEvt.GetKeyCode(); - USHORT nKey = rKeyCode.GetCode(); + sal_uInt16 nKey = rKeyCode.GetCode(); if ((rKeyCode.IsMod1() && rKeyCode.IsMod2()) && ((nKey == KEY_PAGEUP) || (nKey == KEY_PAGEDOWN))) { @@ -211,7 +211,7 @@ void AnnotationTextWindow::MouseButtonDown( const MouseEvent& rMEvt ) GrabFocus(); if ( mpOutlinerView ) mpOutlinerView->MouseButtonDown( rMEvt ); - // todo mpOutlinerView->DocView()->GetViewFrame()->GetBindings().InvalidateAll(FALSE); + // todo mpOutlinerView->DocView()->GetViewFrame()->GetBindings().InvalidateAll(sal_False); } void AnnotationTextWindow::MouseButtonUp( const MouseEvent& rMEvt ) @@ -338,7 +338,7 @@ void AnnotationWindow::InitControls() mpOutliner = new ::Outliner(GetAnnotationPool(),OUTLINERMODE_TEXTOBJECT); Doc()->SetCalcFieldValueHdl( mpOutliner ); - mpOutliner->SetUpdateMode( TRUE ); + mpOutliner->SetUpdateMode( sal_True ); Rescale(); OutputDevice* pDev = Doc()->GetRefDevice(); @@ -368,7 +368,7 @@ void AnnotationWindow::InitControls() mpVScrollbar->EnableDrag(); // mpVScrollbar->AddEventListener( LINK( this, AnnotationWindow, WindowEventListener ) ); - ULONG nCntrl = mpOutliner->GetControlWord(); + sal_uLong nCntrl = mpOutliner->GetControlWord(); nCntrl |= EE_CNTRL_PASTESPECIAL | EE_CNTRL_AUTOCORRECT | EV_CNTRL_AUTOSCROLL | EE_CNTRL_NOCOLORS; /* if (pVOpt->IsFieldShadings()) @@ -381,14 +381,14 @@ void AnnotationWindow::InitControls() nCntrl &= ~EE_CNTRL_ONLINESPELLING; */ mpOutliner->SetControlWord(nCntrl); -// mpOutliner->SetFlatMode( TRUE ); +// mpOutliner->SetFlatMode( sal_True ); Engine()->SetModifyHdl( Link() ); - Engine()->EnableUndo( FALSE ); + Engine()->EnableUndo( sal_False ); Engine()->ClearModifyFlag(); Engine()->GetUndoManager().Clear(); - Engine()->EnableUndo( TRUE ); + Engine()->EnableUndo( sal_True ); Engine()->SetModifyHdl( LINK( this, AnnotationWindow, ModifyHdl ) ); Invalidate(); @@ -509,7 +509,7 @@ void AnnotationWindow::SetLanguage(const SvxLanguageItem aNewItem) Engine()->SetModifyHdl( Link() ); ESelection aOld = getView()->GetSelection(); - ESelection aNewSelection( 0, 0, (USHORT)Engine()->GetParagraphCount()-1, USHRT_MAX ); + ESelection aNewSelection( 0, 0, (sal_uInt16)Engine()->GetParagraphCount()-1, USHRT_MAX ); getView()->SetSelection( aNewSelection ); SfxItemSet aEditAttr(getView()->GetAttribs()); aEditAttr.Put(aNewItem); @@ -798,7 +798,7 @@ void AnnotationWindow::GetFocus() FloatingWindow::GetFocus(); } -void AnnotationWindow::ExecuteSlot( USHORT nSID ) +void AnnotationWindow::ExecuteSlot( sal_uInt16 nSID ) { if( nSID == SID_COPY ) { diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 264cb2fa1afe..09a03e02d87d 100755 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -124,7 +124,7 @@ class AnnotationWindow : public FloatingWindow void setAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation, bool bGrabFocus = false ); const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& getAnnotation() const { return mxAnnotation; } - void ExecuteSlot( USHORT nSID ); + void ExecuteSlot( sal_uInt16 nSID ); ScrollBar* Scrollbar() { return mpVScrollbar;} diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 4355da3011c9..28b392ed7073 100755..100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -100,7 +100,7 @@ void SdOptionsItem::SetModified() // - SdOptionsGeneric - // -------------------- -SdOptionsGeneric::SdOptionsGeneric( USHORT nConfigId, const OUString& rSubTree ) : +SdOptionsGeneric::SdOptionsGeneric( sal_uInt16 nConfigId, const OUString& rSubTree ) : maSubTree ( rSubTree ), mpCfgItem ( NULL ), mnConfigId ( nConfigId ), @@ -126,12 +126,12 @@ void SdOptionsGeneric::Init() const { const Any* pValues = aValues.getConstArray(); - pThis->EnableModify( FALSE ); + pThis->EnableModify( sal_False ); pThis->mbInit = pThis->ReadData( pValues ); - pThis->EnableModify( TRUE ); + pThis->EnableModify( sal_True ); } else - pThis->mbInit = TRUE; + pThis->mbInit = sal_True; } } @@ -165,7 +165,7 @@ void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const Sequence< OUString > SdOptionsGeneric::GetPropertyNames() const { - ULONG nCount; + sal_uLong nCount; const char** ppPropNames; GetPropNameArray( ppPropNames, nCount ); @@ -173,7 +173,7 @@ Sequence< OUString > SdOptionsGeneric::GetPropertyNames() const Sequence< OUString > aNames( nCount ); OUString* pNames = aNames.getArray(); - for( ULONG i = 0; i < nCount; i++ ) + for( sal_uLong i = 0; i < nCount; i++ ) pNames[ i ] = OUString::createFromAscii( ppPropNames[ i ] ); return aNames; @@ -203,26 +203,26 @@ bool SdOptionsGeneric::isMetricSystem() |* \************************************************************************/ -SdOptionsLayout::SdOptionsLayout( USHORT nConfigId, BOOL bUseConfig ) : +SdOptionsLayout::SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Layout" ) : B2U( "Office.Impress/Layout" ) ) : OUString() ), - bRuler( TRUE ), - bMoveOutline( TRUE ), - bDragStripes( FALSE ), - bHandlesBezier( FALSE ), - bHelplines( TRUE ), - nMetric((UINT16)(isMetricSystem() ? FUNIT_CM : FUNIT_INCH)), + bRuler( sal_True ), + bMoveOutline( sal_True ), + bDragStripes( sal_False ), + bHandlesBezier( sal_False ), + bHelplines( sal_True ), + nMetric((sal_uInt16)(isMetricSystem() ? FUNIT_CM : FUNIT_INCH)), nDefTab( 1250 ) { - EnableModify( TRUE ); + EnableModify( sal_True ); } // ----------------------------------------------------------------------------- -BOOL SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const +sal_Bool SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const { return( IsRulerVisible() == rOpt.IsRulerVisible() && IsMoveOutline() == rOpt.IsMoveOutline() && @@ -235,7 +235,7 @@ BOOL SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const // ----------------------------------------------------------------------------- -void SdOptionsLayout::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const +void SdOptionsLayout::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aPropNamesMetric[] = { @@ -269,22 +269,22 @@ void SdOptionsLayout::GetPropNameArray( const char**& ppNames, ULONG& rCount ) c // ----------------------------------------------------------------------------- -BOOL SdOptionsLayout::ReadData( const Any* pValues ) +sal_Bool SdOptionsLayout::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetRulerVisible( *(sal_Bool*) pValues[ 0 ].getValue() ); if( pValues[1].hasValue() ) SetHandlesBezier( *(sal_Bool*) pValues[ 1 ].getValue() ); if( pValues[2].hasValue() ) SetMoveOutline( *(sal_Bool*) pValues[ 2 ].getValue() ); if( pValues[3].hasValue() ) SetDragStripes( *(sal_Bool*) pValues[ 3 ].getValue() ); if( pValues[4].hasValue() ) SetHelplines( *(sal_Bool*) pValues[ 4 ].getValue() ); - if( pValues[5].hasValue() ) SetMetric( (UINT16) *(sal_Int32*) pValues[ 5 ].getValue() ); - if( pValues[6].hasValue() ) SetDefTab( (UINT16) *(sal_Int32*) pValues[ 6 ].getValue() ); + if( pValues[5].hasValue() ) SetMetric( (sal_uInt16) *(sal_Int32*) pValues[ 5 ].getValue() ); + if( pValues[6].hasValue() ) SetDefTab( (sal_uInt16) *(sal_Int32*) pValues[ 6 ].getValue() ); - return TRUE; + return sal_True; } // ----------------------------------------------------------------------------- -BOOL SdOptionsLayout::WriteData( Any* pValues ) const +sal_Bool SdOptionsLayout::WriteData( Any* pValues ) const { pValues[ 0 ] <<= IsRulerVisible(); pValues[ 1 ] <<= IsHandlesBezier(); @@ -294,7 +294,7 @@ BOOL SdOptionsLayout::WriteData( Any* pValues ) const pValues[ 5 ] <<= (sal_Int32) GetMetric(); pValues[ 6 ] <<= (sal_Int32) GetDefTab(); - return TRUE; + return sal_True; } /************************************************************************* @@ -303,17 +303,17 @@ BOOL SdOptionsLayout::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsLayoutItem::SdOptionsLayoutItem( USHORT _nWhich ) +SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich ) : SfxPoolItem ( _nWhich ) -, maOptionsLayout ( 0, FALSE ) +, maOptionsLayout ( 0, sal_False ) { } // ---------------------------------------------------------------------- -SdOptionsLayoutItem::SdOptionsLayoutItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) +SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SfxPoolItem ( _nWhich ) -, maOptionsLayout ( 0, FALSE ) +, maOptionsLayout ( 0, sal_False ) { if( pOpts ) { @@ -378,26 +378,26 @@ void SdOptionsLayoutItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptionsContents::SdOptionsContents( USHORT nConfigId, BOOL bUseConfig ) : +SdOptionsContents::SdOptionsContents( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Content" ) : B2U( "Office.Impress/Content" ) ) : OUString() ) { - EnableModify( TRUE ); + EnableModify( sal_True ); } // ----------------------------------------------------------------------------- -BOOL SdOptionsContents::operator==(const SdOptionsContents&) const +sal_Bool SdOptionsContents::operator==(const SdOptionsContents&) const { return true; } // ----------------------------------------------------------------------------- -void SdOptionsContents::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const +void SdOptionsContents::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aPropNames[] = { @@ -413,22 +413,22 @@ void SdOptionsContents::GetPropNameArray( const char**& ppNames, ULONG& rCount ) // ----------------------------------------------------------------------------- -BOOL SdOptionsContents::ReadData(const Any*) +sal_Bool SdOptionsContents::ReadData(const Any*) { - return TRUE; + return sal_True; } // ----------------------------------------------------------------------------- -BOOL SdOptionsContents::WriteData( Any* pValues ) const +sal_Bool SdOptionsContents::WriteData( Any* pValues ) const { //#i80528# no draft anymore - pValues[ 0 ] <<= (BOOL)false; - pValues[ 1 ] <<= (BOOL)false; - pValues[ 2 ] <<= (BOOL)false; - pValues[ 3 ] <<= (BOOL)false; + pValues[ 0 ] <<= (sal_Bool)false; + pValues[ 1 ] <<= (sal_Bool)false; + pValues[ 2 ] <<= (sal_Bool)false; + pValues[ 3 ] <<= (sal_Bool)false; - return TRUE; + return sal_True; } /************************************************************************* @@ -437,9 +437,9 @@ BOOL SdOptionsContents::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsContentsItem::SdOptionsContentsItem(USHORT _nWhich, SdOptions*, ::sd::FrameView*) +SdOptionsContentsItem::SdOptionsContentsItem(sal_uInt16 _nWhich, SdOptions*, ::sd::FrameView*) : SfxPoolItem ( _nWhich ) -, maOptionsContents ( 0, FALSE ) +, maOptionsContents ( 0, sal_False ) { } @@ -471,7 +471,7 @@ void SdOptionsContentsItem::SetOptions(SdOptions*) const |* \************************************************************************/ -SdOptionsMisc::SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ) : +SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Misc" ) : @@ -480,39 +480,39 @@ SdOptionsMisc::SdOptionsMisc( USHORT nConfigId, BOOL bUseConfig ) : // #97016# nDefaultObjectSizeWidth(8000), nDefaultObjectSizeHeight(5000), - bStartWithTemplate( TRUE ), - bMarkedHitMovesAlways( TRUE ), - bMoveOnlyDragging( FALSE ), - bCrookNoContortion( FALSE ), + bStartWithTemplate( sal_True ), + bMarkedHitMovesAlways( sal_True ), + bMoveOnlyDragging( sal_False ), + bCrookNoContortion( sal_False ), bQuickEdit( GetConfigId() != SDCFG_DRAW ), - bMasterPageCache( TRUE ), - bDragWithCopy( FALSE ), - bPickThrough( TRUE ), - bBigHandles( FALSE ), - bDoubleClickTextEdit( TRUE ), - bClickChangeRotation( FALSE ), - bStartWithActualPage( FALSE ), - bSolidDragging( TRUE ), - bSolidMarkHdl( TRUE ), - bSummationOfParagraphs( FALSE ), + bMasterPageCache( sal_True ), + bDragWithCopy( sal_False ), + bPickThrough( sal_True ), + bBigHandles( sal_False ), + bDoubleClickTextEdit( sal_True ), + bClickChangeRotation( sal_False ), + bStartWithActualPage( sal_False ), + bSolidDragging( sal_True ), + bSolidMarkHdl( sal_True ), + bSummationOfParagraphs( sal_False ), // #90356# - bShowUndoDeleteWarning( TRUE ), - bSlideshowRespectZOrder( TRUE ), - bShowComments( TRUE ), - bPreviewNewEffects( TRUE ), - bPreviewChangedEffects( FALSE ), - bPreviewTransitions( TRUE ), + bShowUndoDeleteWarning( sal_True ), + bSlideshowRespectZOrder( sal_True ), + bShowComments( sal_True ), + bPreviewNewEffects( sal_True ), + bPreviewChangedEffects( sal_False ), + bPreviewTransitions( sal_True ), mnDisplay( 0 ), // The default for 6.1-and-above documents is to use printer-independent // formatting. mnPrinterIndependentLayout (1) { - EnableModify( TRUE ); + EnableModify( sal_True ); } // ----------------------------------------------------------------------------- -BOOL SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const +sal_Bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const { return( IsStartWithTemplate() == rOpt.IsStartWithTemplate() && IsMarkedHitMovesAlways() == rOpt.IsMarkedHitMovesAlways() && @@ -547,7 +547,7 @@ BOOL SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const // ----------------------------------------------------------------------------- -void SdOptionsMisc::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const +void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aPropNames[] = { @@ -592,7 +592,7 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con // ----------------------------------------------------------------------------- -BOOL SdOptionsMisc::ReadData( const Any* pValues ) +sal_Bool SdOptionsMisc::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetMarkedHitMovesAlways( *(sal_Bool*) pValues[ 0 ].getValue() ); if( pValues[1].hasValue() ) SetCrookNoContortion( *(sal_Bool*) pValues[ 1 ].getValue() ); @@ -643,12 +643,12 @@ BOOL SdOptionsMisc::ReadData( const Any* pValues ) SetDisplay(*(sal_Int32*) pValues[ 24 ].getValue()); } - return TRUE; + return sal_True; } // ----------------------------------------------------------------------------- -BOOL SdOptionsMisc::WriteData( Any* pValues ) const +sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const { pValues[ 0 ] <<= IsMarkedHitMovesAlways(); pValues[ 1 ] <<= IsCrookNoContortion(); @@ -686,7 +686,7 @@ BOOL SdOptionsMisc::WriteData( Any* pValues ) const pValues[ 24 ] <<= GetDisplay(); } - return TRUE; + return sal_True; } /************************************************************************* @@ -695,17 +695,17 @@ BOOL SdOptionsMisc::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsMiscItem::SdOptionsMiscItem( USHORT _nWhich ) +SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich ) : SfxPoolItem ( _nWhich ) -, maOptionsMisc ( 0, FALSE ) +, maOptionsMisc ( 0, sal_False ) { } // ---------------------------------------------------------------------- -SdOptionsMiscItem::SdOptionsMiscItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) +SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SfxPoolItem ( _nWhich ) -, maOptionsMisc ( 0, FALSE ) +, maOptionsMisc ( 0, sal_False ) { if( pOpts ) { @@ -738,8 +738,8 @@ SdOptionsMiscItem::SdOptionsMiscItem( USHORT _nWhich, SdOptions* pOpts, ::sd::Fr maOptionsMisc.SetMasterPagePaintCaching( pView->IsMasterPagePaintCaching() ); maOptionsMisc.SetDragWithCopy( pView->IsDragWithCopy() ); - maOptionsMisc.SetPickThrough( (BOOL)pView->GetModel()->IsPickThroughTransparentTextFrames() ); - maOptionsMisc.SetBigHandles( (BOOL)pView->IsBigHandles() ); + maOptionsMisc.SetPickThrough( (sal_Bool)pView->GetModel()->IsPickThroughTransparentTextFrames() ); + maOptionsMisc.SetBigHandles( (sal_Bool)pView->IsBigHandles() ); maOptionsMisc.SetDoubleClickTextEdit( pView->IsDoubleClickTextEdit() ); maOptionsMisc.SetClickChangeRotation( pView->IsClickChangeRotation() ); maOptionsMisc.SetSolidDragging( pView->IsSolidDragging() ); @@ -822,30 +822,30 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptionsSnap::SdOptionsSnap( USHORT nConfigId, BOOL bUseConfig ) : +SdOptionsSnap::SdOptionsSnap( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Snap" ) : B2U( "Office.Impress/Snap" ) ) : OUString() ), - bSnapHelplines( TRUE ), - bSnapBorder( TRUE ), - bSnapFrame( FALSE ), - bSnapPoints( FALSE ), - bOrtho( FALSE ), - bBigOrtho( TRUE ), - bRotate( FALSE ), + bSnapHelplines( sal_True ), + bSnapBorder( sal_True ), + bSnapFrame( sal_False ), + bSnapPoints( sal_False ), + bOrtho( sal_False ), + bBigOrtho( sal_True ), + bRotate( sal_False ), nSnapArea( 5 ), nAngle( 1500 ), nBezAngle( 1500 ) { - EnableModify( TRUE ); + EnableModify( sal_True ); } // ----------------------------------------------------------------------------- -BOOL SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const +sal_Bool SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const { return( IsSnapHelplines() == rOpt.IsSnapHelplines() && IsSnapBorder() == rOpt.IsSnapBorder() && @@ -861,7 +861,7 @@ BOOL SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const // ----------------------------------------------------------------------------- -void SdOptionsSnap::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const +void SdOptionsSnap::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aPropNames[] = { @@ -883,7 +883,7 @@ void SdOptionsSnap::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con // ----------------------------------------------------------------------------- -BOOL SdOptionsSnap::ReadData( const Any* pValues ) +sal_Bool SdOptionsSnap::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetSnapHelplines( *(sal_Bool*) pValues[ 0 ].getValue() ); if( pValues[1].hasValue() ) SetSnapBorder( *(sal_Bool*)pValues[ 1 ].getValue() ); @@ -892,16 +892,16 @@ BOOL SdOptionsSnap::ReadData( const Any* pValues ) if( pValues[4].hasValue() ) SetOrtho( *(sal_Bool*) pValues[ 4 ].getValue() ); if( pValues[5].hasValue() ) SetBigOrtho( *(sal_Bool*) pValues[ 5 ].getValue() ); if( pValues[6].hasValue() ) SetRotate( *(sal_Bool*) pValues[ 6 ].getValue() ); - if( pValues[7].hasValue() ) SetSnapArea( (INT16) *(sal_Int32*) pValues[ 7 ].getValue() ); - if( pValues[8].hasValue() ) SetAngle( (INT16) *(sal_Int32*) pValues[ 8 ].getValue() ); - if( pValues[9].hasValue() ) SetEliminatePolyPointLimitAngle( (INT16) *(sal_Int32*) pValues[ 9 ].getValue() ); + if( pValues[7].hasValue() ) SetSnapArea( (sal_Int16) *(sal_Int32*) pValues[ 7 ].getValue() ); + if( pValues[8].hasValue() ) SetAngle( (sal_Int16) *(sal_Int32*) pValues[ 8 ].getValue() ); + if( pValues[9].hasValue() ) SetEliminatePolyPointLimitAngle( (sal_Int16) *(sal_Int32*) pValues[ 9 ].getValue() ); - return TRUE; + return sal_True; } // ----------------------------------------------------------------------------- -BOOL SdOptionsSnap::WriteData( Any* pValues ) const +sal_Bool SdOptionsSnap::WriteData( Any* pValues ) const { pValues[ 0 ] <<= IsSnapHelplines(); pValues[ 1 ] <<= IsSnapBorder(); @@ -914,7 +914,7 @@ BOOL SdOptionsSnap::WriteData( Any* pValues ) const pValues[ 8 ] <<= (sal_Int32) GetAngle(); pValues[ 9 ] <<= (sal_Int32) GetEliminatePolyPointLimitAngle(); - return TRUE; + return sal_True; } /************************************************************************* @@ -923,17 +923,17 @@ BOOL SdOptionsSnap::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsSnapItem::SdOptionsSnapItem( USHORT _nWhich ) +SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich ) : SfxPoolItem ( _nWhich ) -, maOptionsSnap ( 0, FALSE ) +, maOptionsSnap ( 0, sal_False ) { } // ---------------------------------------------------------------------- -SdOptionsSnapItem::SdOptionsSnapItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) +SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SfxPoolItem ( _nWhich ) -, maOptionsSnap ( 0, FALSE ) +, maOptionsSnap ( 0, sal_False ) { if( pView ) { @@ -945,8 +945,8 @@ SdOptionsSnapItem::SdOptionsSnapItem( USHORT _nWhich, SdOptions* pOpts, ::sd::Fr maOptionsSnap.SetBigOrtho( pView->IsBigOrtho() ); maOptionsSnap.SetRotate( pView->IsAngleSnapEnabled() ); maOptionsSnap.SetSnapArea( pView->GetSnapMagneticPixel() ); - maOptionsSnap.SetAngle( (INT16) pView->GetSnapAngle() ); - maOptionsSnap.SetEliminatePolyPointLimitAngle( (INT16) pView->GetEliminatePolyPointLimitAngle() ); + maOptionsSnap.SetAngle( (sal_Int16) pView->GetSnapAngle() ); + maOptionsSnap.SetEliminatePolyPointLimitAngle( (sal_Int16) pView->GetEliminatePolyPointLimitAngle() ); } else if( pOpts ) { @@ -1005,7 +1005,7 @@ void SdOptionsSnapItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptionsZoom::SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig ) : +SdOptionsZoom::SdOptionsZoom( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : SdOptionsGeneric( nConfigId, ( bUseConfig && ( SDCFG_DRAW == nConfigId ) ) ? B2U( "Office.Draw/Zoom" ) : OUString() ), @@ -1013,14 +1013,14 @@ SdOptionsZoom::SdOptionsZoom( USHORT nConfigId, BOOL bUseConfig ) : nY( 1 ) { - EnableModify( TRUE ); + EnableModify( sal_True ); } // ----------------------------------------------------------------------------- -BOOL SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const +sal_Bool SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const { - INT32 nX1, nX2, nY1, nY2; + sal_Int32 nX1, nX2, nY1, nY2; GetScale( nX1, nY1 ); rOpt.GetScale( nX2, nY2 ); @@ -1031,7 +1031,7 @@ BOOL SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const // ----------------------------------------------------------------------------- -void SdOptionsZoom::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const +void SdOptionsZoom::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aPropNames[] = { @@ -1045,30 +1045,30 @@ void SdOptionsZoom::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con // ----------------------------------------------------------------------------- -BOOL SdOptionsZoom::ReadData( const Any* pValues ) +sal_Bool SdOptionsZoom::ReadData( const Any* pValues ) { - INT32 x = 1, y = 1; + sal_Int32 x = 1, y = 1; if( pValues[0].hasValue() ) x = ( *(sal_Int32*) pValues[ 0 ].getValue() ); if( pValues[1].hasValue() ) y = ( *(sal_Int32*) pValues[ 1 ].getValue() ); SetScale( x, y ); - return TRUE; + return sal_True; } // ----------------------------------------------------------------------------- -BOOL SdOptionsZoom::WriteData( Any* pValues ) const +sal_Bool SdOptionsZoom::WriteData( Any* pValues ) const { - INT32 x, y; + sal_Int32 x, y; GetScale( x, y ); pValues[ 0 ] <<= (sal_Int32) x; pValues[ 1 ] <<= (sal_Int32) y; - return TRUE; + return sal_True; } /************************************************************************* @@ -1077,16 +1077,16 @@ BOOL SdOptionsZoom::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsGrid::SdOptionsGrid( USHORT nConfigId, BOOL bUseConfig ) : +SdOptionsGrid::SdOptionsGrid( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Grid" ) : B2U( "Office.Impress/Grid" ) ) : OUString() ) { - EnableModify( FALSE ); + EnableModify( sal_False ); SetDefaults(); - EnableModify( TRUE ); + EnableModify( sal_True ); } // ----------------------------------------------------------------------------- @@ -1099,7 +1099,7 @@ SdOptionsGrid::~SdOptionsGrid() void SdOptionsGrid::SetDefaults() { - const UINT32 nVal = 1000; + const sal_uInt32 nVal = 1000; SetFldDivisionX( nVal ); SetFldDivisionY( nVal ); @@ -1107,15 +1107,15 @@ void SdOptionsGrid::SetDefaults() SetFldDrawY( nVal ); SetFldSnapX( nVal ); SetFldSnapY( nVal ); - SetUseGridSnap( FALSE ); - SetSynchronize( TRUE ); - SetGridVisible( FALSE ); - SetEqualGrid( TRUE ); + SetUseGridSnap( sal_False ); + SetSynchronize( sal_True ); + SetGridVisible( sal_False ); + SetEqualGrid( sal_True ); } // ----------------------------------------------------------------------------- -BOOL SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const +sal_Bool SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const { return( GetFldDrawX() == rOpt.GetFldDrawX() && GetFldDivisionX() == rOpt.GetFldDivisionX() && @@ -1131,7 +1131,7 @@ BOOL SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const // ----------------------------------------------------------------------------- -void SdOptionsGrid::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const +void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aPropNamesMetric[] = { @@ -1171,20 +1171,20 @@ void SdOptionsGrid::GetPropNameArray( const char**& ppNames, ULONG& rCount ) con // ----------------------------------------------------------------------------- -BOOL SdOptionsGrid::ReadData( const Any* pValues ) +sal_Bool SdOptionsGrid::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetFldDrawX( *(sal_Int32*) pValues[ 0 ].getValue() ); if( pValues[1].hasValue() ) SetFldDrawY( *(sal_Int32*) pValues[ 1 ].getValue() ); if( pValues[2].hasValue() ) { - const UINT32 nDivX = FRound( *(double*) pValues[ 2 ].getValue() ); + const sal_uInt32 nDivX = FRound( *(double*) pValues[ 2 ].getValue() ); SetFldDivisionX( SvxOptionsGrid::GetFldDrawX() / ( nDivX + 1 ) ); } if( pValues[3].hasValue() ) { - const UINT32 nDivY = FRound( *(double*) pValues[ 3 ].getValue() ); + const sal_uInt32 nDivY = FRound( *(double*) pValues[ 3 ].getValue() ); SetFldDivisionY( SvxOptionsGrid::GetFldDrawY() / ( nDivY + 1 ) ); } @@ -1195,12 +1195,12 @@ BOOL SdOptionsGrid::ReadData( const Any* pValues ) if( pValues[8].hasValue() ) SetGridVisible( *(sal_Bool*) pValues[ 8 ].getValue() ); if( pValues[9].hasValue() ) SetEqualGrid( *(sal_Bool*) pValues[ 9 ].getValue() ); - return TRUE; + return sal_True; } // ----------------------------------------------------------------------------- -BOOL SdOptionsGrid::WriteData( Any* pValues ) const +sal_Bool SdOptionsGrid::WriteData( Any* pValues ) const { pValues[ 0 ] <<= (sal_Int32) GetFldDrawX(); pValues[ 1 ] <<= (sal_Int32) GetFldDrawY(); @@ -1213,7 +1213,7 @@ BOOL SdOptionsGrid::WriteData( Any* pValues ) const pValues[ 8 ] <<= IsGridVisible(); pValues[ 9 ] <<= IsEqualGrid(); - return TRUE; + return sal_True; } /************************************************************************* @@ -1222,7 +1222,7 @@ BOOL SdOptionsGrid::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsGridItem::SdOptionsGridItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : +SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SvxGridItem( _nWhich ) { SetSynchronize( pOpts->IsSynchronize() ); @@ -1274,40 +1274,40 @@ void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptionsPrint::SdOptionsPrint( USHORT nConfigId, BOOL bUseConfig ) : +SdOptionsPrint::SdOptionsPrint( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Print" ) : B2U( "Office.Impress/Print" ) ) : OUString() ), - bDraw( TRUE ), - bNotes( FALSE ), - bHandout( FALSE ), - bOutline( FALSE ), - bDate( FALSE ), - bTime( FALSE ), - bPagename( FALSE ), - bHiddenPages( TRUE ), - bPagesize( FALSE ), - bPagetile( FALSE ), - bWarningPrinter( TRUE ), - bWarningSize( FALSE ), - bWarningOrientation( FALSE ), - bBooklet( FALSE ), - bFront( TRUE ), - bBack( TRUE ), - bCutPage( FALSE ), - bPaperbin( FALSE ), - mbHandoutHorizontal( TRUE ), + bDraw( sal_True ), + bNotes( sal_False ), + bHandout( sal_False ), + bOutline( sal_False ), + bDate( sal_False ), + bTime( sal_False ), + bPagename( sal_False ), + bHiddenPages( sal_True ), + bPagesize( sal_False ), + bPagetile( sal_False ), + bWarningPrinter( sal_True ), + bWarningSize( sal_False ), + bWarningOrientation( sal_False ), + bBooklet( sal_False ), + bFront( sal_True ), + bBack( sal_True ), + bCutPage( sal_False ), + bPaperbin( sal_False ), + mbHandoutHorizontal( sal_True ), mnHandoutPages( 6 ), nQuality( 0 ) { - EnableModify( TRUE ); + EnableModify( sal_True ); } // ----------------------------------------------------------------------------- -BOOL SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const +sal_Bool SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const { return( IsDraw() == rOpt.IsDraw() && IsNotes() == rOpt.IsNotes() && @@ -1334,7 +1334,7 @@ BOOL SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const // ----------------------------------------------------------------------------- -void SdOptionsPrint::GetPropNameArray( const char**& ppNames, ULONG& rCount ) const +void SdOptionsPrint::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aDrawPropNames[] = { @@ -1394,7 +1394,7 @@ void SdOptionsPrint::GetPropNameArray( const char**& ppNames, ULONG& rCount ) co // ----------------------------------------------------------------------------- -BOOL SdOptionsPrint::ReadData( const Any* pValues ) +sal_Bool SdOptionsPrint::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetDate( *(sal_Bool*) pValues[ 0 ].getValue() ); if( pValues[1].hasValue() ) SetTime( *(sal_Bool*) pValues[ 1 ].getValue() ); @@ -1406,7 +1406,7 @@ BOOL SdOptionsPrint::ReadData( const Any* pValues ) if( pValues[7].hasValue() ) SetFrontPage( *(sal_Bool*) pValues[ 7 ].getValue() ); if( pValues[8].hasValue() ) SetBackPage( *(sal_Bool*) pValues[ 8 ].getValue() ); if( pValues[9].hasValue() ) SetPaperbin( *(sal_Bool*) pValues[ 9 ].getValue() ); - if( pValues[10].hasValue() ) SetOutputQuality( (UINT16) *(sal_Int32*) pValues[ 10 ].getValue() ); + if( pValues[10].hasValue() ) SetOutputQuality( (sal_uInt16) *(sal_Int32*) pValues[ 10 ].getValue() ); if( pValues[11].hasValue() ) SetDraw( *(sal_Bool*) pValues[ 11 ].getValue() ); // just for impress @@ -1416,15 +1416,15 @@ BOOL SdOptionsPrint::ReadData( const Any* pValues ) if( pValues[13].hasValue() ) SetHandout( *(sal_Bool*) pValues[ 13 ].getValue() ); if( pValues[14].hasValue() ) SetOutline( *(sal_Bool*) pValues[ 14 ].getValue() ); if( pValues[15].hasValue() ) SetHandoutHorizontal( *(sal_Bool*) pValues[15].getValue() ); - if( pValues[16].hasValue() ) SetHandoutPages( (UINT16)*(sal_Int32*) pValues[16].getValue() ); + if( pValues[16].hasValue() ) SetHandoutPages( (sal_uInt16)*(sal_Int32*) pValues[16].getValue() ); } - return TRUE; + return sal_True; } // ----------------------------------------------------------------------------- -BOOL SdOptionsPrint::WriteData( Any* pValues ) const +sal_Bool SdOptionsPrint::WriteData( Any* pValues ) const { pValues[ 0 ] <<= IsDate(); pValues[ 1 ] <<= IsTime(); @@ -1449,7 +1449,7 @@ BOOL SdOptionsPrint::WriteData( Any* pValues ) const pValues[ 16 ] <<= GetHandoutPages(); } - return TRUE; + return sal_True; } /************************************************************************* @@ -1458,17 +1458,17 @@ BOOL SdOptionsPrint::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsPrintItem::SdOptionsPrintItem( USHORT _nWhich ) +SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich ) : SfxPoolItem ( _nWhich ) -, maOptionsPrint ( 0, FALSE ) +, maOptionsPrint ( 0, sal_False ) { } // ---------------------------------------------------------------------- -SdOptionsPrintItem::SdOptionsPrintItem( USHORT _nWhich, SdOptions* pOpts, ::sd::FrameView* ) +SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* ) : SfxPoolItem ( _nWhich ) -, maOptionsPrint ( 0, FALSE ) +, maOptionsPrint ( 0, sal_False ) { if( pOpts ) { @@ -1544,14 +1544,14 @@ void SdOptionsPrintItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptions::SdOptions( USHORT nConfigId ) : - SdOptionsLayout( nConfigId, TRUE ), - SdOptionsContents( nConfigId, TRUE ), - SdOptionsMisc( nConfigId, TRUE ), - SdOptionsSnap( nConfigId, TRUE ), - SdOptionsZoom( nConfigId, TRUE ), - SdOptionsGrid( nConfigId, TRUE ), - SdOptionsPrint( nConfigId, TRUE ) +SdOptions::SdOptions( sal_uInt16 nConfigId ) : + SdOptionsLayout( nConfigId, sal_True ), + SdOptionsContents( nConfigId, sal_True ), + SdOptionsMisc( nConfigId, sal_True ), + SdOptionsSnap( nConfigId, sal_True ), + SdOptionsZoom( nConfigId, sal_True ), + SdOptionsGrid( nConfigId, sal_True ), + SdOptionsPrint( nConfigId, sal_True ) { } @@ -1563,7 +1563,7 @@ SdOptions::~SdOptions() // ---------------------------------------------------------------------- -void SdOptions::StoreConfig( ULONG nOptionsRange ) +void SdOptions::StoreConfig( sal_uLong nOptionsRange ) { if( nOptionsRange & SD_OPTIONS_LAYOUT ) SdOptionsLayout::Store(); diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index c93460fc8b38..b479762b34a1 100755 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -87,7 +87,7 @@ SFX_IMPL_INTERFACE(SdModule, SfxModule, SdResId(STR_APPLICATIONOBJECTBAR)) \************************************************************************/ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) -: SfxModule( SfxApplication::CreateResManager("sd"), FALSE, +: SfxModule( SfxApplication::CreateResManager("sd"), sal_False, pFact1, pFact2, NULL ), pTransferClip(NULL), pTransferDrag(NULL), @@ -96,7 +96,7 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) pDrawOptions(NULL), pSearchItem(NULL), pNumberFormatter( NULL ), - bWaterCan(FALSE), + bWaterCan(sal_False), mpResourceContainer(new ::sd::SdGlobalResourceContainer()) { SetName( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "StarDraw" ) ) ); // Nicht uebersetzen! @@ -198,7 +198,7 @@ SdOptions* SdModule::GetSdOptions(DocumentType eDocType) } if( pOptions ) { - UINT16 nMetric = pOptions->GetMetric(); + sal_uInt16 nMetric = pOptions->GetMetric(); ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); SdDrawDocument* pDoc = NULL; @@ -240,7 +240,7 @@ SvStorageStreamRef SdModule::GetOptionStream( const String& rOptionName, SvStream* pStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE ); if( pStm ) - xOptionStorage = new SvStorage( pStm, TRUE ); + xOptionStorage = new SvStorage( pStm, sal_True ); } if( DOCUMENT_TYPE_DRAW == eType ) diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 3c1abc0c7d22..139af4b09915 100755 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -116,7 +116,7 @@ private: void SdModule::Execute(SfxRequest& rReq) { const SfxItemSet* pSet = rReq.GetArgs(); - ULONG nSlotId = rReq.GetSlot(); + sal_uLong nSlotId = rReq.GetSlot(); switch ( nSlotId ) { @@ -131,9 +131,9 @@ void SdModule::Execute(SfxRequest& rReq) // automatische Rechtschreibpruefung const SfxPoolItem* pItem; if( pSet && SFX_ITEM_SET == pSet->GetItemState( - SID_AUTOSPELL_CHECK, FALSE, &pItem ) ) + SID_AUTOSPELL_CHECK, sal_False, &pItem ) ) { - BOOL bOnlineSpelling = ( (const SfxBoolItem*) pItem )->GetValue(); + sal_Bool bOnlineSpelling = ( (const SfxBoolItem*) pItem )->GetValue(); // am Dokument sichern: ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current()); if( pDocSh ) @@ -148,7 +148,7 @@ void SdModule::Execute(SfxRequest& rReq) case SID_ATTR_METRIC: { const SfxPoolItem* pItem; - if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_ATTR_METRIC, TRUE, &pItem ) ) + if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_ATTR_METRIC, sal_True, &pItem ) ) { FieldUnit eUnit = (FieldUnit)((const SfxUInt16Item*)pItem)->GetValue(); switch( eUnit ) @@ -167,7 +167,7 @@ void SdModule::Execute(SfxRequest& rReq) PutItem( *pItem ); SdOptions* pOptions = GetSdOptions( eDocType ); if(pOptions) - pOptions->SetMetric( (UINT16)eUnit ); + pOptions->SetMetric( (sal_uInt16)eUnit ); rReq.Done(); } } @@ -187,9 +187,9 @@ void SdModule::Execute(SfxRequest& rReq) const SfxPoolItem* pItem; if( pSet && ( - SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_LANGUAGE, FALSE, &pItem ) || - SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, FALSE, &pItem ) || - SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, FALSE, &pItem ) + SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_LANGUAGE, sal_False, &pItem ) || + SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, sal_False, &pItem ) || + SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, sal_False, &pItem ) ) ) { @@ -231,7 +231,7 @@ void SdModule::Execute(SfxRequest& rReq) case SID_OPENHYPERLINK: case SID_OPENDOC: { - BOOL bIntercept = FALSE; + sal_Bool bIntercept = sal_False; ::sd::DrawDocShell* pDocShell = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current()); if (pDocShell) { @@ -245,7 +245,7 @@ void SdModule::Execute(SfxRequest& rReq) // from a shape interaction. if (rReq.GetArgs() == NULL) { - bIntercept = TRUE; + bIntercept = sal_True; } } } @@ -259,7 +259,7 @@ void SdModule::Execute(SfxRequest& rReq) { ErrorBox(NULL, WB_OK, String(SdResId(STR_CANT_PERFORM_IN_LIVEMODE))).Execute(); - SFX_REQUEST_ARG( rReq, pLinkItem, SfxLinkItem, SID_DONELINK, FALSE ); + SFX_REQUEST_ARG( rReq, pLinkItem, SfxLinkItem, SID_DONELINK, sal_False ); if( pLinkItem ) pLinkItem->GetValue().Call( 0 ); } @@ -291,7 +291,7 @@ void SdModule::OutlineToImpress (SfxRequest& rRequest) SfxObjectShellLock xDocShell; ::sd::DrawDocShell* pDocSh; xDocShell = pDocSh = new ::sd::DrawDocShell( - SFX_CREATE_MODE_STANDARD, FALSE); + SFX_CREATE_MODE_STANDARD, sal_False); if(pDocSh) { pDocSh->DoInitNew(NULL); @@ -302,7 +302,7 @@ void SdModule::OutlineToImpress (SfxRequest& rRequest) pDoc->StopWorkStartupDelay(); } - SFX_REQUEST_ARG( rRequest, pFrmItem, SfxFrameItem, SID_DOCFRAME, FALSE); + SFX_REQUEST_ARG( rRequest, pFrmItem, SfxFrameItem, SID_DOCFRAME, sal_False); SfxViewFrame::LoadDocumentIntoFrame( *pDocSh, pFrmItem, ::sd::OUTLINE_FACTORY_ID ); ::sd::ViewShell* pViewSh = pDocSh->GetViewShell(); @@ -510,7 +510,7 @@ void SdModule::AddSummaryPage (SfxViewFrame* pViewFrame, SdDrawDocument* pDocume // The summary page, if it exists, is the last page. SdPage* pSummaryPage = pDocument->GetSdPage ( - (USHORT)nPageCount-1, PK_STANDARD); + (sal_uInt16)nPageCount-1, PK_STANDARD); OSL_ASSERT (pSummaryPage!=NULL); // Take the change mode of the template page as indication of the @@ -535,9 +535,9 @@ SfxFrame* SdModule::CreateFromTemplate( const String& rTemplatePath, const Refer SfxObjectShellLock xDocShell; SfxItemSet* pSet = new SfxAllItemSet( SFX_APP()->GetPool() ); - pSet->Put( SfxBoolItem( SID_TEMPLATE, TRUE ) ); + pSet->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); - ULONG lErr = SFX_APP()->LoadTemplate( xDocShell, rTemplatePath, TRUE, pSet ); + sal_uLong lErr = SFX_APP()->LoadTemplate( xDocShell, rTemplatePath, sal_True, pSet ); SfxObjectShell* pDocShell = xDocShell; @@ -562,7 +562,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) if ( SvtModuleOptions().IsImpress() ) { Reference< XFrame > xTargetFrame; - SFX_REQUEST_ARG( rReq, pFrmItem, SfxUnoFrameItem, SID_FILLFRAME, FALSE); + SFX_REQUEST_ARG( rReq, pFrmItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False); if ( pFrmItem ) xTargetFrame = pFrmItem->GetFrame(); @@ -605,9 +605,9 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) const sal_Bool bIsDocEmpty = pPilotDlg->IsDocEmpty(); // So that you can open the document without AutoLayout-Dialog - pOpt->SetStartWithTemplate(FALSE); + pOpt->SetStartWithTemplate(sal_False); if(bNewDocDirect && !pPilotDlg->GetStartWithFlag()) - bStartWithTemplate = FALSE; + bStartWithTemplate = sal_False; if( pPilotDlg->GetStartType() == ST_OPEN ) { @@ -658,7 +658,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) } catch (::com::sun::star::uno::Exception e) { - DBG_ASSERT (FALSE, "caught IllegalArgumentException while loading document from Impress autopilot"); + DBG_ASSERT (sal_False, "caught IllegalArgumentException while loading document from Impress autopilot"); } } } @@ -719,7 +719,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) if((aDocPath.Len() == 0) && pViewFrame && pViewFrame->GetDispatcher()) { SfxBoolItem aIsChangedItem(SID_MODIFYPAGE, !bIsDocEmpty); - SfxUInt32Item eAutoLayout( ID_VAL_WHATLAYOUT, (UINT32) AUTOLAYOUT_TITLE ); + SfxUInt32Item eAutoLayout( ID_VAL_WHATLAYOUT, (sal_uInt32) AUTOLAYOUT_TITLE ); pViewFrame->GetDispatcher()->Execute(SID_MODIFYPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aIsChangedItem, &eAutoLayout, 0L); } @@ -738,7 +738,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) pDoc->SetChanged(!bIsDocEmpty); - pDocShell->SetUseUserData(TRUE); + pDocShell->SetUseUserData(sal_True); // #94652# clear UNDO stack after autopilot pDocShell->ClearUndoBuffer(); @@ -772,7 +772,7 @@ SfxFrame* SdModule::CreateEmptyDocument( DocumentType eDocType, const Reference< SfxObjectShellLock xDocShell; ::sd::DrawDocShell* pNewDocSh; - xDocShell = pNewDocSh = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD,FALSE,eDocType); + xDocShell = pNewDocSh = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD,sal_False,eDocType); if(pNewDocSh) { pNewDocSh->DoInitNew(NULL); @@ -802,23 +802,23 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewF // settings for the Outputmedium Size aNewSize; - UINT32 nLeft = 0; - UINT32 nRight = 0; - UINT32 nLower = 0; - UINT32 nUpper = 0; + sal_uInt32 nLeft = 0; + sal_uInt32 nRight = 0; + sal_uInt32 nLower = 0; + sal_uInt32 nUpper = 0; switch(eMedium) { case OUTPUT_PAGE: case OUTPUT_OVERHEAD: { - SfxPrinter* pPrinter = pDocShell->GetPrinter(TRUE); + SfxPrinter* pPrinter = pDocShell->GetPrinter(sal_True); if( pPrinter && pPrinter->IsValid()) { // Der Printer gibt leider kein exaktes // Format (z.B. A4) zurueck Size aSize(pPrinter->GetPaperSize()); - Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, MAP_100TH_MM, TRUE); + Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, MAP_100TH_MM, sal_True); if (ePaper != PAPER_USER) { @@ -880,9 +880,9 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewF break; } - BOOL bScaleAll = TRUE; - USHORT nPageCnt = pDoc->GetMasterSdPageCount(PK_STANDARD); - USHORT i; + sal_Bool bScaleAll = sal_True; + sal_uInt16 nPageCnt = pDoc->GetMasterSdPageCount(PK_STANDARD); + sal_uInt16 i; SdPage* pPage; // master pages first @@ -930,7 +930,7 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewF } SdPage* pHandoutPage = pDoc->GetSdPage(0, PK_HANDOUT); - pHandoutPage->CreateTitleAndLayout(TRUE); + pHandoutPage->CreateTitleAndLayout(sal_True); if( (eMedium != OUTPUT_ORIGINAL) && pViewFrame && pViewFrame->GetDispatcher()) { @@ -1029,7 +1029,7 @@ void OutlineToImpressFinalizer::operator() (bool) sd::OutlineViewPageChangesGuard aGuard( pView ); // Remove the first empty pages - USHORT nPageCount = mrDocument.GetPageCount(); + sal_uInt16 nPageCount = mrDocument.GetPageCount(); mrDocument.RemovePage( --nPageCount ); // notes page mrDocument.RemovePage( --nPageCount ); // standard page */ @@ -1037,8 +1037,8 @@ void OutlineToImpressFinalizer::operator() (bool) // Call UpdatePreview once for every slide to resync the // document with the outliner of the OutlineViewShell. - USHORT nPageCount (mrDocument.GetSdPageCount(PK_STANDARD)); - for (USHORT nIndex=0; nIndex<nPageCount; nIndex++) + sal_uInt16 nPageCount (mrDocument.GetSdPageCount(PK_STANDARD)); + for (sal_uInt16 nIndex=0; nIndex<nPageCount; nIndex++) { SdPage* pPage = mrDocument.GetSdPage(nIndex, PK_STANDARD); // Make the page the actual page so that the diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 58aba6823d3a..68f0499f72f6 100755 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -114,7 +114,7 @@ static SdPage* GetCurrentPage( sd::ViewShell* pViewSh, EditFieldInfo* pInfo, boo int nPgNum = 0; Outliner* pOutl = pSdView->GetOutliner(); long nPos = pInfo->GetPara(); - ULONG nParaPos = 0; + sal_uLong nParaPos = 0; for( Paragraph* pPara = pOutl->GetParagraph( 0 ); pPara && nPos >= 0; pPara = pOutl->GetParagraph( ++nParaPos ), nPos-- ) { @@ -122,7 +122,7 @@ static SdPage* GetCurrentPage( sd::ViewShell* pViewSh, EditFieldInfo* pInfo, boo nPgNum++; } - pPage = pViewSh->GetDoc()->GetSdPage( (USHORT)nPgNum, PK_STANDARD ); + pPage = pViewSh->GetDoc()->GetSdPage( (sal_uInt16)nPgNum, PK_STANDARD ); } else { @@ -261,7 +261,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) { nPgNum = (pPage->GetPageNum() - 1) / 2 + 1; } - aRepresentation = pDoc->CreatePageNumValue((USHORT)nPgNum); + aRepresentation = pDoc->CreatePageNumValue((sal_uInt16)nPgNum); } else { @@ -289,7 +289,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) bool bMasterView; SdPage* pPage = GetCurrentPage( pViewSh, pInfo, bMasterView ); - USHORT nPageCount = 0; + sal_uInt16 nPageCount = 0; if( !bMasterView ) { @@ -299,7 +299,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) } else if( pDoc ) { - nPageCount = (USHORT)pDoc->GetSdPageCount(PK_STANDARD); + nPageCount = (sal_uInt16)pDoc->GetSdPageCount(PK_STANDARD); } } @@ -421,7 +421,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) |* virt. Methoden fuer Optionendialog |* \************************************************************************/ -SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) +SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot ) { ::sd::FrameView* pFrameView = NULL; ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); @@ -474,7 +474,7 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) // TP_OPTIONS_LAYOUT: pRet->Put( SdOptionsLayoutItem( ATTR_OPTIONS_LAYOUT, pOptions, pFrameView ) ); - UINT16 nDefTab = 0; + sal_uInt16 nDefTab = 0; if( pFrameView) nDefTab = pDoc->GetDefaultTabulator(); else @@ -490,7 +490,7 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) if( nMetric == (FieldUnit)0xffff ) nMetric = GetFieldUnit(); - pRet->Put( SfxUInt16Item( SID_ATTR_METRIC, (UINT16)nMetric ) ); + pRet->Put( SfxUInt16Item( SID_ATTR_METRIC, (sal_uInt16)nMetric ) ); // TP_OPTIONS_CONTENTS: pRet->Put( SdOptionsContentsItem( ATTR_OPTIONS_CONTENTS, pOptions, pFrameView ) ); @@ -501,7 +501,7 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) { aSdOptionsMiscItem.GetOptionsMisc().SetSummationOfParagraphs( pDoc->IsSummationOfParagraphs() ); aSdOptionsMiscItem.GetOptionsMisc().SetPrinterIndependentLayout ( - (USHORT)pDoc->GetPrinterIndependentLayout()); + (sal_uInt16)pDoc->GetPrinterIndependentLayout()); } pRet->Put( aSdOptionsMiscItem ); @@ -510,10 +510,10 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) pRet->Put( SdOptionsSnapItem( ATTR_OPTIONS_SNAP, pOptions, pFrameView ) ); // TP_SCALE: - UINT32 nW = 10L; - UINT32 nH = 10L; - INT32 nX; - INT32 nY; + sal_uInt32 nW = 10L; + sal_uInt32 nH = 10L; + sal_Int32 nX; + sal_Int32 nY; if( pDocSh ) { SdrPage* pPage = (SdrPage*) pDoc->GetSdPage(0, PK_STANDARD); @@ -548,12 +548,12 @@ SfxItemSet* SdModule::CreateItemSet( USHORT nSlot ) return pRet; } -void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) +void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) { const SfxPoolItem* pItem = NULL; - BOOL bNewDefTab = FALSE; - BOOL bNewPrintOptions = FALSE; - BOOL bMiscOptions = FALSE; + sal_Bool bNewDefTab = sal_False; + sal_Bool bNewPrintOptions = sal_False; + sal_Bool bMiscOptions = sal_False; ::sd::FrameView* pFrameView = NULL; ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); @@ -581,7 +581,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) SdOptions* pOptions = GetSdOptions(eDocType); // Raster if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , - FALSE, (const SfxPoolItem**) &pItem )) + sal_False, (const SfxPoolItem**) &pItem )) { const SdOptionsGridItem* pGridItem = (SdOptionsGridItem*) pItem; pGridItem->SetOptions( pOptions ); @@ -590,35 +590,35 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) // Layout const SdOptionsLayoutItem* pLayoutItem = NULL; if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_LAYOUT, - FALSE, (const SfxPoolItem**) &pLayoutItem )) + sal_False, (const SfxPoolItem**) &pLayoutItem )) { pLayoutItem->SetOptions( pOptions ); } // Metric - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, FALSE, &pItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, sal_False, &pItem ) ) { if( pDoc && eDocType == pDoc->GetDocumentType() ) PutItem( *pItem ); pOptions->SetMetric( ( (SfxUInt16Item*) pItem )->GetValue() ); } - UINT16 nDefTab = pOptions->GetDefTab(); + sal_uInt16 nDefTab = pOptions->GetDefTab(); // Default-Tabulator - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_DEFTABSTOP, FALSE, &pItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_DEFTABSTOP, sal_False, &pItem ) ) { nDefTab = ( (SfxUInt16Item*) pItem )->GetValue(); pOptions->SetDefTab( nDefTab ); - bNewDefTab = TRUE; + bNewDefTab = sal_True; } // Massstab - if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SCALE_X, FALSE, &pItem ) ) + if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SCALE_X, sal_False, &pItem ) ) { - INT32 nX = ( (SfxInt32Item*) pItem )->GetValue(); - if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SCALE_Y, FALSE, &pItem ) ) + sal_Int32 nX = ( (SfxInt32Item*) pItem )->GetValue(); + if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SCALE_Y, sal_False, &pItem ) ) { - INT32 nY = ( (SfxInt32Item*) pItem )->GetValue(); + sal_Int32 nY = ( (SfxInt32Item*) pItem )->GetValue(); pOptions->SetScale( nX, nY ); // #92067# Apply to document only if doc type match @@ -634,7 +634,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) // Contents (Inhalte) const SdOptionsContentsItem* pContentsItem = NULL; if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_CONTENTS, - FALSE, (const SfxPoolItem**) &pContentsItem )) + sal_False, (const SfxPoolItem**) &pContentsItem )) { pContentsItem->SetOptions( pOptions ); } @@ -642,16 +642,16 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) // Misc (Sonstiges) const SdOptionsMiscItem* pMiscItem = NULL; if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_MISC, - FALSE, (const SfxPoolItem**) &pMiscItem )) + sal_False, (const SfxPoolItem**) &pMiscItem )) { pMiscItem->SetOptions( pOptions ); - bMiscOptions = TRUE; + bMiscOptions = sal_True; } // Fangen/Einrasten const SdOptionsSnapItem* pSnapItem = NULL; if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_SNAP, - FALSE, (const SfxPoolItem**) &pSnapItem )) + sal_False, (const SfxPoolItem**) &pSnapItem )) { pSnapItem->SetOptions( pOptions ); } @@ -665,14 +665,14 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) // Drucken const SdOptionsPrintItem* pPrintItem = NULL; if( SFX_ITEM_SET == rSet.GetItemState( ATTR_OPTIONS_PRINT, - FALSE, (const SfxPoolItem**) &pPrintItem )) + sal_False, (const SfxPoolItem**) &pPrintItem )) { pPrintItem->SetOptions( pOptions ); // PrintOptionsSet setzen SdOptionsPrintItem aPrintItem( ATTR_OPTIONS_PRINT, pOptions ); SfxFlagItem aFlagItem( SID_PRINTER_CHANGESTODOC ); - USHORT nFlags = 0; + sal_uInt16 nFlags = 0; nFlags = (aPrintItem.GetOptionsPrint().IsWarningSize() ? SFX_PRINTER_CHG_SIZE : 0) | (aPrintItem.GetOptionsPrint().IsWarningOrientation() ? SFX_PRINTER_CHG_ORIENTATION : 0); @@ -682,7 +682,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) aPrintSet.Put( SfxBoolItem( SID_PRINTER_NOTFOUND_WARN, aPrintItem.GetOptionsPrint().IsWarningPrinter() ) ); aPrintSet.Put( aFlagItem ); - bNewPrintOptions = TRUE; + bNewPrintOptions = sal_True; } // Nur, wenn auch der Dokumenttyp uebereinstimmt... @@ -690,7 +690,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) { if( bNewPrintOptions ) { - pDocSh->GetPrinter(TRUE)-&g |