Kaydet (Commit) f471fe7b authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Better way to avoid ambiguities among ResId ctors

Change-Id: I43c4c1c5ad193cdd3182cea649fae6091984a121
üst dd4bd0ee
......@@ -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; }
......
......@@ -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)
{
......
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