Kaydet (Commit) e5992c48 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:cstylecast, involving pointer to incomplete type

Change-Id: Ifec8ab79b0ecb4ec16cb9a0cf3b67757b56ab5ad
üst 5f2e9679
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
namespace sd { namespace sd {
class View; class View;
class ViewShell;
class DrawDocShell; class DrawDocShell;
class DrawView; class DrawView;
} }
...@@ -56,7 +57,6 @@ class SdResId; ...@@ -56,7 +57,6 @@ class SdResId;
namespace vcl { class Window; } namespace vcl { class Window; }
class SdPage; class SdPage;
class TabPage; class TabPage;
class ViewShell;
class SdCustomShowList; class SdCustomShowList;
class AbstractCopyDlg : public VclAbstractDialog class AbstractCopyDlg : public VclAbstractDialog
...@@ -200,7 +200,7 @@ public: ...@@ -200,7 +200,7 @@ public:
SdDrawDocument* pDoc, SdDrawDocument* pDoc,
SdPage* ) = 0; SdPage* ) = 0;
virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell, virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( sd::ViewShell* pViewShell,
vcl::Window* pParent, vcl::Window* pParent,
SdDrawDocument* pDoc, SdDrawDocument* pDoc,
SdPage* pCurrentPage ) = 0; SdPage* pCurrentPage ) = 0;
......
...@@ -517,10 +517,10 @@ VclAbstractDialog* SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog( vcl:: ...@@ -517,10 +517,10 @@ VclAbstractDialog* SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog( vcl::
return new SdVclAbstractDialog_Impl( new ::sd::MasterLayoutDialog( pParent, pDoc, pCurrentPage )); return new SdVclAbstractDialog_Impl( new ::sd::MasterLayoutDialog( pParent, pDoc, pCurrentPage ));
} }
AbstractHeaderFooterDialog* SdAbstractDialogFactory_Impl::CreateHeaderFooterDialog( ViewShell* pViewShell, AbstractHeaderFooterDialog* SdAbstractDialogFactory_Impl::CreateHeaderFooterDialog( sd::ViewShell* pViewShell,
vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage )
{ {
return new AbstractHeaderFooterDialog_Impl( new ::sd::HeaderFooterDialog( (::sd::ViewShell*)pViewShell, pParent, pDoc, pCurrentPage )); return new AbstractHeaderFooterDialog_Impl( new ::sd::HeaderFooterDialog( pViewShell, pParent, pDoc, pCurrentPage ));
} }
VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateSdPhotoAlbumDialog( vcl::Window* pWindow, SdDrawDocument* pDoc ) VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateSdPhotoAlbumDialog( vcl::Window* pWindow, SdDrawDocument* pDoc )
......
...@@ -261,7 +261,7 @@ public: ...@@ -261,7 +261,7 @@ public:
SdDrawDocument* pDoc, SdDrawDocument* pDoc,
SdPage* ) SAL_OVERRIDE; SdPage* ) SAL_OVERRIDE;
virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell, virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( sd::ViewShell* pViewShell,
vcl::Window* pParent, vcl::Window* pParent,
SdDrawDocument* pDoc, SdDrawDocument* pDoc,
SdPage* pCurrentPage ) SAL_OVERRIDE; SdPage* pCurrentPage ) SAL_OVERRIDE;
......
...@@ -293,7 +293,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) ...@@ -293,7 +293,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
case SID_INSERT_DATE_TIME: case SID_INSERT_DATE_TIME:
{ {
SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
boost::scoped_ptr<AbstractHeaderFooterDialog> pDlg(pFact ? pFact->CreateHeaderFooterDialog( (::ViewShell*)this, GetActiveWindow(), GetDoc(), mpActualPage ) : 0); boost::scoped_ptr<AbstractHeaderFooterDialog> pDlg(pFact ? pFact->CreateHeaderFooterDialog( this, GetActiveWindow(), GetDoc(), mpActualPage ) : 0);
if( pDlg ) if( pDlg )
{ {
pDlg->Execute(); pDlg->Execute();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment