Kaydet (Commit) b5a0b00d authored tarafından Caolán McNamara's avatar Caolán McNamara

callcatcher: another round of resource ctor removals

Change-Id: Ic554fa7c1e549a0f39296836868b22ccf4c859d3
üst e2b9531e
...@@ -46,11 +46,8 @@ ...@@ -46,11 +46,8 @@
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
#include <vcl/layout.hxx> #include <vcl/layout.hxx>
namespace dbp namespace dbp
{ {
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt; using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
...@@ -68,9 +65,6 @@ namespace dbp ...@@ -68,9 +65,6 @@ namespace dbp
using namespace ::comphelper; using namespace ::comphelper;
using namespace ::dbtools; using namespace ::dbtools;
//= OAccessRegulator
struct OAccessRegulator struct OAccessRegulator
{ {
friend class OControlWizardPage; friend class OControlWizardPage;
...@@ -79,22 +73,6 @@ namespace dbp ...@@ -79,22 +73,6 @@ namespace dbp
OAccessRegulator() { } OAccessRegulator() { }
}; };
//= OControlWizardPage
OControlWizardPage::OControlWizardPage( OControlWizard* _pParent, const ResId& _rResId )
:OControlWizardPage_Base( _pParent, _rResId )
,m_pFormDatasourceLabel(NULL)
,m_pFormDatasource(NULL)
,m_pFormContentTypeLabel(NULL)
,m_pFormContentType(NULL)
,m_pFormTableLabel(NULL)
,m_pFormTable(NULL)
{
}
OControlWizardPage::OControlWizardPage( OControlWizard* _pParent, const OString& rID, const OUString& rUIXMLDescription ) OControlWizardPage::OControlWizardPage( OControlWizard* _pParent, const OString& rID, const OUString& rUIXMLDescription )
:OControlWizardPage_Base( _pParent, rID, rUIXMLDescription ) :OControlWizardPage_Base( _pParent, rID, rUIXMLDescription )
,m_pFormDatasourceLabel(NULL) ,m_pFormDatasourceLabel(NULL)
...@@ -106,18 +84,15 @@ namespace dbp ...@@ -106,18 +84,15 @@ namespace dbp
{ {
} }
OControlWizardPage::~OControlWizardPage() OControlWizardPage::~OControlWizardPage()
{ {
} }
OControlWizard* OControlWizardPage::getDialog() OControlWizard* OControlWizardPage::getDialog()
{ {
return static_cast< OControlWizard* >(GetParent()); return static_cast< OControlWizard* >(GetParent());
} }
const OControlWizard* OControlWizardPage::getDialog() const const OControlWizard* OControlWizardPage::getDialog() const
{ {
return static_cast< OControlWizard* >(GetParent()); return static_cast< OControlWizard* >(GetParent());
......
...@@ -72,9 +72,7 @@ namespace dbp ...@@ -72,9 +72,7 @@ namespace dbp
void setFormConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, bool _bAutoDispose = true ); void setFormConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, bool _bAutoDispose = true );
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >
getFormConnection() const; getFormConnection() const;
public: public:
OControlWizardPage( OControlWizard* _pParent, const ResId& _rResId );
OControlWizardPage( OControlWizard* _pParent, const OString& rID, const OUString& rUIXMLDescription ); OControlWizardPage( OControlWizard* _pParent, const OString& rID, const OUString& rUIXMLDescription );
virtual ~OControlWizardPage(); virtual ~OControlWizardPage();
......
...@@ -68,22 +68,17 @@ namespace dbp ...@@ -68,22 +68,17 @@ namespace dbp
void implApplySettings(); void implApplySettings();
}; };
//= OGridPage //= OGridPage
class OGridPage : public OControlWizardPage class OGridPage : public OControlWizardPage
{ {
public: public:
OGridPage( OGridWizard* _pParent, const ResId& _rId ) : OControlWizardPage(_pParent, _rId) { }
OGridPage( OGridWizard* _pParent, const OString& _rID, const OUString& _rUIXMLDescription ) : OControlWizardPage(_pParent, _rID, _rUIXMLDescription) { } OGridPage( OGridWizard* _pParent, const OString& _rID, const OUString& _rUIXMLDescription ) : OControlWizardPage(_pParent, _rID, _rUIXMLDescription) { }
protected: protected:
OGridSettings& getSettings() { return static_cast<OGridWizard*>(getDialog())->getSettings(); } OGridSettings& getSettings() { return static_cast<OGridWizard*>(getDialog())->getSettings(); }
}; };
//= OGridFieldsSelection //= OGridFieldsSelection
class OGridFieldsSelection : public OGridPage class OGridFieldsSelection : public OGridPage
{ {
protected: protected:
......
...@@ -79,8 +79,10 @@ namespace dbp ...@@ -79,8 +79,10 @@ namespace dbp
class OGBWPage : public OControlWizardPage class OGBWPage : public OControlWizardPage
{ {
public: public:
OGBWPage( OControlWizard* _pParent, const ResId& _rId ) : OControlWizardPage(_pParent, _rId) { } OGBWPage(OControlWizard* _pParent, const OString& _rID, const OUString& _rUIXMLDescription)
OGBWPage( OControlWizard* _pParent, const OString& _rID, const OUString& _rUIXMLDescription ) : OControlWizardPage(_pParent, _rID, _rUIXMLDescription) { } : OControlWizardPage(_pParent, _rID, _rUIXMLDescription)
{
}
protected: protected:
OOptionGroupSettings& getSettings() { return static_cast<OGroupBoxWizard*>(getDialog())->getSettings(); } OOptionGroupSettings& getSettings() { return static_cast<OGroupBoxWizard*>(getDialog())->getSettings(); }
......
...@@ -82,14 +82,14 @@ namespace dbp ...@@ -82,14 +82,14 @@ namespace dbp
void implApplySettings(); void implApplySettings();
}; };
//= OLCPage //= OLCPage
class OLCPage : public OControlWizardPage class OLCPage : public OControlWizardPage
{ {
public: public:
OLCPage( OListComboWizard* _pParent, const ResId& _rId ) : OControlWizardPage(_pParent, _rId) { } OLCPage(OListComboWizard* _pParent, const OString& rID, const OUString& rUIXMLDescription)
OLCPage( OListComboWizard* _pParent, const OString& rID, const OUString& rUIXMLDescription ) : OControlWizardPage(_pParent, rID, rUIXMLDescription) { } : OControlWizardPage(_pParent, rID, rUIXMLDescription)
{
}
protected: protected:
OListComboSettings& getSettings() { return static_cast<OListComboWizard*>(getDialog())->getSettings(); } OListComboSettings& getSettings() { return static_cast<OListComboWizard*>(getDialog())->getSettings(); }
......
...@@ -237,7 +237,6 @@ private: ...@@ -237,7 +237,6 @@ private:
SAL_DLLPRIVATE void SetInputSet( const SfxItemSet* pNew ) { pSet = pNew; } SAL_DLLPRIVATE void SetInputSet( const SfxItemSet* pNew ) { pSet = pNew; }
protected: protected:
SfxTabPage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet );
SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet); SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet);
sal_uInt16 GetSlot( sal_uInt16 nWhich ) const sal_uInt16 GetSlot( sal_uInt16 nWhich ) const
......
...@@ -42,10 +42,6 @@ class SvxTabPage : public SfxTabPage ...@@ -42,10 +42,6 @@ class SvxTabPage : public SfxTabPage
{ {
public: public:
SvxTabPage(Window* pParent, ResId Id, const SfxItemSet& rInAttrs)
: SfxTabPage(pParent, Id, rInAttrs)
{
}
SvxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet) SvxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet)
: SfxTabPage(pParent, rID, rUIXMLDescription, &rAttrSet) : SfxTabPage(pParent, rID, rUIXMLDescription, &rAttrSet)
{ {
......
...@@ -163,24 +163,6 @@ void SfxTabPage::SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::st ...@@ -163,24 +163,6 @@ void SfxTabPage::SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::st
return ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >(); return ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >();
} }
SfxTabPage::SfxTabPage( Window *pParent,
const ResId &rResId, const SfxItemSet &rAttrSet ) :
/* [Description]
Constructor
*/
TabPage( pParent, rResId ),
pSet ( &rAttrSet ),
bHasExchangeSupport ( false ),
pImpl ( new TabPageImpl )
{
}
SfxTabPage::SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet) SfxTabPage::SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet)
: TabPage(pParent, rID, rUIXMLDescription) : TabPage(pParent, rID, rUIXMLDescription)
, pSet ( rAttrSet ) , pSet ( rAttrSet )
...@@ -189,50 +171,36 @@ SfxTabPage::SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIX ...@@ -189,50 +171,36 @@ SfxTabPage::SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIX
{ {
} }
SfxTabPage::~SfxTabPage() SfxTabPage::~SfxTabPage()
/* [Description] /* [Description]
Destructor Destructor
*/ */
{ {
delete pImpl; delete pImpl;
} }
bool SfxTabPage::FillItemSet( SfxItemSet* rSet ) bool SfxTabPage::FillItemSet( SfxItemSet* rSet )
{ {
return pImpl->maItemConn.DoFillItemSet( *rSet, GetItemSet() ); return pImpl->maItemConn.DoFillItemSet( *rSet, GetItemSet() );
} }
void SfxTabPage::Reset( const SfxItemSet* rSet ) void SfxTabPage::Reset( const SfxItemSet* rSet )
{ {
pImpl->maItemConn.DoApplyFlags( *rSet ); pImpl->maItemConn.DoApplyFlags( *rSet );
pImpl->maItemConn.DoReset( *rSet ); pImpl->maItemConn.DoReset( *rSet );
} }
void SfxTabPage::ActivatePage( const SfxItemSet& ) void SfxTabPage::ActivatePage( const SfxItemSet& )
/* [Description] /* [Description]
Default implementation of the virtual ActivatePage method. This method is Default implementation of the virtual ActivatePage method. This method is
called when a page of dialogue supports the exchange of data between pages. called when a page of dialogue supports the exchange of data between pages.
<SfxTabPage::DeactivatePage(SfxItemSet *)> <SfxTabPage::DeactivatePage(SfxItemSet *)>
*/ */
{ {
} }
int SfxTabPage::DeactivatePage( SfxItemSet* ) int SfxTabPage::DeactivatePage( SfxItemSet* )
/* [Description] /* [Description]
......
...@@ -20,6 +20,8 @@ OutputDevice::LogicToPixel(Region const&, MapMode const&) const ...@@ -20,6 +20,8 @@ OutputDevice::LogicToPixel(Region const&, MapMode const&) const
OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const
OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) const OutputDevice::LogicToPixel(basegfx::B2DPolygon const&, MapMode const&) const
OutputDevice::PixelToLogic(Region const&, MapMode const&) const OutputDevice::PixelToLogic(Region const&, MapMode const&) const
Primitive2dXmlDump::filterActionType(unsigned short, bool)
Primitive2dXmlDump::filterAllActionTypes()
SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*) SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
ScDBFuncUndo::SetDrawUndoAction(SdrUndoAction*) ScDBFuncUndo::SetDrawUndoAction(SdrUndoAction*)
ScDocument::AreaBroadcastInRange(ScRange const&, ScHint const&) ScDocument::AreaBroadcastInRange(ScRange const&, ScHint const&)
......
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