diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-12-22 21:29:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-23 17:29:34 +0000 |
| commit | 548dbc6bd9c4253f27e6f35578e4a4699902150e (patch) | |
| tree | c35a2a7fd4884f95bb82aa761cbdab7543d62db8 /sw | |
| parent | 6acf1c7ab7b514a8713ed66b74efbee1a75f029a (diff) | |
coverity#1260296 Unchecked dynamic_cast
Change-Id: Ib19609c3f4c83ae8baef83bcdadee79e69743df5
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/misc/swmodalredlineacceptdlg.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/inc/redlndlg.hxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/misc/redlndlg.cxx | 9 |
3 files changed, 7 insertions, 6 deletions
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx index dc9c786adb41..153bbc1a27f7 100644 --- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx +++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx @@ -47,7 +47,7 @@ SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(vcl::Window *pParent) : SfxModalDialog(pParent, "AcceptRejectChangesDialog", "svx/ui/acceptrejectchangesdialog.ui") { - pImplDlg = new SwRedlineAcceptDlg(this, get_content_area(), true); + pImplDlg = new SwRedlineAcceptDlg(this, this, get_content_area(), true); pImplDlg->Initialize(GetExtraData()); pImplDlg->Activate(); // for data's initialisation diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 9e31d25ceab9..f26b02350ed8 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -114,7 +114,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg SAL_DLLPRIVATE sal_uInt16 GetRedlinePos( const SvTreeListEntry& rEntry) const; public: - SwRedlineAcceptDlg(vcl::Window *pParent, vcl::Window *pContentArea, bool bAutoFmt = false); + SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer *pBuilder, vcl::Window *pContentArea, bool bAutoFmt = false); virtual ~SwRedlineAcceptDlg(); DECL_LINK( FilterChangedHdl, void *pDummy = 0 ); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index c830d1a7d7b8..ef6c96a3b385 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -89,7 +89,7 @@ SwModelessRedlineAcceptDlg::SwModelessRedlineAcceptDlg( "AcceptRejectChangesDialog", "svx/ui/acceptrejectchangesdialog.ui") , pChildWin (pChild) { - pImplDlg = new SwRedlineAcceptDlg(this, get_content_area()); + pImplDlg = new SwRedlineAcceptDlg(this, this, get_content_area()); } void SwModelessRedlineAcceptDlg::Activate() @@ -141,9 +141,10 @@ SwModelessRedlineAcceptDlg::~SwModelessRedlineAcceptDlg() delete pImplDlg; } -SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, vcl::Window *pContentArea, bool bAutoFmt) : +SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer *pBuilder, + vcl::Window *pContentArea, bool bAutoFmt) : pParentDlg (pParent), - aTabPagesCTRL (pContentArea, dynamic_cast<VclBuilderContainer*>(pParent)), + aTabPagesCTRL (pContentArea, pBuilder), aPopup (SW_RES(MN_REDLINE_POPUP)), sInserted (SW_RES(STR_REDLINE_INSERTED)), sDeleted (SW_RES(STR_REDLINE_DELETED)), @@ -1209,7 +1210,7 @@ void SwRedlineAcceptDlg::FillInfo(OUString &rExtraData) const SwRedlineAcceptPanel::SwRedlineAcceptPanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rFrame) : PanelLayout(pParent, "ManageChangesPanel", "modules/swriter/ui/managechangessidebar.ui", rFrame) { - mpImplDlg = new SwRedlineAcceptDlg(this, get<VclGrid>("content_area")); + mpImplDlg = new SwRedlineAcceptDlg(this, this, get<VclGrid>("content_area")); mpImplDlg->Init(); |