diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:02:28 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:02:28 +0000 |
| commit | ff74822c48e9680562b3f54611c3dc21dad7fe64 (patch) | |
| tree | 03a0bee1776be8b61597fbd81ef964606f9ea78e /svx/source/outliner | |
| parent | f5bfe99d5762d3fffc1c136f899e83800b277349 (diff) | |
INTEGRATION: CWS sb59 (1.6.62); FILE MERGED
2006/08/28 12:57:58 sb 1.6.62.2: #i67487# Made code warning-free (wntmsci10).
2006/08/03 13:51:53 cl 1.6.62.1: removed compiler warnings
Diffstat (limited to 'svx/source/outliner')
| -rw-r--r-- | svx/source/outliner/outlobj.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/outliner/outlobj.cxx b/svx/source/outliner/outlobj.cxx index a1dacb61bbb4..261472f56bf1 100644 --- a/svx/source/outliner/outlobj.cxx +++ b/svx/source/outliner/outlobj.cxx @@ -4,9 +4,9 @@ * * $RCSfile: outlobj.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2006-09-17 05:31:16 $ + * last change: $Author: obo $ $Date: 2006-10-12 13:02:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -57,7 +57,7 @@ #include <tools/stream.hxx> #endif -DBG_NAME(OutlinerParaObject); +DBG_NAME(OutlinerParaObject) OutlinerParaObject::OutlinerParaObject( USHORT nParaCount ) { @@ -125,7 +125,7 @@ BOOL OutlinerParaObject::ChangeStyleSheets( const XubString& rOldName, SfxStyleF void OutlinerParaObject::SetStyleSheets( USHORT nLevel, const XubString rNewName, const SfxStyleFamily& rNewFamily ) { - for ( USHORT n = Count(); n; ) + for ( USHORT n = sal::static_int_cast< USHORT >( Count() ); n; ) { if ( GetDepth( --n ) == nLevel ) pText->SetStyleSheet( n, rNewName, rNewFamily ); @@ -218,9 +218,9 @@ OutlinerParaObject* OutlinerParaObject::Create( SvStream& rStream, SfxItemPool* nCurPara++; if( nCount ) { - sal_uInt32 nSync = 0; - rStream >> nSync; - DBG_ASSERT(nSync==nSyncRef,"Stream out of sync") + sal_uInt32 _nSync = 0; + rStream >> _nSync; + DBG_ASSERT(_nSync==nSyncRef,"Stream out of sync") } } if( nVersion == 3 ) |