[Libreoffice-commits] .: 3 commits - svx/inc svx/source
Kohei Yoshida
kohei at kemper.freedesktop.org
Thu Jan 19 13:52:17 PST 2012
svx/inc/svx/svdpagv.hxx | 11 ++++-------
svx/inc/svx/svdpntv.hxx | 2 +-
svx/source/svdraw/svdmrkv.cxx | 17 +++--------------
svx/source/svdraw/svdpagv.cxx | 7 -------
svx/source/svdraw/svdpntv.cxx | 2 +-
5 files changed, 9 insertions(+), 30 deletions(-)
New commits:
commit 50f4d165b42a85993685e546cbc524bc1bf68e5c
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date: Thu Jan 19 16:51:09 2012 -0500
Make this a private member (to make it easier to keep track of its usage).
diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx
index 761e5d3..c5773d1 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 f720e68..d7c8959 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 331354b..8d5d71a 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),
commit d06779dd50a61b941dbfe9bb2a2f4070aaa09ce5
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date: Thu Jan 19 16:31:19 2012 -0500
No class derives from SdrPageView. No sense using protected visibility.
diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx
index 4b06de3..ab75435 100644
--- a/svx/inc/svx/svdpagv.hxx
+++ b/svx/inc/svx/svdpagv.hxx
@@ -73,7 +73,7 @@ typedef ::std::vector< SdrPageWindow* > SdrPageWindowVector;
class SVX_DLLPUBLIC SdrPageView
{
-protected:
+private:
SdrView& mrView;
SdrPage* mpPage;
Point aPgOrg; // Nullpunkt der Page
@@ -105,7 +105,7 @@ protected:
SdrPageWindow* mpPreparedPageWindow;
// interface to SdrPageWindow
-protected:
+private:
void ClearPageWindows();
void AppendPageWindow(SdrPageWindow& rNew);
SdrPageWindow* RemovePageWindow(SdrPageWindow& rOld);
@@ -124,13 +124,12 @@ public:
const SdrPageWindow* FindPatchedPageWindow( const OutputDevice& rOutDev ) const;
void PaintOutlinerView(OutputDevice* pOut, const Rectangle& rRect) const;
+
private:
SVX_DLLPRIVATE SdrPageWindow& CreateNewPageWindowEntry(SdrPaintWindow& rPaintWindow);
-protected:
void ImpInvalidateHelpLineArea(sal_uInt16 nNum) const;
-protected:
void SetLayer(const String& rName, SetOfByte& rBS, sal_Bool bJa);
sal_Bool IsLayer(const String& rName, const SetOfByte& rBS) const;
commit 71860292f774920c99663cdbd8bbe0498a0e8da5
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date: Thu Jan 19 16:25:42 2012 -0500
Don't be a listener if you aren't interested in listening.
diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx
index 8a825a0..4b06de3 100644
--- a/svx/inc/svx/svdpagv.hxx
+++ b/svx/inc/svx/svdpagv.hxx
@@ -71,7 +71,7 @@ typedef ::std::vector< SdrPageWindow* > SdrPageWindowVector;
////////////////////////////////////////////////////////////////////////////////////////////////////
-class SVX_DLLPUBLIC SdrPageView : public SfxListener
+class SVX_DLLPUBLIC SdrPageView
{
protected:
SdrView& mrView;
@@ -134,8 +134,6 @@ protected:
void SetLayer(const String& rName, SetOfByte& rBS, sal_Bool bJa);
sal_Bool IsLayer(const String& rName, const SetOfByte& rBS) const;
- virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
-
// Nachsehen, ob AktGroup noch Inserted ist.
void CheckAktGroup();
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 66f8bff..19cee36 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -182,8 +182,6 @@ SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView)
pAktGroup = NULL;
SetAktGroupAndList(NULL, mpPage);
- StartListening(*rNewView.GetModel());
-
for(sal_uInt32 a(0L); a < rNewView.PaintWindowCount(); a++)
{
AddPaintWindowToPageView(*rNewView.GetPaintWindow(a));
@@ -240,11 +238,6 @@ void SdrPageView::RemovePaintWindowFromPageView(SdrPaintWindow& rPaintWindow)
return xReturn;
}
-void SdrPageView::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/)
-{
- // not really interested in
-}
-
void SdrPageView::ModelHasChanged()
{
if (GetAktGroup()!=NULL) CheckAktGroup();
More information about the Libreoffice-commits
mailing list