sw: remove that GETGRID abomination

Change-Id: Ib2299dae7c1aab2d9af992930c29381a1027141b

14 files changed, 73 insertions, 49 deletions

diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 67e3e508e8fc..1b6c1bf4d48a 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -430,13 +430,12 @@ inline sal_Bool SwPageFrm::IsInvalidFly() const
     return bInvalidFlyLayout || bInvalidFlyCntnt;
 }
 
-#define GETGRID( pPage ) const SwTextGridItem *pGrid = NULL; \
- {if( pPage && pPage->HasGrid() && GRID_NONE==(pGrid=(SwTextGridItem*)&pPage->\
-     GetPageDesc()->GetMaster().GetFmtAttr(RES_TEXTGRID))->GetGridType() ) \
-    pGrid = NULL;}
 
-#define GETGRIDWIDTH( pGrid , pDoc )  pDoc->IsSquaredPageMode() ? \
-    pGrid->GetBaseHeight(): pGrid->GetBaseWidth()
+class SwTextGridItem;
+
+SwTextGridItem const* GetGridItem(SwPageFrm const*const);
+
+sal_uInt16 GetGridWidth(SwTextGridItem const&, SwDoc const&);
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_PAGEFRM_HXX
 
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index cdb913d7af93..bbab25780a95 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1506,7 +1506,7 @@ SwTwips SwFlowFrm::_GetUpperSpaceAmountConsideredForPageGrid(
     if ( m_rThis.IsInDocBody() && m_rThis.GetAttrSet()->GetParaGrid().GetValue() )
     {
         const SwPageFrm* pPageFrm = m_rThis.FindPageFrm();
-        GETGRID( pPageFrm )
+        SwTextGridItem const*const pGrid(GetGridItem(pPageFrm));
         if( pGrid )
         {
             const SwFrm* pBodyFrm = pPageFrm->FindBodyCont();
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 8e99d9e9f065..b809700a6f52 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -113,7 +113,8 @@ void SwBodyFrm::Format( const SwBorderAttrs * )
     bool bNoGrid = true;
     if( GetUpper()->IsPageFrm() && ((SwPageFrm*)GetUpper())->HasGrid() )
     {
-        GETGRID( ((SwPageFrm*)GetUpper()) )
+        SwTextGridItem const*const pGrid(
+                GetGridItem(static_cast<SwPageFrm*>(GetUpper())));
         if( pGrid )
         {
             bNoGrid = false;
@@ -125,7 +126,7 @@ void SwBodyFrm::Format( const SwBorderAttrs * )
             {
                 //for textgrid refactor
                 SwDoc *pDoc = GetFmt()->GetDoc();
-                nBorder = nSize % (GETGRIDWIDTH(pGrid, pDoc));
+                nBorder = nSize % (GetGridWidth(*pGrid, *pDoc));
                 nSize -= nBorder;
                 nBorder /= 2;
             }
@@ -174,7 +175,7 @@ SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwPageDesc *pPgDsc ) :
     if( pDesc )
     {
         bHasGrid = sal_True;
-        GETGRID( this )
+        SwTextGridItem const*const pGrid(GetGridItem(this));
         if( !pGrid )
             bHasGrid = sal_False;
     }
@@ -281,7 +282,7 @@ void SwPageFrm::CheckGrid( sal_Bool bInvalidate )
 {
     sal_Bool bOld = bHasGrid;
     bHasGrid = sal_True;
-    GETGRID( this )
+    SwTextGridItem const*const pGrid(GetGridItem(this));
     bHasGrid = 0 != pGrid;
     if( bInvalidate || bOld != bHasGrid )
     {
@@ -2279,4 +2280,23 @@ bool SwPageFrm::IsOverHeaderFooterArea( const Point& rPt, FrameControlType &rCon
     return false;
 }
 
+SwTextGridItem const* GetGridItem(SwPageFrm const*const pPage)
+{
+    if (pPage && pPage->HasGrid())
+    {
+        SwTextGridItem const& rGridItem(
+                pPage->GetPageDesc()->GetMaster().GetTextGrid());
+        if (GRID_NONE != rGridItem.GetGridType())
+        {
+            return &rGridItem;
+        }
+    }
+    return 0;
+}
+
+sal_uInt16 GetGridWidth(SwTextGridItem const& rG, SwDoc const& rDoc)
+{
+    return (rDoc.IsSquaredPageMode()) ? rG.GetBaseHeight() : rG.GetBaseWidth();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index b090ae1161d8..097a0259d911 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5504,7 +5504,7 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const
 {
     if( !bHasGrid || pRetoucheFly || pRetoucheFly2 )
         return;
-    GETGRID( this )
+    SwTextGridItem const*const pGrid(GetGridItem(this));
     if( pGrid && ( OUTDEV_PRINTER != pOut->GetOutDevType() ?
         pGrid->GetDisplayGrid() : pGrid->GetPrintGrid() ) )
     {
@@ -5522,7 +5522,7 @@ void SwPageFrm::PaintGrid( OutputDevice* pOut, SwRect &rRect ) const
                 bool bCell = GRID_LINES_CHARS == pGrid->GetGridType();
                 long nGrid = pGrid->GetBaseHeight();
                 const SwDoc* pDoc = GetFmt()->GetDoc();
-                long nGridWidth = GETGRIDWIDTH(pGrid,pDoc); //for textgrid refactor
+                long nGridWidth = GetGridWidth(*pGrid, *pDoc);
                 long nRuby = pGrid->GetRubyHeight();
                 long nSum = nGrid + nRuby;
                 const Color *pCol = &pGrid->GetColor();
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 04d52b5932ea..93a417040a3d 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -527,7 +527,7 @@ bool SwTxtFrm::PaintEmpty( const SwRect &rRect, bool bCheck ) const
                 if ( GetTxtNode()->GetSwAttrSet().GetParaGrid().GetValue() &&
                      IsInDocBody() )
                 {
-                    GETGRID( FindPageFrm() )
+                    SwTextGridItem const*const pGrid(GetGridItem(FindPageFrm()));
                     if ( pGrid )
                     {
                         // center character in grid line
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index f911e6a4e94b..21b7121a2fea 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -94,7 +94,8 @@ bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
         // do not add extra italic value if we have an active character grid
         if ( rInf.SnapToGrid() )
         {
-            GETGRID( rInf.GetTxtFrm()->FindPageFrm() )
+            SwTextGridItem const*const pGrid(
+                    GetGridItem(rInf.GetTxtFrm()->FindPageFrm()));
             bAddItalic = !pGrid || GRID_LINES_CHARS != pGrid->GetGridType();
         }
 
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 033eb0b1d88d..df80a34527b1 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -741,7 +741,8 @@ void SwTxtCursor::_GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
                         if( ((SwMultiPortion*)pPor)->IsDouble() )
                             SetPropFont( 50 );
 
-                        GETGRID( GetTxtFrm()->FindPageFrm() )
+                        SwTextGridItem const*const pGrid(
+                                GetGridItem(GetTxtFrm()->FindPageFrm()));
                         const bool bHasGrid = pGrid && GetInfo().SnapToGrid();
                         const sal_uInt16 nRubyHeight = bHasGrid ?
                                                    pGrid->GetRubyHeight() : 0;
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 08eca5eba198..602e645d2b7f 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -409,13 +409,12 @@ void SwTxtFormatter::BuildPortions( SwTxtFormatInfo &rInf )
     SwLinePortion *pPor = NewPortion( rInf );
 
     // Asian grid stuff
-    GETGRID( pFrm->FindPageFrm() )
+    SwTextGridItem const*const pGrid(GetGridItem(pFrm->FindPageFrm()));
     const bool bHasGrid = pGrid && rInf.SnapToGrid() &&
                               GRID_LINES_CHARS == pGrid->GetGridType();
 
     const SwDoc *pDoc = rInf.GetTxtFrm()->GetNode()->GetDoc();
-    const sal_uInt16 nGridWidth = bHasGrid ?
-                                GETGRIDWIDTH(pGrid,pDoc) : 0;   //for textgrid refactor
+    const sal_uInt16 nGridWidth = (bHasGrid) ? GetGridWidth(*pGrid, *pDoc) : 0;
 
     // used for grid mode only:
     // the pointer is stored, because after formatting of non-asian text,
@@ -1057,7 +1056,8 @@ SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf)
         // 3. Kerning portions at beginning of line in grid mode
         if ( ! pPor && ! pCurr->GetPortion() )
         {
-            GETGRID( GetTxtFrm()->FindPageFrm() )
+            SwTextGridItem const*const pGrid(
+                    GetGridItem(GetTxtFrm()->FindPageFrm()));
             if ( pGrid )
                 pPor = new SwKernPortion( *pCurr );
         }
@@ -1116,7 +1116,8 @@ SwLinePortion *SwTxtFormatter::WhichFirstPortion(SwTxtFormatInfo &rInf)
         // 9. Kerning portions at beginning of line in grid mode
         if ( !pPor && !pCurr->GetPortion() )
         {
-            GETGRID( GetTxtFrm()->FindPageFrm() )
+            SwTextGridItem const*const pGrid(
+                    GetGridItem(GetTxtFrm()->FindPageFrm()));
             if ( pGrid )
                 pPor = new SwKernPortion( *pCurr );
         }
@@ -1268,7 +1269,8 @@ SwLinePortion *SwTxtFormatter::NewPortion( SwTxtFormatInfo &rInf )
 
                     if ( rInf.SnapToGrid() )
                     {
-                        GETGRID( GetTxtFrm()->FindPageFrm() )
+                        SwTextGridItem const*const pGrid(
+                                GetGridItem(GetTxtFrm()->FindPageFrm()));
                         if ( pGrid )
                         {
                             bRubyTop = ! pGrid->GetRubyTextBelow();
@@ -1716,7 +1718,7 @@ void SwTxtFormatter::CalcRealHeight( bool bNewLine )
     KSHORT nLineHeight = pCurr->Height();
     pCurr->SetClipping( false );
 
-    GETGRID( pFrm->FindPageFrm() )
+    SwTextGridItem const*const pGrid(GetGridItem(pFrm->FindPageFrm()));
     if ( pGrid && GetInfo().SnapToGrid() )
     {
         const sal_uInt16 nGridWidth = pGrid->GetBaseHeight();
@@ -2476,7 +2478,7 @@ void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf )
         if( pFly->Fix() < rInf.Width() )
             rInf.Width( pFly->Fix() );
 
-        GETGRID( pFrm->FindPageFrm() )
+        SwTextGridItem const*const pGrid(GetGridItem(pFrm->FindPageFrm()));
         if ( pGrid )
         {
             const SwPageFrm* pPageFrm = pFrm->FindPageFrm();
@@ -2489,7 +2491,7 @@ void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf )
                                     (pPageFrm->*fnRect->fnGetPrtLeft)();
 
             const SwDoc *pDoc = rInf.GetTxtFrm()->GetNode()->GetDoc();
-            const sal_uInt16 nGridWidth = GETGRIDWIDTH( pGrid, pDoc);   //For textgrid refactor
+            const sal_uInt16 nGridWidth = GetGridWidth(*pGrid, *pDoc);
 
             SwTwips nStartX = GetLeftMargin();
             if ( bVert )
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 5ee8e9bc452e..4bd2b0fd8ca1 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -243,7 +243,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip,
     // Baseline-Ausgabe auch bei nicht-TxtPortions (vgl. TabPor mit Fill)
     // if no special vertical alignment is used,
     // we calculate Y value for the whole line
-    GETGRID( GetTxtFrm()->FindPageFrm() )
+    SwTextGridItem const*const pGrid(GetGridItem(GetTxtFrm()->FindPageFrm()));
     const bool bAdjustBaseLine =
         GetLineInfo().HasSpecialAlign( GetTxtFrm()->IsVertical() ) ||
         ( 0 != pGrid );
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index de34d1f82968..aea80ef9fd92 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -284,7 +284,7 @@ sal_uInt16 SwTxtCursor::AdjustBaseLine( const SwLineLayout& rLine,
 
     sal_uInt16 nOfst = rLine.GetRealHeight() - rLine.Height();
 
-    GETGRID( pFrm->FindPageFrm() )
+    SwTextGridItem const*const pGrid(GetGridItem(pFrm->FindPageFrm()));
 
     if ( pGrid && GetInfo().SnapToGrid() )
     {
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 5e0335273027..bd87c7439439 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -1341,7 +1341,7 @@ SwSpaceManipulator::~SwSpaceManipulator()
 void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint,
     SwMultiPortion& rMulti, const SwMultiPortion* pEnvPor )
 {
-    GETGRID( pFrm->FindPageFrm() )
+    SwTextGridItem const*const pGrid(GetGridItem(pFrm->FindPageFrm()));
     const bool bHasGrid = pGrid && GetInfo().SnapToGrid();
     sal_uInt16 nRubyHeight = 0;
     bool bRubyTop = false;
@@ -1845,7 +1845,7 @@ bool SwTxtFormatter::BuildMultiPortion( SwTxtFormatInfo &rInf,
     SwLinePortion *pNextSecond = NULL;
     bool bRet = false;
 
-    GETGRID( pFrm->FindPageFrm() )
+    SwTextGridItem const*const pGrid(GetGridItem(pFrm->FindPageFrm()));
     const bool bHasGrid = pGrid && GRID_LINES_CHARS == pGrid->GetGridType();
 
     bool bRubyTop = false;
@@ -2293,7 +2293,8 @@ SwLinePortion* SwTxtFormatter::MakeRestPortion( const SwLineLayout* pLine,
 
             if ( GetInfo().SnapToGrid() )
             {
-                GETGRID( pFrm->FindPageFrm() )
+                SwTextGridItem const*const pGrid(
+                        GetGridItem(pFrm->FindPageFrm()));
                 if ( pGrid )
                 {
                     bRubyTop = ! pGrid->GetRubyTextBelow();
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index c39e0a7ad71a..a56dc4133b6c 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -325,7 +325,7 @@ bool SwTxtFrm::FormatEmpty()
     if ( GetTxtNode()->GetSwAttrSet().GetParaGrid().GetValue() &&
             IsInDocBody() )
     {
-        GETGRID( FindPageFrm() )
+        SwTextGridItem const*const pGrid(GetGridItem(FindPageFrm()));
         if ( pGrid )
             nHeight = pGrid->GetBaseHeight() + pGrid->GetRubyHeight();
     }
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index cef5612f0593..d1fee2930355 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1437,7 +1437,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
                 if( GetTxtNode()->GetSwAttrSet().GetRegister().GetValue())
                     break;
 
-                GETGRID( FindPageFrm() )
+                SwTextGridItem const*const pGrid(GetGridItem(FindPageFrm()));
                 if ( pGrid && GetTxtNode()->GetSwAttrSet().GetParaGrid().GetValue() )
                     break;
 
@@ -1598,7 +1598,7 @@ void SwTxtFrm::Prepare( const PrepareHint ePrep, const void* pVoid,
         {
             if ( GetValidPrtAreaFlag() )
             {
-                GETGRID( FindPageFrm() )
+                SwTextGridItem const*const pGrid(GetGridItem(FindPageFrm()));
                 if ( pGrid && GetTxtNode()->GetSwAttrSet().GetParaGrid().GetValue() )
                     InvalidatePrt();
             }
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 66efedb25bd9..c4af0baedea7 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -950,13 +950,13 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
     if ( rInf.GetFrm() && rInf.SnapToGrid() && rInf.GetFont() &&
          SW_CJK == rInf.GetFont()->GetActual() )
     {
-        GETGRID( rInf.GetFrm()->FindPageFrm() )
+        SwTextGridItem const*const pGrid(GetGridItem(rInf.GetFrm()->FindPageFrm()));
         if ( pGrid && GRID_LINES_CHARS == pGrid->GetGridType() && pGrid->IsSnapToChars())
         {
             //for textgrid refactor
             //const sal_uInt16 nGridWidth = pGrid->GetBaseHeight();
             const SwDoc* pDoc = rInf.GetShell()->GetDoc();
-            const sal_uInt16 nGridWidth = GETGRIDWIDTH(pGrid, pDoc);
+            const sal_uInt16 nGridWidth = GetGridWidth(*pGrid, *pDoc);
             sal_Int32* pKernArray = new sal_Int32[rInf.GetLen()];
 
             if ( pPrinter )
@@ -1040,14 +1040,14 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
     if ( rInf.GetFrm() && rInf.SnapToGrid() && rInf.GetFont() &&
          SW_CJK == rInf.GetFont()->GetActual() )
     {
-        GETGRID( rInf.GetFrm()->FindPageFrm() )
+        SwTextGridItem const*const pGrid(GetGridItem(rInf.GetFrm()->FindPageFrm()));
 
         if ( pGrid && GRID_LINES_CHARS == pGrid->GetGridType() && !pGrid->IsSnapToChars() )
         {
             const sal_uInt16  nDefaultFontHeight = GetDefaultFontHeight( rInf );
 
             const SwDoc* pDoc = rInf.GetShell()->GetDoc();
-            long nGridWidthAdd = GETGRIDWIDTH(pGrid, pDoc);
+            long nGridWidthAdd = GetGridWidth(*pGrid, *pDoc);
             if( SW_LATIN == rInf.GetFont()->GetActual() )
                 nGridWidthAdd = ( nGridWidthAdd - nDefaultFontHeight ) / 2;
             else
@@ -1822,11 +1822,11 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
     if ( rInf.GetFrm() && nLn && rInf.SnapToGrid() && rInf.GetFont() &&
          SW_CJK == rInf.GetFont()->GetActual() )
     {
-        GETGRID( rInf.GetFrm()->FindPageFrm() )
+        SwTextGridItem const*const pGrid(GetGridItem(rInf.GetFrm()->FindPageFrm()));
         if ( pGrid && GRID_LINES_CHARS == pGrid->GetGridType() && pGrid->IsSnapToChars() )
         {
             const SwDoc* pDoc = rInf.GetShell()->GetDoc();
-            const sal_uInt16 nGridWidth = GETGRIDWIDTH(pGrid, pDoc);
+            const sal_uInt16 nGridWidth = GetGridWidth(*pGrid, *pDoc);
 
             OutputDevice* pOutDev;
 
@@ -1864,13 +1864,13 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
     if ( rInf.GetFrm() && nLn && rInf.SnapToGrid() && rInf.GetFont() &&
          SW_CJK == rInf.GetFont()->GetActual() )
     {
-        GETGRID( rInf.GetFrm()->FindPageFrm() )
+        SwTextGridItem const*const pGrid(GetGridItem(rInf.GetFrm()->FindPageFrm()));
         if ( pGrid && GRID_LINES_CHARS == pGrid->GetGridType() && !pGrid->IsSnapToChars() )
         {
             const sal_uInt16 nDefaultFontHeight = GetDefaultFontHeight( rInf );
 
             const SwDoc* pDoc = rInf.GetShell()->GetDoc();
-            long nGridWidthAdd = GETGRIDWIDTH(pGrid, pDoc);
+            long nGridWidthAdd = GetGridWidth(*pGrid, *pDoc);
             if( SW_LATIN == rInf.GetFont()->GetActual() )
                 nGridWidthAdd = ( nGridWidthAdd - nDefaultFontHeight ) / 2;
             else
@@ -2110,11 +2110,11 @@ sal_Int32 SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf )
     if ( rInf.GetFrm() && rInf.GetLen() && rInf.SnapToGrid() &&
          rInf.GetFont() && SW_CJK == rInf.GetFont()->GetActual() )
     {
-        GETGRID( rInf.GetFrm()->FindPageFrm() )
+        SwTextGridItem const*const pGrid(GetGridItem(rInf.GetFrm()->FindPageFrm()));
         if ( pGrid && GRID_LINES_CHARS == pGrid->GetGridType() && pGrid->IsSnapToChars() )
         {
             const SwDoc* pDoc = rInf.GetShell()->GetDoc();
-            const sal_uInt16 nGridWidth = GETGRIDWIDTH(pGrid, pDoc);
+            const sal_uInt16 nGridWidth = GetGridWidth(*pGrid, *pDoc);
 
             long nWidthPerChar = pKernArray[ rInf.GetLen() - 1 ] / rInf.GetLen();
 
@@ -2137,14 +2137,14 @@ sal_Int32 SwFntObj::GetCrsrOfst( SwDrawTextInfo &rInf )
     if ( rInf.GetFrm() && rInf.GetLen() && rInf.SnapToGrid() &&
          rInf.GetFont() && SW_CJK == rInf.GetFont()->GetActual() )
     {
-        GETGRID( rInf.GetFrm()->FindPageFrm() )
+        SwTextGridItem const*const pGrid(GetGridItem(rInf.GetFrm()->FindPageFrm()));
         if ( pGrid && GRID_LINES_CHARS == pGrid->GetGridType() && !pGrid->IsSnapToChars() )
         {
 
             const sal_uInt16 nDefaultFontHeight = GetDefaultFontHeight( rInf );
 
             const SwDoc* pDoc = rInf.GetShell()->GetDoc();
-            long nGridWidthAdd = GETGRIDWIDTH(pGrid, pDoc);
+            long nGridWidthAdd = GetGridWidth(*pGrid, *pDoc);
             if( SW_LATIN == rInf.GetFont()->GetActual() )
                 nGridWidthAdd = ( nGridWidthAdd - nDefaultFontHeight ) / 2;
             else
@@ -2365,11 +2365,11 @@ sal_Int32 SwFont::GetTxtBreak( SwDrawTextInfo& rInf, long nTextWidth )
     if ( rInf.GetFrm() && nLn && rInf.SnapToGrid() &&
          rInf.GetFont() && SW_CJK == rInf.GetFont()->GetActual() )
     {
-        GETGRID( rInf.GetFrm()->FindPageFrm() )
+        SwTextGridItem const*const pGrid(GetGridItem(rInf.GetFrm()->FindPageFrm()));
         if ( pGrid && GRID_LINES_CHARS == pGrid->GetGridType() && pGrid->IsSnapToChars() )
         {
             const SwDoc* pDoc = rInf.GetShell()->GetDoc();
-            const sal_uInt16 nGridWidth = GETGRIDWIDTH(pGrid, pDoc);
+            const sal_uInt16 nGridWidth = GetGridWidth(*pGrid, *pDoc);
 
             sal_Int32* pKernArray = new sal_Int32[rInf.GetLen()];
             rInf.GetOut().GetTextArray( rInf.GetText(), pKernArray,
@@ -2399,13 +2399,13 @@ sal_Int32 SwFont::GetTxtBreak( SwDrawTextInfo& rInf, long nTextWidth )
     if ( rInf.GetFrm() && nLn && rInf.SnapToGrid() && rInf.GetFont() &&
          SW_CJK == rInf.GetFont()->GetActual() )
     {
-        GETGRID( rInf.GetFrm()->FindPageFrm() )
+        SwTextGridItem const*const pGrid(GetGridItem(rInf.GetFrm()->FindPageFrm()));
         if ( pGrid && GRID_LINES_CHARS == pGrid->GetGridType() && !pGrid->IsSnapToChars() )
         {
             const sal_uInt16 nDefaultFontHeight = GetDefaultFontHeight( rInf );
 
             const SwDoc* pDoc = rInf.GetShell()->GetDoc();
-            long nGridWidthAdd = GETGRIDWIDTH(pGrid, pDoc);
+            long nGridWidthAdd = GetGridWidth(*pGrid, *pDoc);
             if( SW_LATIN == rInf.GetFont()->GetActual() )
                 nGridWidthAdd = ( nGridWidthAdd - nDefaultFontHeight ) / 2 ;
             else