summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2012-05-29 22:04:32 +0200
committerJulien Nabet <serval2412@yahoo.fr>2012-05-29 22:04:32 +0200
commit4c21b80c8e57c101afb8d1578f3ae810419e0d5f (patch)
tree88279ccea93e1d7068a36b250f1a32337df75689
parent40106014f7b5c414faf087472a5ae350e683db53 (diff)
Reduce scope
Change-Id: I12a743f9ef98377482472c6b31c2ea8b2c18b538
-rw-r--r--sw/source/ui/docvw/PostItMgr.cxx2
-rw-r--r--sw/source/ui/shells/mediash.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index 6d4256319531..7052fcc5997a 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -936,7 +936,6 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,cons
long lBottomBorder = rBorder.Bottom() - 5;
const long lVisibleHeight = lBottomBorder - lTopBorder; //rBorder.GetHeight() ;
long lTranslatePos = 0;
- bool bDone = false;
bool bScrollbars = false;
// do all neccessary resizings
@@ -965,6 +964,7 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,cons
//start the real layout so nothing overlaps anymore
if (aVisiblePostItList.size()>1)
{
+ bool bDone = false;
long lSpaceUsed = 0;
int loop = 0;
// if no window is moved anymore we are finished
diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx
index 9321c5db7bc8..f43c62429c47 100644
--- a/sw/source/ui/shells/mediash.cxx
+++ b/sw/source/ui/shells/mediash.cxx
@@ -166,10 +166,10 @@ void SwMediaShell::GetMediaState(SfxItemSet &rSet)
{
SwWrtShell& rSh = GetShell();
SdrView* pView = rSh.GetDrawView();
- bool bDisable = true;
if( pView )
{
+ bool bDisable = true;
SdrMarkList* pMarkList = new SdrMarkList( pView->GetMarkedObjectList() );
if( 1 == pMarkList->GetMarkCount() )