[Libreoffice-commits] core.git: extensions/source include/sfx2 include/svx sfx2/source unusedcode.easy
Caolán McNamara
caolanm at redhat.com
Mon Aug 18 01:35:25 PDT 2014
extensions/source/dbpilots/controlwizard.cxx | 25 -------------------
extensions/source/dbpilots/controlwizard.hxx | 2 -
extensions/source/dbpilots/gridwizard.hxx | 5 ---
extensions/source/dbpilots/groupboxwiz.hxx | 6 +++-
extensions/source/dbpilots/listcombowizard.hxx | 8 +++---
include/sfx2/tabdlg.hxx | 1
include/svx/dlgctrl.hxx | 4 ---
sfx2/source/dialog/tabdlg.cxx | 32 -------------------------
unusedcode.easy | 2 +
9 files changed, 10 insertions(+), 75 deletions(-)
New commits:
commit b5a0b00d494928482e4dd44395765c480c8ae252
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 18 08:26:48 2014 +0100
callcatcher: another round of resource ctor removals
Change-Id: Ic554fa7c1e549a0f39296836868b22ccf4c859d3
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index a60491a..d51aef5 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -46,11 +46,8 @@
#include <tools/urlobj.hxx>
#include <vcl/layout.hxx>
-
namespace dbp
{
-
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::lang;
@@ -68,9 +65,6 @@ namespace dbp
using namespace ::comphelper;
using namespace ::dbtools;
-
- //= OAccessRegulator
-
struct OAccessRegulator
{
friend class OControlWizardPage;
@@ -79,22 +73,6 @@ namespace dbp
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_Base( _pParent, rID, rUIXMLDescription )
,m_pFormDatasourceLabel(NULL)
@@ -106,18 +84,15 @@ namespace dbp
{
}
-
OControlWizardPage::~OControlWizardPage()
{
}
-
OControlWizard* OControlWizardPage::getDialog()
{
return static_cast< OControlWizard* >(GetParent());
}
-
const OControlWizard* OControlWizardPage::getDialog() const
{
return static_cast< OControlWizard* >(GetParent());
diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx
index 725c0b3..6df51b8 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -72,9 +72,7 @@ namespace dbp
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 >
getFormConnection() const;
-
public:
- OControlWizardPage( OControlWizard* _pParent, const ResId& _rResId );
OControlWizardPage( OControlWizard* _pParent, const OString& rID, const OUString& rUIXMLDescription );
virtual ~OControlWizardPage();
diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx
index e65e75d..d3aac82 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -68,22 +68,17 @@ namespace dbp
void implApplySettings();
};
-
//= OGridPage
-
class OGridPage : public OControlWizardPage
{
public:
- OGridPage( OGridWizard* _pParent, const ResId& _rId ) : OControlWizardPage(_pParent, _rId) { }
OGridPage( OGridWizard* _pParent, const OString& _rID, const OUString& _rUIXMLDescription ) : OControlWizardPage(_pParent, _rID, _rUIXMLDescription) { }
protected:
OGridSettings& getSettings() { return static_cast<OGridWizard*>(getDialog())->getSettings(); }
};
-
//= OGridFieldsSelection
-
class OGridFieldsSelection : public OGridPage
{
protected:
diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx
index 28bf05b..a2e1c3e 100644
--- a/extensions/source/dbpilots/groupboxwiz.hxx
+++ b/extensions/source/dbpilots/groupboxwiz.hxx
@@ -79,8 +79,10 @@ namespace dbp
class OGBWPage : public OControlWizardPage
{
public:
- OGBWPage( OControlWizard* _pParent, const ResId& _rId ) : OControlWizardPage(_pParent, _rId) { }
- OGBWPage( OControlWizard* _pParent, const OString& _rID, const OUString& _rUIXMLDescription ) : OControlWizardPage(_pParent, _rID, _rUIXMLDescription) { }
+ OGBWPage(OControlWizard* _pParent, const OString& _rID, const OUString& _rUIXMLDescription)
+ : OControlWizardPage(_pParent, _rID, _rUIXMLDescription)
+ {
+ }
protected:
OOptionGroupSettings& getSettings() { return static_cast<OGroupBoxWizard*>(getDialog())->getSettings(); }
diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx
index d757609..a2ac8e1 100644
--- a/extensions/source/dbpilots/listcombowizard.hxx
+++ b/extensions/source/dbpilots/listcombowizard.hxx
@@ -82,14 +82,14 @@ namespace dbp
void implApplySettings();
};
-
//= OLCPage
-
class OLCPage : public OControlWizardPage
{
public:
- OLCPage( OListComboWizard* _pParent, const ResId& _rId ) : OControlWizardPage(_pParent, _rId) { }
- OLCPage( OListComboWizard* _pParent, const OString& rID, const OUString& rUIXMLDescription ) : OControlWizardPage(_pParent, rID, rUIXMLDescription) { }
+ OLCPage(OListComboWizard* _pParent, const OString& rID, const OUString& rUIXMLDescription)
+ : OControlWizardPage(_pParent, rID, rUIXMLDescription)
+ {
+ }
protected:
OListComboSettings& getSettings() { return static_cast<OListComboWizard*>(getDialog())->getSettings(); }
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 45acb9b..d916df3 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -237,7 +237,6 @@ private:
SAL_DLLPRIVATE void SetInputSet( const SfxItemSet* pNew ) { pSet = pNew; }
protected:
- SfxTabPage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet );
SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet);
sal_uInt16 GetSlot( sal_uInt16 nWhich ) const
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 4e007df..6127f70 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -42,10 +42,6 @@ class SvxTabPage : public SfxTabPage
{
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)
: SfxTabPage(pParent, rID, rUIXMLDescription, &rAttrSet)
{
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index dcf6d31..e0a7ce4 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -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 >();
}
-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)
: TabPage(pParent, rID, rUIXMLDescription)
, pSet ( rAttrSet )
@@ -189,50 +171,36 @@ SfxTabPage::SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIX
{
}
-
-
SfxTabPage::~SfxTabPage()
-
/* [Description]
Destructor
*/
-
{
delete pImpl;
}
-
-
bool SfxTabPage::FillItemSet( SfxItemSet* rSet )
{
return pImpl->maItemConn.DoFillItemSet( *rSet, GetItemSet() );
}
-
-
void SfxTabPage::Reset( const SfxItemSet* rSet )
{
pImpl->maItemConn.DoApplyFlags( *rSet );
pImpl->maItemConn.DoReset( *rSet );
}
-
-
void SfxTabPage::ActivatePage( const SfxItemSet& )
-
/* [Description]
Default implementation of the virtual ActivatePage method. This method is
called when a page of dialogue supports the exchange of data between pages.
<SfxTabPage::DeactivatePage(SfxItemSet *)>
*/
-
{
}
-
-
int SfxTabPage::DeactivatePage( SfxItemSet* )
/* [Description]
diff --git a/unusedcode.easy b/unusedcode.easy
index b2ac9e8..a79e652 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -20,6 +20,8 @@ OutputDevice::LogicToPixel(Region const&, MapMode const&) const
OutputDevice::LogicToPixel(basegfx::B2DPolygon const&) const
OutputDevice::LogicToPixel(basegfx::B2DPolygon 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*)
ScDBFuncUndo::SetDrawUndoAction(SdrUndoAction*)
ScDocument::AreaBroadcastInRange(ScRange const&, ScHint const&)
More information about the Libreoffice-commits
mailing list