mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:datamembershadow in FrameView

Browse Source 
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>
This commit is contained in:
Noel Grandin 2018-05-10 12:27:36 +02:00
parent 1b0b0f3c64
commit c26351ee51
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compilerplugins/clang/datamembershadow.cxx
View File

@ -51,8 +51,6 @@ bool DataMemberShadow::VisitFieldDecl(FieldDecl const * fieldDecl)
if (loplugin::hasPathnamePrefix(aFileName, SRCDIR "/chart2/source/")) if (loplugin::hasPathnamePrefix(aFileName, SRCDIR "/chart2/source/"))
return true; return true;
if (loplugin::isSamePathname(aFileName, SRCDIR "/cppcanvas/source/mtfrenderer/emfplus.cxx"))
return true;
if (loplugin::isSamePathname(aFileName, SRCDIR "/include/sfx2/recentdocsview.hxx")) if (loplugin::isSamePathname(aFileName, SRCDIR "/include/sfx2/recentdocsview.hxx"))
return true; return true;
if (loplugin::isSamePathname(aFileName, SRCDIR "/include/sfx2/templatelocalview.hxx")) if (loplugin::isSamePathname(aFileName, SRCDIR "/include/sfx2/templatelocalview.hxx"))
@ -61,13 +59,6 @@ bool DataMemberShadow::VisitFieldDecl(FieldDecl const * fieldDecl)
return true; return true;
if (loplugin::isSamePathname(aFileName, SRCDIR "/sd/inc/Outliner.hxx")) if (loplugin::isSamePathname(aFileName, SRCDIR "/sd/inc/Outliner.hxx"))
return true; 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") if (loplugin::isSamePathname(aFileName, SRCDIR "/store/source/stortree.hxx")
|| loplugin::isSamePathname(aFileName, SRCDIR "/store/source/stordata.hxx")) || loplugin::isSamePathname(aFileName, SRCDIR "/store/source/stordata.hxx"))
return true; return true;

2
sd/source/ui/inc/FrameView.hxx
View File

@ -182,7 +182,7 @@ private:
sal_uInt16 mnSelectedPage; sal_uInt16 mnSelectedPage;
PageKind mePageKindOnLoad; PageKind mePageKindOnLoad;
sal_uInt16 mnSelectedPageOnLoad; 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 meStandardEditMode; ///< edit mode in drawing mode (Page/MasterPage)
// EditMode meNotesEditMode; ///< edit mode in notes mode (Page/MasterPage) // EditMode meNotesEditMode; ///< edit mode in notes mode (Page/MasterPage)
// EditMode meHandoutEditMode; ///< edit mode in handout mode (Page/MasterPage) // EditMode meHandoutEditMode; ///< edit mode in handout mode (Page/MasterPage)

8
sd/source/ui/view/frmview.cxx
View File

@ -173,7 +173,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
mePageKindOnLoad = pFrameView->GetPageKindOnLoad(); mePageKindOnLoad = pFrameView->GetPageKindOnLoad();
mnSelectedPage = pFrameView->GetSelectedPage(); mnSelectedPage = pFrameView->GetSelectedPage();
mnSelectedPageOnLoad = pFrameView->GetSelectedPageOnLoad(); mnSelectedPageOnLoad = pFrameView->GetSelectedPageOnLoad();
meEditMode = pFrameView->GetViewShEditMode(); mePageEditMode = pFrameView->GetViewShEditMode();
// meStandardEditMode = pFrameView->GetViewShEditMode(PageKind::Standard); // meStandardEditMode = pFrameView->GetViewShEditMode(PageKind::Standard);
// meNotesEditMode = pFrameView->GetViewShEditMode(PageKind::Notes); // meNotesEditMode = pFrameView->GetViewShEditMode(PageKind::Notes);
// meHandoutEditMode = pFrameView->GetViewShEditMode(PageKind::Handout); // meHandoutEditMode = pFrameView->GetViewShEditMode(PageKind::Handout);
@ -208,7 +208,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
mePageKindOnLoad = PageKind::Standard; mePageKindOnLoad = PageKind::Standard;
mnSelectedPage = 0; mnSelectedPage = 0;
mnSelectedPageOnLoad = 0; mnSelectedPageOnLoad = 0;
meEditMode = EditMode::Page; mePageEditMode = EditMode::Page;
// meStandardEditMode = EditMode::Page; // meStandardEditMode = EditMode::Page;
// meNotesEditMode = EditMode::Page; // meNotesEditMode = EditMode::Page;
// meHandoutEditMode = EditMode::MasterPage; // meHandoutEditMode = EditMode::MasterPage;
@ -319,7 +319,7 @@ void FrameView::Update(SdOptions const * pOptions)
*/ */
void FrameView::SetViewShEditMode(EditMode eMode) void FrameView::SetViewShEditMode(EditMode eMode)
{ {
meEditMode = eMode; mePageEditMode = eMode;
} }
/** /**
@ -327,7 +327,7 @@ void FrameView::SetViewShEditMode(EditMode eMode)
*/ */
EditMode FrameView::GetViewShEditMode() EditMode FrameView::GetViewShEditMode()
{ {
return meEditMode; return mePageEditMode;
} }
void FrameView::SetViewShEditModeOnLoad (EditMode eMode) void FrameView::SetViewShEditModeOnLoad (EditMode eMode)