diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-01-19 16:51:09 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-01-19 16:52:18 -0500 |
| commit | 50f4d165b42a85993685e546cbc524bc1bf68e5c (patch) | |
| tree | 86db178ff5f4591ecef0d8b2f446dde24b7d7341 | |
| parent | d06779dd50a61b941dbfe9bb2a2f4070aaa09ce5 (diff) | |
Make this a private member (to make it easier to keep track of its usage).
| -rw-r--r-- | svx/inc/svx/svdpntv.hxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 17 | ||||
| -rw-r--r-- | svx/source/svdraw/svdpntv.cxx | 2 |
3 files changed, 5 insertions, 16 deletions
diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx index 761e5d3d056a..c5773d101d77 100644 --- a/svx/inc/svx/svdpntv.hxx +++ b/svx/inc/svx/svdpntv.hxx @@ -132,6 +132,7 @@ class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, p friend class FrameAnimator; friend class SdrGrafObj; + SdrPageView* mpPageView; protected: SdrModel* pMod; #ifdef DBG_UTIL @@ -145,7 +146,6 @@ protected: String aMeasureLayer; // Aktueller Layer fuer Bemassung // Container aPagV; // Liste von SdrPageViews - SdrPageView* mpPageView; // All windows this view is displayed on SdrPaintWindowVector maPaintWindows; diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index f720e680c23c..d7c8959b59d2 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -307,21 +307,15 @@ void SdrMarkView::ClearPageView() void SdrMarkView::HideSdrPage() { bool bMrkChg(false); - //HMHbool bVis(false); - if(mpPageView) + SdrPageView* pPageView = GetSdrPageView(); + if (pPageView) { // break all creation actions when hiding page (#75081#) BrkAction(); - //HMHbVis = IsMarkHdlShown(); - - //HMHif(bVis) - //HMH{ - //HMH HideMarkHdl(); - //HMH} // Discard all selections on this page - bMrkChg = GetMarkedObjectListWriteAccess().DeletePageView(*mpPageView); + bMrkChg = GetMarkedObjectListWriteAccess().DeletePageView(*pPageView); } SdrSnapView::HideSdrPage(); @@ -331,11 +325,6 @@ void SdrMarkView::HideSdrPage() MarkListHasChanged(); AdjustMarkHdl(); } - - //HMHif(bVis) - //HMH{ - //HMH ShowMarkHdl(); - //HMH} } //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 331354b50621..8d5d71a2b5f7 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -204,7 +204,7 @@ void SdrPaintView::ImpClearVars() } SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut) -: mpPageView(0L), +: mpPageView(NULL), aDefaultAttr(pModel1->GetItemPool()), mbBufferedOutputAllowed(false), mbBufferedOverlayAllowed(false), |