summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2013-09-14 01:21:10 +0200
committerJulien Nabet <serval2412@yahoo.fr>2013-09-14 01:23:15 +0200
commit83ea64d4cf6603366cf4ff83c4cb37e2352cd589 (patch)
tree8c7b5e3d14bbc91f104af9250048ed20e6219595 /sw
parentf9bee0318cb3097e7d17c5b96b2b426ddafb658c (diff)
cppcheck: reduce scope
Change-Id: I4d74c6444e3816306cba8b731280bb90899f4ea7
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/txtnode/fntcache.cxx2
-rw-r--r--sw/source/ui/wrtsh/move.cxx3
2 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 2372ea7ebfb7..125e4b7cb9ac 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1097,9 +1097,9 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
if ( rInf.GetSpace() || rInf.GetKanaComp())
{
long nSpaceAdd = rInf.GetSpace() / SPACING_PRECISION_FACTOR;
- bool bSpecialJust = false;
if ( rInf.GetFont() && rInf.GetLen() )
{
+ bool bSpecialJust = false;
const SwScriptInfo* pSI = rInf.GetScriptInfo();
const sal_uInt8 nActual = rInf.GetFont()->GetActual();
///Kana Compression
diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/ui/wrtsh/move.cxx
index 26125c5235f2..1c7f03bf254b 100644
--- a/sw/source/ui/wrtsh/move.cxx
+++ b/sw/source/ui/wrtsh/move.cxx
@@ -421,7 +421,6 @@ sal_Bool SwWrtShell::PushCrsr(SwTwips lOffset, sal_Bool bSelect)
// and we have to remember the position on the stack to return to it later.
sal_Bool bIsFrmSel = sal_False;
- bool bIsObjSel = false;
//Target position is now within the viewable region -->
//Place the cursor at the target position; remember that no target
@@ -436,7 +435,7 @@ sal_Bool SwWrtShell::PushCrsr(SwTwips lOffset, sal_Bool bSelect)
EndSelect();
bIsFrmSel = IsFrmSelected();
- bIsObjSel = 0 != IsObjSelected();
+ bool bIsObjSel = 0 != IsObjSelected();
// unselect frame
if( bIsFrmSel || bIsObjSel )