summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-01-20 09:35:45 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-01-20 09:36:06 +0100
commit3e58329130038fe5f53ce645b738b40df7507bfc (patch)
treecfcbd30ac7a1563774f126b33b65ce0ad33a24b7 /sw
parent2649b3b16fca0c1a1ab7ea2f39db16916875a616 (diff)
sw: indentation fixes
Change-Id: I8b281b425483fb7fc3cf34e31533c2ddc1b03637
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/tiledrendering/tiledrendering.cxx4
-rw-r--r--sw/source/core/txtnode/fntcache.cxx106
2 files changed, 55 insertions, 55 deletions
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 6d5cb783a081..160f3aa8675f 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -82,8 +82,8 @@ private:
SwTiledRenderingTest::SwTiledRenderingTest()
: m_bFound(true),
- m_nSelectionBeforeSearchResult(0),
- m_nSelectionAfterSearchResult(0)
+ m_nSelectionBeforeSearchResult(0),
+ m_nSelectionAfterSearchResult(0)
{
}
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 4f08a87c4b88..3f54a1735fe7 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -208,61 +208,61 @@ struct CalcLinePosData
static void lcl_calcLinePos( const CalcLinePosData &rData,
Point &rStart, Point &rEnd, sal_Int32 nStart, sal_Int32 nWrLen )
{
- long nBlank = 0;
- const sal_Int32 nEnd = nStart + nWrLen;
- const long nTmpSpaceAdd = rData.rInf.GetSpace() / SPACING_PRECISION_FACTOR;
+ long nBlank = 0;
+ const sal_Int32 nEnd = nStart + nWrLen;
+ const long nTmpSpaceAdd = rData.rInf.GetSpace() / SPACING_PRECISION_FACTOR;
- if ( nEnd < rData.nCnt
+ if ( nEnd < rData.nCnt
&& CH_BLANK == rData.rInf.GetText()[ rData.rInf.GetIdx() + nEnd ] )
- {
- if( nEnd + 1 == rData.nCnt )
- nBlank -= nTmpSpaceAdd;
- else
- nBlank -= rData.nHalfSpace;
- }
-
- // determine start, end and length of wave line
- sal_Int32 nKernStart = nStart ? rData.pKernArray[ nStart - 1 ] : 0;
- sal_Int32 nKernEnd = rData.pKernArray[ nEnd - 1 ];
-
- const sal_uInt16 nDir = rData.bBidiPor ? 1800 :
- UnMapDirection( rData.rFont.GetOrientation(), rData.bSwitchH2V );
-
- switch ( nDir )
- {
- case 0 :
- rStart.X() += nKernStart;
- rEnd.X() = nBlank + rData.rInf.GetPos().X() + nKernEnd;
- rEnd.Y() = rData.rInf.GetPos().Y();
- break;
- case 900 :
- rStart.Y() -= nKernStart;
- rEnd.X() = rData.rInf.GetPos().X();
- rEnd.Y() = nBlank + rData.rInf.GetPos().Y() - nKernEnd;
- break;
- case 1800 :
- rStart.X() -= nKernStart;
- rEnd.X() = rData.rInf.GetPos().X() - nKernEnd - nBlank;
- rEnd.Y() = rData.rInf.GetPos().Y();
- break;
- case 2700 :
- rStart.Y() += nKernStart;
- rEnd.X() = rData.rInf.GetPos().X();
- rEnd.Y() = nBlank + rData.rInf.GetPos().Y() + nKernEnd;
- break;
- }
-
- if ( rData.bSwitchL2R )
- {
- rData.rInf.GetFrame()->SwitchLTRtoRTL( rStart );
- rData.rInf.GetFrame()->SwitchLTRtoRTL( rEnd );
- }
-
- if ( rData.bSwitchH2V )
- {
- rData.rInf.GetFrame()->SwitchHorizontalToVertical( rStart );
- rData.rInf.GetFrame()->SwitchHorizontalToVertical( rEnd );
- }
+ {
+ if( nEnd + 1 == rData.nCnt )
+ nBlank -= nTmpSpaceAdd;
+ else
+ nBlank -= rData.nHalfSpace;
+ }
+
+ // determine start, end and length of wave line
+ sal_Int32 nKernStart = nStart ? rData.pKernArray[ nStart - 1 ] : 0;
+ sal_Int32 nKernEnd = rData.pKernArray[ nEnd - 1 ];
+
+ const sal_uInt16 nDir = rData.bBidiPor ? 1800 :
+ UnMapDirection( rData.rFont.GetOrientation(), rData.bSwitchH2V );
+
+ switch ( nDir )
+ {
+ case 0 :
+ rStart.X() += nKernStart;
+ rEnd.X() = nBlank + rData.rInf.GetPos().X() + nKernEnd;
+ rEnd.Y() = rData.rInf.GetPos().Y();
+ break;
+ case 900 :
+ rStart.Y() -= nKernStart;
+ rEnd.X() = rData.rInf.GetPos().X();
+ rEnd.Y() = nBlank + rData.rInf.GetPos().Y() - nKernEnd;
+ break;
+ case 1800 :
+ rStart.X() -= nKernStart;
+ rEnd.X() = rData.rInf.GetPos().X() - nKernEnd - nBlank;
+ rEnd.Y() = rData.rInf.GetPos().Y();
+ break;
+ case 2700 :
+ rStart.Y() += nKernStart;
+ rEnd.X() = rData.rInf.GetPos().X();
+ rEnd.Y() = nBlank + rData.rInf.GetPos().Y() + nKernEnd;
+ break;
+ }
+
+ if ( rData.bSwitchL2R )
+ {
+ rData.rInf.GetFrame()->SwitchLTRtoRTL( rStart );
+ rData.rInf.GetFrame()->SwitchLTRtoRTL( rEnd );
+ }
+
+ if ( rData.bSwitchH2V )
+ {
+ rData.rInf.GetFrame()->SwitchHorizontalToVertical( rStart );
+ rData.rInf.GetFrame()->SwitchHorizontalToVertical( rEnd );
+ }
}
// Returns the Ascent of the Font on the given output device;