fdo#39674 fix some spelling

Change-Id: I72e497fb97edf8782c69000576f42896594e1556

23 files changed, 112 insertions, 112 deletions

diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx
index 8dc7fdbb8991..f1d29727d3de 100644
--- a/canvas/source/cairo/cairo_canvashelper.hxx
+++ b/canvas/source/cairo/cairo_canvashelper.hxx
@@ -190,7 +190,7 @@ namespace cairocanvas
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
             drawTextLayout( const ::com::sun::star::rendering::XCanvas*     pCanvas,
                             const ::com::sun::star::uno::Reference<
-                                ::com::sun::star::rendering::XTextLayout >& layoutetText,
+                                ::com::sun::star::rendering::XTextLayout >& laidOutText,
                             const ::com::sun::star::rendering::ViewState&   viewState,
                             const ::com::sun::star::rendering::RenderState& renderState );
 
diff --git a/canvas/source/directx/dx_bitmapcanvashelper.hxx b/canvas/source/directx/dx_bitmapcanvashelper.hxx
index 597f92cf66f4..cb0016a892ee 100644
--- a/canvas/source/directx/dx_bitmapcanvashelper.hxx
+++ b/canvas/source/directx/dx_bitmapcanvashelper.hxx
@@ -74,7 +74,7 @@ namespace dxcanvas
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
             drawTextLayout( const ::com::sun::star::rendering::XCanvas*     pCanvas,
                             const ::com::sun::star::uno::Reference<
-                                ::com::sun::star::rendering::XTextLayout >& layoutetText,
+                                ::com::sun::star::rendering::XTextLayout >& laidOutText,
                             const ::com::sun::star::rendering::ViewState&   viewState,
                             const ::com::sun::star::rendering::RenderState& renderState );
 
diff --git a/canvas/source/directx/dx_canvashelper.hxx b/canvas/source/directx/dx_canvashelper.hxx
index 317c53bea939..157d6113c47b 100644
--- a/canvas/source/directx/dx_canvashelper.hxx
+++ b/canvas/source/directx/dx_canvashelper.hxx
@@ -191,7 +191,7 @@ namespace dxcanvas
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
             drawTextLayout( const ::com::sun::star::rendering::XCanvas*     pCanvas,
                             const ::com::sun::star::uno::Reference<
-                                ::com::sun::star::rendering::XTextLayout >& layoutetText,
+                                ::com::sun::star::rendering::XTextLayout >& laidOutText,
                             const ::com::sun::star::rendering::ViewState&   viewState,
                             const ::com::sun::star::rendering::RenderState& renderState );
 
diff --git a/canvas/source/vcl/canvashelper.hxx b/canvas/source/vcl/canvashelper.hxx
index 5729d60c103e..f112b79d2041 100644
--- a/canvas/source/vcl/canvashelper.hxx
+++ b/canvas/source/vcl/canvashelper.hxx
@@ -205,7 +205,7 @@ namespace vclcanvas
         ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive >
             drawTextLayout( const ::com::sun::star::rendering::XCanvas*         rCanvas,
                             const ::com::sun::star::uno::Reference<
-                                    ::com::sun::star::rendering::XTextLayout >& layoutetText,
+                                    ::com::sun::star::rendering::XTextLayout >& laidOutText,
                             const ::com::sun::star::rendering::ViewState&       viewState,
                             const ::com::sun::star::rendering::RenderState&     renderState );
 
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx
index 8c5963276df5..54f2354b671d 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -249,13 +249,13 @@ void lcl_SplineCalculation::CalculatePeriodic()
             double xDiff2p1 = xDiff2 + xDiff1;
             double xDiff0p2 = xDiff0 + xDiff2;
             double xDiff1p0 = xDiff1 + xDiff0;
-            double fFaktor = 1.5 / (xDiff0*xDiff1 + xDiff1*xDiff2 + xDiff2*xDiff0);
+            double fFactor = 1.5 / (xDiff0*xDiff1 + xDiff1*xDiff2 + xDiff2*xDiff0);
             double yDiff0 = (m_aPoints[ 1 ].second - m_aPoints[ 0 ].second) / xDiff0;
             double yDiff1 = (m_aPoints[ 2 ].second - m_aPoints[ 1 ].second) / xDiff1;
             double yDiff2 = (m_aPoints[ 0 ].second - m_aPoints[ 2 ].second) / xDiff2;
-            m_aSecDerivY[ 1 ] = fFaktor * (yDiff1*xDiff2p1 - yDiff0*xDiff0p2);
-            m_aSecDerivY[ 2 ] = fFaktor * (yDiff2*xDiff0p2 - yDiff1*xDiff1p0);
-            m_aSecDerivY[ 3 ] = fFaktor * (yDiff0*xDiff1p0 - yDiff2*xDiff2p1);
+            m_aSecDerivY[ 1 ] = fFactor * (yDiff1*xDiff2p1 - yDiff0*xDiff0p2);
+            m_aSecDerivY[ 2 ] = fFactor * (yDiff2*xDiff0p2 - yDiff1*xDiff1p0);
+            m_aSecDerivY[ 3 ] = fFactor * (yDiff0*xDiff1p0 - yDiff2*xDiff2p1);
             m_aSecDerivY[ 0 ] = m_aSecDerivY[ 3 ];
         }
         else if (n==2)
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 313c6b7440a8..5b5c432ab120 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -689,7 +689,7 @@ private:
 
     ColorModel          eCM;
 
-    Color               aAktuellColor;
+    Color               aCurrentColor;
 
     void    ConvertColorValues (Color& rColor, ColorModel eModell);
     void    RgbToCmyk_Impl( Color& rColor, sal_uInt16& rK );
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 65bfec74c450..bdb78a23abf1 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -441,16 +441,16 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
                 {
                     m_pLbColorModel->SelectEntryPos( CM_RGB );
 
-                    aAktuellColor.SetColor ( ( ( const XFillColorItem* ) pPoolItem )->GetColorValue().GetColor() );
+                    aCurrentColor.SetColor ( ( ( const XFillColorItem* ) pPoolItem )->GetColorValue().GetColor() );
 
                     m_pEdtName->SetText( ( ( const XFillColorItem* ) pPoolItem )->GetName() );
 
-                    m_pR->SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
-                    m_pG->SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
-                    m_pB->SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
+                    m_pR->SetValue( ColorToPercent_Impl( aCurrentColor.GetRed() ) );
+                    m_pG->SetValue( ColorToPercent_Impl( aCurrentColor.GetGreen() ) );
+                    m_pB->SetValue( ColorToPercent_Impl( aCurrentColor.GetBlue() ) );
 
                     // fill ItemSet and pass it on to XOut
-                    rXFSet.Put( XFillColorItem( OUString(), aAktuellColor ) );
+                    rXFSet.Put( XFillColorItem( OUString(), aCurrentColor ) );
                     m_pCtlPreviewOld->SetAttributes( aXFillAttr.GetItemSet() );
                     m_pCtlPreviewNew->SetAttributes( aXFillAttr.GetItemSet() );
 
@@ -489,7 +489,7 @@ long SvxColorTabPage::CheckChanges_Impl()
 {
     // used to NOT lose changes
 
-    Color aTmpColor (aAktuellColor);
+    Color aTmpColor (aCurrentColor);
     if (eCM != CM_RGB)
         ConvertColorValues (aTmpColor, CM_RGB);
 
@@ -572,7 +572,7 @@ sal_Bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet )
         }
         else
         {
-            aColor.SetColor (aAktuellColor.GetColor());
+            aColor.SetColor (aCurrentColor.GetColor());
             if (eCM != CM_RGB)
                 ConvertColorValues (aColor, CM_RGB);
         }
@@ -635,20 +635,20 @@ IMPL_LINK_NOARG(SvxColorTabPage, ModifiedHdl_Impl)
     if (eCM == CM_RGB)
     {
         // read current MtrFields, if cmyk, then k-value as transparency
-        aAktuellColor.SetColor ( Color( (sal_uInt8)PercentToColor_Impl( (sal_uInt16) m_pR->GetValue() ),
+        aCurrentColor.SetColor ( Color( (sal_uInt8)PercentToColor_Impl( (sal_uInt16) m_pR->GetValue() ),
                                         (sal_uInt8)PercentToColor_Impl( (sal_uInt16) m_pG->GetValue() ),
                                         (sal_uInt8)PercentToColor_Impl( (sal_uInt16) m_pB->GetValue() ) ).GetColor() );
     }
     else
     {
         // read current MtrFields, if cmyk, then k-value as transparency
-        aAktuellColor.SetColor ( Color( (sal_uInt8)PercentToColor_Impl( (sal_uInt16) m_pK->GetValue() ),
+        aCurrentColor.SetColor ( Color( (sal_uInt8)PercentToColor_Impl( (sal_uInt16) m_pK->GetValue() ),
                                         (sal_uInt8)PercentToColor_Impl( (sal_uInt16) m_pC->GetValue() ),
                                         (sal_uInt8)PercentToColor_Impl( (sal_uInt16) m_pY->GetValue() ),
                                         (sal_uInt8)PercentToColor_Impl( (sal_uInt16) m_pM->GetValue() ) ).GetColor() );
     }
 
-    Color aTmpColor(aAktuellColor);
+    Color aTmpColor(aCurrentColor);
 
     if (eCM != CM_RGB)
         ConvertColorValues (aTmpColor, CM_RGB);
@@ -718,8 +718,8 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl)
     if( bDifferent )
     {
         if (eCM != CM_RGB)
-            ConvertColorValues (aAktuellColor, CM_RGB);
-        pEntry = new XColorEntry( aAktuellColor, aName );
+            ConvertColorValues (aCurrentColor, CM_RGB);
+        pEntry = new XColorEntry( aCurrentColor, aName );
 
         pColorList->Insert( pEntry, pColorList->Count() );
 
@@ -789,7 +789,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl)
         // if not existing the entry is entered
         if( bDifferent )
         {
-            Color aTmpColor (aAktuellColor);
+            Color aTmpColor (aCurrentColor);
 
             if (eCM != CM_RGB)
                 ConvertColorValues (aTmpColor, CM_RGB);
@@ -817,7 +817,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl)
 {
     SvColorDialog* pColorDlg = new SvColorDialog( GetParentDialog() );
 
-    Color aTmpColor (aAktuellColor);
+    Color aTmpColor (aCurrentColor);
     if (eCM != CM_RGB)
         ConvertColorValues (aTmpColor, CM_RGB);
 
@@ -828,20 +828,20 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl)
     {
         sal_uInt16 nK = 0;
         Color aPreviewColor = pColorDlg->GetColor();
-        aAktuellColor = aPreviewColor;
+        aCurrentColor = aPreviewColor;
         if (eCM != CM_RGB)
         {
-            ConvertColorValues (aAktuellColor, eCM);
-            m_pC->SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
-            m_pY->SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
-            m_pM->SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
+            ConvertColorValues (aCurrentColor, eCM);
+            m_pC->SetValue( ColorToPercent_Impl( aCurrentColor.GetRed() ) );
+            m_pY->SetValue( ColorToPercent_Impl( aCurrentColor.GetGreen() ) );
+            m_pM->SetValue( ColorToPercent_Impl( aCurrentColor.GetBlue() ) );
             m_pK->SetValue( ColorToPercent_Impl( nK ) );
         }
         else
         {
-            m_pR->SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
-            m_pG->SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
-            m_pB->SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
+            m_pR->SetValue( ColorToPercent_Impl( aCurrentColor.GetRed() ) );
+            m_pG->SetValue( ColorToPercent_Impl( aCurrentColor.GetGreen() ) );
+            m_pB->SetValue( ColorToPercent_Impl( aCurrentColor.GetBlue() ) );
         }
 
         // fill ItemSet and pass it on to XOut
@@ -970,7 +970,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
     {
         if (eCM != (ColorModel) nPos)
         {
-            ConvertColorValues (aAktuellColor, (ColorModel) nPos);
+            ConvertColorValues (aCurrentColor, (ColorModel) nPos);
         }
 
         eCM = (ColorModel) nPos;
@@ -982,9 +982,9 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
                 m_pRGB->Show();
                 m_pCYMK->Hide();
 
-                m_pR->SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
-                m_pG->SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
-                m_pB->SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
+                m_pR->SetValue( ColorToPercent_Impl( aCurrentColor.GetRed() ) );
+                m_pG->SetValue( ColorToPercent_Impl( aCurrentColor.GetGreen() ) );
+                m_pB->SetValue( ColorToPercent_Impl( aCurrentColor.GetBlue() ) );
 
             }
             break;
@@ -994,10 +994,10 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
                 m_pCYMK->Show();
                 m_pRGB->Hide();
 
-                m_pC->SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
-                m_pY->SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
-                m_pM->SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
-                m_pK->SetValue( ColorToPercent_Impl( aAktuellColor.GetTransparency() ) );
+                m_pC->SetValue( ColorToPercent_Impl( aCurrentColor.GetRed() ) );
+                m_pY->SetValue( ColorToPercent_Impl( aCurrentColor.GetGreen() ) );
+                m_pM->SetValue( ColorToPercent_Impl( aCurrentColor.GetBlue() ) );
+                m_pK->SetValue( ColorToPercent_Impl( aCurrentColor.GetTransparency() ) );
 
             }
             break;
@@ -1019,20 +1019,20 @@ long SvxColorTabPage::ChangeColorHdl_Impl( void* )
     {
         XColorEntry* pEntry = pColorList->GetColor( nPos );
 
-        aAktuellColor.SetColor ( pEntry->GetColor().GetColor() );
+        aCurrentColor.SetColor ( pEntry->GetColor().GetColor() );
         if (eCM != CM_RGB)
         {
-            ConvertColorValues (aAktuellColor, eCM);
-            m_pC->SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
-            m_pY->SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
-            m_pM->SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
-            m_pK->SetValue( ColorToPercent_Impl( aAktuellColor.GetTransparency() ) );
+            ConvertColorValues (aCurrentColor, eCM);
+            m_pC->SetValue( ColorToPercent_Impl( aCurrentColor.GetRed() ) );
+            m_pY->SetValue( ColorToPercent_Impl( aCurrentColor.GetGreen() ) );
+            m_pM->SetValue( ColorToPercent_Impl( aCurrentColor.GetBlue() ) );
+            m_pK->SetValue( ColorToPercent_Impl( aCurrentColor.GetTransparency() ) );
         }
         else
         {
-            m_pR->SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
-            m_pG->SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
-            m_pB->SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
+            m_pR->SetValue( ColorToPercent_Impl( aCurrentColor.GetRed() ) );
+            m_pG->SetValue( ColorToPercent_Impl( aCurrentColor.GetGreen() ) );
+            m_pB->SetValue( ColorToPercent_Impl( aCurrentColor.GetBlue() ) );
         }
 
         // fill ItemSet and pass it on to XOut
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index 99a1ff728f45..42da7531f96d 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -300,7 +300,7 @@ namespace drawinglayer
                     if(aMetaFileRealSize.getWidth() > aMetaFilePrefSize.getWidth()
                         || aMetaFileRealSize.getHeight() > aMetaFilePrefSize.getHeight())
                     {
-                        // clipping needed. Embed to MaskPrimitive2D. Create childs and mask polygon
+                        // clipping needed. Embed to MaskPrimitive2D. Create children and mask polygon
                         basegfx::B2DPolygon aMaskPolygon(basegfx::tools::createUnitPolygon());
                         aMaskPolygon.transform(rTransform);
 
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index f7844fd219de..8f134d23289a 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -398,11 +398,11 @@ namespace canvas
 
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL
-            drawTextLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout >& layoutetText,
+            drawTextLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout >& laidOutText,
                             const ::com::sun::star::rendering::ViewState&                                       viewState,
                             const ::com::sun::star::rendering::RenderState&                                     renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
         {
-            tools::verifyArgs(layoutetText, viewState, renderState,
+            tools::verifyArgs(laidOutText, viewState, renderState,
                               BOOST_CURRENT_FUNCTION,
                               static_cast< UnambiguousBaseType* >(this));
 
@@ -411,7 +411,7 @@ namespace canvas
             mbSurfaceDirty = true;
             maCanvasHelper.modifying();
 
-            return maCanvasHelper.drawTextLayout( this, layoutetText, viewState, renderState );
+            return maCanvasHelper.drawTextLayout( this, laidOutText, viewState, renderState );
         }
 
 
diff --git a/include/svtools/unitconv.hxx b/include/svtools/unitconv.hxx
index 637f575eb9ee..2798e5dbc93a 100644
--- a/include/svtools/unitconv.hxx
+++ b/include/svtools/unitconv.hxx
@@ -35,7 +35,7 @@ SVT_DLLPUBLIC void      SetFieldUnit( MetricField& rCtrl, FieldUnit eUnit, sal_B
 SVT_DLLPUBLIC void      SetFieldUnit( MetricBox& rCtrl, FieldUnit eUnit, sal_Bool bAll = sal_False );
 
 SVT_DLLPUBLIC long      CalcToUnit( float nIn, SfxMapUnit eUnit );
-SVT_DLLPUBLIC long      CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFaktor );
+SVT_DLLPUBLIC long      CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFactor );
 
 SVT_DLLPUBLIC long      ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl );
 SVT_DLLPUBLIC long      ControlToItem( long nIn, SfxFieldUnit eCtrl, SfxMapUnit eItem );
diff --git a/ios/iosremote/SWRevealViewController/SWRevealViewController.m b/ios/iosremote/SWRevealViewController/SWRevealViewController.m
index de861f66ed0c..53f101f0c889 100755
--- a/ios/iosremote/SWRevealViewController/SWRevealViewController.m
+++ b/ios/iosremote/SWRevealViewController/SWRevealViewController.m
@@ -544,7 +544,7 @@ static NSString * const SWSegueRightIdentifier = @"sw_right";
     // Uncomment the following code if you want the child controllers
     // to be loaded at this point.
     //
-    // We leave this commented out because we think loading childs here is conceptually wrong.
+    // We leave this commented out because we think loading children here is conceptually wrong.
     // Instead, we refrain view loads until necesary, for example we may never load
     // the rear controller view -or the front controller view- if it is never displayed.
     //
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 367a355a77ba..f1988d69dfa0 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -631,11 +631,11 @@ double ScGetBw(double fZins, double fZzr, double fRmz,
 void ScBW();
 void ScDIA();
 double ScGetGDA(double fWert, double fRest, double fDauer,
-                       double fPeriode, double fFaktor);
+                       double fPeriode, double fFactor);
 void ScGDA();
 void ScGDA2();
 double ScInterVDB(double fWert,double fRest,double fDauer,double fDauer1,
-                double fPeriode,double fFaktor);
+                double fPeriode,double fFactor);
 void ScVDB();
 void ScLaufz();
 void ScLIA();
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index bec70aa69fb5..4eb407544375 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -972,10 +972,10 @@ void ScInterpreter::ScDIA()
 }
 
 double ScInterpreter::ScGetGDA(double fWert, double fRest, double fDauer,
-                double fPeriode, double fFaktor)
+                double fPeriode, double fFactor)
 {
     double fGda, fZins, fAlterWert, fNeuerWert;
-    fZins = fFaktor / fDauer;
+    fZins = fFactor / fDauer;
     if (fZins >= 1.0)
     {
         fZins = 1.0;
@@ -1003,20 +1003,20 @@ void ScInterpreter::ScGDA()
     sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 4, 5 ) )
     {
-        double nFaktor;
+        double nFactor;
         if (nParamCount == 5)
-            nFaktor = GetDouble();
+            nFactor = GetDouble();
         else
-            nFaktor = 2.0;
+            nFactor = 2.0;
         double nPeriode = GetDouble();
         double nDauer   = GetDouble();
         double nRest    = GetDouble();
         double nWert    = GetDouble();
-        if (nWert < 0.0 || nRest < 0.0 || nFaktor <= 0.0 || nRest > nWert
+        if (nWert < 0.0 || nRest < 0.0 || nFactor <= 0.0 || nRest > nWert
                         || nPeriode < 1.0 || nPeriode > nDauer)
             PushIllegalArgument();
         else
-            PushDouble(ScGetGDA(nWert, nRest, nDauer, nPeriode, nFaktor));
+            PushDouble(ScGetGDA(nWert, nRest, nDauer, nPeriode, nFactor));
     }
 }
 
@@ -1065,7 +1065,7 @@ void ScInterpreter::ScGDA2()
 }
 
 double ScInterpreter::ScInterVDB(double fWert,double fRest,double fDauer,
-                             double fDauer1,double fPeriode,double fFaktor)
+                             double fDauer1,double fPeriode,double fFactor)
 {
     double fVdb=0;
     double fIntEnd   = ::rtl::math::approxCeil(fPeriode);
@@ -1082,7 +1082,7 @@ double ScInterpreter::ScInterVDB(double fWert,double fRest,double fDauer,
     {
         if(!bNowLia)
         {
-            fGda = ScGetGDA(fWert, fRest, fDauer, (double) i, fFaktor);
+            fGda = ScGetGDA(fWert, fRest, fDauer, (double) i, fFactor);
             fLia = fRestwert/ (fDauer1 - (double) (i-1));
 
             if (fLia > fGda)
@@ -1120,23 +1120,23 @@ void ScInterpreter::ScVDB()
     sal_uInt8 nParamCount = GetByte();
     if ( MustHaveParamCount( nParamCount, 5, 7 ) )
     {
-        double fWert, fRest, fDauer, fAnfang, fEnde, fFaktor, fVdb = 0.0;
+        double fWert, fRest, fDauer, fAnfang, fEnde, fFactor, fVdb = 0.0;
         bool bFlag;
         if (nParamCount == 7)
             bFlag = GetBool();
         else
             bFlag = false;
         if (nParamCount >= 6)
-            fFaktor = GetDouble();
+            fFactor = GetDouble();
         else
-            fFaktor = 2.0;
+            fFactor = 2.0;
         fEnde   = GetDouble();
         fAnfang = GetDouble();
         fDauer  = GetDouble();
         fRest   = GetDouble();
         fWert   = GetDouble();
         if (fAnfang < 0.0 || fEnde < fAnfang || fEnde > fDauer || fWert < 0.0
-                          || fRest > fWert || fFaktor <= 0.0)
+                          || fRest > fWert || fFactor <= 0.0)
             PushIllegalArgument();
         else
         {
@@ -1150,7 +1150,7 @@ void ScInterpreter::ScVDB()
             {
                 for (sal_uLong i = nLoopStart + 1; i <= nLoopEnd; i++)
                 {
-                    double fTerm = ScGetGDA(fWert, fRest, fDauer, (double) i, fFaktor);
+                    double fTerm = ScGetGDA(fWert, fRest, fDauer, (double) i, fFactor);
 
                     //  Teilperioden am Anfang / Ende beruecksichtigen:
                     if ( i == nLoopStart+1 )
@@ -1169,7 +1169,7 @@ void ScInterpreter::ScVDB()
                 //@Die Frage aller Fragen: "Ist das hier richtig"
                 if(!::rtl::math::approxEqual(fAnfang,::rtl::math::approxFloor(fAnfang)))
                 {
-                    if(fFaktor>1)
+                    if(fFactor>1)
                     {
                         if(fAnfang>fDauer/2 || ::rtl::math::approxEqual(fAnfang,fDauer/2))
                         {
@@ -1181,8 +1181,8 @@ void ScInterpreter::ScVDB()
                     }
                 }
 
-                fWert-=ScInterVDB(fWert,fRest,fDauer,fDauer1,fAnfang,fFaktor);
-                fVdb=ScInterVDB(fWert,fRest,fDauer,fDauer-fAnfang,fEnde-fAnfang,fFaktor);
+                fWert-=ScInterVDB(fWert,fRest,fDauer,fDauer1,fAnfang,fFactor);
+                fVdb=ScInterVDB(fWert,fRest,fDauer,fDauer-fAnfang,fEnde-fAnfang,fFactor);
             }
         }
         PushDouble(fVdb);
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index b855bc25fc8e..ed38031fcc7f 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -1226,7 +1226,7 @@ void ImportExcel::EndSheet( void )
 }
 
 
-void ImportExcel::NeueTabelle( void )
+void ImportExcel::NewTable( void )
 {
     SCTAB nTab = GetCurrScTab();
     if( nTab > 0 && !pD->HasTable( nTab ) )
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 610db5513b67..bb1e3c2d8ac7 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -155,7 +155,7 @@ FltError ImportExcel::Read( void )
                                 if( pExcRoot->eDateiTyp == Biff2 )
                                 {
                                     eAkt = Z_Biff2;
-                                    NeueTabelle();
+                                    NewTable();
                                 }
                             break;
                             case EXC_BIFF3:
@@ -163,7 +163,7 @@ FltError ImportExcel::Read( void )
                                 if( pExcRoot->eDateiTyp == Biff3 )
                                 {
                                     eAkt = Z_Biff3;
-                                    NeueTabelle();
+                                    NewTable();
                                 }
                             break;
                             case EXC_BIFF4:
@@ -171,7 +171,7 @@ FltError ImportExcel::Read( void )
                                 if( pExcRoot->eDateiTyp == Biff4 )
                                 {
                                     eAkt = Z_Biff4;
-                                    NeueTabelle();
+                                    NewTable();
                                 }
                                 else if( pExcRoot->eDateiTyp == Biff4W )
                                     eAkt = Z_Biff4W;
@@ -189,7 +189,7 @@ FltError ImportExcel::Read( void )
                                 else if( pExcRoot->eDateiTyp == Biff5 )
                                 {
                                     // #i62752# possible to have BIFF5 sheet without globals
-                                    NeueTabelle();
+                                    NewTable();
                                     eAkt = Z_Biff5TPre;  // Shrfmla Prefetch, Row-Prefetch
                                     nBofLevel = 0;
                                     aIn.StoreGlobalPosition(); // und Position merken
@@ -441,7 +441,7 @@ FltError ImportExcel::Read( void )
                         if( pExcRoot->eDateiTyp == Biff4 )
                         {
                             eAkt = Z_Biff4T;
-                            NeueTabelle();
+                            NewTable();
                         }
                         else
                             eAkt = Z_Ende;
@@ -530,7 +530,7 @@ FltError ImportExcel::Read( void )
                     case 0x8F:  break;                  // BUNDLEHEADER [   4 ]
                     case 0x0409:                        // BOF          [   4 ]
                         Bof4();
-                        NeueTabelle();
+                        NewTable();
                         if( pExcRoot->eDateiTyp == Biff4 )
                         {
                             eAkt = Z_Biff4T;
@@ -696,7 +696,7 @@ FltError ImportExcel::Read( void )
                 {
                     case 0x0809:                        // BOF          [    5]
                         Bof5();
-                        NeueTabelle();
+                        NewTable();
                         switch( pExcRoot->eDateiTyp )
                         {
                             case Biff5:
@@ -882,7 +882,7 @@ FltError ImportExcel8::Read( void )
                         Bof5(); // read the BOF record
                     else
                         pExcRoot->eDateiTyp = Biff8;    // on missing BOF, assume a standard worksheet
-                    NeueTabelle();
+                    NewTable();
                     switch( pExcRoot->eDateiTyp )
                     {
                     case Biff8:     // worksheet
@@ -976,7 +976,7 @@ FltError ImportExcel8::Read( void )
                     else if( pExcRoot->eDateiTyp == Biff8 )
                     {
                         // #i62752# possible to have BIFF8 sheet without globals
-                        NeueTabelle();
+                        NewTable();
                         eAkt = EXC_STATE_SHEET_PRE;  // Shrfmla Prefetch, Row-Prefetch
                         bSheetHasCodeName = false; // reset
                         aIn.StoreGlobalPosition();
diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx
index 7c583959625a..7fafecf80ff2 100644
--- a/sc/source/filter/inc/imp_op.hxx
+++ b/sc/source/filter/inc/imp_op.hxx
@@ -201,7 +201,7 @@ protected:
                                             //      -> excform.cxx
 
     virtual void            EndSheet( void );
-    void                    NeueTabelle( void );
+    void                    NewTable( void );
     const ScTokenArray*     ErrorToFormula( sal_uInt8 bErrOrVal, sal_uInt8 nError,
                                 double& rVal );
 
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 50213b614a4b..41cfbc8ea924 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -329,7 +329,7 @@ void View::DoPaste (::Window* pWindow)
                         pOutliner->QuickInsertLineBreak( ESelection( nPara, nParaLen, nPara, nParaLen ) );
                     }
 
-                    DBG_ASSERT( rEdit.GetParagraphCount() <= 1, "Titelobjekt contains hard line breaks" );
+                    DBG_ASSERT( rEdit.GetParagraphCount() <= 1, "Titleobject contains hard line breaks" );
                     pOutliner->SetUpdateMode(bOldUpdateMode);
                 }
             }
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index cb0e66f60567..9d525150e89c 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2006,7 +2006,7 @@ sal_Bool SfxDispatcher::_FillState
 
         // Determine the object and call the Message of this object
         SfxShell *pSh = GetShell(rSvr.GetShellLevel());
-        DBG_ASSERT(pSh, "ObjektShell not found");
+        DBG_ASSERT(pSh, "ObjectShell not found");
 
         SfxStateFunc pFunc;
 
diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx
index 305bf08c901c..1694ab9ac752 100644
--- a/svtools/source/misc/unitconv.cxx
+++ b/svtools/source/misc/unitconv.cxx
@@ -279,7 +279,7 @@ FieldUnit MapToFieldUnit( const SfxMapUnit eUnit )
 
 // -----------------------------------------------------------------------
 
-long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFaktor )
+long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFactor )
 {
     DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP       ||
                 eUnit == SFX_MAPUNIT_100TH_MM   ||
@@ -313,7 +313,7 @@ long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFaktor )
             nRet += 10 - nTmp;
         nRet /= 10;
     }
-    return nRet * nFaktor / 20;
+    return nRet * nFactor / 20;
 }
 
 // -----------------------------------------------------------------------
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 99282ba364d5..38c383912782 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -886,7 +886,7 @@ OUString UHashMap::getNameFromId(sal_uInt32 nId)
         if (it->second == nId)
             return it->first;
     }
-    OSL_FAIL("[CL] unknown SdrObjekt identifier");
+    OSL_FAIL("[CL] unknown SdrObject identifier");
     return OUString();
 }
 
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index f5aab3ef4f7a..539ffe437e6c 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -40,7 +40,7 @@ void SwCache::Check()
         SwCacheObj *pTmp = pLast;
         while ( pTmp && pTmp != pObj )
             pTmp = pTmp->GetPrev();
-        SAL_WARN_IF( !pTmp, "sw.core", "Objekt not found." );
+        SAL_WARN_IF( !pTmp, "sw.core", "Object not found." );
 
         ++nCnt;
         if ( pObj == pFirst )
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 3753f0164461..d42b06771eba 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -189,9 +189,9 @@ class SwAutoFormat
     bool HasSelBlanks( SwPaM& rPam ) const;
     bool HasBreakAttr( const SwTxtNode& ) const;
     void DeleteSel( SwPaM& rPam );
-    bool DeleteAktNxtPara( const String& rNxtPara );
+    bool DeleteCurNxtPara( const String& rNxtPara );
     /// delete in the node start and/or end
-    void DeleteAktPara( bool bStart = true, bool nEnd = true );
+    void DeleteCurrentParagraph( bool bStart = true, bool nEnd = true );
     void DelEmptyLine( bool bTstNextPara = true );
     /// when using multiline paragraphs delete the "left" and/or
     /// "right" margins
@@ -1063,7 +1063,7 @@ bool SwAutoFormat::IsSentenceAtEnd( const SwTxtNode& rTxtNd ) const
 }
 
 /// Delete beginning and/or end in a node
-void SwAutoFormat::DeleteAktPara( bool bStart, bool bEnd )
+void SwAutoFormat::DeleteCurrentParagraph( bool bStart, bool bEnd )
 {
     if( aFlags.bAFmtByInput
         ? aFlags.bAFmtByInpDelSpacesAtSttEnd
@@ -1122,7 +1122,7 @@ void SwAutoFormat::DeleteSel( SwPaM& rDelPam )
         pEditShell->DeleteSel( rDelPam );
 }
 
-bool SwAutoFormat::DeleteAktNxtPara( const String& rNxtPara )
+bool SwAutoFormat::DeleteCurNxtPara( const String& rNxtPara )
 {
     // delete blanks at the end of the current and at the beginning of the next one
     aDelPam.DeleteMark();
@@ -1271,7 +1271,7 @@ void SwAutoFormat::BuildIndent()
                 bBreak = !IsFastFullLine( *pNxtNd ) ||
                         IsBlanksInString( *pNxtNd ) ||
                         IsSentenceAtEnd( *pNxtNd );
-                if( DeleteAktNxtPara( pNxtNd->GetTxt() ))
+                if( DeleteCurNxtPara( pNxtNd->GetTxt() ))
                 {
                     pDoc->InsertString( aDelPam, OUString(' ') );
                 }
@@ -1282,7 +1282,7 @@ void SwAutoFormat::BuildIndent()
                     !CalcLevel( *pNxtNd ) );
         }
     }
-    DeleteAktPara( true, true );
+    DeleteCurrentParagraph( true, true );
     AutoCorrect();
 }
 
@@ -1311,7 +1311,7 @@ void SwAutoFormat::BuildTextIndent()
         {
             bBreak = !IsFastFullLine( *pNxtNd ) || IsBlanksInString( *pNxtNd ) ||
                     IsSentenceAtEnd( *pNxtNd );
-            if( DeleteAktNxtPara( pNxtNd->GetTxt() ) )
+            if( DeleteCurNxtPara( pNxtNd->GetTxt() ) )
             {
                 pDoc->InsertString( aDelPam, OUString(' ') );
             }
@@ -1320,7 +1320,7 @@ void SwAutoFormat::BuildTextIndent()
             pNxtNd = GetNextNode();
         }
     }
-    DeleteAktPara( true, true );
+    DeleteCurrentParagraph( true, true );
     AutoCorrect();
 }
 
@@ -1345,7 +1345,7 @@ void SwAutoFormat::BuildText()
         {
             bBreak = !IsFastFullLine( *pNxtNd ) || IsBlanksInString( *pNxtNd ) ||
                     IsSentenceAtEnd( *pNxtNd );
-            if( DeleteAktNxtPara( pNxtNd->GetTxt() ) )
+            if( DeleteCurNxtPara( pNxtNd->GetTxt() ) )
             {
                 pDoc->InsertString( aDelPam, OUString(' ') );
             }
@@ -1357,7 +1357,7 @@ void SwAutoFormat::BuildText()
                 break;
         }
     }
-    DeleteAktPara( true, true );
+    DeleteCurrentParagraph( true, true );
     AutoCorrect();
 }
 
@@ -1390,7 +1390,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
                     IsBlanksInString( *pAktTxtNd ) ||
                     IsSentenceAtEnd( *pAktTxtNd );
     sal_Bool bRTL = pEditShell->IsInRightToLeftText();
-    DeleteAktPara( true, true );
+    DeleteCurrentParagraph( true, true );
 
     bool bChgBullet = false, bChgEnum = false;
     xub_StrLen nAutoCorrPos = 0;
@@ -1658,7 +1658,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
         SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES );
         bBreak = !IsFastFullLine( *pNxtNd ) || IsBlanksInString( *pNxtNd ) ||
                 IsSentenceAtEnd( *pNxtNd );
-        if( DeleteAktNxtPara( pNxtNd->GetTxt() ) )
+        if( DeleteCurNxtPara( pNxtNd->GetTxt() ) )
         {
             pDoc->InsertString( aDelPam, OUString(' ') );
         }
@@ -1669,7 +1669,7 @@ void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
         if(!pNxtNd || pCurrNode == pNxtNd)
             break;
     }
-    DeleteAktPara( false, true );
+    DeleteCurrentParagraph( false, true );
     AutoCorrect( nAutoCorrPos );
 }
 
@@ -1745,7 +1745,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces )
             bBreak = !IsFastFullLine( *pNxtNd ) ||
                     IsBlanksInString( *pNxtNd ) ||
                     IsSentenceAtEnd( *pNxtNd );
-            if( DeleteAktNxtPara( pNxtNd->GetTxt() ) )
+            if( DeleteCurNxtPara( pNxtNd->GetTxt() ) )
             {
                 pDoc->InsertString( aDelPam, OUString(' ') );
             }
@@ -1754,7 +1754,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces )
             pNxtNd = GetNextNode();
         }
     }
-    DeleteAktPara( true, true );
+    DeleteCurrentParagraph( true, true );
     AutoCorrect();
 }
 
@@ -1775,8 +1775,8 @@ void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl )
 
         DelPrevPara();
 
-        DeleteAktPara( true, false );
-        DeleteAktNxtPara( aEmptyStr );
+        DeleteCurrentParagraph( true, false );
+        DeleteCurNxtPara( aEmptyStr );
 
         aDelPam.DeleteMark();
         aDelPam.GetPoint()->nNode = aNdIdx.GetIndex() + 1;
@@ -1785,7 +1785,7 @@ void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl )
     }
     else
     {
-        DeleteAktPara( true, true );
+        DeleteCurrentParagraph( true, true );
         AutoCorrect();
     }
 }
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 6a261064a4de..fa3fee23d5cb 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -222,7 +222,7 @@ static sal_Unicode ImplPatternChar( sal_Unicode cChar, sal_Char cEditMask )
 
 // -----------------------------------------------------------------------
 
-static int ImplKommaPointCharEqual( sal_Unicode c1, sal_Unicode c2 )
+static int ImplCommaPointCharEqual( sal_Unicode c1, sal_Unicode c2 )
 {
     if ( c1 == c2 )
         return sal_True;
@@ -267,7 +267,7 @@ static OUString ImplPatternReformat( const OUString& rStr,
         {
             // if it is a literal copy otherwise ignore because it might be the next valid
             // character of the string
-            if ( ImplKommaPointCharEqual( cChar, cLiteral ) )
+            if ( ImplCommaPointCharEqual( cChar, cLiteral ) )
                 nStrIndex++;
             else
             {
@@ -313,7 +313,7 @@ static OUString ImplPatternReformat( const OUString& rStr,
                         {
                             if ( rEditMask[n] == EDITMASK_LITERAL )
                             {
-                                if ( ImplKommaPointCharEqual( cChar, rLiteralMask[n] ) )
+                                if ( ImplCommaPointCharEqual( cChar, rLiteralMask[n] ) )
                                     i = n+1;
 
                                 break;
@@ -655,7 +655,7 @@ static bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
                     {
                         // only valid if no literal present
                         if ( (rEditMask[nTempPos+1] != EDITMASK_LITERAL ) &&
-                             ImplKommaPointCharEqual( cChar, rLiteralMask[nTempPos] ) )
+                             ImplCommaPointCharEqual( cChar, rLiteralMask[nTempPos] ) )
                         {
                             nTempPos++;
                             ImplPatternMaxPos( pEdit->GetText(), rEditMask, nFormatFlags, bSameMask, nNewPos, nTempPos );