[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - connectivity/source svtools/source

[Libreoffice Gerrit user]

 connectivity/source/inc/ado/Aolewrap.hxx |    3 +--
 svtools/source/svhtml/parhtml.cxx        |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit edd29ae3d8a17e69f5d7bfaff562635322ff21c5
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Sat Nov 3 01:09:35 2012 +0100

    fdo#53070 fix access violation
    
    Through that different initialization pIUnknown
    got random address. The consequence was that
    if (pIUnknown)
        pIUnknown->Release();
    ends with access viloation in
    WpBase& WpBase::operator=(const WpBase& rhs)
    
    Change-Id: I8b3c5de233d0868fea052c990cc83aed917117ae
    (cherry picked from commit ac2cfed553b8c9303f86758e9fe8b70911db00cd)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx
index 810603d..e4702ae 100644
--- a/connectivity/source/inc/ado/Aolewrap.hxx
+++ b/connectivity/source/inc/ado/Aolewrap.hxx
@@ -103,9 +103,8 @@ namespace connectivity
             }
 
             WpOLEBase(const WpOLEBase<T>& aWrapper)
-                : WpBase(aWrapper)
-                , pInterface(aWrapper.pInterface)
             {
+                operator=(aWrapper);
             }
 
             virtual ~WpOLEBase()
commit f8d569846ad04ff80e2810be865cacffd6cc1527
Author: Louis Possoz <louis.possoz at quelfutur.org>
Date:   Fri Oct 26 16:18:34 2012 +0200

    fdo#50931 : Cannot import HTML <br/> and <hr/>
    
    Reviewed-on: https://gerrit.libreoffice.org/915
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 9fdf86df4eb65a0cd2a178998daf751afc34805e)
    
    Change-Id: Ia4932c2e1f451ae45675a32de42a5cf971224211
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index d1c588c..3011833 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1119,7 +1119,7 @@ int HTMLParser::_GetNextToken()
                         if( MAX_LEN == sTmpBuffer.getLength() )
                             aToken += String(sTmpBuffer.makeStringAndClear());
                         nNextCh = GetNextChar();
-                    } while( '>' != nNextCh && !HTML_ISSPACE( nNextCh ) &&
+                    } while( '>' != nNextCh && '/' != nNextCh && !HTML_ISSPACE( nNextCh ) &&
                              IsParserWorking() && !rInput.IsEof() );
 
                     if( sTmpBuffer.getLength() )