[Libreoffice-commits] core.git: 2 commits - connectivity/source sw/source

[Gabriele Bulfon]

 connectivity/source/drivers/odbcbase/OConnection.cxx |    2 +-
 sw/source/filter/html/swhtml.cxx                     |    6 +++---
 sw/source/filter/html/swhtml.hxx                     |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 12b7ba60b746031f2bbef59758270cc0281f4dab
Author: Gabriele Bulfon <gabriele.bulfon at sonicle.com>
Date:   Fri Jul 5 21:27:12 2013 +0200

    use proper SQLINTEGER type (fixes build on Illumos)
    
    Change-Id: I85296600195dd5d74d2a112ce6cfef7f276535ab

diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx
index dfe22be..9e04bba 100644
--- a/connectivity/source/drivers/odbcbase/OConnection.cxx
+++ b/connectivity/source/drivers/odbcbase/OConnection.cxx
@@ -417,7 +417,7 @@ OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeExcepti
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
 
 
-    sal_Int32 nValueLen;
+    SQLINTEGER nValueLen;
     char pCat[1024];
     OTools::ThrowException(this,
         N3SQLGetConnectAttr(m_aConnectionHandle,SQL_ATTR_CURRENT_CATALOG,(SDB_ODBC_CHAR*)pCat,(sizeof pCat)-1,&nValueLen),
commit b3f41543851e9985c6c7ba133c32753c9bc732c1
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jul 5 15:04:50 2013 +0200

    SwHTMLParser: avoid a spurious ~SwindexReg assert
    
    The pPam that is passed to SwHTMLParser would be reinitialized by
    SwReader::Read anyway.  Can be reproduced with bugdoc from fdo#65935.
    
    Change-Id: I3b7dcc9c83d9d2eac05ee6ec38909dea7350d245

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index cf572e9..76a2d17 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -237,7 +237,7 @@ sal_uLong HTMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, co
 
 
 
-SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
+SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn,
                             const String& rPath,
                             const String& rBaseURL,
                             int bReadNewDoc,
@@ -305,7 +305,8 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
     eScriptLang = HTML_SL_UNKNOWN;
     bAnyStarBasic = sal_True;
 
-    pPam = new SwPaM( *rCrsr.GetPoint() );
+    rCrsr.DeleteMark();
+    pPam = &rCrsr; // re-use existing cursor: avoids spurious ~SwIndexReg assert
     memset( &aAttrTab, 0, sizeof( _HTMLAttrTable ));
 
     // Die Font-Groessen 1-7 aus der INI-Datei lesen
@@ -453,7 +454,6 @@ SwHTMLParser::~SwHTMLParser()
         aSetAttrTab.clear();
     }
 
-    delete pPam;
     delete pCSS1Parser;
     delete pNumRuleInfo;
     DeleteFormImpl();
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index d3e0ab4..a8db7b8 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -894,7 +894,7 @@ protected:
 
 public:
 
-    SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn,
+    SwHTMLParser( SwDoc* pD, SwPaM & rCrsr, SvStream& rIn,
                     const String& rFileName,
                     const String& rBaseURL,
                     int bReadNewDoc = sal_True,