GetBasic and m_pBasic are unused
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:
@@ -43,12 +43,11 @@ class SVX_DLLPUBLIC FmFormPage : public SdrPage
|
|||||||
friend class FmFormObj;
|
friend class FmFormObj;
|
||||||
FmFormPageImpl* m_pImpl;
|
FmFormPageImpl* m_pImpl;
|
||||||
OUString m_sPageName;
|
OUString m_sPageName;
|
||||||
StarBASIC* m_pBasic;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
TYPEINFO();
|
TYPEINFO();
|
||||||
|
|
||||||
FmFormPage(FmFormModel& rModel,StarBASIC*, bool bMasterPage=sal_False);
|
FmFormPage(FmFormModel& rModel, bool bMasterPage=false);
|
||||||
FmFormPage(const FmFormPage& rPage);
|
FmFormPage(const FmFormPage& rPage);
|
||||||
~FmFormPage();
|
~FmFormPage();
|
||||||
|
|
||||||
@@ -70,7 +69,6 @@ public:
|
|||||||
public:
|
public:
|
||||||
const OUString& GetName() const { return m_sPageName; }
|
const OUString& GetName() const { return m_sPageName; }
|
||||||
void SetName( const OUString& rName ) { m_sPageName = rName; }
|
void SetName( const OUString& rName ) { m_sPageName = rName; }
|
||||||
StarBASIC* GetBasic() const { return m_pBasic; }
|
|
||||||
sal_Bool RequestHelp(
|
sal_Bool RequestHelp(
|
||||||
Window* pWin,
|
Window* pWin,
|
||||||
SdrView* pView,
|
SdrView* pView,
|
||||||
|
@@ -28,7 +28,7 @@ class ScDrawLayer;
|
|||||||
class ScDrawPage: public FmFormPage
|
class ScDrawPage: public FmFormPage
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScDrawPage(ScDrawLayer& rNewModel, StarBASIC* pBasic, bool bMasterPage = false);
|
ScDrawPage(ScDrawLayer& rNewModel, bool bMasterPage = false);
|
||||||
~ScDrawPage();
|
~ScDrawPage();
|
||||||
|
|
||||||
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage();
|
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage();
|
||||||
|
@@ -28,8 +28,8 @@
|
|||||||
|
|
||||||
// -----------------------------------------------------------------------
|
// -----------------------------------------------------------------------
|
||||||
|
|
||||||
ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, StarBASIC* pBasic, bool bMasterPage) :
|
ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, bool bMasterPage) :
|
||||||
FmFormPage(rNewModel, pBasic, bMasterPage)
|
FmFormPage(rNewModel, bMasterPage)
|
||||||
{
|
{
|
||||||
SetSize( Size( LONG_MAX, LONG_MAX ) );
|
SetSize( Size( LONG_MAX, LONG_MAX ) );
|
||||||
}
|
}
|
||||||
|
@@ -308,10 +308,7 @@ void ScDrawLayer::UseHyphenator()
|
|||||||
|
|
||||||
SdrPage* ScDrawLayer::AllocPage(bool bMasterPage)
|
SdrPage* ScDrawLayer::AllocPage(bool bMasterPage)
|
||||||
{
|
{
|
||||||
// don't create basic until it is needed
|
return new ScDrawPage(*this, bMasterPage);
|
||||||
StarBASIC* pBasic = NULL;
|
|
||||||
ScDrawPage* pPage = new ScDrawPage( *this, pBasic, bMasterPage);
|
|
||||||
return pPage;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
sal_Bool ScDrawLayer::HasObjects() const
|
sal_Bool ScDrawLayer::HasObjects() const
|
||||||
|
@@ -156,7 +156,7 @@ protected:
|
|||||||
public:
|
public:
|
||||||
TYPEINFO();
|
TYPEINFO();
|
||||||
|
|
||||||
SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, sal_Bool bMasterPage=sal_False);
|
SdPage(SdDrawDocument& rNewDoc, sal_Bool bMasterPage=sal_False);
|
||||||
SdPage(const SdPage& rSrcPage);
|
SdPage(const SdPage& rSrcPage);
|
||||||
~SdPage();
|
~SdPage();
|
||||||
virtual SdrPage* Clone() const;
|
virtual SdrPage* Clone() const;
|
||||||
|
@@ -502,7 +502,7 @@ SdrModel* SdDrawDocument::AllocModel() const
|
|||||||
// not know, as they are _derivatives_ of SdrPage) when loading.
|
// not know, as they are _derivatives_ of SdrPage) when loading.
|
||||||
SdrPage* SdDrawDocument::AllocPage(bool bMasterPage)
|
SdrPage* SdDrawDocument::AllocPage(bool bMasterPage)
|
||||||
{
|
{
|
||||||
return new SdPage(*this, NULL, bMasterPage);
|
return new SdPage(*this, bMasterPage);
|
||||||
}
|
}
|
||||||
|
|
||||||
// When the model has changed
|
// When the model has changed
|
||||||
|
@@ -89,8 +89,8 @@ TYPEINIT2( SdPage, FmFormPage, SdrObjUserCall );
|
|||||||
|*
|
|*
|
||||||
\************************************************************************/
|
\************************************************************************/
|
||||||
|
|
||||||
SdPage::SdPage(SdDrawDocument& rNewDoc, StarBASIC* pBasic, sal_Bool bMasterPage)
|
SdPage::SdPage(SdDrawDocument& rNewDoc, sal_Bool bMasterPage)
|
||||||
: FmFormPage(rNewDoc, pBasic, bMasterPage)
|
: FmFormPage(rNewDoc, bMasterPage)
|
||||||
, SdrObjUserCall()
|
, SdrObjUserCall()
|
||||||
, mePageKind(PK_STANDARD)
|
, mePageKind(PK_STANDARD)
|
||||||
, meAutoLayout(AUTOLAYOUT_NONE)
|
, meAutoLayout(AUTOLAYOUT_NONE)
|
||||||
|
@@ -131,7 +131,7 @@ FmFormModel::~FmFormModel()
|
|||||||
\************************************************************************/
|
\************************************************************************/
|
||||||
SdrPage* FmFormModel::AllocPage(bool bMasterPage)
|
SdrPage* FmFormModel::AllocPage(bool bMasterPage)
|
||||||
{
|
{
|
||||||
return new FmFormPage(*this, NULL, bMasterPage);
|
return new FmFormPage(*this, bMasterPage);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*************************************************************************
|
/*************************************************************************
|
||||||
|
@@ -56,10 +56,9 @@ using com::sun::star::container::XNameContainer;
|
|||||||
TYPEINIT1(FmFormPage, SdrPage);
|
TYPEINIT1(FmFormPage, SdrPage);
|
||||||
|
|
||||||
//------------------------------------------------------------------
|
//------------------------------------------------------------------
|
||||||
FmFormPage::FmFormPage(FmFormModel& rModel, StarBASIC* _pBasic, bool bMasterPage)
|
FmFormPage::FmFormPage(FmFormModel& rModel, bool bMasterPage)
|
||||||
:SdrPage(rModel, bMasterPage)
|
:SdrPage(rModel, bMasterPage)
|
||||||
,m_pImpl( new FmFormPageImpl( *this ) )
|
,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)
|
FmFormPage::FmFormPage(const FmFormPage& rPage)
|
||||||
:SdrPage(rPage)
|
:SdrPage(rPage)
|
||||||
,m_pImpl(new FmFormPageImpl( *this ) )
|
,m_pImpl(new FmFormPageImpl( *this ) )
|
||||||
,m_pBasic(0)
|
|
||||||
{
|
{
|
||||||
m_pImpl->initFrom( rPage.GetImpl() );
|
m_pImpl->initFrom( rPage.GetImpl() );
|
||||||
m_sPageName = rPage.m_sPageName;
|
m_sPageName = rPage.m_sPageName;
|
||||||
|
@@ -49,7 +49,7 @@ using namespace ::com::sun::star::drawing;
|
|||||||
using namespace ::com::sun::star::frame;
|
using namespace ::com::sun::star::frame;
|
||||||
|
|
||||||
SwDPage::SwDPage(SwDrawDocument& rNewModel, sal_Bool bMasterPage) :
|
SwDPage::SwDPage(SwDrawDocument& rNewModel, sal_Bool bMasterPage) :
|
||||||
FmFormPage(rNewModel, 0, bMasterPage),
|
FmFormPage(rNewModel, bMasterPage),
|
||||||
pGridLst( 0 ),
|
pGridLst( 0 ),
|
||||||
rDoc(rNewModel.GetDoc())
|
rDoc(rNewModel.GetDoc())
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user