[Libreoffice-commits] core.git: chart2/source include/svx svx/source
Miklos Vajna
vmiklos at collabora.co.uk
Fri Sep 4 00:04:52 PDT 2015
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 12
include/svx/fmview.hxx | 2
include/svx/svdcrtv.hxx | 2
include/svx/svddrgmt.hxx | 4
include/svx/svddrgv.hxx | 4
include/svx/svdedtv.hxx | 14 -
include/svx/svdpntv.hxx | 154 +++++------
svx/source/engine3d/view3d1.cxx | 10
svx/source/svdraw/svdcrtv.cxx | 106 ++++----
svx/source/svdraw/svddrgv.cxx | 50 +--
svx/source/svdraw/svdedtv.cxx | 32 +-
svx/source/svdraw/svdedtv1.cxx | 6
svx/source/svdraw/svdedtv2.cxx | 8
svx/source/svdraw/svdedxv.cxx | 40 +--
svx/source/svdraw/svdglev.cxx | 8
svx/source/svdraw/svdmrkv.cxx | 50 +--
svx/source/svdraw/svdmrkv1.cxx | 2
svx/source/svdraw/svdpagv.cxx | 8
svx/source/svdraw/svdpntv.cxx | 182 +++++++-------
svx/source/svdraw/svdsnpv.cxx | 34 +-
svx/source/svdraw/svdview.cxx | 88 +++---
svx/source/svdraw/svdxcgv.cxx | 64 ++--
22 files changed, 440 insertions(+), 440 deletions(-)
New commits:
commit 2c1019739b1a15971b894b7e382de097894af47c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Sep 4 09:03:42 2015 +0200
svx: prefix members of SdrPaintView
'mpModel=pModel' is more readable than 'pMod=pModel1'.
Change-Id: I617d85e2c2d4b6b5b0d235cdd3cd9129e276b28d
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index d6623b9..da032cc 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -137,11 +137,11 @@ void DrawViewWrapper::ReInit()
if(pOutDev)
aOutputSize = pOutDev->GetOutputSize();
- bPageVisible = false;
- bPageBorderVisible = false;
- bBordVisible = false;
- bGridVisible = false;
- bHlplVisible = false;
+ mbPageVisible = false;
+ mbPageBorderVisible = false;
+ mbBordVisible = false;
+ mbGridVisible = false;
+ mbHlplVisible = false;
this->SetNoDragXorPolys(true);//for interactive 3D resize-dragging: paint only a single rectangle (not a simulated 3D object)
@@ -154,7 +154,7 @@ void DrawViewWrapper::ReInit()
DrawViewWrapper::~DrawViewWrapper()
{
- aComeBackIdle.Stop();//@todo this should be done in destructor of base class
+ maComeBackIdle.Stop();//@todo this should be done in destructor of base class
UnmarkAllObj();//necessary to avoid a paint call during the destructor hierarchy
}
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index 6d5f610..2cef775 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -147,7 +147,7 @@ public:
virtual SdrPaintWindow* BeginCompleteRedraw(OutputDevice* pOut) SAL_OVERRIDE;
virtual void EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer) SAL_OVERRIDE;
- SVX_DLLPRIVATE const OutputDevice* GetActualOutDev() const {return pActualOutDev;}
+ SVX_DLLPRIVATE const OutputDevice* GetActualOutDev() const {return mpActualOutDev;}
SVX_DLLPRIVATE bool checkUnMarkAll(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xSource);
private:
diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index a1d8f6c..4afca16 100644
--- a/include/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
@@ -84,7 +84,7 @@ public:
virtual bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE;
- void SetMeasureLayer(const OUString& rName) { aMeasureLayer=rName; }
+ void SetMeasureLayer(const OUString& rName) { maMeasureLayer=rName; }
// If the MeasureLayer is not set (empty string), then use the active layer for measuring.
void SetEditMode(SdrViewEditMode eMode) { SdrDragView::SetEditMode(eMode); CheckEdgeMode(); }
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index 54527db..90f1616 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -159,8 +159,8 @@ protected:
void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal=0) const;
SdrHdl* GetDragHdl() const { return getSdrDragView().mpDragHdl; }
SdrHdlKind GetDragHdlKind() const { return getSdrDragView().meDragHdl; }
- SdrDragStat& DragStat() { return getSdrDragView().aDragStat; }
- const SdrDragStat& DragStat() const { return getSdrDragView().aDragStat; }
+ SdrDragStat& DragStat() { return getSdrDragView().maDragStat; }
+ const SdrDragStat& DragStat() const { return getSdrDragView().maDragStat; }
Point& Ref1() const { return mrSdrDragView.maRef1; }
Point& Ref2() const { return mrSdrDragView.maRef2; }
const SdrHdlList& GetHdlList() const { return getSdrDragView().GetHdlList(); }
diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx
index 802404d..f4af1b9 100644
--- a/include/svx/svddrgv.hxx
+++ b/include/svx/svddrgv.hxx
@@ -246,8 +246,8 @@ public:
// errors,...
// Default=EmptyRect=no limitation
// only partially implemented
- void SetWorkArea(const Rectangle& rRect) { aMaxWorkArea=rRect; }
- const Rectangle& GetWorkArea() const { return aMaxWorkArea; }
+ void SetWorkArea(const Rectangle& rRect) { maMaxWorkArea=rRect; }
+ const Rectangle& GetWorkArea() const { return maMaxWorkArea; }
// The DragLimit refers to the Page of the object.
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index ae10b82..7eff811 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -166,7 +166,7 @@ protected:
// Check possibilities of all marked objects
virtual void CheckPossibilities();
- void ForcePossibilities() const { if (bPossibilitiesDirty || bSomeObjChgdFlag) const_cast<SdrEditView*>(this)->CheckPossibilities(); }
+ void ForcePossibilities() const { if (bPossibilitiesDirty || mbSomeObjChgdFlag) const_cast<SdrEditView*>(this)->CheckPossibilities(); }
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -180,14 +180,14 @@ public:
// The comment used for the UndoAction is the first BegUndo(String).
// In this case NotifyNewUndoAction is called at the last EndUndo().
// NotifyNewUndoAction() is not called for an empty group.
- void BegUndo() { pMod->BegUndo(); } // open undo-grouping
- void BegUndo(const OUString& rComment) { pMod->BegUndo(rComment); } // open undo-grouping
- void BegUndo(const OUString& rComment, const OUString& rObjDescr, SdrRepeatFunc eFunc=SDRREPFUNC_OBJ_NONE) { pMod->BegUndo(rComment,rObjDescr,eFunc); } // open undo-grouping
+ void BegUndo() { mpModel->BegUndo(); } // open undo-grouping
+ void BegUndo(const OUString& rComment) { mpModel->BegUndo(rComment); } // open undo-grouping
+ void BegUndo(const OUString& rComment, const OUString& rObjDescr, SdrRepeatFunc eFunc=SDRREPFUNC_OBJ_NONE) { mpModel->BegUndo(rComment,rObjDescr,eFunc); } // open undo-grouping
void EndUndo(); // close undo-grouping (incl. BroadcastEdges)
- void AddUndo(SdrUndoAction* pUndo) { pMod->AddUndo(pUndo); } // add action
+ void AddUndo(SdrUndoAction* pUndo) { mpModel->AddUndo(pUndo); } // add action
// only after first BegUndo or befor last EndUndo:
- void SetUndoComment(const OUString& rComment) { pMod->SetUndoComment(rComment); }
- void SetUndoComment(const OUString& rComment, const OUString& rObjDescr) { pMod->SetUndoComment(rComment,rObjDescr); }
+ void SetUndoComment(const OUString& rComment) { mpModel->SetUndoComment(rComment); }
+ void SetUndoComment(const OUString& rComment, const OUString& rObjDescr) { mpModel->SetUndoComment(rComment,rObjDescr); }
bool IsUndoEnabled() const;
std::vector< SdrUndoAction* > CreateConnectorUndo( SdrObject& rO );
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 17db66a..0cf05b5 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -127,63 +127,63 @@ class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, p
SdrPageView* mpPageView;
protected:
- SdrModel* pMod;
+ SdrModel* mpModel;
#ifdef DBG_UTIL
- VclPtr<SdrItemBrowser> pItemBrowser;
+ VclPtr<SdrItemBrowser> mpItemBrowser;
#endif
- VclPtr<OutputDevice> pActualOutDev; // Only for comparison
- VclPtr<OutputDevice> pDragWin;
- SfxStyleSheet* pDefaultStyleSheet;
+ VclPtr<OutputDevice> mpActualOutDev; // Only for comparison
+ VclPtr<OutputDevice> mpDragWin;
+ SfxStyleSheet* mpDefaultStyleSheet;
- OUString aAktLayer; // Current drawing layer
- OUString aMeasureLayer; // Current layer for measurements
+ OUString maActualLayer; // Current drawing layer
+ OUString maMeasureLayer; // Current layer for measurements
// Container aPagV; // List of SdrPageViews
// All windows this view is displayed on
SdrPaintWindowVector maPaintWindows;
- MapMode aActualMapMode;
- Size aGridBig; // FIXME: We need to get rid of this eventually
- Size aGridFin; // FIXME: We need to get rid of this eventually
- SdrDragStat aDragStat;
- Rectangle aMaxWorkArea;
- SfxItemSet aDefaultAttr;
- Idle aComeBackIdle;
+ MapMode maActualMapMode;
+ Size maGridBig; // FIXME: We need to get rid of this eventually
+ Size maGridFin; // FIXME: We need to get rid of this eventually
+ SdrDragStat maDragStat;
+ Rectangle maMaxWorkArea;
+ SfxItemSet maDefaultAttr;
+ Idle maComeBackIdle;
- SdrAnimationMode eAnimationMode;
+ SdrAnimationMode meAnimationMode;
- sal_uInt16 nHitTolPix;
- sal_uInt16 nMinMovPix;
- sal_uInt16 nHitTolLog;
- sal_uInt16 nMinMovLog;
- GraphicManagerDrawFlags nGraphicManagerDrawMode;
+ sal_uInt16 mnHitTolPix;
+ sal_uInt16 mnMinMovPix;
+ sal_uInt16 mnHitTolLog;
+ sal_uInt16 mnMinMovLog;
+ GraphicManagerDrawFlags mnGraphicManagerDrawMode;
// Hold an incarnation of Drawinglayer configuration options
SvtOptionsDrawinglayer maDrawinglayerOpt;
- bool bPageVisible : 1;
- bool bPageBorderVisible : 1;
- bool bBordVisible : 1;
- bool bGridVisible : 1;
- bool bGridFront : 1;
- bool bHlplVisible : 1;
- bool bHlplFront : 1;
- bool bGlueVisible : 1; // Persistent; show glue points
- bool bGlueVisible2 : 1; // Also show glue points for GluePointEdit
- bool bGlueVisible3 : 1; // Also show glue points for EdgeTool
- bool bGlueVisible4 : 1; // Show glue points, if one edge is selected
- bool bRestoreColors : 1; // Pens and Brushes are reset
- bool bSomeObjChgdFlag : 1;
- bool bSwapAsynchron : 1;
- bool bPrintPreview : 1;
+ bool mbPageVisible : 1;
+ bool mbPageBorderVisible : 1;
+ bool mbBordVisible : 1;
+ bool mbGridVisible : 1;
+ bool mbGridFront : 1;
+ bool mbHlplVisible : 1;
+ bool mbHlplFront : 1;
+ bool mbGlueVisible : 1; // Persistent; show glue points
+ bool mbGlueVisible2 : 1; // Also show glue points for GluePointEdit
+ bool mbGlueVisible3 : 1; // Also show glue points for EdgeTool
+ bool mbGlueVisible4 : 1; // Show glue points, if one edge is selected
+ bool mbRestoreColors : 1; // Pens and Brushes are reset
+ bool mbSomeObjChgdFlag : 1;
+ bool mbSwapAsynchron : 1;
+ bool mbPrintPreview : 1;
// These bools manage, the status that is displayed
//
// Enter/Leave group: default is true, but is set to false in
// e.g. Chart, where we'd get Ghost effects when rendering
- bool bVisualizeEnteredGroup : 1;
- bool bAnimationPause : 1;
+ bool mbVisualizeEnteredGroup : 1;
+ bool mbAnimationPause : 1;
// #114898#
// Flag which decides if buffered output for this view is allowed. When
@@ -250,12 +250,12 @@ protected:
// If one does not want to wait for the IdleState of the system (cheated as const)
void FlushComeBackTimer() const;
void TheresNewMapMode();
- void ImpSetGlueVisible2(bool bOn) { if (bGlueVisible2!=bOn) { bGlueVisible2=bOn; if (!bGlueVisible && !bGlueVisible3 && !bGlueVisible4) GlueInvalidate(); } }
- void ImpSetGlueVisible3(bool bOn) { if (bGlueVisible3!=bOn) { bGlueVisible3=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible4) GlueInvalidate(); } }
- void ImpSetGlueVisible4(bool bOn) { if (bGlueVisible4!=bOn) { bGlueVisible4=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible3) GlueInvalidate(); } }
+ void ImpSetGlueVisible2(bool bOn) { if (mbGlueVisible2!=bOn) { mbGlueVisible2=bOn; if (!mbGlueVisible && !mbGlueVisible3 && !mbGlueVisible4) GlueInvalidate(); } }
+ void ImpSetGlueVisible3(bool bOn) { if (mbGlueVisible3!=bOn) { mbGlueVisible3=bOn; if (!mbGlueVisible && !mbGlueVisible2 && !mbGlueVisible4) GlueInvalidate(); } }
+ void ImpSetGlueVisible4(bool bOn) { if (mbGlueVisible4!=bOn) { mbGlueVisible4=bOn; if (!mbGlueVisible && !mbGlueVisible2 && !mbGlueVisible3) GlueInvalidate(); } }
public:
- bool ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; }
+ bool ImpIsGlueVisible() { return mbGlueVisible || mbGlueVisible2 || mbGlueVisible3 || mbGlueVisible4; }
protected:
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE;
@@ -275,7 +275,7 @@ public:
TYPEINFO_OVERRIDE();
virtual void ClearPageView();
- SdrModel* GetModel() const { return pMod; }
+ SdrModel* GetModel() const { return mpModel; }
virtual bool IsAction() const;
virtual void MovAction(const Point& rPnt);
@@ -295,19 +295,19 @@ public:
// using the split pane), so that I can convert my pixel values to logical
// values.
void SetActualWin(const OutputDevice* pWin);
- void SetMinMoveDistancePixel(sal_uInt16 nVal) { nMinMovPix=nVal; TheresNewMapMode(); }
- void SetHitTolerancePixel(sal_uInt16 nVal) { nHitTolPix=nVal; TheresNewMapMode(); }
- sal_uInt16 GetHitTolerancePixel() const { return (sal_uInt16)nHitTolPix; }
+ void SetMinMoveDistancePixel(sal_uInt16 nVal) { mnMinMovPix=nVal; TheresNewMapMode(); }
+ void SetHitTolerancePixel(sal_uInt16 nVal) { mnHitTolPix=nVal; TheresNewMapMode(); }
+ sal_uInt16 GetHitTolerancePixel() const { return (sal_uInt16)mnHitTolPix; }
// Data read access on logic HitTolerance and MinMoveTolerance
- sal_uInt16 getHitTolLog() const { return nHitTolLog; }
+ sal_uInt16 getHitTolLog() const { return mnHitTolLog; }
// Flag for group visualization
- bool DoVisualizeEnteredGroup() const { return bVisualizeEnteredGroup; }
+ bool DoVisualizeEnteredGroup() const { return mbVisualizeEnteredGroup; }
// Using the DragState we can tell e.g. which distance was
// already dragged
- const SdrDragStat& GetDragStat() const { return aDragStat; }
+ const SdrDragStat& GetDragStat() const { return maDragStat; }
// Registering/de-registering a PageView at a View
//
@@ -375,35 +375,35 @@ protected:
public:
/// Draw Page as a white area or not
- bool IsPageVisible() const { return bPageVisible; }
+ bool IsPageVisible() const { return mbPageVisible; }
/// Draw Page as a white area or not
- bool IsPageBorderVisible() const { return bPageBorderVisible; }
+ bool IsPageBorderVisible() const { return mbPageBorderVisible; }
/// Draw Border line or not
- bool IsBordVisible() const { return bBordVisible; }
+ bool IsBordVisible() const { return mbBordVisible; }
/// Draw Grid or not
- bool IsGridVisible() const { return bGridVisible; }
+ bool IsGridVisible() const { return mbGridVisible; }
/// Draw Grid in front of objects or behind them
- bool IsGridFront() const { return bGridFront ; }
+ bool IsGridFront() const { return mbGridFront ; }
/// Draw Help line of the Page or not
- bool IsHlplVisible() const { return bHlplVisible; }
+ bool IsHlplVisible() const { return mbHlplVisible; }
/// Draw Help line in fron of the objects or beging them
- bool IsHlplFront() const { return bHlplFront ; }
+ bool IsHlplFront() const { return mbHlplFront ; }
Color GetGridColor() const { return maGridColor;}
- void SetPageVisible(bool bOn = true) { bPageVisible=bOn; InvalidateAllWin(); }
- void SetPageBorderVisible(bool bOn = true) { bPageBorderVisible=bOn; InvalidateAllWin(); }
- void SetBordVisible(bool bOn = true) { bBordVisible=bOn; InvalidateAllWin(); }
- void SetGridVisible(bool bOn = true) { bGridVisible=bOn; InvalidateAllWin(); }
- void SetGridFront(bool bOn = true) { bGridFront =bOn; InvalidateAllWin(); }
- void SetHlplVisible(bool bOn = true) { bHlplVisible=bOn; InvalidateAllWin(); }
- void SetHlplFront(bool bOn = true) { bHlplFront =bOn; InvalidateAllWin(); }
- void SetGlueVisible(bool bOn = true) { if (bGlueVisible!=bOn) { bGlueVisible=bOn; if (!bGlueVisible2 && !bGlueVisible3 && !bGlueVisible4) GlueInvalidate(); } }
+ void SetPageVisible(bool bOn = true) { mbPageVisible=bOn; InvalidateAllWin(); }
+ void SetPageBorderVisible(bool bOn = true) { mbPageBorderVisible=bOn; InvalidateAllWin(); }
+ void SetBordVisible(bool bOn = true) { mbBordVisible=bOn; InvalidateAllWin(); }
+ void SetGridVisible(bool bOn = true) { mbGridVisible=bOn; InvalidateAllWin(); }
+ void SetGridFront(bool bOn = true) { mbGridFront =bOn; InvalidateAllWin(); }
+ void SetHlplVisible(bool bOn = true) { mbHlplVisible=bOn; InvalidateAllWin(); }
+ void SetHlplFront(bool bOn = true) { mbHlplFront =bOn; InvalidateAllWin(); }
+ void SetGlueVisible(bool bOn = true) { if (mbGlueVisible!=bOn) { mbGlueVisible=bOn; if (!mbGlueVisible2 && !mbGlueVisible3 && !mbGlueVisible4) GlueInvalidate(); } }
void SetGridColor( Color aColor );
bool IsPreviewRenderer() const { return mbPreviewRenderer; }
@@ -419,10 +419,10 @@ public:
void setHideDraw(bool bNew) { if(bNew != (bool)mbHideDraw) mbHideDraw = bNew; }
void setHideFormControl(bool bNew) { if(bNew != (bool)mbHideFormControl) mbHideFormControl = bNew; }
- void SetGridCoarse(const Size& rSiz) { aGridBig=rSiz; }
- void SetGridFine(const Size& rSiz) { aGridFin=rSiz; if (aGridFin.Height()==0) aGridFin.Height()=aGridFin.Width(); if (bGridVisible) InvalidateAllWin(); } // #40479#
- const Size& GetGridCoarse() const { return aGridBig; }
- const Size& GetGridFine() const { return aGridFin; }
+ void SetGridCoarse(const Size& rSiz) { maGridBig=rSiz; }
+ void SetGridFine(const Size& rSiz) { maGridFin=rSiz; if (maGridFin.Height()==0) maGridFin.Height()=maGridFin.Width(); if (mbGridVisible) InvalidateAllWin(); } // #40479#
+ const Size& GetGridCoarse() const { return maGridBig; }
+ const Size& GetGridFine() const { return maGridFin; }
void InvalidateAllWin();
void InvalidateAllWin(const Rectangle& rRect, bool bPlus1Pix=false);
@@ -432,8 +432,8 @@ public:
virtual void InvalidateOneWin(vcl::Window& rWin);
virtual void InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect);
- void SetActiveLayer(const OUString& rName) { aAktLayer=rName; }
- const OUString& GetActiveLayer() const { return aAktLayer; }
+ void SetActiveLayer(const OUString& rName) { maActualLayer=rName; }
+ const OUString& GetActiveLayer() const { return maActualLayer; }
/// Leave an object group of all visible Pages (like `chdir ..` in MSDOS)
void LeaveOneGroup();
@@ -447,9 +447,9 @@ public:
/// Default attributes at the View
/// Newly created objects are assigned these attributes by default when they are created.
void SetDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll);
- const SfxItemSet& GetDefaultAttr() const { return aDefaultAttr; }
+ const SfxItemSet& GetDefaultAttr() const { return maDefaultAttr; }
void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr);
- SfxStyleSheet* GetDefaultStyleSheet() const { return pDefaultStyleSheet; }
+ SfxStyleSheet* GetDefaultStyleSheet() const { return mpDefaultStyleSheet; }
void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll);
void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, bool bOnlyHardAttr) const;
@@ -459,8 +459,8 @@ public:
/// the loading there. When such an object is done loading, it is displayed.
/// TODO: Only works at the moment, if SwapGraphics is enabled in the model.
/// The default = false flag is non-persistent
- bool IsSwapAsynchron() const { return bSwapAsynchron; }
- void SetSwapAsynchron(bool bJa=true) { bSwapAsynchron=bJa; }
+ bool IsSwapAsynchron() const { return mbSwapAsynchron; }
+ void SetSwapAsynchron(bool bJa=true) { mbSwapAsynchron=bJa; }
virtual bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin);
virtual bool MouseButtonDown(const MouseEvent& /*rMEvt*/, vcl::Window* /*pWin*/) { return false; }
@@ -483,7 +483,7 @@ public:
/// Enable/disable animations for ::Paint
/// Is used by e.g. SdrGrafObj, if it contains an animation
/// Preventing automatic animation is needed for e.g. the presentation view
- bool IsAnimationEnabled() const { return ( SDR_ANIMATION_ANIMATE == eAnimationMode ); }
+ bool IsAnimationEnabled() const { return ( SDR_ANIMATION_ANIMATE == meAnimationMode ); }
void SetAnimationEnabled( bool bEnable=true );
/// Set/unset pause state for animations
@@ -498,7 +498,7 @@ public:
/// The Browser is destroyed for bShow=false
#ifdef DBG_UTIL
void ShowItemBrowser(bool bShow=true);
- bool IsItemBrowserVisible() const { return pItemBrowser!=nullptr && GetItemBrowser()->IsVisible(); }
+ bool IsItemBrowserVisible() const { return mpItemBrowser!=nullptr && GetItemBrowser()->IsVisible(); }
vcl::Window* GetItemBrowser() const;
#endif
@@ -507,8 +507,8 @@ public:
void VisAreaChanged(const OutputDevice* pOut=NULL);
void VisAreaChanged(const SdrPageWindow& rWindow);
- bool IsPrintPreview() const { return bPrintPreview; }
- void SetPrintPreview(bool bOn = true) { bPrintPreview=bOn; }
+ bool IsPrintPreview() const { return mbPrintPreview; }
+ void SetPrintPreview(bool bOn = true) { mbPrintPreview=bOn; }
const svtools::ColorConfig& getColorConfig() const { return maColorConfig;}
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index d3414bd..62ce42a 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -100,7 +100,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, bool /*bOnly3DAttr*/) co
{
// Creating itemset with corresponding field
SfxItemSet aSet(
- pMod->GetItemPool(),
+ mpModel->GetItemPool(),
SDRATTR_START, SDRATTR_END,
SID_ATTR_3D_INTERN, SID_ATTR_3D_INTERN,
0, 0);
@@ -135,7 +135,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, bool /*bOnly3DAttr*/) co
if(!nSelectedItems && !pInScene)
{
// Get defaults and apply
- SfxItemSet aDefaultSet(pMod->GetItemPool(), SDRATTR_3D_FIRST, SDRATTR_3D_LAST);
+ SfxItemSet aDefaultSet(mpModel->GetItemPool(), SDRATTR_3D_FIRST, SDRATTR_3D_LAST);
GetAttributes(aDefaultSet);
aSet.Put(aDefaultSet);
@@ -182,7 +182,7 @@ void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, bool
if(!nSelectedItems && !pInScene)
{
// Set defaults
- SfxItemSet aDefaultSet(pMod->GetItemPool(), SDRATTR_3D_FIRST, SDRATTR_3D_LAST);
+ SfxItemSet aDefaultSet(mpModel->GetItemPool(), SDRATTR_3D_FIRST, SDRATTR_3D_LAST);
aDefaultSet.Put(rAttr);
SetAttributes(aDefaultSet);
@@ -191,12 +191,12 @@ void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, bool
double E3dView::GetDefaultCamPosZ()
{
- return (double) static_cast<const SfxUInt32Item&>(pMod->GetItemPool().GetDefaultItem(SDRATTR_3DSCENE_DISTANCE)).GetValue();
+ return (double) static_cast<const SfxUInt32Item&>(mpModel->GetItemPool().GetDefaultItem(SDRATTR_3DSCENE_DISTANCE)).GetValue();
}
double E3dView::GetDefaultCamFocal()
{
- return (double) static_cast<const SfxUInt32Item&>(pMod->GetItemPool().GetDefaultItem(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue();
+ return (double) static_cast<const SfxUInt32Item&>(mpModel->GetItemPool().GetDefaultItem(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 5f6cbeb..d263aad 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -260,10 +260,10 @@ void SdrCreateView::TakeActionRect(Rectangle& rRect) const
{
if (pAktCreate!=NULL)
{
- rRect=aDragStat.GetActionRect();
+ rRect=maDragStat.GetActionRect();
if (rRect.IsEmpty())
{
- rRect=Rectangle(aDragStat.GetPrev(),aDragStat.GetNow());
+ rRect=Rectangle(maDragStat.GetPrev(),maDragStat.GetNow());
}
}
else
@@ -406,11 +406,11 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const
}
if (pCreatePV!=NULL)
{ // otherwise no side registered!
- OUString aLay(aAktLayer);
+ OUString aLay(maActualLayer);
- if(nInvent == SdrInventor && nIdent == OBJ_MEASURE && !aMeasureLayer.isEmpty())
+ if(nInvent == SdrInventor && nIdent == OBJ_MEASURE && !maMeasureLayer.isEmpty())
{
- aLay = aMeasureLayer;
+ aLay = maMeasureLayer;
}
SdrLayerID nLayer=pCreatePV->GetPage()->GetLayerAdmin().GetLayerID(aLay,true);
@@ -425,14 +425,14 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const
{
pAktCreate->SetPage(pCreatePV->GetPage());
}
- else if (pMod)
+ else if (mpModel)
{
- pAktCreate->SetModel(pMod);
+ pAktCreate->SetModel(mpModel);
}
}
else
{
- pAktCreate = SdrObjFactory::MakeNewObject(nInvent, nIdent, pCreatePV->GetPage(), pMod);
+ pAktCreate = SdrObjFactory::MakeNewObject(nInvent, nIdent, pCreatePV->GetPage(), mpModel);
}
Point aPnt(rPnt);
@@ -443,7 +443,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const
}
if (pAktCreate!=NULL)
{
- if (pDefaultStyleSheet!=NULL) pAktCreate->NbcSetStyleSheet(pDefaultStyleSheet, false);
+ if (mpDefaultStyleSheet!=NULL) pAktCreate->NbcSetStyleSheet(mpDefaultStyleSheet, false);
// SW uses a naked SdrObject for frame construction. Normally, such an
// object should not be created. Since it is possible to use it as a helper
@@ -451,22 +451,22 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const
// construction) at least no items should be set at that object.
if(nInvent != SdrInventor || nIdent != OBJ_NONE)
{
- pAktCreate->SetMergedItemSet(aDefaultAttr);
+ pAktCreate->SetMergedItemSet(maDefaultAttr);
}
- if (pMod && HAS_BASE(SdrCaptionObj,pAktCreate))
+ if (mpModel && HAS_BASE(SdrCaptionObj,pAktCreate))
{
- SfxItemSet aSet(pMod->GetItemPool());
+ SfxItemSet aSet(mpModel->GetItemPool());
aSet.Put(XFillColorItem(OUString(),Color(COL_WHITE))); // in case someone turns on Solid
aSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
pAktCreate->SetMergedItemSet(aSet);
}
- if (pMod && nInvent==SdrInventor && (nIdent==OBJ_TEXT || nIdent==OBJ_TEXTEXT ||
+ if (mpModel && nInvent==SdrInventor && (nIdent==OBJ_TEXT || nIdent==OBJ_TEXTEXT ||
nIdent==OBJ_TITLETEXT || nIdent==OBJ_OUTLINETEXT))
{
// default for all text frames: no background, no border
- SfxItemSet aSet(pMod->GetItemPool());
+ SfxItemSet aSet(mpModel->GetItemPool());
aSet.Put(XFillColorItem(OUString(),Color(COL_WHITE))); // in case someone turns on Solid
aSet.Put(XFillStyleItem(drawing::FillStyle_NONE));
aSet.Put(XLineColorItem(OUString(),Color(COL_BLACK))); // in case someone turns on Solid
@@ -502,12 +502,12 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const
}
}
- aDragStat.Reset(aPnt);
- aDragStat.SetView(static_cast<SdrView*>(this));
- aDragStat.SetPageView(pCreatePV);
- aDragStat.SetMinMove(ImpGetMinMovLogic(nMinMov,pOut));
- pDragWin=pOut;
- if (pAktCreate->BegCreate(aDragStat))
+ maDragStat.Reset(aPnt);
+ maDragStat.SetView(static_cast<SdrView*>(this));
+ maDragStat.SetPageView(pCreatePV);
+ maDragStat.SetMinMove(ImpGetMinMovLogic(nMinMov,pOut));
+ mpDragWin=pOut;
+ if (pAktCreate->BegCreate(maDragStat))
{
ShowCreateObj(/*pOut,sal_True*/);
bRet=true;
@@ -554,14 +554,14 @@ void SdrCreateView::MovCreateObj(const Point& rPnt)
{
if (pAktCreate!=NULL) {
Point aPnt(rPnt);
- if (!aDragStat.IsNoSnap())
+ if (!maDragStat.IsNoSnap())
{
aPnt=GetSnapPos(aPnt,pCreatePV);
}
if (IsOrtho())
{
- if (aDragStat.IsOrtho8Possible()) OrthoDistance8(aDragStat.GetPrev(),aPnt,IsBigOrtho());
- else if (aDragStat.IsOrtho4Possible()) OrthoDistance4(aDragStat.GetPrev(),aPnt,IsBigOrtho());
+ if (maDragStat.IsOrtho8Possible()) OrthoDistance8(maDragStat.GetPrev(),aPnt,IsBigOrtho());
+ else if (maDragStat.IsOrtho4Possible()) OrthoDistance4(maDragStat.GetPrev(),aPnt,IsBigOrtho());
}
// If the drag point was limited and Ortho is active, do
@@ -569,19 +569,19 @@ void SdrCreateView::MovCreateObj(const Point& rPnt)
bool bDidLimit(ImpLimitToWorkArea(aPnt));
if(bDidLimit && IsOrtho())
{
- if(aDragStat.IsOrtho8Possible())
- OrthoDistance8(aDragStat.GetPrev(), aPnt, false);
- else if(aDragStat.IsOrtho4Possible())
- OrthoDistance4(aDragStat.GetPrev(), aPnt, false);
+ if(maDragStat.IsOrtho8Possible())
+ OrthoDistance8(maDragStat.GetPrev(), aPnt, false);
+ else if(maDragStat.IsOrtho4Possible())
+ OrthoDistance4(maDragStat.GetPrev(), aPnt, false);
}
- if (aPnt==aDragStat.GetNow()) return;
- bool bMerk(aDragStat.IsMinMoved());
- if (aDragStat.CheckMinMoved(aPnt))
+ if (aPnt==maDragStat.GetNow()) return;
+ bool bMerk(maDragStat.IsMinMoved());
+ if (maDragStat.CheckMinMoved(aPnt))
{
- if (!bMerk) aDragStat.NextPoint();
- aDragStat.NextMove(aPnt);
- pAktCreate->MovCreate(aDragStat);
+ if (!bMerk) maDragStat.NextPoint();
+ maDragStat.NextMove(aPnt);
+ pAktCreate->MovCreate(maDragStat);
// MovCreate changes the object, so use ActionChanged() on it
pAktCreate->ActionChanged();
@@ -601,7 +601,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
if (pAktCreate!=NULL)
{
- sal_uIntPtr nCount=aDragStat.GetPointAnz();
+ sal_uIntPtr nCount=maDragStat.GetPointAnz();
if (nCount<=1 && eCmd==SDRCREATE_FORCEEND)
{
@@ -611,10 +611,10 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
bool bPntsEq=nCount>1;
sal_uIntPtr i=1;
- Point aP0=aDragStat.GetPoint(0);
- while (bPntsEq && i<nCount) { bPntsEq=aP0==aDragStat.GetPoint(i); i++; }
+ Point aP0=maDragStat.GetPoint(0);
+ while (bPntsEq && i<nCount) { bPntsEq=aP0==maDragStat.GetPoint(i); i++; }
- if (pAktCreate->EndCreate(aDragStat,eCmd))
+ if (pAktCreate->EndCreate(maDragStat,eCmd))
{
HideCreateObj();
@@ -635,7 +635,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
}
else
{
- nLayer = rAd.GetLayerID(aAktLayer, true);
+ nLayer = rAd.GetLayerID(maActualLayer, true);
}
if(SDRLAYER_NOTFOUND == nLayer)
@@ -685,7 +685,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
{ // more points
if (eCmd==SDRCREATE_FORCEEND || // nothing there -- force ending
nCount==0 || // no existing points (should never happen)
- (nCount<=1 && !aDragStat.IsMinMoved())) { // MinMove not met
+ (nCount<=1 && !maDragStat.IsMinMoved())) { // MinMove not met
BrkCreateObj();
}
else
@@ -693,7 +693,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
// replace for DrawCreateObjDiff
HideCreateObj();
ShowCreateObj();
- aDragStat.ResetMinMoved(); // NextPoint is at MovCreateObj()
+ maDragStat.ResetMinMoved(); // NextPoint is at MovCreateObj()
bRet=true;
}
}
@@ -713,15 +713,15 @@ void SdrCreateView::BckCreateObj()
{
if (pAktCreate!=NULL)
{
- if (aDragStat.GetPointAnz()<=2 )
+ if (maDragStat.GetPointAnz()<=2 )
{
BrkCreateObj();
}
else
{
HideCreateObj();
- aDragStat.PrevPoint();
- if (pAktCreate->BckCreate(aDragStat))
+ maDragStat.PrevPoint();
+ if (pAktCreate->BckCreate(maDragStat))
{
ShowCreateObj();
}
@@ -738,7 +738,7 @@ void SdrCreateView::BrkCreateObj()
if (pAktCreate!=NULL)
{
HideCreateObj();
- pAktCreate->BrkCreate(aDragStat);
+ pAktCreate->BrkCreate(maDragStat);
SdrObject::Free( pAktCreate );
pAktCreate=NULL;
pCreatePV=NULL;
@@ -747,7 +747,7 @@ void SdrCreateView::BrkCreateObj()
void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/)
{
- if(IsCreateObj() && !aDragStat.IsShown())
+ if(IsCreateObj() && !maDragStat.IsShown())
{
if(pAktCreate)
{
@@ -794,7 +794,7 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/)
if(pCircObj && OBJ_CIRC != pCircObj->GetObjIdentifier())
{
// #i103058# Allow SolidDragging with four points
- if(aDragStat.GetPointAnz() < 4)
+ if(maDragStat.GetPointAnz() < 4)
{
bUseSolidDragging = false;
}
@@ -813,7 +813,7 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/)
if(!(aCurrentSnapRect.GetWidth() > 1 && aCurrentSnapRect.GetHeight() > 1))
{
- Rectangle aNewRect(aDragStat.GetStart(), aDragStat.GetStart() + Point(2, 2));
+ Rectangle aNewRect(maDragStat.GetStart(), maDragStat.GetStart() + Point(2, 2));
pAktCreate->NbcSetSnapRect(aNewRect);
}
}
@@ -823,14 +823,14 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/)
// The up-to-now created path needs to be set at the object to have something
// that can be visualized
SdrPathObj& rPathObj(static_cast<SdrPathObj&>(*pAktCreate));
- const basegfx::B2DPolyPolygon aCurrentPolyPolygon(rPathObj.getObjectPolyPolygon(aDragStat));
+ const basegfx::B2DPolyPolygon aCurrentPolyPolygon(rPathObj.getObjectPolyPolygon(maDragStat));
if(aCurrentPolyPolygon.count())
{
rPathObj.NbcSetPathPoly(aCurrentPolyPolygon);
}
- aDragPolyPolygon = rPathObj.getDragPolyPolygon(aDragStat);
+ aDragPolyPolygon = rPathObj.getDragPolyPolygon(maDragStat);
}
// use the SdrObject directly for overlay
@@ -838,7 +838,7 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/)
}
else
{
- ::basegfx::B2DPolyPolygon aPoly = pAktCreate->TakeCreatePoly(aDragStat);
+ ::basegfx::B2DPolyPolygon aPoly = pAktCreate->TakeCreatePoly(maDragStat);
Point aGridOff = pAktCreate->GetGridOffset();
// Hack for calc, transform position of create placeholder
// object according to current zoom so as objects relative
@@ -860,20 +860,20 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/)
}
}
- aDragStat.SetShown(true);
+ maDragStat.SetShown(true);
}
}
void SdrCreateView::HideCreateObj()
{
- if(IsCreateObj() && aDragStat.IsShown())
+ if(IsCreateObj() && maDragStat.IsShown())
{
// for migration from XOR, replace DrawDragObj here to create
// overlay objects instead.
mpCreateViewExtraData->HideOverlay();
//DrawCreateObj(pOut,bFull);
- aDragStat.SetShown(false);
+ maDragStat.SetShown(false);
}
}
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 0bae034..6850354 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -132,7 +132,7 @@ void SdrDragView::TakeActionRect(Rectangle& rRect) const
{
if (mpCurrentSdrDragMethod)
{
- rRect=aDragStat.GetActionRect();
+ rRect=maDragStat.GetActionRect();
if (rRect.IsEmpty())
{
SdrPageView* pPV = GetSdrPageView();
@@ -155,7 +155,7 @@ void SdrDragView::TakeActionRect(Rectangle& rRect) const
}
if (rRect.IsEmpty())
{
- rRect=Rectangle(aDragStat.GetNow(),aDragStat.GetNow());
+ rRect=Rectangle(maDragStat.GetNow(),maDragStat.GetNow());
}
}
else
@@ -236,19 +236,19 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
|| pHdl->GetKind() == HDL_TRNS
|| pHdl->GetKind() == HDL_GRAD)
{
- aDragStat.Reset(aPnt);
+ maDragStat.Reset(aPnt);
}
else
{
- aDragStat.Reset(pHdl->GetPos());
+ maDragStat.Reset(pHdl->GetPos());
}
- aDragStat.SetView(static_cast<SdrView*>(this));
- aDragStat.SetPageView(mpMarkedPV); // <<-- DragPV has to go here!!!
- aDragStat.SetMinMove(ImpGetMinMovLogic(nMinMov,pOut));
- aDragStat.SetHdl(pHdl);
- aDragStat.NextPoint();
- pDragWin=pOut;
+ maDragStat.SetView(static_cast<SdrView*>(this));
+ maDragStat.SetPageView(mpMarkedPV); // <<-- DragPV has to go here!!!
+ maDragStat.SetMinMove(ImpGetMinMovLogic(nMinMov,pOut));
+ maDragStat.SetHdl(pHdl);
+ maDragStat.NextPoint();
+ mpDragWin=pOut;
mpDragHdl=pHdl;
meDragHdl= pHdl==NULL ? HDL_MOVE : pHdl->GetKind();
mbDragHdl=meDragHdl==HDL_REF1 || meDragHdl==HDL_REF2 || meDragHdl==HDL_MIRX;
@@ -484,7 +484,7 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
delete mpCurrentSdrDragMethod;
mpCurrentSdrDragMethod = pForcedMeth;
}
- aDragStat.SetDragMethod(mpCurrentSdrDragMethod);
+ maDragStat.SetDragMethod(mpCurrentSdrDragMethod);
if (mpCurrentSdrDragMethod)
{
bRet = mpCurrentSdrDragMethod->BeginSdrDrag();
@@ -502,7 +502,7 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
mbFramDrag=true;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
- aDragStat.SetDragMethod(mpCurrentSdrDragMethod);
+ maDragStat.SetDragMethod(mpCurrentSdrDragMethod);
bRet = mpCurrentSdrDragMethod->BeginSdrDrag();
}
}
@@ -510,7 +510,7 @@ bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
{
delete mpCurrentSdrDragMethod;
mpCurrentSdrDragMethod = 0;
- aDragStat.SetDragMethod(mpCurrentSdrDragMethod);
+ maDragStat.SetDragMethod(mpCurrentSdrDragMethod);
}
}
}
@@ -533,7 +533,7 @@ bool SdrDragView::EndDragObj(bool bCopy)
bool bRet(false);
// #i73341# If inserting GluePoint, do not insist on last points being different
- if(mpCurrentSdrDragMethod && aDragStat.IsMinMoved() && (IsInsertGluePoint() || aDragStat.GetNow() != aDragStat.GetPrev()))
+ if(mpCurrentSdrDragMethod && maDragStat.IsMinMoved() && (IsInsertGluePoint() || maDragStat.GetNow() != maDragStat.GetPrev()))
{
sal_uIntPtr nSavedHdlCount=0;
@@ -580,7 +580,7 @@ bool SdrDragView::EndDragObj(bool bCopy)
meDragHdl=HDL_MOVE;
mpDragHdl=NULL;
- if (!bSomeObjChgdFlag)
+ if (!mbSomeObjChgdFlag)
{
// Obj did not broadcast (e. g. Writer FlyFrames)
if(!mbDragHdl)
@@ -685,7 +685,7 @@ bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point
if (bRet)
{
- aDragStat.SetMinMoved();
+ maDragStat.SetMinMoved();
MovDragObj(rPnt);
}
}
@@ -704,12 +704,12 @@ bool SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd)
if(IsInsObjPoint())
{
sal_uInt32 nNextPnt(mnInsPointNum);
- Point aPnt(aDragStat.GetNow());
+ Point aPnt(maDragStat.GetNow());
bool bOk=EndDragObj();
if (bOk && eCmd!=SDRCREATE_FORCEEND)
{
// Ret=True means: Action is over.
- bOk=!(ImpBegInsObjPoint(true, nNextPnt, aPnt, eCmd == SDRCREATE_NEXTOBJECT, pDragWin));
+ bOk=!(ImpBegInsObjPoint(true, nNextPnt, aPnt, eCmd == SDRCREATE_NEXTOBJECT, mpDragWin));
}
return bOk;
@@ -772,7 +772,7 @@ bool SdrDragView::BegInsGluePoint(const Point& rPnt)
bRet=BegDragObj(rPnt,NULL,pHdl,0);
if (bRet)
{
- aDragStat.SetMinMoved();
+ maDragStat.SetMinMoved();
MovDragObj(rPnt);
}
else
@@ -801,7 +801,7 @@ bool SdrDragView::BegInsGluePoint(const Point& rPnt)
void SdrDragView::ShowDragObj()
{
- if(mpCurrentSdrDragMethod && !aDragStat.IsShown())
+ if(mpCurrentSdrDragMethod && !maDragStat.IsShown())
{
for(sal_uInt32 a(0); a < PaintWindowCount(); a++)
{
@@ -817,16 +817,16 @@ void SdrDragView::ShowDragObj()
}
}
- aDragStat.SetShown(true);
+ maDragStat.SetShown(true);
}
}
void SdrDragView::HideDragObj()
{
- if(mpCurrentSdrDragMethod && aDragStat.IsShown())
+ if(mpCurrentSdrDragMethod && maDragStat.IsShown())
{
mpCurrentSdrDragMethod->destroyOverlayGeometry();
- aDragStat.SetShown(false);
+ maDragStat.SetShown(false);
}
}
@@ -837,7 +837,7 @@ void SdrDragView::SetNoDragXorPolys(bool bOn)
if (IsNoDragXorPolys()!=bOn)
{
const bool bDragging(mpCurrentSdrDragMethod);
- const bool bShown(bDragging && aDragStat.IsShown());
+ const bool bShown(bDragging && maDragStat.IsShown());
if(bShown)
{
@@ -861,7 +861,7 @@ void SdrDragView::SetNoDragXorPolys(bool bOn)
void SdrDragView::SetDragStripes(bool bOn)
{
- if (mpCurrentSdrDragMethod && aDragStat.IsShown())
+ if (mpCurrentSdrDragMethod && maDragStat.IsShown())
{
HideDragObj();
mbDragStripes=bOn;
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 18830ea..b3ec685 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -106,15 +106,15 @@ SdrEditView::~SdrEditView()
SdrLayer* SdrEditView::InsertNewLayer(const OUString& rName, sal_uInt16 nPos)
{
- SdrLayerAdmin& rLA=pMod->GetLayerAdmin();
+ SdrLayerAdmin& rLA=mpModel->GetLayerAdmin();
sal_uInt16 nMax=rLA.GetLayerCount();
if (nPos>nMax) nPos=nMax;
SdrLayer* pNewLayer=rLA.NewLayer(rName,nPos);
if( GetModel()->IsUndoEnabled() )
- AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewLayer(nPos,rLA,*pMod));
+ AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewLayer(nPos,rLA,*mpModel));
- pMod->SetChanged();
+ mpModel->SetChanged();
return pNewLayer;
}
@@ -199,7 +199,7 @@ void SdrEditView::ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID)
void SdrEditView::DeleteLayer(const OUString& rName)
{
- SdrLayerAdmin& rLA = pMod->GetLayerAdmin();
+ SdrLayerAdmin& rLA = mpModel->GetLayerAdmin();
SdrLayer* pLayer = rLA.GetLayer(rName, true);
sal_uInt16 nLayerNum(rLA.GetLayerPos(pLayer));
@@ -217,12 +217,12 @@ void SdrEditView::DeleteLayer(const OUString& rName)
for(sal_uInt16 nPageKind(0); nPageKind < 2; nPageKind++)
{
// MasterPages and DrawPages
- sal_uInt16 nPgAnz(bMaPg ? pMod->GetMasterPageCount() : pMod->GetPageCount());
+ sal_uInt16 nPgAnz(bMaPg ? mpModel->GetMasterPageCount() : mpModel->GetPageCount());
for(sal_uInt16 nPgNum(0); nPgNum < nPgAnz; nPgNum++)
{
// over all pages
- SdrPage* pPage = (bMaPg) ? pMod->GetMasterPage(nPgNum) : pMod->GetPage(nPgNum);
+ SdrPage* pPage = (bMaPg) ? mpModel->GetMasterPage(nPgNum) : mpModel->GetPage(nPgNum);
const size_t nObjCount(pPage->GetObjCount());
// make sure OrdNums are correct
@@ -269,7 +269,7 @@ void SdrEditView::DeleteLayer(const OUString& rName)
if( bUndo )
{
- AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoDeleteLayer(nLayerNum, rLA, *pMod));
+ AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoDeleteLayer(nLayerNum, rLA, *mpModel));
rLA.RemoveLayer(nLayerNum);
EndUndo();
}
@@ -278,7 +278,7 @@ void SdrEditView::DeleteLayer(const OUString& rName)
delete rLA.RemoveLayer(nLayerNum);
}
- pMod->SetChanged();
+ mpModel->SetChanged();
}
}
@@ -289,7 +289,7 @@ void SdrEditView::EndUndo()
// #i13033#
// Comparison changed to 1L since EndUndo() is called later now
// and EndUndo WILL change count to count-1
- if(1L == pMod->GetUndoBracketLevel())
+ if(1L == mpModel->GetUndoBracketLevel())
{
ImpBroadcastEdgesOfMarkedNodes();
}
@@ -297,7 +297,7 @@ void SdrEditView::EndUndo()
// #i13033#
// moved to bottom to still have access to UNDOs inside of
// ImpBroadcastEdgesOfMarkedNodes()
- pMod->EndUndo();
+ mpModel->EndUndo();
}
void SdrEditView::ImpBroadcastEdgesOfMarkedNodes()
@@ -466,9 +466,9 @@ bool SdrEditView::IsDismantlePossible(bool bMakeLines) const
void SdrEditView::CheckPossibilities()
{
- if (bSomeObjChgdFlag) bPossibilitiesDirty=true;
+ if (mbSomeObjChgdFlag) bPossibilitiesDirty=true;
- if(bSomeObjChgdFlag)
+ if(mbSomeObjChgdFlag)
{
// This call IS necessary to correct the MarkList, in which
// no longer to the model belonging objects still can reside.
@@ -963,7 +963,7 @@ void SdrEditView::CopyMarkedObj()
bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, SdrInsertFlags nOptions)
{
if (nOptions & SdrInsertFlags::SETDEFLAYER) {
- SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(aAktLayer,true);
+ SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(maActualLayer,true);
if (nLayer==SDRLAYER_NOTFOUND) nLayer=0;
if (rPV.GetLockedLayers().IsSet(nLayer) || !rPV.GetVisibleLayers().IsSet(nLayer)) {
SdrObject::Free( pObj ); // Layer locked or invisible
@@ -972,8 +972,8 @@ bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, SdrInser
pObj->NbcSetLayer(nLayer);
}
if (nOptions & SdrInsertFlags::SETDEFATTR) {
- if (pDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(pDefaultStyleSheet, false);
- pObj->SetMergedItemSet(aDefaultAttr);
+ if (mpDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(mpDefaultStyleSheet, false);
+ pObj->SetMergedItemSet(maDefaultAttr);
}
if (!pObj->IsInserted()) {
SdrInsertReason aReason(SDRREASON_VIEWCALL);
@@ -1037,7 +1037,7 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO
bool SdrEditView::IsUndoEnabled() const
{
- return pMod->IsUndoEnabled();
+ return mpModel->IsUndoEnabled();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index fca61f6..fde1694 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -910,7 +910,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, bool /*bOnlyH
SfxItemSet SdrEditView::GetAttrFromMarked(bool bOnlyHardAttr) const
{
- SfxItemSet aSet(pMod->GetItemPool());
+ SfxItemSet aSet(mpModel->GetItemPool());
MergeAttrFromMarked(aSet,bOnlyHardAttr);
//the EE_FEATURE items should not be set with SetAttrToMarked (see error message there)
//so we do not set them here
@@ -1286,7 +1286,7 @@ bool SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHard
SfxItemSet SdrEditView::GetGeoAttrFromMarked() const
{
- SfxItemSet aRetSet(pMod->GetItemPool(), // SID_ATTR_TRANSFORM_... from s:svxids.hrc
+ SfxItemSet aRetSet(mpModel->GetItemPool(), // SID_ATTR_TRANSFORM_... from s:svxids.hrc
SID_ATTR_TRANSFORM_POS_X, SID_ATTR_TRANSFORM_ANGLE,
SID_ATTR_TRANSFORM_PROTECT_POS, SID_ATTR_TRANSFORM_AUTOHEIGHT,
SDRATTR_ECKENRADIUS, SDRATTR_ECKENRADIUS,
@@ -1514,7 +1514,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
bool bShear =false;
bool bSetAttr=false;
- SfxItemSet aSetAttr(pMod->GetItemPool());
+ SfxItemSet aSetAttr(mpModel->GetItemPool());
const SfxPoolItem* pPoolItem=NULL;
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 090efa7..4d6698d 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -547,7 +547,7 @@ void SdrEditView::ImpCopyAttributes(const SdrObject* pSource, SdrObject* pDest)
if(pSource && pDest)
{
- SfxItemSet aSet(pMod->GetItemPool(),
+ SfxItemSet aSet(mpModel->GetItemPool(),
SDRATTR_START, SDRATTR_NOTPERSIST_FIRST-1,
SDRATTR_NOTPERSIST_LAST+1, SDRATTR_END,
EE_ITEMS_START, EE_ITEMS_END,
@@ -765,7 +765,7 @@ void SdrEditView::DistributeMarkedObjects()
if(nMark > 2)
{
- SfxItemSet aNewAttr(pMod->GetItemPool());
+ SfxItemSet aNewAttr(mpModel->GetItemPool());
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
@@ -2070,14 +2070,14 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
if(aMetaFile.GetActionSize())
{
aLogicRect = pGraf->GetLogicRect();
- ImpSdrGDIMetaFileImport aFilter(*pMod, pObj->GetLayer(), aLogicRect);
+ ImpSdrGDIMetaFileImport aFilter(*mpModel, pObj->GetLayer(), aLogicRect);
nInsAnz = aFilter.DoImport(aMetaFile, *pOL, nInsPos, pProgrInfo);
}
}
if ( pOle2!=NULL && pOle2->GetGraphic() )
{
aLogicRect = pOle2->GetLogicRect();
- ImpSdrGDIMetaFileImport aFilter(*pMod, pObj->GetLayer(), aLogicRect);
+ ImpSdrGDIMetaFileImport aFilter(*mpModel, pObj->GetLayer(), aLogicRect);
nInsAnz = aFilter.DoImport(pOle2->GetGraphic()->GetGDIMetaFile(), *pOL, nInsPos, pProgrInfo);
}
if (nInsAnz!=0)
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 2a4c97e..f38d33f 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -150,10 +150,10 @@ void SdrObjEditView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
if (pSdrHint!=NULL && pTextEditOutliner!=NULL) {
SdrHintKind eKind=pSdrHint->GetKind();
if (eKind==HINT_REFDEVICECHG) {
- pTextEditOutliner->SetRefDevice(pMod->GetRefDevice());
+ pTextEditOutliner->SetRefDevice(mpModel->GetRefDevice());
}
if (eKind==HINT_DEFAULTTABCHG) {
- pTextEditOutliner->SetDefTab(pMod->GetDefaultTabulator());
+ pTextEditOutliner->SetDefTab(mpModel->GetDefaultTabulator());
}
if (eKind==HINT_DEFFONTHGTCHG) {
@@ -512,7 +512,7 @@ IMPL_LINK_TYPED(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI,v
}
}
}
- Outliner& rDrawOutl=pMod->GetDrawOutliner(pTextObj);
+ Outliner& rDrawOutl=mpModel->GetDrawOutliner(pTextObj);
Link<EditFieldInfo*,void> aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl();
if (!bOk && aDrawOutlLink.IsSet()) {
aDrawOutlLink.Call(pFI);
@@ -729,7 +729,7 @@ bool SdrObjEditView::SdrBeginTextEdit(
pTextEditOutlinerView->ShowCursor();
pTextEditOutliner->SetStatusEventHdl(LINK(this,SdrObjEditView,ImpOutlinerStatusEventHdl));
#ifdef DBG_UTIL
- if (pItemBrowser!=nullptr) pItemBrowser->SetDirty();
+ if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty();
#endif
pTextEditOutliner->ClearModifyFlag();
@@ -1042,10 +1042,10 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
GetMarkedObjectListWriteAccess().SetNameDirty();
}
#ifdef DBG_UTIL
- if (pItemBrowser)
+ if (mpItemBrowser)
{
GetMarkedObjectListWriteAccess().SetNameDirty();
- pItemBrowser->SetDirty();
+ mpItemBrowser->SetDirty();
}
#endif
}
@@ -1197,15 +1197,15 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin)
{
if (pTextEditOutlinerView->PostKeyEvent(rKEvt, pWin))
{
- if( pMod )
+ if( mpModel )
{
if( pTextEditOutliner && pTextEditOutliner->IsModified() )
- pMod->SetChanged();
+ mpModel->SetChanged();
}
if (pWin!=NULL && pWin!=pTextEditWin) SetTextEditWin(pWin);
#ifdef DBG_UTIL
- if (pItemBrowser!=nullptr) pItemBrowser->SetDirty();
+ if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
return true;
@@ -1222,7 +1222,7 @@ bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin)
Point aPt(rMEvt.GetPosPixel());
if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
else if (pTextEditWin!=nullptr) aPt=pTextEditWin->PixelToLogic(aPt);
- bPostIt=IsTextEditHit(aPt,nHitTolLog);
+ bPostIt=IsTextEditHit(aPt,mnHitTolLog);
}
if (bPostIt) {
Point aPixPos(rMEvt.GetPosPixel());
@@ -1239,7 +1239,7 @@ bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin)
if (pTextEditOutlinerView->MouseButtonDown(aMEvt)) {
if (pWin!=NULL && pWin!=pTextEditWin) SetTextEditWin(pWin);
#ifdef DBG_UTIL
- if (pItemBrowser!=nullptr) pItemBrowser->SetDirty();
+ if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
return true;
@@ -1257,7 +1257,7 @@ bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin)
Point aPt(rMEvt.GetPosPixel());
if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
else if (pTextEditWin!=nullptr) aPt=pTextEditWin->PixelToLogic(aPt);
- bPostIt=IsTextEditHit(aPt,nHitTolLog);
+ bPostIt=IsTextEditHit(aPt,mnHitTolLog);
}
if (bPostIt) {
Point aPixPos(rMEvt.GetPosPixel());
@@ -1270,7 +1270,7 @@ bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin)
rMEvt.GetButtons(),rMEvt.GetModifier());
if (pTextEditOutlinerView->MouseButtonUp(aMEvt)) {
#ifdef DBG_UTIL
- if (pItemBrowser!=nullptr) pItemBrowser->SetDirty();
+ if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
return true;
@@ -1291,7 +1291,7 @@ bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin)
aPt=pWin->PixelToLogic(aPt);
else if (pTextEditWin)
aPt=pTextEditWin->PixelToLogic(aPt);
- bPostIt=IsTextEditHit(aPt,nHitTolLog);
+ bPostIt=IsTextEditHit(aPt,mnHitTolLog);
}
if (bPostIt) {
Point aPixPos(rMEvt.GetPosPixel());
@@ -1308,7 +1308,7 @@ bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin)
rMEvt.GetButtons(),rMEvt.GetModifier());
if (pTextEditOutlinerView->MouseMove(aMEvt) && bSelMode) {
#ifdef DBG_UTIL
- if (pItemBrowser!=nullptr) pItemBrowser->SetDirty();
+ if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
return true;
@@ -1329,7 +1329,7 @@ bool SdrObjEditView::Command(const CommandEvent& rCEvt, vcl::Window* pWin)
Point aPt(rCEvt.GetMousePosPixel());
if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
else if (pTextEditWin!=nullptr) aPt=pTextEditWin->PixelToLogic(aPt);
- bPostIt=IsTextEditHit(aPt,nHitTolLog);
+ bPostIt=IsTextEditHit(aPt,mnHitTolLog);
}
if (bPostIt) {
Point aPixPos(rCEvt.GetMousePosPixel());
@@ -1345,7 +1345,7 @@ bool SdrObjEditView::Command(const CommandEvent& rCEvt, vcl::Window* pWin)
pTextEditOutlinerView->Command(aCEvt);
if (pWin!=NULL && pWin!=pTextEditWin) SetTextEditWin(pWin);
#ifdef DBG_UTIL
- if (pItemBrowser!=nullptr) pItemBrowser->SetDirty();
+ if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
return true;
@@ -1569,7 +1569,7 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll)
// Now we build an ItemSet aSet that doesn't contain EE_Items from
// *pSet (otherwise it would be a copy).
sal_uInt16* pNewWhichTable=RemoveWhichRange(pSet->GetRanges(),EE_ITEMS_START,EE_ITEMS_END);
- SfxItemSet aSet(pMod->GetItemPool(),pNewWhichTable);
+ SfxItemSet aSet(mpModel->GetItemPool(),pNewWhichTable);
delete[] pNewWhichTable;
SfxWhichIter aIter(aSet);
sal_uInt16 nWhich=aIter.FirstWhich();
@@ -1616,8 +1616,8 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll)
pTextEditOutlinerView->SetAttribs(rSet);
#ifdef DBG_UTIL
- if (pItemBrowser!=nullptr)
- pItemBrowser->SetDirty();
+ if (mpItemBrowser!=nullptr)
+ mpItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index 7f2faba..cf771b1 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -81,7 +81,7 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, co
}
}
}
- if (!bConst && nMarkCount!=0) pMod->SetChanged();
+ if (!bConst && nMarkCount!=0) mpModel->SetChanged();
}
@@ -262,7 +262,7 @@ void SdrGlueEditView::DeleteMarkedGluePoints()
EndUndo();
UnmarkAllGluePoints();
if (nMarkCount!=0)
- pMod->SetChanged();
+ mpModel->SetChanged();
}
@@ -312,7 +312,7 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints()
EndUndo();
if (nMarkCount!=0)
- pMod->SetChanged();
+ mpModel->SetChanged();
}
@@ -348,7 +348,7 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo
}
}
}
- if (nMarkCount!=0) pMod->SetChanged();
+ if (nMarkCount!=0) mpModel->SetChanged();
}
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index d281507..dbb3582 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -272,7 +272,7 @@ void SdrMarkView::TakeActionRect(Rectangle& rRect) const
{
if(IsMarkObj() || IsMarkPoints() || IsMarkGluePoints())
{
- rRect = Rectangle(aDragStat.GetStart(), aDragStat.GetNow());
+ rRect = Rectangle(maDragStat.GetStart(), maDragStat.GetNow());
}
else
{
@@ -321,18 +321,18 @@ bool SdrMarkView::BegMarkObj(const Point& rPnt, bool bUnmark)
basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y());
mpMarkObjOverlay = new ImplMarkingOverlay(*this, aStartPos, bUnmark);
- aDragStat.Reset(rPnt);
- aDragStat.NextPoint();
- aDragStat.SetMinMove(nMinMovLog);
+ maDragStat.Reset(rPnt);
+ maDragStat.NextPoint();
+ maDragStat.SetMinMove(mnMinMovLog);
return true;
}
void SdrMarkView::MovMarkObj(const Point& rPnt)
{
- if(IsMarkObj() && aDragStat.CheckMinMoved(rPnt))
+ if(IsMarkObj() && maDragStat.CheckMinMoved(rPnt))
{
- aDragStat.NextMove(rPnt);
+ maDragStat.NextMove(rPnt);
DBG_ASSERT(mpMarkObjOverlay, "SdrSnapView::MovSetPageOrg: no ImplPageOriginOverlay (!)");
basegfx::B2DPoint aNewPos(rPnt.X(), rPnt.Y());
mpMarkObjOverlay->SetSecondPosition(aNewPos);
@@ -345,9 +345,9 @@ bool SdrMarkView::EndMarkObj()
if(IsMarkObj())
{
- if(aDragStat.IsMinMoved())
+ if(maDragStat.IsMinMoved())
{
- Rectangle aRect(aDragStat.GetStart(), aDragStat.GetNow());
+ Rectangle aRect(maDragStat.GetStart(), maDragStat.GetNow());
aRect.Justify();
MarkObj(aRect, mpMarkObjOverlay->IsUnmarking());
bRetval = true;
@@ -382,9 +382,9 @@ bool SdrMarkView::BegMarkPoints(const Point& rPnt, bool bUnmark)
basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y());
mpMarkPointsOverlay = new ImplMarkingOverlay(*this, aStartPos, bUnmark);
- aDragStat.Reset(rPnt);
- aDragStat.NextPoint();
- aDragStat.SetMinMove(nMinMovLog);
+ maDragStat.Reset(rPnt);
+ maDragStat.NextPoint();
+ maDragStat.SetMinMove(mnMinMovLog);
return true;
}
@@ -394,9 +394,9 @@ bool SdrMarkView::BegMarkPoints(const Point& rPnt, bool bUnmark)
void SdrMarkView::MovMarkPoints(const Point& rPnt)
{
- if(IsMarkPoints() && aDragStat.CheckMinMoved(rPnt))
+ if(IsMarkPoints() && maDragStat.CheckMinMoved(rPnt))
{
- aDragStat.NextMove(rPnt);
+ maDragStat.NextMove(rPnt);
DBG_ASSERT(mpMarkPointsOverlay, "SdrSnapView::MovSetPageOrg: no ImplPageOriginOverlay (!)");
basegfx::B2DPoint aNewPos(rPnt.X(), rPnt.Y());
@@ -410,9 +410,9 @@ bool SdrMarkView::EndMarkPoints()
if(IsMarkPoints())
{
- if(aDragStat.IsMinMoved())
+ if(maDragStat.IsMinMoved())
{
- Rectangle aRect(aDragStat.GetStart(), aDragStat.GetNow());
+ Rectangle aRect(maDragStat.GetStart(), maDragStat.GetNow());
aRect.Justify();
MarkPoints(aRect, mpMarkPointsOverlay->IsUnmarking());
@@ -448,9 +448,9 @@ bool SdrMarkView::BegMarkGluePoints(const Point& rPnt, bool bUnmark)
basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y());
mpMarkGluePointsOverlay = new ImplMarkingOverlay(*this, aStartPos, bUnmark);
- aDragStat.Reset(rPnt);
- aDragStat.NextPoint();
- aDragStat.SetMinMove(nMinMovLog);
+ maDragStat.Reset(rPnt);
+ maDragStat.NextPoint();
+ maDragStat.SetMinMove(mnMinMovLog);
return true;
}
@@ -460,9 +460,9 @@ bool SdrMarkView::BegMarkGluePoints(const Point& rPnt, bool bUnmark)
void SdrMarkView::MovMarkGluePoints(const Point& rPnt)
{
- if(IsMarkGluePoints() && aDragStat.CheckMinMoved(rPnt))
+ if(IsMarkGluePoints() && maDragStat.CheckMinMoved(rPnt))
{
- aDragStat.NextMove(rPnt);
+ maDragStat.NextMove(rPnt);
DBG_ASSERT(mpMarkGluePointsOverlay, "SdrSnapView::MovSetPageOrg: no ImplPageOriginOverlay (!)");
basegfx::B2DPoint aNewPos(rPnt.X(), rPnt.Y());
@@ -476,9 +476,9 @@ bool SdrMarkView::EndMarkGluePoints()
if(IsMarkGluePoints())
{
- if(aDragStat.IsMinMoved())
+ if(maDragStat.IsMinMoved())
{
- Rectangle aRect(aDragStat.GetStart(),aDragStat.GetNow());
+ Rectangle aRect(maDragStat.GetStart(),maDragStat.GetNow());
aRect.Justify();
MarkGluePoints(&aRect, mpMarkGluePointsOverlay->IsUnmarking());
@@ -1353,7 +1353,7 @@ bool SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const
SdrHdl* SdrMarkView::PickHandle(const Point& rPnt, SdrSearchOptions nOptions, SdrHdl* pHdl0) const
{
- if (bSomeObjChgdFlag) { // recalculate handles, if necessary
+ if (mbSomeObjChgdFlag) { // recalculate handles, if necessary
FlushComeBackTimer();
}
bool bBack(nOptions & SdrSearchOptions::BACKWARD);
@@ -1865,7 +1865,7 @@ bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie
rpObj=NULL;
rpPV=NULL;
Point aPt(rPnt);
- sal_uInt16 nTol=(sal_uInt16)nHitTolLog;
+ sal_uInt16 nTol=(sal_uInt16)mnHitTolLog;
bool bFnd=false;
const size_t nMarkCount=GetMarkedObjectCount();
for (size_t nMarkNum=nMarkCount; nMarkNum>0 && !bFnd;) {
@@ -2091,7 +2091,7 @@ void SdrMarkView::MarkListHasChanged()
mbMarkedObjRectDirty=true;
mbMarkedPointsRectsDirty=true;
#ifdef DBG_UTIL
- if (pItemBrowser!=nullptr) pItemBrowser->SetDirty();
+ if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty();
#endif
bool bOneEdgeMarked=false;
if (GetMarkedObjectCount()==1) {
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 87f1630..61b241c 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -475,7 +475,7 @@ bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16
if (!IsGluePointEditMode()) return false;
bool bBack(nOptions & SdrSearchOptions::BACKWARD);
bool bNext(nOptions & SdrSearchOptions::NEXT);
- OutputDevice* pOut=pActualOutDev.get();
+ OutputDevice* pOut=mpActualOutDev.get();
if (pOut==NULL) pOut=GetFirstOutputDevice();
if (pOut==NULL) return false;
SortMarkedObjects();
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index bb28b3a..f8c9a27 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -424,10 +424,10 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
if (GetPage()==NULL)
return;
- long nx1=GetView().aGridBig.Width();
- long nx2=GetView().aGridFin.Width();
- long ny1=GetView().aGridBig.Height();
- long ny2=GetView().aGridFin.Height();
+ long nx1=GetView().maGridBig.Width();
+ long nx2=GetView().maGridFin.Width();
+ long ny1=GetView().maGridBig.Height();
+ long ny2=GetView().maGridFin.Height();
if (nx1==0) nx1=nx2;
if (nx2==0) nx2=nx1;
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 738f092..94e03e3 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -161,48 +161,48 @@ TYPEINIT2(SdrPaintView,SfxListener,SfxRepeatTarget);
void SdrPaintView::ImpClearVars()
{
#ifdef DBG_UTIL
- pItemBrowser=NULL;
+ mpItemBrowser=NULL;
#endif
- bPageVisible=true;
- bPageBorderVisible=true;
- bBordVisible=true;
- bGridVisible=true;
- bGridFront =false;
- bHlplVisible=true;
- bHlplFront =true;
- bGlueVisible=false;
- bGlueVisible2=false;
- bGlueVisible3=false;
- bGlueVisible4=false;
- bSwapAsynchron=false;
- bPrintPreview=false;
+ mbPageVisible=true;
+ mbPageBorderVisible=true;
+ mbBordVisible=true;
+ mbGridVisible=true;
+ mbGridFront =false;
+ mbHlplVisible=true;
+ mbHlplFront =true;
+ mbGlueVisible=false;
+ mbGlueVisible2=false;
+ mbGlueVisible3=false;
+ mbGlueVisible4=false;
+ mbSwapAsynchron=false;
+ mbPrintPreview=false;
mbPreviewRenderer=false;
- eAnimationMode = SDR_ANIMATION_ANIMATE;
- bAnimationPause = false;
-
- nHitTolPix=2;
- nMinMovPix=3;
- nHitTolLog=0;
- nMinMovLog=0;
- pActualOutDev=NULL;
- pDragWin=NULL;
- bRestoreColors=true;
- pDefaultStyleSheet=NULL;
- bSomeObjChgdFlag=false;
- nGraphicManagerDrawMode = GraphicManagerDrawFlags::STANDARD;
- aComeBackIdle.SetPriority(SchedulerPriority::REPAINT);
- aComeBackIdle.SetIdleHdl(LINK(this,SdrPaintView,ImpComeBackHdl));
-
- if (pMod)
- SetDefaultStyleSheet(pMod->GetDefaultStyleSheet(), true);
+ meAnimationMode = SDR_ANIMATION_ANIMATE;
+ mbAnimationPause = false;
+
+ mnHitTolPix=2;
+ mnMinMovPix=3;
+ mnHitTolLog=0;
+ mnMinMovLog=0;
+ mpActualOutDev=NULL;
+ mpDragWin=NULL;
+ mbRestoreColors=true;
+ mpDefaultStyleSheet=NULL;
+ mbSomeObjChgdFlag=false;
+ mnGraphicManagerDrawMode = GraphicManagerDrawFlags::STANDARD;
+ maComeBackIdle.SetPriority(SchedulerPriority::REPAINT);
+ maComeBackIdle.SetIdleHdl(LINK(this,SdrPaintView,ImpComeBackHdl));
+
+ if (mpModel)
+ SetDefaultStyleSheet(mpModel->GetDefaultStyleSheet(), true);
maGridColor = Color( COL_BLACK );
}
-SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut)
+SdrPaintView::SdrPaintView(SdrModel* pModel, OutputDevice* pOut)
: mpPageView(NULL),
- aDefaultAttr(pModel1->GetItemPool()),
+ maDefaultAttr(pModel->GetItemPool()),
mbBufferedOutputAllowed(false),
mbBufferedOverlayAllowed(false),
mbPagePaintingAllowed(true),
@@ -211,7 +211,7 @@ SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut)
mbHideDraw(false),
mbHideFormControl(false)
{
- pMod=pModel1;
+ mpModel=pModel;
ImpClearVars();
if(pOut)
@@ -220,7 +220,7 @@ SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut)
}
// flag to visualize groups
- bVisualizeEnteredGroup = true;
+ mbVisualizeEnteredGroup = true;
maColorConfig.AddListener(this);
onChangeColorConfig();
@@ -228,14 +228,14 @@ SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut)
SdrPaintView::~SdrPaintView()
{
- if (pDefaultStyleSheet)
- EndListening(*pDefaultStyleSheet);
+ if (mpDefaultStyleSheet)
+ EndListening(*mpDefaultStyleSheet);
maColorConfig.RemoveListener(this);
ClearPageView();
#ifdef DBG_UTIL
- pItemBrowser.disposeAndClear();
+ mpItemBrowser.disposeAndClear();
#endif
// delete existing SdrPaintWindows
@@ -251,23 +251,23 @@ SdrPaintView::~SdrPaintView()
void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
//If the stylesheet has been destroyed
- if (&rBC == pDefaultStyleSheet)
+ if (&rBC == mpDefaultStyleSheet)
{
const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
if (pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING)
- pDefaultStyleSheet = NULL;
+ mpDefaultStyleSheet = NULL;
return;
}
- bool bObjChg=!bSomeObjChgdFlag; // if true, evaluate for ComeBack timer
+ bool bObjChg=!mbSomeObjChgdFlag; // if true, evaluate for ComeBack timer
if (bObjChg) {
const SdrHint* pSdrHint = dynamic_cast<const SdrHint*>(&rHint);
if (pSdrHint) {
SdrHintKind eKind=pSdrHint->GetKind();
if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED) {
if (bObjChg) {
- bSomeObjChgdFlag=true;
- aComeBackIdle.Start();
+ mbSomeObjChgdFlag=true;
+ maComeBackIdle.Start();
}
}
if (eKind==HINT_PAGEORDERCHG) {
@@ -295,18 +295,18 @@ void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , sal_
IMPL_LINK_NOARG_TYPED(SdrPaintView, ImpComeBackHdl, Idle *, void)
{
- if (bSomeObjChgdFlag) {
- bSomeObjChgdFlag=false;
+ if (mbSomeObjChgdFlag) {
+ mbSomeObjChgdFlag=false;
ModelHasChanged();
}
}
void SdrPaintView::FlushComeBackTimer() const
{
- if (bSomeObjChgdFlag) {
+ if (mbSomeObjChgdFlag) {
// casting to nonconst
- const_cast<SdrPaintView*>(this)->ImpComeBackHdl(&const_cast<SdrPaintView*>(this)->aComeBackIdle);
- const_cast<SdrPaintView*>(this)->aComeBackIdle.Stop();
+ const_cast<SdrPaintView*>(this)->ImpComeBackHdl(&const_cast<SdrPaintView*>(this)->maComeBackIdle);
+ const_cast<SdrPaintView*>(this)->maComeBackIdle.Stop();
}
}
@@ -325,9 +325,9 @@ void SdrPaintView::ModelHasChanged()
}
#ifdef DBG_UTIL
- if(pItemBrowser)
+ if(mpItemBrowser)
{
- pItemBrowser->SetDirty();
+ mpItemBrowser->SetDirty();
}
#endif
}
@@ -404,15 +404,15 @@ sal_uInt16 SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pO
void SdrPaintView::TheresNewMapMode()
{
- if (pActualOutDev) {
- nHitTolLog=(sal_uInt16)pActualOutDev->PixelToLogic(Size(nHitTolPix,0)).Width();
- nMinMovLog=(sal_uInt16)pActualOutDev->PixelToLogic(Size(nMinMovPix,0)).Width();
+ if (mpActualOutDev) {
+ mnHitTolLog=(sal_uInt16)mpActualOutDev->PixelToLogic(Size(mnHitTolPix,0)).Width();
+ mnMinMovLog=(sal_uInt16)mpActualOutDev->PixelToLogic(Size(mnMinMovPix,0)).Width();
}
}
void SdrPaintView::SetActualWin(const OutputDevice* pWin)
{
- pActualOutDev = const_cast<OutputDevice *>(pWin);
+ mpActualOutDev = const_cast<OutputDevice *>(pWin);
TheresNewMapMode();
}
@@ -469,8 +469,8 @@ void SdrPaintView::AddWindowToPaintView(OutputDevice* pNewWin, vcl::Window *pWin
}
#ifdef DBG_UTIL
- if (pItemBrowser!=nullptr)
- pItemBrowser->ForceParent();
+ if (mpItemBrowser!=nullptr)
+ mpItemBrowser->ForceParent();
#endif
}
@@ -491,8 +491,8 @@ void SdrPaintView::DeleteWindowFromPaintView(OutputDevice* pOldWin)
}
#ifdef DBG_UTIL
- if (pItemBrowser!=nullptr)
- pItemBrowser->ForceParent();
+ if (mpItemBrowser!=nullptr)
+ mpItemBrowser->ForceParent();
#endif
}
@@ -1006,15 +1006,15 @@ void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, bool /*bRep
const SfxPoolItem *pPoolItem=NULL;
if (rAttr.GetItemState(SDRATTR_LAYERID,true,&pPoolItem)==SfxItemState::SET) {
SdrLayerID nLayerId=static_cast<const SdrLayerIdItem*>(pPoolItem)->GetValue();
- const SdrLayer* pLayer=pMod->GetLayerAdmin().GetLayerPerID(nLayerId);
+ const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayerPerID(nLayerId);
if (pLayer!=NULL) {
- if (bMeasure) aMeasureLayer=pLayer->GetName();
- else aAktLayer=pLayer->GetName();
+ if (bMeasure) maMeasureLayer=pLayer->GetName();
+ else maActualLayer=pLayer->GetName();
}
}
if (rAttr.GetItemState(SDRATTR_LAYERNAME,true,&pPoolItem)==SfxItemState::SET) {
- if (bMeasure) aMeasureLayer=static_cast<const SdrLayerNameItem*>(pPoolItem)->GetValue();
- else aAktLayer=static_cast<const SdrLayerNameItem*>(pPoolItem)->GetValue();
+ if (bMeasure) maMeasureLayer=static_cast<const SdrLayerNameItem*>(pPoolItem)->GetValue();
+ else maActualLayer=static_cast<const SdrLayerNameItem*>(pPoolItem)->GetValue();
}
}
@@ -1022,9 +1022,9 @@ void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, bool /*bOnlyHar
{
// bOnlyHardAttr has no effect here at all.
bool bMeasure=ISA(SdrView) && static_cast<const SdrView*>(this)->IsMeasureTool();
- const OUString& aNam = bMeasure ? aMeasureLayer : aAktLayer;
+ const OUString& aNam = bMeasure ? maMeasureLayer : maActualLayer;
rAttr.Put(SdrLayerNameItem(aNam));
- SdrLayerID nLayer=pMod->GetLayerAdmin().GetLayerID(aNam,true);
+ SdrLayerID nLayer=mpModel->GetLayerAdmin().GetLayerID(aNam,true);
if (nLayer!=SDRLAYER_NOTFOUND) {
rAttr.Put(SdrLayerIdItem(nLayer));
}
@@ -1052,48 +1052,48 @@ void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll)
}
}
#endif
- if (bReplaceAll) aDefaultAttr.Set(rAttr);
- else aDefaultAttr.Put(rAttr,false); // if FALSE, regard InvalidItems as "holes," not as Default
+ if (bReplaceAll) maDefaultAttr.Set(rAttr);
+ else maDefaultAttr.Put(rAttr,false); // if FALSE, regard InvalidItems as "holes," not as Default
SetNotPersistDefaultAttr(rAttr,bReplaceAll);
#ifdef DBG_UTIL
- if (pItemBrowser!=nullptr) pItemBrowser->SetDirty();
+ if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty();
#endif
}
void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr)
{
- if (pDefaultStyleSheet)
- EndListening(*pDefaultStyleSheet);
- pDefaultStyleSheet=pStyleSheet;
- if (pDefaultStyleSheet)
- StartListening(*pDefaultStyleSheet);
+ if (mpDefaultStyleSheet)
+ EndListening(*mpDefaultStyleSheet);
+ mpDefaultStyleSheet=pStyleSheet;
+ if (mpDefaultStyleSheet)
+ StartListening(*mpDefaultStyleSheet);
if (pStyleSheet!=NULL && !bDontRemoveHardAttr) {
SfxWhichIter aIter(pStyleSheet->GetItemSet());
sal_uInt16 nWhich=aIter.FirstWhich();
while (nWhich!=0) {
if (pStyleSheet->GetItemSet().GetItemState(nWhich,true)==SfxItemState::SET) {
- aDefaultAttr.ClearItem(nWhich);
+ maDefaultAttr.ClearItem(nWhich);
}
nWhich=aIter.NextWhich();
}
}
#ifdef DBG_UTIL
- if (pItemBrowser!=nullptr) pItemBrowser->SetDirty();
+ if (mpItemBrowser!=nullptr) mpItemBrowser->SetDirty();
#endif
}
bool SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const
{
- if(bOnlyHardAttr || !pDefaultStyleSheet)
+ if(bOnlyHardAttr || !mpDefaultStyleSheet)
{
- rTargetSet.Put(aDefaultAttr, false);
+ rTargetSet.Put(maDefaultAttr, false);
}
else
{
// else merge with DefStyleSheet
- rTargetSet.Put(pDefaultStyleSheet->GetItemSet(), false);
- rTargetSet.Put(aDefaultAttr, false);
+ rTargetSet.Put(mpDefaultStyleSheet->GetItemSet(), false);
+ rTargetSet.Put(maDefaultAttr, false);
}
MergeNotPersistDefaultAttr(rTargetSet, bOnlyHardAttr);
return true;
@@ -1122,15 +1122,15 @@ bool SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHar
void SdrPaintView::ShowItemBrowser(bool bShow)
{
if (bShow) {
- if (pItemBrowser==nullptr) {
- pItemBrowser=VclPtr<SdrItemBrowser>::Create(*static_cast<SdrView*>(this));
+ if (mpItemBrowser==nullptr) {
+ mpItemBrowser=VclPtr<SdrItemBrowser>::Create(*static_cast<SdrView*>(this));
}
- pItemBrowser->Show();
- pItemBrowser->GrabFocus();
+ mpItemBrowser->Show();
+ mpItemBrowser->GrabFocus();
} else {
- if (pItemBrowser!=nullptr) {
- pItemBrowser->Hide();
- pItemBrowser.disposeAndClear();
+ if (mpItemBrowser!=nullptr) {
+ mpItemBrowser->Hide();
+ mpItemBrowser.disposeAndClear();
}
}
}
@@ -1197,15 +1197,15 @@ void SdrPaintView::SetAnimationEnabled( bool bEnable )
#if defined DBG_UTIL
vcl::Window* SdrPaintView::GetItemBrowser() const
{
- return pItemBrowser;
+ return mpItemBrowser;
}
#endif
void SdrPaintView::SetAnimationPause( bool bSet )
{
- if((bool)bAnimationPause != bSet)
+ if((bool)mbAnimationPause != bSet)
{
- bAnimationPause = bSet;
+ mbAnimationPause = bSet;
if(mpPageView)
{
@@ -1226,7 +1226,7 @@ void SdrPaintView::SetAnimationPause( bool bSet )
void SdrPaintView::SetAnimationMode( const SdrAnimationMode eMode )
{
- eAnimationMode = eMode;
+ meAnimationMode = eMode;
}
void SdrPaintView::VisAreaChanged(const OutputDevice* pOut)
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index ba2cc9d..2dc72ae 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -258,7 +258,7 @@ void SdrSnapView::BrkAction()
void SdrSnapView::TakeActionRect(Rectangle& rRect) const
{
if (IsSetPageOrg() || IsDragHelpLine()) {
- rRect=Rectangle(aDragStat.GetNow(),aDragStat.GetNow());
+ rRect=Rectangle(maDragStat.GetNow(),maDragStat.GetNow());
} else {
SdrPaintView::TakeActionRect(rRect);
}
@@ -289,7 +289,7 @@ SdrSnap SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
long dx1,dy1;
long mx=aMagnSiz.Width();
long my=aMagnSiz.Height();
- if (bHlplVisible && bHlplSnap && !IsDragHelpLine())
+ if (mbHlplVisible && bHlplSnap && !IsDragHelpLine())
{
const SdrHelpLineList& rHLL=pPV->GetHelpLines();
sal_uInt16 nCount=rHLL.GetCount();
@@ -317,7 +317,7 @@ SdrSnap SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
} // switch
}
}
- if (bBordVisible && bBordSnap) {
+ if (mbBordVisible && bBordSnap) {
SdrPage* pPage=pPV->GetPage();
long xs=pPage->GetWdt();
long ys=pPage->GetHgt();
@@ -460,7 +460,7 @@ bool SdrSnapView::BegSetPageOrg(const Point& rPnt)
DBG_ASSERT(0L == mpPageOriginOverlay, "SdrSnapView::BegSetPageOrg: There exists a ImplPageOriginOverlay (!)");
basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y());
mpPageOriginOverlay = new ImplPageOriginOverlay(*this, aStartPos);
- aDragStat.Reset(GetSnapPos(rPnt,NULL));
+ maDragStat.Reset(GetSnapPos(rPnt,NULL));
return true;
}
@@ -469,9 +469,9 @@ void SdrSnapView::MovSetPageOrg(const Point& rPnt)
{
if(IsSetPageOrg())
{
- aDragStat.NextMove(GetSnapPos(rPnt,NULL));
+ maDragStat.NextMove(GetSnapPos(rPnt,NULL));
DBG_ASSERT(mpPageOriginOverlay, "SdrSnapView::MovSetPageOrg: no ImplPageOriginOverlay (!)");
- basegfx::B2DPoint aNewPos(aDragStat.GetNow().X(), aDragStat.GetNow().Y());
+ basegfx::B2DPoint aNewPos(maDragStat.GetNow().X(), maDragStat.GetNow().Y());
mpPageOriginOverlay->SetPosition(aNewPos);
}
}
@@ -486,7 +486,7 @@ bool SdrSnapView::EndSetPageOrg()
if(pPV)
{
- Point aPnt(aDragStat.GetNow());
+ Point aPnt(maDragStat.GetNow());
pPV->SetPageOrigin(aPnt);
bRet = true;
}
@@ -548,8 +548,8 @@ bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV)
DBG_ASSERT(0L == mpHelpLineOverlay, "SdrSnapView::BegDragHelpLine: There exists a ImplHelpLineOverlay (!)");
mpHelpLineOverlay = new ImplHelpLineOverlay(*this, aStartPos, pPV, nHelpLineNum, rHelpLine.GetKind());
- aDragStat.Reset(GetSnapPos(aHelpLinePos, pPV));
- aDragStat.SetMinMove(ImpGetMinMovLogic(-3, 0L));
+ maDragStat.Reset(GetSnapPos(aHelpLinePos, pPV));
+ maDragStat.SetMinMove(ImpGetMinMovLogic(-3, 0L));
bRet = true;
}
@@ -570,7 +570,7 @@ bool SdrSnapView::BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind)
DBG_ASSERT(0L == mpHelpLineOverlay, "SdrSnapView::BegDragHelpLine: There exists a ImplHelpLineOverlay (!)");
basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y());
mpHelpLineOverlay = new ImplHelpLineOverlay(*this, aStartPos, 0L, 0, eNewKind);
- aDragStat.Reset(GetSnapPos(rPnt, 0L));
+ maDragStat.Reset(GetSnapPos(rPnt, 0L));
bRet = true;
}
@@ -594,15 +594,15 @@ Pointer SdrSnapView::GetDraggedHelpLinePointer() const
void SdrSnapView::MovDragHelpLine(const Point& rPnt)
{
- if(IsDragHelpLine() && aDragStat.CheckMinMoved(rPnt))
+ if(IsDragHelpLine() && maDragStat.CheckMinMoved(rPnt))
{
Point aPnt(GetSnapPos(rPnt, 0L));
- if(aPnt != aDragStat.GetNow())
+ if(aPnt != maDragStat.GetNow())
{
- aDragStat.NextMove(aPnt);
+ maDragStat.NextMove(aPnt);
DBG_ASSERT(mpHelpLineOverlay, "SdrSnapView::MovDragHelpLine: no ImplHelpLineOverlay (!)");
- basegfx::B2DPoint aNewPos(aDragStat.GetNow().X(), aDragStat.GetNow().Y());
+ basegfx::B2DPoint aNewPos(maDragStat.GetNow().X(), maDragStat.GetNow().Y());
mpHelpLineOverlay->SetPosition(aNewPos);
}
}
@@ -614,14 +614,14 @@ bool SdrSnapView::EndDragHelpLine()
if(IsDragHelpLine())
{
- if(aDragStat.IsMinMoved())
+ if(maDragStat.IsMinMoved())
{
SdrPageView* pPageView = mpHelpLineOverlay->GetPageView();
if(pPageView)
{
// moved existing one
- Point aPnt(aDragStat.GetNow());
+ Point aPnt(maDragStat.GetNow());
const SdrHelpLineList& rHelpLines = pPageView->GetHelpLines();
SdrHelpLine aChangedHelpLine = rHelpLines[mpHelpLineOverlay->GetHelpLineNumber()];
aChangedHelpLine.SetPos(aPnt);
@@ -636,7 +636,7 @@ bool SdrSnapView::EndDragHelpLine()
if(pPageView)
{
- Point aPnt(aDragStat.GetNow());
+ Point aPnt(maDragStat.GetNow());
SdrHelpLine aNewHelpLine(mpHelpLineOverlay->GetHelpLineKind(), aPnt);
pPageView->InsertHelpLine(aNewHelpLine);
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index ae95ec1..775da20 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -186,9 +186,9 @@ bool SdrView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin)
case KeyFuncType::COPY : Yank(); break;
case KeyFuncType::PASTE : Paste(pWin); break;
case KeyFuncType::DELETE: DeleteMarked(); break;
- case KeyFuncType::UNDO: pMod->Undo(); break;
- case KeyFuncType::REDO: pMod->Redo(); break;
- case KeyFuncType::REPEAT: pMod->Repeat(*this); break;
+ case KeyFuncType::UNDO: mpModel->Undo(); break;
+ case KeyFuncType::REDO: mpModel->Redo(); break;
+ case KeyFuncType::REPEAT: mpModel->Repeat(*this); break;
default: {
switch (rKEvt.GetKeyCode().GetFullCode()) {
case KEY_ESCAPE: {
@@ -200,9 +200,9 @@ bool SdrView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin)
case KEY_CUT: case KEY_DELETE+KEY_SHIFT: Cut(); break;
case KEY_COPY: case KEY_INSERT+KEY_MOD1: Yank(); break;
case KEY_PASTE: case KEY_INSERT+KEY_SHIFT: Paste(pWin); break;
- case KEY_UNDO: case KEY_BACKSPACE+KEY_MOD2: pMod->Undo(); break;
- case KEY_BACKSPACE+KEY_MOD2+KEY_SHIFT: pMod->Redo(); break;
- case KEY_REPEAT: case KEY_BACKSPACE+KEY_MOD2+KEY_MOD1: pMod->Repeat(*this); break;
+ case KEY_UNDO: case KEY_BACKSPACE+KEY_MOD2: mpModel->Undo(); break;
+ case KEY_BACKSPACE+KEY_MOD2+KEY_SHIFT: mpModel->Redo(); break;
+ case KEY_REPEAT: case KEY_BACKSPACE+KEY_MOD2+KEY_MOD1: mpModel->Repeat(*this); break;
case KEY_MOD1+KEY_A: MarkAll(); break;
default: bRet=false;
} // switch
@@ -221,7 +221,7 @@ bool SdrView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin)
bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin)
{
SetActualWin(pWin);
- if (rMEvt.IsLeft()) aDragStat.SetMouseDown(true);
+ if (rMEvt.IsLeft()) maDragStat.SetMouseDown(true);
bool bRet = SdrCreateView::MouseButtonDown(rMEvt,pWin);
if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) {
SdrViewEvent aVEvt;
@@ -234,7 +234,7 @@ bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin)
bool SdrView::MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin)
{
SetActualWin(pWin);
- if (rMEvt.IsLeft()) aDragStat.SetMouseDown(false);
+ if (rMEvt.IsLeft()) maDragStat.SetMouseDown(false);
bool bAction = IsAction();
bool bRet = !bAction && SdrCreateView::MouseButtonUp(rMEvt,pWin);
if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) {
@@ -248,7 +248,7 @@ bool SdrView::MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin)
bool SdrView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin)
{
SetActualWin(pWin);
- aDragStat.SetMouseDown(rMEvt.IsLeft());
+ maDragStat.SetMouseDown(rMEvt.IsLeft());
bool bRet = SdrCreateView::MouseMove(rMEvt,pWin);
if (!IsExtendedMouseEventDispatcherEnabled() && !IsTextEditInSelectionMode()) {
SdrViewEvent aVEvt;
@@ -283,7 +283,7 @@ SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, SdrMouseEventKind nEve
rVEvt.nMouseClicks=rMEvt.GetClicks();
rVEvt.nMouseMode=rMEvt.GetMode();
rVEvt.nMouseCode=rMEvt.GetButtons() | rMEvt.GetModifier();
- const OutputDevice* pOut=pActualOutDev;
+ const OutputDevice* pOut=mpActualOutDev;
if (pOut==NULL)
{
pOut = GetFirstOutputDevice();
@@ -319,7 +319,7 @@ SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, SdrMouseEventKind nEve
SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) const
{
- const OutputDevice* pOut=pActualOutDev;
+ const OutputDevice* pOut=mpActualOutDev;
if (pOut==NULL)
{
pOut = GetFirstOutputDevice();
@@ -356,7 +356,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
{
eHit=SDRHIT_HANDLE; // handle is hit: highest priority
}
- else if (bEditMode && IsHlplVisible() && IsHlplFront() && pOut!=NULL && PickHelpLine(aLocalLogicPosition,nHitTolLog,*pOut,nHlplIdx,pPV))
+ else if (bEditMode && IsHlplVisible() && IsHlplFront() && pOut!=NULL && PickHelpLine(aLocalLogicPosition,mnHitTolLog,*pOut,nHlplIdx,pPV))
{
eHit=SDRHIT_HELPLINE; // help line in the foreground hit: can be moved now
}
@@ -364,7 +364,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
{
eHit=SDRHIT_GLUEPOINT; // deselected glue point hit
}
- else if (PickObj(aLocalLogicPosition,nHitTolLog,pHitObj,pPV,SdrSearchOptions::DEEP|SdrSearchOptions::MARKED,&pObj,&bHitPassDirect))
+ else if (PickObj(aLocalLogicPosition,mnHitTolLog,pHitObj,pPV,SdrSearchOptions::DEEP|SdrSearchOptions::MARKED,&pObj,&bHitPassDirect))
{
eHit=SDRHIT_MARKEDOBJECT;
sdr::table::SdrTableObj* pTableObj = dynamic_cast< sdr::table::SdrTableObj* >( pObj );
@@ -384,7 +384,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
}
}
}
- else if (PickObj(aLocalLogicPosition,nHitTolLog,pHitObj,pPV,SdrSearchOptions::DEEP|SdrSearchOptions::ALSOONMASTER|SdrSearchOptions::WHOLEPAGE,&pObj,&bHitPassDirect))
+ else if (PickObj(aLocalLogicPosition,mnHitTolLog,pHitObj,pPV,SdrSearchOptions::DEEP|SdrSearchOptions::ALSOONMASTER|SdrSearchOptions::WHOLEPAGE,&pObj,&bHitPassDirect))
{
// MasterPages and WholePage for Macro and URL
eHit=SDRHIT_UNMARKEDOBJECT;
@@ -405,7 +405,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
}
}
}
- else if (bEditMode && IsHlplVisible() && !IsHlplFront() && pOut!=NULL && PickHelpLine(aLocalLogicPosition,nHitTolLog,*pOut,nHlplIdx,pPV))
+ else if (bEditMode && IsHlplVisible() && !IsHlplFront() && pOut!=NULL && PickHelpLine(aLocalLogicPosition,mnHitTolLog,*pOut,nHlplIdx,pPV))
{
eHit=SDRHIT_HELPLINE; // help line in foreground hit: can be moved now
}
@@ -437,7 +437,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
SdrObjMacroHitRec aHitRec;
aHitRec.aPos=aLocalLogicPosition;
aHitRec.aDownPos=aLocalLogicPosition;
- aHitRec.nTol=nHitTolLog;
+ aHitRec.nTol=mnHitTolLog;
aHitRec.pVisiLayer=&pPV->GetVisibleLayers();
aHitRec.pPageView=pPV;
if (bDeep) bDeep=pHitObj->IsMacroHit(aHitRec);
@@ -486,9 +486,9 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
const GeoStat& rGeo=pTextObj->GetGeoStat();
if (rGeo.nRotationAngle!=0) RotatePoint(aTemporaryTextRelativePosition,Point(),-rGeo.nSin,rGeo.nCos); // -sin for Unrotate
// we currently don't account for ticker text
- if(pActualOutDev && pActualOutDev->GetOutDevType() == OUTDEV_WINDOW)
+ if(mpActualOutDev && mpActualOutDev->GetOutDevType() == OUTDEV_WINDOW)
{
- OutlinerView aOLV(pOutliner, const_cast<vcl::Window*>(static_cast<const vcl::Window*>(pActualOutDev.get())));
+ OutlinerView aOLV(pOutliner, const_cast<vcl::Window*>(static_cast<const vcl::Window*>(mpActualOutDev.get())));
const EditView& aEV=aOLV.GetEditView();
const SvxFieldItem* pItem=aEV.GetField(aTemporaryTextRelativePosition);
if (pItem!=NULL) {
@@ -517,7 +517,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
aBoundRect = pHitObj->GetSnapRect();
}
- sal_Int32 nTolerance(nHitTolLog);
+ sal_Int32 nTolerance(mnHitTolLog);
bool bBoundRectHit(false);
if(pOut)
@@ -590,7 +590,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
else if (IsMarking())
{
eEvent=SDREVENT_ENDMARK;
- if (!aDragStat.IsMinMoved())
+ if (!maDragStat.IsMinMoved())
{
eEvent=SDREVENT_BRKMARK;
rVEvt.bAddMark=MODKEY_MultiMark;
@@ -764,11 +764,11 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
bool bMouseDown=rVEvt.bMouseDown;
bool bMouseUp=rVEvt.bMouseUp;
if (bMouseDown) {
- if (bMouseLeft) aDragStat.SetMouseDown(true);
+ if (bMouseLeft) maDragStat.SetMouseDown(true);
} else if (bMouseUp) {
- if (bMouseLeft) aDragStat.SetMouseDown(false);
+ if (bMouseLeft) maDragStat.SetMouseDown(false);
} else { // else, MouseMove
- aDragStat.SetMouseDown(bMouseLeft);
+ maDragStat.SetMouseDown(bMouseLeft);
}
#ifdef MODKEY_NoSnap
@@ -803,7 +803,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
case SDREVENT_ENDMARK : EndAction(); bRet=true; break;
case SDREVENT_BRKMARK : {
BrkAction();
- if (!MarkObj(aLogicPos,nHitTolLog,rVEvt.bAddMark)) {
+ if (!MarkObj(aLogicPos,mnHitTolLog,rVEvt.bAddMark)) {
// No object hit. Do the following:
// 1. deselect any selected glue points
// 2. deselect any selected polygon points
@@ -821,12 +821,12 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
MarkObj(rVEvt.pRootObj,rVEvt.pPV);
if (eHit==SDRHIT_TEXTEDIT)
{
- bool bRet2(pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType() &&
- SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, const_cast<vcl::Window*>(static_cast<const vcl::Window*>(pActualOutDev.get())), false, nullptr));
+ bool bRet2(mpActualOutDev && OUTDEV_WINDOW == mpActualOutDev->GetOutDevType() &&
+ SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, const_cast<vcl::Window*>(static_cast<const vcl::Window*>(mpActualOutDev.get())), false, nullptr));
if(bRet2)
{
- MouseEvent aMEvt(pActualOutDev->LogicToPixel(aLogicPos),
+ MouseEvent aMEvt(mpActualOutDev->LogicToPixel(aLogicPos),
1,rVEvt.nMouseMode,rVEvt.nMouseCode,rVEvt.nMouseCode);
OutlinerView* pOLV=GetTextEditOutlinerView();
@@ -848,17 +848,17 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
if (!rVEvt.bAddMark) UnmarkAllObj();
bool bUnmark=rVEvt.bUnmark;
if (rVEvt.bPrevNextMark) {
- bRet=MarkNextObj(aLogicPos,nHitTolLog,rVEvt.bMarkPrev);
+ bRet=MarkNextObj(aLogicPos,mnHitTolLog,rVEvt.bMarkPrev);
} else {
SortMarkedObjects();
const size_t nCount0=GetMarkedObjectCount();
- bRet=MarkObj(aLogicPos,nHitTolLog,rVEvt.bAddMark);
+ bRet=MarkObj(aLogicPos,mnHitTolLog,rVEvt.bAddMark);
SortMarkedObjects();
const size_t nCount1=GetMarkedObjectCount();
bUnmark=nCount1<nCount0;
}
if (!bUnmark) {
- BegDragObj(aLogicPos,NULL,nullptr,nMinMovLog);
+ BegDragObj(aLogicPos,NULL,nullptr,mnMinMovLog);
bRet=true;
}
} break;
@@ -870,7 +870,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
bRet=MarkPoint(*rVEvt.pHdl,rVEvt.bUnmark);
}
if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) {
- BegDragObj(aLogicPos,NULL,rVEvt.pHdl,nMinMovLog);
+ BegDragObj(aLogicPos,NULL,rVEvt.pHdl,mnMinMovLog);
bRet=true;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list