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

GetBasic and m_pBasic are unused

Browse Source 
which is probably a good thing because it is zeroed in the copy ctor which
looks rather dubious

Change-Id: Ia082601982aaea5df92cf7aa9724cbe187716e0c
This commit is contained in:
Caolán McNamara
2013-12-09 13:19:21 +00:00
parent 826d133ccf
commit 8a8981c603
10 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/svx/fmpage.hxx
View File

@@ -43,12 +43,11 @@ class SVX_DLLPUBLIC FmFormPage : public SdrPage
friend class FmFormObj;
FmFormPageImpl* m_pImpl;
OUString m_sPageName;
StarBASIC* m_pBasic;
public:
TYPEINFO();
FmFormPage(FmFormModel& rModel,StarBASIC*, bool bMasterPage=sal_False);
FmFormPage(FmFormModel& rModel, bool bMasterPage=false);
FmFormPage(const FmFormPage& rPage);
~FmFormPage();
@@ -70,7 +69,6 @@ public:
public:
const OUString& GetName() const { return m_sPageName; }
void SetName( const OUString& rName ) { m_sPageName = rName; }
StarBASIC* GetBasic() const { return m_pBasic; }
sal_Bool RequestHelp(
Window* pWin,
SdrView* pView,

2
sc/inc/drawpage.hxx
View File

@@ -28,7 +28,7 @@ class ScDrawLayer;
class ScDrawPage: public FmFormPage
{
public:
ScDrawPage(ScDrawLayer& rNewModel, StarBASIC* pBasic, bool bMasterPage = false);
ScDrawPage(ScDrawLayer& rNewModel, bool bMasterPage = false);
~ScDrawPage();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage();

4
sc/source/core/data/drawpage.cxx
View File

@@ -28,8 +28,8 @@
// -----------------------------------------------------------------------
ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, StarBASIC* pBasic, bool bMasterPage) :
FmFormPage(rNewModel, pBasic, bMasterPage)
ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, bool bMasterPage) :
FmFormPage(rNewModel, bMasterPage)
{
SetSize( Size( LONG_MAX, LONG_MAX ) );
}

5
sc/source/core/data/drwlayer.cxx
View File

@@ -308,10 +308,7 @@ void ScDrawLayer::UseHyphenator()
SdrPage* ScDrawLayer::AllocPage(bool bMasterPage)
{
// don't create basic until it is needed
StarBASIC* pBasic = NULL;
ScDrawPage* pPage = new ScDrawPage( *this, pBasic, bMasterPage);
return pPage;
return new ScDrawPage(*this, bMasterPage);
}
sal_Bool ScDrawLayer::HasObjects() const

2
sd/inc/sdpage.hxx
View File

@@ -156,7 +156,7 @@ protected:
public:
TYPEINFO();
SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, sal_Bool bMasterPage=sal_False);
SdPage(SdDrawDocument& rNewDoc, sal_Bool bMasterPage=sal_False);
SdPage(const SdPage& rSrcPage);
~SdPage();
virtual SdrPage* Clone() const;

2
sd/source/core/drawdoc.cxx
View File

@@ -502,7 +502,7 @@ SdrModel* SdDrawDocument::AllocModel() const
// not know, as they are _derivatives_ of SdrPage) when loading.
SdrPage* SdDrawDocument::AllocPage(bool bMasterPage)
{
return new SdPage(*this, NULL, bMasterPage);
return new SdPage(*this, bMasterPage);
}
// When the model has changed

4
sd/source/core/sdpage.cxx
View File

@@ -89,8 +89,8 @@ TYPEINIT2( SdPage, FmFormPage, SdrObjUserCall );
|*
\************************************************************************/
SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, sal_Bool bMasterPage)
: FmFormPage(rNewDoc, pBasic, bMasterPage)
SdPage::SdPage(SdDrawDocument& rNewDoc, sal_Bool bMasterPage)
: FmFormPage(rNewDoc, bMasterPage)
, SdrObjUserCall()
, mePageKind(PK_STANDARD)
, meAutoLayout(AUTOLAYOUT_NONE)

2
svx/source/form/fmmodel.cxx
View File

@@ -131,7 +131,7 @@ FmFormModel::~FmFormModel()
\************************************************************************/
SdrPage* FmFormModel::AllocPage(bool bMasterPage)
{
return new FmFormPage(*this, NULL, bMasterPage);
return new FmFormPage(*this, bMasterPage);
}
/*************************************************************************

4
svx/source/form/fmpage.cxx
View File

@@ -56,10 +56,9 @@ using com::sun::star::container::XNameContainer;
TYPEINIT1(FmFormPage, SdrPage);
//------------------------------------------------------------------
FmFormPage::FmFormPage(FmFormModel& rModel, StarBASIC* _pBasic, bool bMasterPage)
FmFormPage::FmFormPage(FmFormModel& rModel, bool bMasterPage)
:SdrPage(rModel, bMasterPage)
,m_pImpl( new FmFormPageImpl( *this ) )
,m_pBasic(_pBasic)
{
}
@@ -67,7 +66,6 @@ FmFormPage::FmFormPage(FmFormModel& rModel, StarBASIC* _pBasic, bool bMasterPage
FmFormPage::FmFormPage(const FmFormPage& rPage)
:SdrPage(rPage)
,m_pImpl(new FmFormPageImpl( *this ) )
,m_pBasic(0)
{
m_pImpl->initFrom( rPage.GetImpl() );
m_sPageName = rPage.m_sPageName;

2
sw/source/core/draw/dpage.cxx
View File

@@ -49,7 +49,7 @@ using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::frame;
SwDPage::SwDPage(SwDrawDocument& rNewModel, sal_Bool bMasterPage) :
FmFormPage(rNewModel, 0, bMasterPage),
FmFormPage(rNewModel, bMasterPage),
pGridLst( 0 ),
rDoc(rNewModel.GetDoc())
{