[Libreoffice-commits] .: Branch 'integration/dev300_m98' - 2 commits - cppcanvas/source rsc/source

[Norbert Thiebaud]

 cppcanvas/source/uno/exports.dxp |    1 -
 cppcanvas/source/uno/exports.map |    1 -
 rsc/source/parser/rscdb.cxx      |   10 +++++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 7090b30ce26780a3df307ab8ff0e92dbe0b28d46
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Mar 1 05:38:05 2011 -0600

    cppcanvas does not export component_writeInfo anymore

diff --git a/cppcanvas/source/uno/exports.dxp b/cppcanvas/source/uno/exports.dxp
index 9630d7e..f0e1c69 100644
--- a/cppcanvas/source/uno/exports.dxp
+++ b/cppcanvas/source/uno/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/cppcanvas/source/uno/exports.map b/cppcanvas/source/uno/exports.map
index 31a8b65..a488d5d 100644
--- a/cppcanvas/source/uno/exports.map
+++ b/cppcanvas/source/uno/exports.map
@@ -2,7 +2,6 @@ UDK_3_0_0 {
     global:
 _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
         component_getImplementationEnvironment;
-        component_writeInfo;
         component_getFactory;
     local:
     *;
commit acca87297b7b72a7dc490d5cfdc4c93944f91678
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Jan 31 20:41:37 2011 +0000

    fix branching on un-initialized memory in some cases

diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index cd1a0c9..a699cc6 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -370,8 +370,9 @@ void RscTypCont :: Delete( Atom nRT, const RscId & rId ){
 sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName,
                                  sal_uInt32 nConst, sal_uInt32 nId, BOOL bFirst )
 {
-    RscSysEntry *	pSysEntry;
-    BOOL			bId1 = FALSE;
+    RscSysEntry *pSysEntry;
+    RscSysEntry *pFoundEntry = NULL;
+    BOOL		 bId1 = FALSE;
 
     for ( size_t i = 0, n = aSysLst.size(); i < n; ++i )
     {
@@ -382,9 +383,12 @@ sal_uInt32 RscTypCont :: PutSysName( sal_uInt32 nRscTyp, char * pFileName,
             if(  pSysEntry->nRscTyp == nRscTyp
               && pSysEntry->nTyp    == nConst
               && pSysEntry->nRefId  == nId
-              )
+                 ) {
+                pFoundEntry = pSysEntry;
                 break;
+            }
     }
+    pSysEntry = pFoundEntry;
 
     if ( !pSysEntry || (bFirst && !bId1) )
     {