diff options
Diffstat (limited to 'sw/source/ui/fldui/changedb.cxx')
-rw-r--r-- | sw/source/ui/fldui/changedb.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index a08e717f6948..cbd24bf1c498 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -166,12 +166,12 @@ void SwChangeDBDlg::FillDBPopup() SvStringsDtor aDBNameList(5, 1); pSh->GetAllUsedDB( aDBNameList, &aAllDBNames ); - USHORT nCount = aDBNameList.Count(); + sal_uInt16 nCount = aDBNameList.Count(); aUsedDBTLB.Clear(); SvLBoxEntry *pFirst = 0; SvLBoxEntry *pLast = 0; - for (USHORT k = 0; k < nCount; k++) + for (sal_uInt16 k = 0; k < nCount; k++) { sDBName = *aDBNameList.GetObject(k); sDBName = sDBName.GetToken(0); @@ -201,8 +201,8 @@ SvLBoxEntry* SwChangeDBDlg::Insert(const String& rDBName) SvLBoxEntry* pParent; SvLBoxEntry* pChild; - USHORT nParent = 0; - USHORT nChild = 0; + sal_uInt16 nParent = 0; + sal_uInt16 nChild = 0; Image aTableImg = aImageList.GetImage(IMG_DBTABLE); Image aDBImg = aImageList.GetImage(IMG_DB); @@ -259,7 +259,7 @@ void __EXPORT SwChangeDBDlg::Apply() --------------------------------------------------------------------*/ void SwChangeDBDlg::UpdateFlds() { - SvStringsDtor aDBNames( (BYTE)aUsedDBTLB.GetSelectionCount(), 1 ); + SvStringsDtor aDBNames( (sal_uInt8)aUsedDBTLB.GetSelectionCount(), 1 ); SvLBoxEntry* pEntry = aUsedDBTLB.FirstSelected(); while( pEntry ) @@ -271,7 +271,7 @@ void SwChangeDBDlg::UpdateFlds() *pTmp += DB_DELIM; *pTmp += aUsedDBTLB.GetEntryText( pEntry ); *pTmp += DB_DELIM; - int nCommandType = (int)(ULONG)pEntry->GetUserData(); + int nCommandType = (int)(sal_uLong)pEntry->GetUserData(); *pTmp += String::CreateFromInt32(nCommandType); aDBNames.Insert(pTmp, aDBNames.Count() ); } @@ -317,14 +317,14 @@ IMPL_LINK( SwChangeDBDlg, ButtonHdl, Button *, EMPTYARG ) IMPL_LINK( SwChangeDBDlg, TreeSelectHdl, SvTreeListBox *, EMPTYARG ) { - BOOL bEnable = FALSE; + sal_Bool bEnable = sal_False; SvLBoxEntry* pEntry = aAvailDBTLB.GetCurEntry(); if (pEntry) { if (aAvailDBTLB.GetParent(pEntry)) - bEnable = TRUE; + bEnable = sal_True; aOKBT.Enable( bEnable ); } return 0; @@ -341,7 +341,7 @@ void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData) sTmp += '.'; sTmp += (String)rDBData.sCommand; - for (USHORT i = 0; i < sTmp.Len(); i++) + for (sal_uInt16 i = 0; i < sTmp.Len(); i++) { sName += sTmp.GetChar(i); if (sTmp.GetChar(i) == '~') |