diff options
Diffstat (limited to 'sd/source/ui/dlg/dlgassim.cxx')
| -rwxr-xr-x | sd/source/ui/dlg/dlgassim.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index aa2e234b0868..6c8d220157ae 100755 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -116,8 +116,8 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc ) { Outliner* pOutliner = pDoc->GetInternalOutliner(); - USHORT nPage = 0; - const USHORT nMaxPages = pDoc->GetPageCount(); + sal_uInt16 nPage = 0; + const sal_uInt16 nMaxPages = pDoc->GetPageCount(); while( nPage < nMaxPages ) { SdPage* pPage = (SdPage*) pDoc->GetPage( nPage ); @@ -130,8 +130,8 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc ) if(!pTO) { // Ermittelt das SdrTextObject mit dem Layout Text dieser Seite - const ULONG nObjectCount = pPage->GetObjCount(); - for (ULONG nObject = 0; nObject < nObjectCount; nObject++) + const sal_uLong nObjectCount = pPage->GetObjCount(); + for (sal_uLong nObject = 0; nObject < nObjectCount; nObject++) { SdrObject* pObject = pPage->GetObj(nObject); if (pObject->GetObjInventor() == SdrInventor && pObject->GetObjIdentifier() == OBJ_OUTLINETEXT) @@ -150,14 +150,14 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc ) pOutliner->Clear(); pOutliner->SetText( *pOPO ); - ULONG nCount = pOutliner->GetParagraphCount(); + sal_uLong nCount = pOutliner->GetParagraphCount(); Paragraph* pPara = NULL; - for (ULONG nPara = 0; nPara < nCount; nPara++) + for (sal_uLong nPara = 0; nPara < nCount; nPara++) { pPara = pOutliner->GetParagraph(nPara); - if(pPara && pOutliner->GetDepth( (USHORT) nPara ) == 0 ) + if(pPara && pOutliner->GetDepth( (sal_uInt16) nPara ) == 0 ) { String aParaText = pOutliner->GetText(pPara); if(aParaText.Len() != 0) @@ -173,10 +173,10 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc ) pOutliner->Clear(); } -USHORT SdPageListControl::GetSelectedPage() +sal_uInt16 SdPageListControl::GetSelectedPage() { SvLBoxEntry* pSelEntry = GetCurEntry(); - USHORT nPage = 0; + sal_uInt16 nPage = 0; if ( pSelEntry ) { @@ -196,10 +196,10 @@ USHORT SdPageListControl::GetSelectedPage() return nPage; } -BOOL SdPageListControl::IsPageChecked( USHORT nPage ) +sal_Bool SdPageListControl::IsPageChecked( sal_uInt16 nPage ) { SvLBoxEntry* pEntry = GetModel()->GetEntry(nPage); - return pEntry?(BOOL)(GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED): FALSE; + return pEntry?(sal_Bool)(GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED): sal_False; } void SdPageListControl::DataChanged( const DataChangedEvent& rDCEvt ) |