diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-25 10:17:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-26 08:10:37 +0100 |
| commit | c7e2b4ff70c751541167fea7adacaf2556b43312 (patch) | |
| tree | f710e404978e6e289c14730c49b4c891ceef4bda /sd/source/ui | |
| parent | 122da2eea23faf6916c3f3b9e1895f5c404b26c7 (diff) | |
loplugin:datamembershadow in SmartHdl
rename both these fields
Change-Id: I7c414bb440872cdc36d29613be52a5a7542ff9bb
Reviewed-on: https://gerrit.libreoffice.org/48565
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/func/smarttag.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/inc/smarttag.hxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/viewoverlaymanager.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index f72830c15383..d63f7a096eda 100644 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -350,14 +350,14 @@ void SmartTagSet::CheckPossibilities() SmartHdl::SmartHdl( const SmartTagReference& xTag, SdrObject* pObject, const Point& rPnt, SdrHdlKind eNewKind /*=SdrHdlKind::Move*/ ) : SdrHdl( rPnt, eNewKind ) -, mxTag( xTag ) +, mxSmartTag( xTag ) { SetObj( pObject ); } SmartHdl::SmartHdl( const SmartTagReference& xTag, const Point& rPnt, SdrHdlKind eNewKind /*=SdrHdlKind::Move*/ ) : SdrHdl( rPnt, eNewKind ) -, mxTag( xTag ) +, mxSmartTag( xTag ) { } diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index 821f2e45f364..98e13f88f687 100644 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx @@ -167,11 +167,11 @@ public: SmartHdl( const SmartTagReference& xTag, SdrObject* pObject, const Point& rPnt, SdrHdlKind eNewKind ); SmartHdl( const SmartTagReference& xTag, const Point& rPnt, SdrHdlKind eNewKind ); - const SmartTagReference& getTag() const { return mxTag; } + const SmartTagReference& getTag() const { return mxSmartTag; } virtual bool isMarkable() const; protected: - SmartTagReference mxTag; + SmartTagReference mxSmartTag; }; } // end of namespace sd diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index e48d2392979a..c1cec7013f47 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -151,7 +151,7 @@ public: static void HideTip(); private: - rtl::Reference< ChangePlaceholderTag > mxTag; + rtl::Reference< ChangePlaceholderTag > mxChangePlaceholderTag; int mnHighlightId; Size maImageSize; @@ -159,7 +159,7 @@ private: ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag /*, sal_uInt16 nSID, const Image& rImage, const Image& rImageMO*/, const Point& rPnt ) : SmartHdl( xTag, rPnt, SdrHdlKind::SmartTag ) -, mxTag( dynamic_cast< ChangePlaceholderTag* >( xTag.get() ) ) +, mxChangePlaceholderTag( dynamic_cast< ChangePlaceholderTag* >( xTag.get() ) ) , mnHighlightId( -1 ) , maImageSize( 42, 42 ) { @@ -222,7 +222,7 @@ void ImageButtonHdl::CreateB2dIAObject() const Point aTagPos( GetPos() ); basegfx::B2DPoint aPosition( aTagPos.X(), aTagPos.Y() ); - BitmapEx aBitmapEx( mxTag->createOverlayImage( mnHighlightId ) ); // maImageMO.GetBitmapEx() : maImage.GetBitmapEx() ); + BitmapEx aBitmapEx( mxChangePlaceholderTag->createOverlayImage( mnHighlightId ) ); // maImageMO.GetBitmapEx() : maImage.GetBitmapEx() ); maImageSize = aBitmapEx.GetSizePixel(); maImageSize.Width() >>= 1; maImageSize.Height() >>= 1; |