diff options
| -rw-r--r-- | include/tools/resid.hxx | 13 | ||||
| -rw-r--r-- | sfx2/source/control/objface.cxx | 4 |
2 files changed, 2 insertions, 15 deletions
diff --git a/include/tools/resid.hxx b/include/tools/resid.hxx index 07976f7bdeb5..26f21c742536 100644 --- a/include/tools/resid.hxx +++ b/include/tools/resid.hxx @@ -65,19 +65,6 @@ public: { ImplInit( nId, rMgr, NULL ); } - // backwards compatibility; avoid ambiguities - ResId( sal_uInt16 nId, ResMgr& rMgr ) - { - ImplInit( sal_uInt32(nId), rMgr, NULL ); - } - ResId( int nId, ResMgr& rMgr ) - { - ImplInit( sal_uInt32(nId), rMgr, NULL ); - } - ResId( long nId, ResMgr& rMgr ) - { - ImplInit( sal_uInt32(nId), rMgr, NULL ); - } sal_uInt32 GetWinBits() const { return m_nWinBits; } void SetWinBits( sal_uInt32 nBits ) const { m_nWinBits = nBits; } diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index 6e261e483124..315b7b0a450d 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -83,8 +83,8 @@ struct SfxInterface_Impl bool bRegistered; SfxInterface_Impl() : - aPopupRes(0,*SfxApplication::GetOrCreate()->GetSfxResManager()), - aStatBarRes(0,*SfxApplication::GetOrCreate()->GetSfxResManager()) + aPopupRes(nullptr, *SfxApplication::GetOrCreate()->GetSfxResManager()), + aStatBarRes(nullptr, *SfxApplication::GetOrCreate()->GetSfxResManager()) , pModule(NULL) , bRegistered(false) { |