diff options
| -rw-r--r-- | oox/source/helper/textinputstream.cxx | 1 | ||||
| -rw-r--r-- | sw/source/core/doc/tblrwcl.cxx | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx index 5ecd73863a34..34c599ae7d8a 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 4aa61c312f9d..856e31d970b0 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 ); |