mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make this a private member (to make it easier to keep track of its usage).

Browse Source
This commit is contained in:
Kohei Yoshida
2012-01-19 16:51:09 -05:00
parent d06779dd50
commit 50f4d165b4
3 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
svx/inc/svx/svdpntv.hxx
View File

@@ -132,6 +132,7 @@ class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, p
friend class FrameAnimator; friend class FrameAnimator;
friend class SdrGrafObj; friend class SdrGrafObj;
SdrPageView* mpPageView;
protected: protected:
SdrModel* pMod; SdrModel* pMod;
#ifdef DBG_UTIL #ifdef DBG_UTIL
@@ -145,7 +146,6 @@ protected:
String aMeasureLayer; // Aktueller Layer fuer Bemassung String aMeasureLayer; // Aktueller Layer fuer Bemassung
// Container aPagV; // Liste von SdrPageViews // Container aPagV; // Liste von SdrPageViews
SdrPageView* mpPageView;
// All windows this view is displayed on // All windows this view is displayed on
SdrPaintWindowVector maPaintWindows; SdrPaintWindowVector maPaintWindows;

17
svx/source/svdraw/svdmrkv.cxx
View File

@@ -307,21 +307,15 @@ void SdrMarkView::ClearPageView()
void SdrMarkView::HideSdrPage() void SdrMarkView::HideSdrPage()
{ {
bool bMrkChg(false); bool bMrkChg(false);
//HMHbool bVis(false);
if(mpPageView) SdrPageView* pPageView = GetSdrPageView();
if (pPageView)
{ {
// break all creation actions when hiding page (#75081#) // break all creation actions when hiding page (#75081#)
BrkAction(); BrkAction();
//HMHbVis = IsMarkHdlShown();
//HMHif(bVis)
//HMH{
//HMH HideMarkHdl();
//HMH}
// Discard all selections on this page // Discard all selections on this page
bMrkChg = GetMarkedObjectListWriteAccess().DeletePageView(*mpPageView); bMrkChg = GetMarkedObjectListWriteAccess().DeletePageView(*pPageView);
} }
SdrSnapView::HideSdrPage(); SdrSnapView::HideSdrPage();
@@ -331,11 +325,6 @@ void SdrMarkView::HideSdrPage()
MarkListHasChanged(); MarkListHasChanged();
AdjustMarkHdl(); AdjustMarkHdl();
} }
//HMHif(bVis)
//HMH{
//HMH ShowMarkHdl();
//HMH}
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////

2
svx/source/svdraw/svdpntv.cxx
View File

@@ -204,7 +204,7 @@ void SdrPaintView::ImpClearVars()
} }
SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut) SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut)
: mpPageView(0L), : mpPageView(NULL),
aDefaultAttr(pModel1->GetItemPool()), aDefaultAttr(pModel1->GetItemPool()),
mbBufferedOutputAllowed(false), mbBufferedOutputAllowed(false),
mbBufferedOverlayAllowed(false), mbBufferedOverlayAllowed(false),