sw: translate Netto to Net

Change-Id: Ia9a11eb8266b602c334b774d4794ff71d29754bc

8 files changed, 33 insertions, 33 deletions

diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 9730e62aad80..7ca7d1db7ce1 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1337,7 +1337,7 @@ void SwTxtFormatInfo::CtorInitTxtFormatInfo( SwTxtFrm *pNewFrm, const bool bNewI
     nForcedLeftMargin = 0;
     pRest = 0;
     nLineHeight = 0;
-    nLineNettoHeight = 0;
+    nLineNetHeight = 0;
     SetLineStart(0);
     Init();
 }
@@ -1443,7 +1443,7 @@ SwTxtFormatInfo::SwTxtFormatInfo( const SwTxtFormatInfo& rInf,
     nRealWidth = sal_uInt16(nActWidth);
     nWidth = nRealWidth;
     nLineHeight = 0;
-    nLineNettoHeight = 0;
+    nLineNetHeight = 0;
     nForcedLeftMargin = 0;
 
     nMinLeading = 0;
@@ -1483,7 +1483,7 @@ bool SwTxtFormatInfo::_CheckFtnPortion( SwLineLayout* pCurr )
         if( pPor->IsFtnPortion() && nHeight > ((SwFtnPortion*)pPor)->Orig() )
         {
             SetLineHeight( nHeight );
-            SetLineNettoHeight( pCurr->Height() );
+            SetLineNetHeight( pCurr->Height() );
             return true;
         }
     }
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 575cd434f0b0..19062014c5dc 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -538,7 +538,7 @@ class SwTxtFormatInfo : public SwTxtPaintInfo
     sal_uInt16 nRealWidth;      // "real" line width
     sal_uInt16 nWidth;          // "virtual" line width
     sal_uInt16 nLineHeight;     // Final height after CalcLine
-    sal_uInt16 nLineNettoHeight; // line height without spacing
+    sal_uInt16 nLineNetHeight; // line height without spacing
     sal_uInt16 nForcedLeftMargin; // Shift of left margin due to frame
 
     sal_Int16  nMinLeading;     // minimum number of chars before hyphenation point
@@ -651,8 +651,8 @@ public:
     // these are used during fly calculation
     inline sal_uInt16 GetLineHeight() const { return nLineHeight; }
     inline void SetLineHeight( const sal_uInt16 nNew ) { nLineHeight = nNew; }
-    inline sal_uInt16 GetLineNettoHeight() const { return nLineNettoHeight; }
-    inline void SetLineNettoHeight( const sal_uInt16 nNew ) { nLineNettoHeight = nNew; }
+    inline sal_uInt16 GetLineNetHeight() const { return nLineNetHeight; }
+    inline void SetLineNetHeight( const sal_uInt16 nNew ) { nLineNetHeight = nNew; }
 
     inline const SwLinePortion *GetUnderflow() const { return pUnderflow; }
     inline SwLinePortion *GetUnderflow() { return pUnderflow; }
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 1cd6a83fd9b1..0d3e80b664f5 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1486,7 +1486,7 @@ sal_Int32 SwTxtFormatter::FormatLine(const sal_Int32 nStartPos)
     bool bBuild = true;
     SetFlyInCntBase( false );
     GetInfo().SetLineHeight( 0 );
-    GetInfo().SetLineNettoHeight( 0 );
+    GetInfo().SetLineNetHeight( 0 );
 
     // Recycling muss bei geaenderter Zeilenhoehe unterdrueckt werden
     // und auch bei geaendertem Ascent (Absenken der Grundlinie).
@@ -2216,7 +2216,7 @@ bool SwTxtFormatter::ChkFlyUnderflow( SwTxtFormatInfo &rInf ) const
                         // RealHeight including spacing
                         rInf.SetLineHeight( nHeight );
                         // Height without extra spacing
-                        rInf.SetLineNettoHeight( pCurr->Height() );
+                        rInf.SetLineNetHeight( pCurr->Height() );
                         return true;
                     }
                 }
@@ -2227,7 +2227,7 @@ bool SwTxtFormatter::ChkFlyUnderflow( SwTxtFormatInfo &rInf ) const
                 if ( ! aInter.IsOver( aLine ) )
                 {
                     rInf.SetLineHeight( nHeight );
-                    rInf.SetLineNettoHeight( pCurr->Height() );
+                    rInf.SetLineNetHeight( pCurr->Height() );
                     return true;
                 }
                 else
@@ -2242,7 +2242,7 @@ bool SwTxtFormatter::ChkFlyUnderflow( SwTxtFormatInfo &rInf ) const
                         ((SwFlyPortion*)pPos)->GetFixWidth() != aInter.Width() )
                     {
                         rInf.SetLineHeight( nHeight );
-                        rInf.SetLineNettoHeight( pCurr->Height() );
+                        rInf.SetLineNetHeight( pCurr->Height() );
                         return true;
                     }
                 }
@@ -2275,7 +2275,7 @@ void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf )
         // Real line height has already been calculated, we only have to
         // search for intersections in the lower part of the strip
         nAscent = pCurr->GetAscent();
-        nHeight = rInf.GetLineNettoHeight();
+        nHeight = rInf.GetLineNetHeight();
         nTop += rInf.GetLineHeight() - nHeight;
     }
     else
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index 0aa7075eff01..058a41e691dd 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -248,11 +248,11 @@ sal_uInt16 SwTxtCursor::AdjustBaseLine( const SwLineLayout& rLine,
                 // centered inside the whole line.
 
                 //for text refactor
-                const sal_uInt16 nLineNetto =  rLine.Height() - nRubyHeight;
-                //const sal_uInt16 nLineNetto = ( nPorHeight > nGridWidth ) ?
+                const sal_uInt16 nLineNet =  rLine.Height() - nRubyHeight;
+                //const sal_uInt16 nLineNet = ( nPorHeight > nGridWidth ) ?
                  //                           rLine.Height() - nRubyHeight :
                  //                           nGridWidth;
-                nOfst += ( nLineNetto - nPorHeight ) / 2;
+                nOfst += ( nLineNet - nPorHeight ) / 2;
                 if ( bRubyTop )
                     nOfst += nRubyHeight;
             }
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 17a30fe6f7a0..a00a0a749eb6 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -397,7 +397,7 @@ bool SwTxtFrm::FillRegister( SwTwips& rRegStart, sal_uInt16& rRegDiff )
 
                             aFnt.ChgFnt( pSh, *pOut );
                             rRegDiff = aFnt.GetHeight( pSh, *pOut );
-                            sal_uInt16 nNettoHeight = rRegDiff;
+                            sal_uInt16 nNetHeight = rRegDiff;
 
                             switch( rSpace.GetLineSpaceRule() )
                             {
@@ -426,19 +426,19 @@ bool SwTxtFrm::FillRegister( SwTwips& rRegStart, sal_uInt16& rRegDiff )
                                     if( !nTmp )
                                         ++nTmp;
                                     rRegDiff = (sal_uInt16)nTmp;
-                                    nNettoHeight = rRegDiff;
+                                    nNetHeight = rRegDiff;
                                     break;
                                 }
                                 case SVX_INTER_LINE_SPACE_FIX:
                                 {
                                     rRegDiff = rRegDiff + rSpace.GetInterLineSpace();
-                                    nNettoHeight = rRegDiff;
+                                    nNetHeight = rRegDiff;
                                     break;
                                 }
                                 default: OSL_FAIL( ": unknown InterLineSpaceRule" );
                             }
                             pDesc->SetRegHeight( rRegDiff );
-                            pDesc->SetRegAscent( rRegDiff - nNettoHeight +
+                            pDesc->SetRegAscent( rRegDiff - nNetHeight +
                                                  aFnt.GetAscent( pSh, *pOut ) );
                             pOut->SetMapMode( aOldMap );
                         }
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 96963a20995e..6e0349b8a8b2 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -886,7 +886,7 @@ private:
 
     SwSectionFmt *InsertSection(SwPaM& rMyPaM, wwSection &rSection);
     bool SetCols(SwFrmFmt &rFmt, const wwSection &rSection,
-        sal_uInt32 nNettoWidth) const;
+        sal_uInt32 nNetWidth) const;
     bool SectionIsProtected(const wwSection &rSection) const;
     void SetLeftRight(wwSection &rSection);
     bool IsNewDoc() const;
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index 713eccfeea24..b1d0896828d0 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -53,7 +53,7 @@ struct WW8SwFlyPara
     sal_Int16 nLeMgn, nRiMgn;       // Raender
     sal_Int16 nUpMgn, nLoMgn;       // Raender
     sal_Int16 nWidth, nHeight;      // Groesse
-    sal_Int16 nNettoWidth;
+    sal_Int16 nNetWidth;
 
     SwFrmSize eHeightFix;       // Hoehe Fix oder Min
     RndStdIds eAnchor;          // Bindung
@@ -66,7 +66,7 @@ struct WW8SwFlyPara
     sal_uInt8 nXBind, nYBind;        // relativ zu was gebunden
 
                 // 2.Teil: sich waehrend des Einlesens ergebende AEnderungen
-    long nNewNettoWidth;
+    long nNewNetWidth;
     SwPosition* pMainTextPos;   // um nach Apo in Haupttext zurueckzukehren
     sal_uInt16 nLineSpace;          // LineSpace in tw fuer Graf-Apos
     bool bAutoWidth;
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 3f3fd8f27ea5..0618b42468ee 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -321,7 +321,7 @@ void SwWW8ImplReader::Read_ParaBiDi(sal_uInt16, const sal_uInt8* pData, short nL
 }
 
 bool wwSectionManager::SetCols(SwFrmFmt &rFmt, const wwSection &rSection,
-    sal_uInt32 nNettoWidth) const
+    sal_uInt32 nNetWidth) const
 {
     //sprmSCcolumns - number of columns - 1
     const sal_Int16 nCols = rSection.NoCols();
@@ -346,7 +346,7 @@ bool wwSectionManager::SetCols(SwFrmFmt &rFmt, const wwSection &rSection,
     }
 
     aCol.Init(nCols, writer_cast<sal_uInt16>(nColSpace),
-        writer_cast<sal_uInt16>(nNettoWidth));
+        writer_cast<sal_uInt16>(nNetWidth));
 
     // sprmSFEvenlySpaced
     if (!rSep.fEvenlySpaced)
@@ -364,7 +364,7 @@ bool wwSectionManager::SetCols(SwFrmFmt &rFmt, const wwSection &rSection,
             pCol->SetLeft(writer_cast<sal_uInt16>(nLeft));
             pCol->SetRight(writer_cast<sal_uInt16>(nRight));
         }
-        aCol.SetWishWidth(writer_cast<sal_uInt16>(nNettoWidth));
+        aCol.SetWishWidth(writer_cast<sal_uInt16>(nNetWidth));
     }
     rFmt.SetFmtAttr(aCol);
     return true;
@@ -1751,7 +1751,7 @@ WW8SwFlyPara::WW8SwFlyPara( SwPaM& rPaM,
     (void) nPgLeft;
 
     memset( this, 0, sizeof( WW8SwFlyPara ) );  // Initialisieren
-    nNewNettoWidth = MINFLY;                    // Minimum
+    nNewNetWidth = MINFLY;                    // Minimum
 
     eSurround = ( rWW.nSp37 > 1 ) ? SURROUND_IDEAL : SURROUND_NONE;
     //#i119466 mapping "Around" wrap setting to "Parallel" for table
@@ -1780,15 +1780,15 @@ WW8SwFlyPara::WW8SwFlyPara( SwPaM& rPaM,
         nHeight = MINFLY;
     }
 
-    nWidth = nNettoWidth = rWW.nSp28;
+    nWidth = nNetWidth = rWW.nSp28;
     if( nWidth <= 10 )                              // Auto-Breite
     {
         bAutoWidth = true;
-        nWidth = nNettoWidth =
+        nWidth = nNetWidth =
             msword_cast<sal_Int16>((nPgWidth ? nPgWidth : 2268)); // 4 cm
     }
     if( nWidth <= MINFLY )
-        nWidth = nNettoWidth = MINFLY;              // Minimale Breite
+        nWidth = nNetWidth = MINFLY;              // Minimale Breite
 
     eVAlign = text::VertOrientation::NONE;                            // Defaults
     eHAlign = text::HoriOrientation::NONE;
@@ -1998,8 +1998,8 @@ WW8SwFlyPara::WW8SwFlyPara( SwPaM& rPaM,
 // ohne Wissen ueber den Inhalt eingesetzt wird.
 void WW8SwFlyPara::BoxUpWidth( long nInWidth )
 {
-    if( bAutoWidth && nInWidth > nNewNettoWidth )
-        nNewNettoWidth = nInWidth;
+    if( bAutoWidth && nInWidth > nNewNetWidth )
+        nNewNetWidth = nInWidth;
 };
 
 // Die Klasse WW8FlySet ist von SfxItemSet abgeleitet und stellt auch
@@ -2505,10 +2505,10 @@ void SwWW8ImplReader::StopApo()
         // function, the extension of the SW-fly has to be set
         // manually as the SW fly has no auto function to adjust the
         // frame´s size.
-        if( pSFlyPara->nNewNettoWidth > MINFLY )    // BoxUpWidth ?
+        if( pSFlyPara->nNewNetWidth > MINFLY )    // BoxUpWidth ?
         {
-            long nW = pSFlyPara->nNewNettoWidth;
-            nW += pSFlyPara->nWidth - pSFlyPara->nNettoWidth;   // Rand dazu
+            long nW = pSFlyPara->nNewNetWidth;
+            nW += pSFlyPara->nWidth - pSFlyPara->nNetWidth;   // Rand dazu
             pSFlyPara->pFlyFmt->SetFmtAttr(
                 SwFmtFrmSize( pSFlyPara->eHeightFix, nW, pSFlyPara->nHeight ) );
         }