svx/source/form/ParseContext.cxx | 2 +- sw/source/filter/html/htmlgrin.cxx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit f6c6474ddea7dfdb63d5b67a0b637c8c41fa4d13 Author: Michael Stahl <[email protected]> Date: Fri Sep 26 15:23:12 2014 +0200 AddressSanitizer: alloc-dealloc-mismatch (operator new vs free) Change-Id: I500e70e64c478210bc6da0c13894995a0984c018 diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 4e136a4..0d834fe 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -698,12 +698,12 @@ IMAGE_SETEVENT: INetURLObject aGraphicURL( sGrfNm ); if( aGraphicURL.GetProtocol() == INET_PROT_DATA ) { - SvMemoryStream* aStream = aGraphicURL.getData(); - if( aStream ) + SvMemoryStream* pStream = aGraphicURL.getData(); + if (pStream) { - if (GRFILTER_OK == GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, "", *aStream)) + if (GRFILTER_OK == GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, "", *pStream)) sGrfNm = ""; - free( aStream ); + delete pStream; } } // sBaseURL is empty if the source is clipboard commit 24a9eac14fc22e18a48eae5a0de1b5e98194ef86 Author: Michael Stahl <[email protected]> Date: Fri Sep 26 15:56:15 2014 +0200 svx: fix up c10225762ce2c242d21126b5730b1d60f0150ed Change-Id: Ib810a512f5a88af88901c53025cdf132f95b2ddc diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index f075d00..9c3c760 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -65,7 +65,7 @@ OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const case ERROR_INVALID_INT_COMPARE: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_INT_NO_VALID); break; case ERROR_INVALID_DATE_COMPARE: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_ACCESS_DAT_NO_VALID); break; case ERROR_INVALID_REAL_COMPARE: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_REAL_NO_VALID); break; - case ERROR_INVALID_TABLE: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE); break; + case ERROR_INVALID_TABLE1: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE); break; case ERROR_INVALID_TABLE_OR_QUERY: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE_OR_QUERY); break; case ERROR_INVALID_COLUMN: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_COLUMN); break; case ERROR_INVALID_TABLE_EXIST: aMsg = SVX_RESSTR(RID_STR_SVT_SQL_SYNTAX_TABLE_EXISTS); break; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
