[Libreoffice-commits] core.git: sd/inc sd/source

[Stephan Bergmann]

 sd/inc/sdabstdlg.hxx           |    4 ++--
 sd/source/ui/dlg/sddlgfact.cxx |    4 ++--
 sd/source/ui/dlg/sddlgfact.hxx |    2 +-
 sd/source/ui/view/drviews3.cxx |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e5992c481c01f6c85e43192ef83e384a035d9bf1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Dec 5 18:15:11 2014 +0100

    loplugin:cstylecast, involving pointer to incomplete type
    
    Change-Id: Ifec8ab79b0ecb4ec16cb9a0cf3b67757b56ab5ad

diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 6120b20..2c7932c 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -34,6 +34,7 @@
 
 namespace sd {
     class View;
+    class ViewShell;
     class DrawDocShell;
     class DrawView;
 }
@@ -56,7 +57,6 @@ class SdResId;
 namespace vcl { class Window; }
 class SdPage;
 class TabPage;
-class ViewShell;
 class SdCustomShowList;
 
 class AbstractCopyDlg : public VclAbstractDialog
@@ -200,7 +200,7 @@ public:
                                                                   SdDrawDocument* pDoc,
                                                                   SdPage* ) = 0;
 
-    virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell,
+    virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( sd::ViewShell* pViewShell,
                                                                   vcl::Window* pParent,
                                                                   SdDrawDocument* pDoc,
                                                                   SdPage* pCurrentPage ) = 0;
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index cd9e452..b6103aec 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -517,10 +517,10 @@ VclAbstractDialog* SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog( vcl::
   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 )
 {
-    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 )
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index cc146f6..2c599a0 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -261,7 +261,7 @@ public:
                                                                   SdDrawDocument* pDoc,
                                                                   SdPage* ) SAL_OVERRIDE;
 
-    virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell,
+    virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( sd::ViewShell* pViewShell,
                                                                   vcl::Window* pParent,
                                                                   SdDrawDocument* pDoc,
                                                                   SdPage* pCurrentPage ) SAL_OVERRIDE;
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index acc191b..6152834 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -293,7 +293,7 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
         case SID_INSERT_DATE_TIME:
         {
             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 )
             {
                 pDlg->Execute();