[Libreoffice-commits] .: oox/source sw/source

[Julien Nabet]

 oox/source/helper/textinputstream.cxx |    1 -
 sw/source/core/doc/tblrwcl.cxx        |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 7c243e238b228eb71ffa26a5effbb9d73a1db18f
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue May 1 19:42:50 2012 +0200

    Oups ! (Thank you Korrawit !)
    
    Change-Id: I21122084cb35be38d859b44deb6200b68f378a0a

diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx
index 5ecd738..34c599a 100644
--- a/oox/source/helper/textinputstream.cxx
+++ b/oox/source/helper/textinputstream.cxx
@@ -199,7 +199,6 @@ OUString TextInputStream::readToChar( sal_Unicode cChar, bool bIncludeChar )
         const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm, rtl_TextEncoding eTextEnc )
 {
     Reference< XTextInputStream > xTextStrm;
-    // TODO JUL const char* pcCharset = rtl_getMimeCharsetFromTextEncoding( eTextEnc );
     const char* pcCharset = rtl_getBestMimeCharsetFromTextEncoding( eTextEnc );
     OSL_ENSURE( pcCharset, "TextInputStream::createXTextInputStream - unsupported text encoding" );
     if( rxContext.is() && rxInStrm.is() && pcCharset ) try
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 4aa61c3..856e31d 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -1764,7 +1764,7 @@ sal_Bool SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
     }
 
     SwTableLine* pInsLine = new SwTableLine(
-                (SwTableLineFmt*)pFndBox->GetLines().front().GetLine()->GetFrmFmt(), 0,
+                (SwTableLineFmt*)(&pFndBox->GetLines().front().GetLine()->GetFrmFmt()), 0,
                 !pFndBox->GetUpper() ? 0 : pFndBox->GetBox() );
     pInsLine->ClaimFrmFmt()->ResetFmtAttr( RES_FRM_SIZE );