sw/source/ui/docvw/PostItMgr.cxx | 2 +-
sw/source/ui/shells/mediash.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4c21b80c8e57c101afb8d1578f3ae810419e0d5f
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Tue May 29 22:04:32 2012 +0200
Reduce scope
Change-Id: I12a743f9ef98377482472c6b31c2ea8b2c18b538
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index 6d42563..7052fcc 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 9321c5d..f43c624 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() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
