WaE: throw out some warnings

11 files changed, 80 insertions, 195 deletions

diff --git a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
index a9b8072ab..821a0c38c 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
@@ -745,11 +745,8 @@ DBG_BF_ASSERT(0, "STRIP");
 /*N*/           }
 /*N*/
 /*N*/           BYTE nLevel = aNum.GetLevel();
-/*N*/           BYTE nNdOldLvl = MAXLEVEL;
 /*N*/           if( pStt->GetNum() )
 /*N*/           {
-/*N*/               if( NO_NUMBERING != pStt->GetNum()->GetLevel() )
-/*N*/                   nNdOldLvl = nLevel = pStt->GetNum()->GetLevel();
 /*N*/               if( pStt->GetNum()->IsStart() )
 /*N*/               {
 /*?*/                   aNum.SetStart( TRUE );
@@ -861,30 +858,6 @@ DBG_BF_ASSERT(0, "STRIP");
 /*N*/                   ((SwTxtFmtColl*)pStt->GetFmtColl())->GetOutlineLevel() )
 /*N*/               pOutlNd = pStt;
 /*N*/
-/*N*/ //FEATURE::CONDCOLL
-/*N*/
-/*N*/ #ifndef NUM_RELSPACE
-/*N*/           // hat sich eine Level - Aenderung ergeben, so setze jetzt die
-/*N*/           // gueltigen Einzuege
-/*N*/           if( sbCheck && ( nLevel != nNdOldLvl || pStt->IsSetNumLSpace())
-/*N*/               && GetRealLevel( nLevel ) < MAXLEVEL )
-/*N*/           {
-/*N*/               SvxLRSpaceItem aLR( ((SvxLRSpaceItem&)pStt->SwCntntNode::GetAttr(
-/*N*/                                   RES_LR_SPACE )) );
-/*N*/
-/*N*/               const SwNumFmt& rNFmt = pRule->Get( GetRealLevel( nLevel ));
-/*N*/
-/*N*/               // ohne Nummer immer ohne FirstLineOffset!!!!
-/*N*/               short nFOfst = rNFmt.GetFirstLineOffset();
-/*N*/               if( nLevel & NO_NUMLEVEL ) nFOfst = 0;
-/*N*/               aLR.SetTxtFirstLineOfstValue( nFOfst );
-/*N*/               aLR.SetTxtLeft( rNFmt.GetAbsLSpace() );
-/*N*/
-/*N*/               pStt->SwCntntNode::SetAttr( aLR );
-/*N*/           }
-/*N*/           // Flag immer loeschen!
-/*N*/           pStt->SetNumLSpace( FALSE );
-/*N*/ #endif
 /*N*/           aNum.SetStart( FALSE );
 /*N*/           aNum.SetSetValue( USHRT_MAX );
 /*N*/       }
diff --git a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
index c9341446f..68d2af1b4 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
@@ -400,10 +400,13 @@ typedef BOOL (*Fn_AcceptReject)( SwRedlineTbl& rArr, USHORT& rPos,
 /*  */
 
 /*?*/SwRedlineData::SwRedlineData( const SwRedlineData& rCpy, BOOL bCpyNext )
-/*?*/   : nAuthor( rCpy.nAuthor ), eType( rCpy.eType ), aStamp( rCpy.aStamp ),
-/*?*/   sComment( rCpy.sComment ), nSeqNo( rCpy.nSeqNo ),
-/*?*/   pExtraData( rCpy.pExtraData ? rCpy.pExtraData->CreateNew() : 0 ),
-/*?*/   pNext( (bCpyNext && rCpy.pNext) ? new SwRedlineData( *rCpy.pNext ) : 0 )
+/*?*/   : pNext( (bCpyNext && rCpy.pNext) ? new SwRedlineData( *rCpy.pNext ) : 0 )
+/*?*/   , pExtraData( rCpy.pExtraData ? rCpy.pExtraData->CreateNew() : 0 )
+/*?*/   , sComment( rCpy.sComment )
+/*?*/   , aStamp( rCpy.aStamp )
+/*?*/   , eType( rCpy.eType )
+/*?*/   , nAuthor( rCpy.nAuthor )
+/*?*/   , nSeqNo( rCpy.nSeqNo )
 /*?*/{
 /*?*/}
 
@@ -411,8 +414,13 @@ typedef BOOL (*Fn_AcceptReject)( SwRedlineTbl& rArr, USHORT& rPos,
 /*?*/SwRedlineData::SwRedlineData( SwRedlineType eT, USHORT nAut, const DateTime& rDT,
 /*?*/                  const String& rCmnt, SwRedlineData *pNxt,
 /*?*/                  SwRedlineExtraData* pData )
-/*?*/   : eType( eT ), pNext( pNxt ), nAuthor( nAut ), aStamp( rDT ),
-/*?*/     sComment( rCmnt ), pExtraData( pData ), nSeqNo( 0 )
+/*?*/   : pNext( pNxt )
+/*?*/   , pExtraData( pData )
+/*?*/   , sComment( rCmnt )
+/*?*/   , aStamp( rDT )
+/*?*/   , eType( eT )
+/*?*/   , nAuthor( nAut )
+/*?*/   , nSeqNo( 0 )
 /*?*/{
 /*?*/}
 
@@ -425,18 +433,18 @@ typedef BOOL (*Fn_AcceptReject)( SwRedlineTbl& rArr, USHORT& rPos,
 /*  */
 
 /*?*/SwRedline::SwRedline( const SwRedlineData& rData, const SwPosition& rPos )
-/*?*/   : SwPaM( rPos ),
-/*?*/   pCntntSect( 0 ),
-/*?*/   pRedlineData( new SwRedlineData( rData ))
+/*?*/   : SwPaM( rPos )
+/*?*/   , pRedlineData( new SwRedlineData( rData ))
+/*?*/   , pCntntSect( 0 )
 /*?*/{
 /*?*/   bDelLastPara = bIsLastParaDelete = FALSE;
 /*?*/   bIsVisible = TRUE;
 /*?*/}
 
 /*?*/SwRedline::SwRedline( const SwRedline& rCpy )
-/*?*/   : SwPaM( *rCpy.GetMark(), *rCpy.GetPoint() ),
-/*?*/   pCntntSect( 0 ),
-/*?*/   pRedlineData( new SwRedlineData( *rCpy.pRedlineData ))
+/*?*/   : SwPaM( *rCpy.GetMark(), *rCpy.GetPoint() )
+/*?*/   , pRedlineData( new SwRedlineData( *rCpy.pRedlineData ))
+/*?*/   , pCntntSect( 0 )
 /*?*/{
 /*?*/   bDelLastPara = bIsLastParaDelete = FALSE;
 /*?*/   bIsVisible = TRUE;
diff --git a/binfilter/bf_sw/source/core/doc/sw_lineinfo.cxx b/binfilter/bf_sw/source/core/doc/sw_lineinfo.cxx
index 731ce2f9b..79183738e 100644
--- a/binfilter/bf_sw/source/core/doc/sw_lineinfo.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_lineinfo.cxx
@@ -67,7 +67,7 @@ namespace binfilter {
 /*N*/ {
 /*N*/ }
 
-/*N*/ SwLineNumberInfo::SwLineNumberInfo(const SwLineNumberInfo &rCpy ) :
+/*N*/ SwLineNumberInfo::SwLineNumberInfo(const SwLineNumberInfo &rCpy ) : SwClient(),
 /*N*/   aType( rCpy.GetNumType() ),
 /*N*/   aDivider( rCpy.GetDivider() ),
 /*N*/   nPosFromLeft( rCpy.GetPosFromLeft() ),
diff --git a/binfilter/bf_sw/source/core/doc/sw_number.cxx b/binfilter/bf_sw/source/core/doc/sw_number.cxx
index 04664b5d8..e9791fc45 100644
--- a/binfilter/bf_sw/source/core/doc/sw_number.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_number.cxx
@@ -57,7 +57,7 @@ SwNumFmt* SwNumRule::aBaseFmts[ RULE_END ][ MAXLEVEL ] =
 };
 
 Font* SwNumRule::pDefBulletFont = 0;
-sal_Char* SwNumRule::pDefOutlineName = "Outline";
+const char* SwNumRule::pDefOutlineName = "Outline";
 
 USHORT SwNumRule::aDefNumIndents[ MAXLEVEL ] = {
 //cm:   0,5  1,0  1,5  2,0   2,5   3,0   3,5   4,0   4,5   5,0
@@ -78,17 +78,17 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
 /*N*/       rNd.NumRuleChgd();
 /*N*/ }
 
-/*N*/ SwNumFmt::SwNumFmt() :
-/*N*/   SwClient( 0 ),
-/*N*/   SvxNumberFormat(SVX_NUM_ARABIC),
-/*N*/     pVertOrient(new SwFmtVertOrient( 0, VERT_NONE))
+/*N*/ SwNumFmt::SwNumFmt()
+/*N*/   : SvxNumberFormat(SVX_NUM_ARABIC)
+/*N*/   , SwClient( 0 )
+/*N*/   , pVertOrient(new SwFmtVertOrient( 0, VERT_NONE))
 /*N*/ {
 /*N*/ }
 
-/*N*/ SwNumFmt::SwNumFmt( const SwNumFmt& rFmt) :
-/*N*/   SwClient( rFmt.pRegisteredIn ),
-/*N*/   SvxNumberFormat(rFmt),
-/*N*/     pVertOrient(new SwFmtVertOrient( 0, (SwVertOrient)rFmt.GetVertOrient()))
+/*N*/ SwNumFmt::SwNumFmt(const SwNumFmt& rFmt)
+/*N*/   : SvxNumberFormat(rFmt)
+/*N*/   , SwClient( rFmt.pRegisteredIn )
+/*N*/   , pVertOrient(new SwFmtVertOrient( 0, (SwVertOrient)rFmt.GetVertOrient()))
 /*N*/ {
 /*N*/   SvxFrameVertOrient eVertOrient2 = rFmt.GetVertOrient();
 /*N*/   SetGraphicBrush( rFmt.GetBrush(), &rFmt.GetGraphicSize(),
@@ -291,15 +291,15 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
 /*N*/ }
 
 /*N*/ SwNumRule::SwNumRule( const String& rNm, SwNumRuleType eType, BOOL bAutoFlg )
-/*N*/   : eRuleType( eType ),
-/*N*/   sName( rNm ),
-/*N*/   bAutoRuleFlag( bAutoFlg ),
-/*N*/   bInvalidRuleFlag( TRUE ),
-/*N*/   bContinusNum( FALSE ),
-/*N*/   bAbsSpaces( FALSE ),
-/*N*/   nPoolFmtId( USHRT_MAX ),
-/*N*/   nPoolHelpId( USHRT_MAX ),
-/*N*/   nPoolHlpFileId( UCHAR_MAX )
+/*N*/   : sName( rNm )
+/*N*/   , eRuleType( eType )
+/*N*/   , nPoolFmtId( USHRT_MAX )
+/*N*/   , nPoolHelpId( USHRT_MAX )
+/*N*/   , nPoolHlpFileId( UCHAR_MAX )
+/*N*/   , bAutoRuleFlag( bAutoFlg )
+/*N*/   , bInvalidRuleFlag( TRUE )
+/*N*/   , bContinusNum( FALSE )
+/*N*/   , bAbsSpaces( FALSE )
 /*N*/ {
 /*N*/   if( !nRefCount++ )          // zum erstmal, also initialisiern
 /*N*/   {
@@ -336,15 +336,15 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
 /*N*/ }
 
 /*N*/ SwNumRule::SwNumRule( const SwNumRule& rNumRule )
-/*N*/   : eRuleType( rNumRule.eRuleType ),
-/*N*/   sName( rNumRule.sName ),
-/*N*/   bAutoRuleFlag( rNumRule.bAutoRuleFlag ),
-/*N*/   bInvalidRuleFlag( TRUE ),
-/*N*/   bContinusNum( rNumRule.bContinusNum ),
-/*N*/   bAbsSpaces( rNumRule.bAbsSpaces ),
-/*N*/   nPoolFmtId( rNumRule.GetPoolFmtId() ),
-/*N*/   nPoolHelpId( rNumRule.GetPoolHelpId() ),
-/*N*/   nPoolHlpFileId( rNumRule.GetPoolHlpFileId() )
+/*N*/   : sName( rNumRule.sName )
+/*N*/   , eRuleType( rNumRule.eRuleType )
+/*N*/   , nPoolFmtId( rNumRule.GetPoolFmtId() )
+/*N*/   , nPoolHelpId( rNumRule.GetPoolHelpId() )
+/*N*/   , nPoolHlpFileId( rNumRule.GetPoolHlpFileId() )
+/*N*/   , bAutoRuleFlag( rNumRule.bAutoRuleFlag )
+/*N*/   , bInvalidRuleFlag( TRUE )
+/*N*/   , bContinusNum( rNumRule.bContinusNum )
+/*N*/   , bAbsSpaces( rNumRule.bAbsSpaces )
 /*N*/ {
 /*N*/   ++nRefCount;
 /*N*/   memset( aFmts, 0, sizeof( aFmts ));
diff --git a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
index b4b0be23f..2dad82843 100644
--- a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
@@ -1644,19 +1644,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
 /*N*/ //                cm: 0,5  1,0  1,5  2,0   2,5   3,0   3,5   4,0   4,5   5,0
 /*N*/                   283, 567, 850, 1134, 1417, 1701, 1984, 2268, 2551, 2835
 /*N*/               };
-/*N*/ #ifdef USE_MEASUREMENT
-/*N*/           static const USHORT aAbsSpaceInch[ MAXLEVEL ] =
-/*N*/               {
-/*N*/                   283, 567, 850, 1134, 1417, 1701, 1984, 2268, 2551, 2835
-/*N*/               };
-/*N*/           const USHORT* pArr = MEASURE_METRIC ==
-/*N*/                               GetAppLocaleData().getMeasurementSystemEnum()
-/*N*/                                   ? aAbsSpace
-/*N*/                                   : aAbsSpaceInch;
-/*N*/ #else
 /*N*/           const USHORT* pArr = aAbsSpace;
-/*N*/ #endif
-/*N*/
 /*N*/           aFmt.SetFirstLineOffset( - (*pArr) );
 /*N*/           for( n = 0; n < MAXLEVEL; ++n, ++pArr )
 /*N*/           {
@@ -1675,21 +1663,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
 /*N*/                  1588, 1758                   // 2.80, 3.10
 /*N*/               };
 /*N*/
-/*N*/ #ifdef USE_MEASUREMENT
-/*N*/           static const USHORT aAbsSpaceInch[ MAXLEVEL ] =
-/*N*/               {
-/*N*/                   385,  385,  770,  963,
-/*N*/                  1155, 1386, 1771, 2002,
-/*N*/                  2156, 2387
-/*N*/               };
-/*N*/
-/*N*/           const USHORT* pArr = MEASURE_METRIC ==
-/*N*/                               GetAppLocaleData().getMeasurementSystemEnum()
-/*N*/                                   ? aAbsSpace
-/*N*/                                   : aAbsSpaceInch;
-/*N*/ #else
 /*N*/           const USHORT* pArr = aAbsSpace;
-/*N*/ #endif
 /*N*/           SwNumFmt aFmt;
 /*N*/           aFmt.SetNumberingType(SVX_NUM_ARABIC);
 /*N*/           aFmt.SetCharFmt( pNumCFmt );
@@ -1734,19 +1708,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
 /*N*/ //                cm: 0,5  1,0  1,5  2,0   2,5   3,0   3,5   4,0   4,5   5,0
 /*N*/                   283, 567, 850, 1134, 1417, 1701, 1984, 2268, 2551, 2835
 /*N*/               };
-/*N*/ #ifdef USE_MEASUREMENT
-/*N*/           static const USHORT aAbsSpaceInch[ MAXLEVEL ] =
-/*N*/               {
-/*N*/                   283, 567, 850, 1134, 1417, 1701, 1984, 2268, 2551, 2835
-/*N*/               };
-/*N*/           const USHORT* pArr = MEASURE_METRIC ==
-/*N*/                               GetAppLocaleData().getMeasurementSystemEnum()
-/*N*/                                   ? aAbsSpace
-/*N*/                                   : aAbsSpaceInch;
-/*N*/ #else
 /*N*/           const USHORT* pArr = aAbsSpace;
-/*N*/ #endif
-/*N*/
 /*N*/           aFmt.SetFirstLineOffset( - (*pArr) );
 /*N*/           for( n = 0; n < MAXLEVEL; ++n, ++pArr )
 /*N*/           {
@@ -1765,21 +1727,8 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
 /*N*/                   369,  624,      // 0.65, 1.10,
 /*N*/                   255,  879       // 0.45, 1.55
 /*N*/               };
-/*N*/           static const USHORT aAbsSpaceInch0to2[] =
-/*N*/               {
-/*N*/                   308,  308,
-/*N*/                   501,  847,
-/*N*/                   347, 1194
-/*N*/               };
 /*N*/
-/*N*/ #ifdef USE_MEASUREMENT
-/*N*/           const USHORT* pArr0to2 = MEASURE_METRIC ==
-/*N*/                           GetAppLocaleData().getMeasurementSystemEnum()
-/*N*/                               ? aAbsSpace0to2
-/*N*/                               : aAbsSpaceInch0to2;
-/*N*/ #else
 /*N*/           const USHORT* pArr0to2 = aAbsSpace0to2;
-/*N*/ #endif
 /*N*/           SwNumFmt aFmt;
 /*N*/           aFmt.SetNumberingType(SVX_NUM_ARABIC);
 /*N*/           aFmt.SetStart( 1 );
@@ -1839,19 +1788,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
 /*N*/ //                cm: 0,4  0,8  1,2  1,6  2,0   2,4   2,8   3,2   3,6   4,0
 /*N*/                   227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
 /*N*/               };
-/*N*/ #ifdef USE_MEASUREMENT
-/*N*/           static const USHORT aAbsSpaceInch[ MAXLEVEL ] =
-/*N*/               {
-/*N*/                   227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
-/*N*/               };
-/*N*/           const USHORT* pArr = MEASURE_METRIC ==
-/*N*/                               GetAppLocaleData().getMeasurementSystemEnum()
-/*N*/                                   ? aAbsSpace
-/*N*/                                   : aAbsSpaceInch;
-/*N*/ #else
 /*N*/           const USHORT* pArr = aAbsSpace;
-/*N*/ #endif
-/*N*/
 /*N*/           aFmt.SetFirstLineOffset( - (*pArr) );
 /*N*/           for( n = 0; n < MAXLEVEL; ++n, ++pArr )
 /*N*/           {
@@ -1875,19 +1812,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
 /*N*/ //                cm: 0,3  0,6  0,9  1,2  1,5  1,8   2,1   2,4   2,7   3,0
 /*N*/                   170, 340, 510, 680, 850, 1020, 1191, 1361, 1531, 1701
 /*N*/               };
-/*N*/ #ifdef USE_MEASUREMENT
-/*N*/           static const USHORT aAbsSpaceInch[ MAXLEVEL ] =
-/*N*/               {
-/*N*/                   170, 340, 510, 680, 850, 1020, 1191, 1361, 1531, 1701
-/*N*/               };
-/*N*/           const USHORT* pArr = MEASURE_METRIC ==
-/*N*/                               GetAppLocaleData().getMeasurementSystemEnum()
-/*N*/                                   ? aAbsSpace
-/*N*/                                   : aAbsSpaceInch;
-/*N*/ #else
 /*N*/           const USHORT* pArr = aAbsSpace;
-/*N*/ #endif
-/*N*/
 /*N*/           aFmt.SetFirstLineOffset( - (*pArr) );
 /*N*/           for( n = 0; n < MAXLEVEL; ++n, ++pArr )
 /*N*/           {
@@ -1929,19 +1854,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
 /*N*/ //                cm: 0,4  0,8  1,2  1,6  2,0   2,4   2,8   3,2   3,6   4,0
 /*N*/                   227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
 /*N*/               };
-/*N*/ #ifdef USE_MEASUREMENT
-/*N*/           static const USHORT aAbsSpaceInch[ MAXLEVEL ] =
-/*N*/               {
-/*N*/                   227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
-/*N*/               };
-/*N*/           const USHORT* pArr = MEASURE_METRIC ==
-/*N*/                               GetAppLocaleData().getMeasurementSystemEnum()
-/*N*/                                   ? aAbsSpace
-/*N*/                                   : aAbsSpaceInch;
-/*N*/ #else
 /*N*/           const USHORT* pArr = aAbsSpace;
-/*N*/ #endif
-/*N*/
 /*N*/           aFmt.SetFirstLineOffset( - (*pArr) );
 /*N*/           for( n = 0; n < MAXLEVEL; ++n, ++pArr )
 /*N*/           {
@@ -1971,19 +1884,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
 /*N*/ //                cm: 0,4  0,8  1,2  1,6  2,0   2,4   2,8   3,2   3,6   4,0
 /*N*/                   227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
 /*N*/               };
-/*N*/ #ifdef USE_MEASUREMENT
-/*N*/           static const USHORT aAbsSpaceInch[ MAXLEVEL ] =
-/*N*/               {
-/*N*/                   227, 454, 680, 907, 1134, 1361, 1587, 1814, 2041, 2268
-/*N*/               };
-/*N*/           const USHORT* pArr = MEASURE_METRIC ==
-/*N*/                               GetAppLocaleData().getMeasurementSystemEnum()
-/*N*/                                   ? aAbsSpace
-/*N*/                                   : aAbsSpaceInch;
-/*N*/ #else
 /*N*/           const USHORT* pArr = aAbsSpace;
-/*N*/ #endif
-/*N*/
 /*N*/           aFmt.SetFirstLineOffset( - (*pArr) );
 /*N*/           for( n = 0; n < MAXLEVEL; ++n, ++pArr )
 /*N*/           {
diff --git a/binfilter/bf_sw/source/core/doc/sw_sortopt.cxx b/binfilter/bf_sw/source/core/doc/sw_sortopt.cxx
index 603b7d44f..5e36dfa2e 100644
--- a/binfilter/bf_sw/source/core/doc/sw_sortopt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_sortopt.cxx
@@ -51,11 +51,11 @@ namespace binfilter {
 /*N*/ {
 /*N*/ }
 
-/*N*/ SwSortKey::SwSortKey(const SwSortKey& rOld) :
-/*N*/   eSortOrder( rOld.eSortOrder ),
-/*N*/   sSortType( rOld.sSortType ),
-/*N*/   nColumnId( rOld.nColumnId ),
-/*N*/   bIsNumeric( rOld.bIsNumeric )
+/*N*/ SwSortKey::SwSortKey(const SwSortKey& rOld)
+/*N*/   : sSortType( rOld.sSortType )
+/*N*/   , eSortOrder( rOld.eSortOrder )
+/*N*/   , nColumnId( rOld.nColumnId )
+/*N*/   , bIsNumeric( rOld.bIsNumeric )
 /*N*/ {
 /*N*/ }
 
@@ -65,11 +65,10 @@ namespace binfilter {
 
 
 /*N*/ SwSortOptions::SwSortOptions()
-/*?*/   :
-/*N*/   nLanguage( LANGUAGE_SYSTEM ),
-/*N*/   cDeli( 9 ),
-/*N*/   bTable( FALSE ),
-/*N*/   bIgnoreCase( FALSE )
+/*N*/   : cDeli( 9 )
+/*?*/   , nLanguage( LANGUAGE_SYSTEM )
+/*N*/   , bTable( FALSE )
+/*N*/   , bIgnoreCase( FALSE )
 /*N*/ {
 /*N*/ }
 
diff --git a/binfilter/bf_sw/source/core/doc/sw_swserv.cxx b/binfilter/bf_sw/source/core/doc/sw_swserv.cxx
index abecebf1f..4e07b516e 100644
--- a/binfilter/bf_sw/source/core/doc/sw_swserv.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_swserv.cxx
@@ -137,14 +137,20 @@ namespace binfilter {
 /*N*/ }
 
 /*N*/ SwDataChanged::SwDataChanged( const SwPaM& rPam, USHORT nTyp )
-/*N*/   : pPam( &rPam ), nType( nTyp ), pDoc( rPam.GetDoc() ), pPos( 0 )
+/*N*/   : pPam( &rPam )
+/*N*/   , pPos( 0 )
+/*N*/   , pDoc( rPam.GetDoc() )
+/*N*/   , nType( nTyp )
 /*N*/ {
 /*N*/   nNode = rPam.GetPoint()->nNode.GetIndex();
 /*N*/   nCntnt = rPam.GetPoint()->nContent.GetIndex();
 /*N*/ }
 
 /*N*/ SwDataChanged::SwDataChanged( SwDoc* pDoc2, const SwPosition& rPos, USHORT nTyp )
-/*N*/   : pPam( 0 ), nType( nTyp ), pDoc( pDoc2 ), pPos( &rPos )
+/*N*/   : pPam( 0 )
+/*N*/   , pPos( &rPos )
+/*N*/   , pDoc( pDoc2 )
+/*N*/   , nType( nTyp )
 /*N*/ {
 /*N*/   nNode = rPos.nNode.GetIndex();
 /*N*/   nCntnt = rPos.nContent.GetIndex();
diff --git a/binfilter/bf_sw/source/core/doc/sw_swtable.cxx b/binfilter/bf_sw/source/core/doc/sw_swtable.cxx
index 41006d583..527a8f1b4 100644
--- a/binfilter/bf_sw/source/core/doc/sw_swtable.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_swtable.cxx
@@ -553,12 +553,12 @@ namespace binfilter {
 /*N*/   rSrtArr.Insert( p );        // eintragen
 /*N*/ }
 
-/*N*/ SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, const SwStartNode& rSttNd, SwTableLine *pUp ) :
-/*N*/   SwClient( 0 ),
-/*N*/   aLines( 0, 0 ),
-/*N*/   pUpper( pUp ),
-/*N*/   pImpl( 0 ),
-/*N*/   pSttNd( &rSttNd )
+/*N*/ SwTableBox::SwTableBox( SwTableBoxFmt* pFmt, const SwStartNode& rSttNd, SwTableLine *pUp )
+/*N*/   : SwClient( 0 )
+/*N*/   , aLines( 0, 0 )
+/*N*/   , pSttNd( &rSttNd )
+/*N*/   , pUpper( pUp )
+/*N*/   , pImpl( 0 )
 /*N*/ {
 /*N*/   pFmt->GetDoc();
 /*N*/   CheckBoxFmt( pFmt )->Add( this );
@@ -932,7 +932,7 @@ namespace binfilter {
 /*?*/                   BOOL bNewIsTxtFmt = pNumFmtr->IsTextFormat( nNewFmt ) ||
 /*?*/                                       NUMBERFORMAT_TEXT == nNewFmt;
 /*?*/
-/*?*/                   if( !bNewIsTxtFmt && nOldFmt != nNewFmt || pNewFml )
+/*?*/                   if( (!bNewIsTxtFmt && nOldFmt != nNewFmt) || pNewFml )
 /*?*/                   {
 /*?*/               DBG_BF_ASSERT(0, "STRIP");
 /*?*/                   }
diff --git a/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx b/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
index e2b5a6abf..586246ea7 100644
--- a/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
@@ -557,8 +557,12 @@ struct _InsULPara
     _InsULPara( SwTableNode* pTNd, BOOL bUpperLower, BOOL bUpper,
                 SwTableBox* pLeft, SwTableBox* pMerge, SwTableBox* pRight,
                 SwTableLine* pLine=0, SwTableBox* pBox=0 )
-        : pTblNd( pTNd ), pInsLine( pLine ), pInsBox( pBox ),
-        pLeftBox( pLeft ), pMergeBox( pMerge ), pRightBox( pRight )
+        : pTblNd( pTNd )
+        , pInsLine( pLine )
+        , pInsBox( pBox )
+        , pLeftBox( pLeft )
+        , pRightBox( pRight )
+        , pMergeBox( pMerge )
         {   bUL_LR = bUpperLower; bUL = bUpper; }
 
     void SetLeft( SwTableBox* pBox=0 )
diff --git a/binfilter/bf_sw/source/core/inc/GetMetricVal.hxx b/binfilter/bf_sw/source/core/inc/GetMetricVal.hxx
index 5cd7dc70e..689111522 100644
--- a/binfilter/bf_sw/source/core/inc/GetMetricVal.hxx
+++ b/binfilter/bf_sw/source/core/inc/GetMetricVal.hxx
@@ -35,13 +35,7 @@ namespace binfilter {
 
 inline USHORT GetMetricVal( int n )
 {
-#ifdef USE_MEASUREMENT
-    USHORT nVal = MEASURE_METRIC == GetAppLocaleData().getMeasurementSystemEnum()
-                    ? 567       // 1 cm
-                    : 770;      // 1/2 Inch
-#else
     USHORT nVal = 567;      // 1 cm
-#endif
 
     if( CM_01 == n )
         nVal /= 10;
diff --git a/binfilter/inc/bf_sw/numrule.hxx b/binfilter/inc/bf_sw/numrule.hxx
index a07b41e35..adae38e59 100644
--- a/binfilter/inc/bf_sw/numrule.hxx
+++ b/binfilter/inc/bf_sw/numrule.hxx
@@ -102,7 +102,7 @@ class SwNumRule
     static USHORT aDefNumIndents[ MAXLEVEL ];
     static USHORT nRefCount;
     static Font* pDefBulletFont;
-    static char* pDefOutlineName;
+    static const char* pDefOutlineName;
 
     SwNumFmt* aFmts[ MAXLEVEL ];
 
@@ -140,7 +140,7 @@ public:
     inline const Font* GetBulletFont( const SwNodeNum& ) const;
     static inline const Font& GetDefBulletFont();
 
-    static char* GetOutlineRuleName() { return pDefOutlineName; }
+    static const char* GetOutlineRuleName() { return pDefOutlineName; }
 
     static inline USHORT GetNumIndent( BYTE nLvl );
     static inline USHORT GetBullIndent( BYTE nLvl );