3 files changed, 8 insertions, 12 deletions
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 40bdebb0717a..44205833db53 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -828,7 +828,7 @@ void SvxNumRule::SetLevel(sal_uInt16 nLevel, const SvxNumberFormat* pFmt)
     }
 }
 
-OUString SvxNumRule::MakeNumString( const SvxNodeNum& rNum, bool bInclStrings ) const
+OUString SvxNumRule::MakeNumString( const SvxNodeNum& rNum ) const
 {
     OUString aStr;
     if( SVX_NO_NUM > rNum.GetLevel() && !( SVX_NO_NUMLEVEL & rNum.GetLevel() ) )
@@ -874,10 +874,7 @@ OUString SvxNumRule::MakeNumString( const SvxNodeNum& rNum, bool bInclStrings )
             }
         }
 
-        if( bInclStrings )
-        {
-            aStr = rMyNFmt.GetPrefix() + aStr + rMyNFmt.GetSuffix();
-        }
+        aStr = rMyNFmt.GetPrefix() + aStr + rMyNFmt.GetSuffix();
     }
     return aStr;
 }
diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx
index 345bc6c8b61c..118d532d3a1c 100644
--- a/editeng/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -93,11 +93,11 @@ Paper SvxPaperInfo::GetSvxPaper( const Size &rSize, MapUnit eUnit, bool bSloppy
 }
 
 
-long SvxPaperInfo::GetSloppyPaperDimension( long nSize, MapUnit eUnit )
+long SvxPaperInfo::GetSloppyPaperDimension( long nSize )
 {
-    nSize = eUnit == MAP_100TH_MM ? nSize : OutputDevice::LogicToLogic(nSize, eUnit, MAP_100TH_MM);
+    nSize = OutputDevice::LogicToLogic(nSize, MAP_TWIP, MAP_100TH_MM);
     nSize = PaperInfo::sloppyFitPageDimension(nSize);
-    return eUnit == MAP_100TH_MM ? nSize : OutputDevice::LogicToLogic(nSize, MAP_100TH_MM, eUnit);
+    return OutputDevice::LogicToLogic(nSize, MAP_100TH_MM, MAP_TWIP);
 }
 
 
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 6f5d4b52c295..c60dff652299 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -1130,17 +1130,16 @@ bool SvxTabStopItem::Insert( const SvxTabStop& rTab )
     return maTabStops.insert( rTab ).second;
 }
 
-void SvxTabStopItem::Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart,
-                            sal_uInt16 nEnd )
+void SvxTabStopItem::Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart )
 {
-    for( sal_uInt16 i = nStart; i < nEnd && i < pTabs->Count(); i++ )
+    for( sal_uInt16 i = nStart; i < pTabs->Count(); i++ )
     {
         const SvxTabStop& rTab = (*pTabs)[i];
         sal_uInt16 nTabPos = GetPos(rTab);
         if(SVX_TAB_NOTFOUND != nTabPos)
             Remove(nTabPos);
     }
-    for( sal_uInt16 i = nStart; i < nEnd && i < pTabs->Count(); i++ )
+    for( sal_uInt16 i = nStart; i < pTabs->Count(); i++ )
     {
         maTabStops.insert( (*pTabs)[i] );
     }