Kaydet (Commit) 49ca17de authored tarafından Julien Nabet's avatar Julien Nabet

cppcheck: reduce scope

Change-Id: Ifa54cc132f0c6591c57639f85e789b08a60b7f4b
üst 37915c87
...@@ -733,7 +733,6 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) ...@@ -733,7 +733,6 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
{ {
SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin(); SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin();
SdrLayerID nLayer = 0, nOldLayer = 0; SdrLayerID nLayer = 0, nOldLayer = 0;
SdrLayer* pLayer = NULL;
SdrObject* pObj = NULL; SdrObject* pObj = NULL;
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
sal_uLong nMarkCount = rMarkList.GetMarkCount(); sal_uLong nMarkCount = rMarkList.GetMarkCount();
...@@ -759,7 +758,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) ...@@ -759,7 +758,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
// Append the layer name to the current page number. // Append the layer name to the current page number.
if( bOneLayer && nMarkCount ) if( bOneLayer && nMarkCount )
{ {
pLayer = rLayerAdmin.GetLayerPerID( nLayer ); SdrLayer* pLayer = rLayerAdmin.GetLayerPerID( nLayer );
if( pLayer ) if( pLayer )
{ {
aOUString += " (" ; aOUString += " (" ;
......
...@@ -1777,7 +1777,6 @@ SdrDragResize::SdrDragResize(SdrDragView& rNewView) ...@@ -1777,7 +1777,6 @@ SdrDragResize::SdrDragResize(SdrDragView& rNewView)
void SdrDragResize::TakeSdrDragComment(OUString& rStr) const void SdrDragResize::TakeSdrDragComment(OUString& rStr) const
{ {
ImpTakeDescriptionStr(STR_DragMethResize, rStr); ImpTakeDescriptionStr(STR_DragMethResize, rStr);
bool bEqual(aXFact == aYFact);
Fraction aFact1(1,1); Fraction aFact1(1,1);
Point aStart(DragStat().GetStart()); Point aStart(DragStat().GetStart());
Point aRef(DragStat().GetRef1()); Point aRef(DragStat().GetRef1());
...@@ -1800,6 +1799,7 @@ void SdrDragResize::TakeSdrDragComment(OUString& rStr) const ...@@ -1800,6 +1799,7 @@ void SdrDragResize::TakeSdrDragComment(OUString& rStr) const
rStr += " ("; rStr += " (";
bool bEqual(aXFact == aYFact);
if(bX) if(bX)
{ {
if(!bEqual) if(!bEqual)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment