diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-10 12:27:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-11 09:19:26 +0200 |
| commit | c26351ee513afe0557a6ea51a9072714e8a0434f (patch) | |
| tree | 87df7a195b0d7208087591121149c73b8d9d5e74 /sd | |
| parent | 1b0b0f3c64bf8e551a70c2067f4fe87fd29e81d4 (diff) | |
loplugin:datamembershadow in FrameView
Change-Id: I968bde3533682943c30587c74fbfc8a9260feebf
Reviewed-on: https://gerrit.libreoffice.org/54107
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/inc/FrameView.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/frmview.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx index 3ff8240337d4..582be882d613 100644 --- a/sd/source/ui/inc/FrameView.hxx +++ b/sd/source/ui/inc/FrameView.hxx @@ -182,7 +182,7 @@ private: sal_uInt16 mnSelectedPage; PageKind mePageKindOnLoad; sal_uInt16 mnSelectedPageOnLoad; - EditMode meEditMode; ///< edit mode in drawing mode (Page/MasterPage) + EditMode mePageEditMode; ///< edit mode in drawing mode (Page/MasterPage) // EditMode meStandardEditMode; ///< edit mode in drawing mode (Page/MasterPage) // EditMode meNotesEditMode; ///< edit mode in notes mode (Page/MasterPage) // EditMode meHandoutEditMode; ///< edit mode in handout mode (Page/MasterPage) diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index ffaf3d3ab582..f28469956422 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -173,7 +173,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * mePageKindOnLoad = pFrameView->GetPageKindOnLoad(); mnSelectedPage = pFrameView->GetSelectedPage(); mnSelectedPageOnLoad = pFrameView->GetSelectedPageOnLoad(); - meEditMode = pFrameView->GetViewShEditMode(); + mePageEditMode = pFrameView->GetViewShEditMode(); // meStandardEditMode = pFrameView->GetViewShEditMode(PageKind::Standard); // meNotesEditMode = pFrameView->GetViewShEditMode(PageKind::Notes); // meHandoutEditMode = pFrameView->GetViewShEditMode(PageKind::Handout); @@ -208,7 +208,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * mePageKindOnLoad = PageKind::Standard; mnSelectedPage = 0; mnSelectedPageOnLoad = 0; - meEditMode = EditMode::Page; + mePageEditMode = EditMode::Page; // meStandardEditMode = EditMode::Page; // meNotesEditMode = EditMode::Page; // meHandoutEditMode = EditMode::MasterPage; @@ -319,7 +319,7 @@ void FrameView::Update(SdOptions const * pOptions) */ void FrameView::SetViewShEditMode(EditMode eMode) { - meEditMode = eMode; + mePageEditMode = eMode; } /** @@ -327,7 +327,7 @@ void FrameView::SetViewShEditMode(EditMode eMode) */ EditMode FrameView::GetViewShEditMode() { - return meEditMode; + return mePageEditMode; } void FrameView::SetViewShEditModeOnLoad (EditMode eMode) |