Kaydet (Commit) f7e46815 authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS asyncdialogs (1.36.54); FILE MERGED

2006/09/20 15:00:48 pb 1.36.54.6: RESYNC: (1.40-1.41); FILE MERGED
2006/08/30 12:15:35 pb 1.36.54.5: RESYNC: (1.39-1.40); FILE MERGED
2006/07/12 15:15:29 pb 1.36.54.4: RESYNC: (1.38-1.39); FILE MERGED
2006/05/31 10:59:57 pb 1.36.54.3: RESYNC: (1.37-1.38); FILE MERGED
2006/03/22 10:18:51 pb 1.36.54.2: RESYNC: (1.36-1.37); FILE MERGED
2006/03/01 09:50:08 pb 1.36.54.1: fix: #i57125# warnings removed
üst f8d55f6f
......@@ -4,9 +4,9 @@
*
* $RCSfile: content.cxx,v $
*
* $Revision: 1.42 $
* $Revision: 1.43 $
*
* last change: $Author: ihi $ $Date: 2006-11-14 15:21:46 $
* last change: $Author: vg $ $Date: 2006-11-22 10:28:33 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
......@@ -910,7 +910,7 @@ void SwContentType::FillMemberList(sal_Bool* pbLevelOrVisibiblityChanged)
pMember->Insert(pCnt);
nMemberCount++;
if(nOldMemberCount > (int)i &&
(pOldMember->GetObject(i))->IsInvisible() != pCnt->IsInvisible())
(pOldMember->GetObject((USHORT)i))->IsInvisible() != pCnt->IsInvisible())
*pbLevelOrVisibiblityChanged = sal_True;
}
}
......@@ -1592,7 +1592,7 @@ sal_Bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
nLevel <= pTxtNd->GetLevel();
nLevel++ )
{
sal_uInt16 nVal = aNumVector[nLevel];
sal_uInt16 nVal = (sal_uInt16)aNumVector[nLevel];
nVal ++;
nVal -= pOutlRule->Get(nLevel).GetStart();
sEntry += String::CreateFromInt32( nVal );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment