[Libreoffice-commits] core.git: 3 commits - chart2/CppunitTest_chart2_import.mk include/tools sfx2/source tools/source

[Stephan Bergmann]

 chart2/CppunitTest_chart2_import.mk |    3 +++
 include/tools/resid.hxx             |   13 -------------
 sfx2/source/control/objface.cxx     |    4 ++--
 tools/source/rc/resmgr.cxx          |   12 ++++--------
 4 files changed, 9 insertions(+), 23 deletions(-)

New commits:
commit defbb4752bfa4bc2a35f5ee4c24d0e1654afeb2c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 18 09:52:20 2015 +0100

    Missing dependency
    
    Change-Id: I4b66f7e549fe318f61b5ec8127ca073b2eb19ed3

diff --git a/chart2/CppunitTest_chart2_import.mk b/chart2/CppunitTest_chart2_import.mk
index 742f7f68..50d58f2 100644
--- a/chart2/CppunitTest_chart2_import.mk
+++ b/chart2/CppunitTest_chart2_import.mk
@@ -132,4 +132,7 @@ $(eval $(call gb_CppunitTest_use_configuration,chart2_import))
 
 $(eval $(call gb_CppunitTest_use_unittest_configuration,chart2_import))
 
+$(call gb_CppunitTest_get_target,chart2_import): \
+    $(call gb_AllLangResTarget_get_target,sd)
+
 # vim: set noet sw=4 ts=4:
commit 765efd36fcadbc5df32f8fc2d7e8f4caf332ffbc
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 18 09:49:22 2015 +0100

    DBG_ASSERT -> assert
    
    The only caller of GetResourceSkipHeader (BitmapEx ctor in
    vcl/source/gdi/bitmapex.cxx) unconditionally expects *ppResMgr to be non-null
    after the call.
    
    Change-Id: I17e71df81019de5b78c4356c7aec967c50a5a6ae

diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 27d0cd7..6e0f348 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1075,15 +1075,11 @@ void * ResMgr::GetResourceSkipHeader( const ResId& rResId, ResMgr ** ppResMgr )
 {
     osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
 
-    DBG_ASSERT( rResId.GetResMgr(), "illegal ResId without ResMgr" );
     *ppResMgr = rResId.GetResMgr();
-    if( *ppResMgr )
-    {
-        (*ppResMgr)->GetResource( rResId );
-        (*ppResMgr)->Increment( sizeof( RSHEADER_TYPE ) );
-        return (*ppResMgr)->GetClass();
-    }
-    return getEmptyBuffer();
+    assert(*ppResMgr != nullptr);
+    (*ppResMgr)->GetResource( rResId );
+    (*ppResMgr)->Increment( sizeof( RSHEADER_TYPE ) );
+    return (*ppResMgr)->GetClass();
 }
 
 void ResMgr::PopContext( const Resource* pResObj )
commit f471fe7badd582ca64e452790b5ac46c365b8931
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 17 14:38:33 2015 +0100

    Better way to avoid ambiguities among ResId ctors
    
    Change-Id: I43c4c1c5ad193cdd3182cea649fae6091984a121

diff --git a/include/tools/resid.hxx b/include/tools/resid.hxx
index 07976f7..26f21c7 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 6e261e4..315b7b0 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)
     {