diff options
| -rw-r--r-- | compilerplugins/clang/datamembershadow.cxx | 9 | ||||
| -rw-r--r-- | sd/source/ui/inc/FrameView.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/frmview.cxx | 8 |
3 files changed, 5 insertions, 14 deletions
diff --git a/compilerplugins/clang/datamembershadow.cxx b/compilerplugins/clang/datamembershadow.cxx index f92d748eaa25..7cf7940dfb1d 100644 --- a/compilerplugins/clang/datamembershadow.cxx +++ b/compilerplugins/clang/datamembershadow.cxx @@ -51,8 +51,6 @@ bool DataMemberShadow::VisitFieldDecl(FieldDecl const * fieldDecl) if (loplugin::hasPathnamePrefix(aFileName, SRCDIR "/chart2/source/")) return true; - if (loplugin::isSamePathname(aFileName, SRCDIR "/cppcanvas/source/mtfrenderer/emfplus.cxx")) - return true; if (loplugin::isSamePathname(aFileName, SRCDIR "/include/sfx2/recentdocsview.hxx")) return true; if (loplugin::isSamePathname(aFileName, SRCDIR "/include/sfx2/templatelocalview.hxx")) @@ -61,13 +59,6 @@ bool DataMemberShadow::VisitFieldDecl(FieldDecl const * fieldDecl) return true; if (loplugin::isSamePathname(aFileName, SRCDIR "/sd/inc/Outliner.hxx")) return true; - if (loplugin::isSamePathname(aFileName, SRCDIR "/sd/source/ui/annotations/annotationtag.cxx")) - return true; - if (loplugin::isSamePathname(aFileName, SRCDIR "/sd/source/ui/inc/FrameView.hxx") - || loplugin::isSamePathname(aFileName, SRCDIR "/sd/source/filter/ppt/../../ui/inc/FrameView.hxx")) - return true; - if (loplugin::isSamePathname(aFileName, SRCDIR "/sd/source/ui/inc/unopage.hxx")) - return true; if (loplugin::isSamePathname(aFileName, SRCDIR "/store/source/stortree.hxx") || loplugin::isSamePathname(aFileName, SRCDIR "/store/source/stordata.hxx")) return true; 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) |