[Libreoffice-commits] core.git: 2 commits - connectivity/source sw/source
connectivity/source/parse/sqliterator.cxx |6 +++---
sw/source/uibase/shells/textsh1.cxx | 10 --
2 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit bf770e860382ff8b6483b820a6dacb55f1cd5c68
Author: Julien Nabet
AuthorDate: Thu Apr 20 12:43:38 2023 +0200
Commit: Julien Nabet
CommitDate: Thu Apr 20 15:16:34 2023 +0200
Typo: nCurentPos->nCurrentPos (connectivity/sqliterator)
Change-Id: I6580e81a8a792ff98e1b8594ed79bd77b684b719
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150684
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/connectivity/source/parse/sqliterator.cxx
b/connectivity/source/parse/sqliterator.cxx
index 64ea48d0351a..1a205953f7aa 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1216,10 +1216,10 @@ void
OSQLParseTreeIterator::traverseSearchCondition(OSQLParseNode const * pSearc
OSL_ENSURE(pSearchCondition->count() == 2,"OSQLParseTreeIterator:
error in parse tree!");
const OSQLParseNode* pPart2 = pSearchCondition->getChild(1);
-sal_Int32 nCurentPos = pPart2->count()-2;
+sal_Int32 nCurrentPos = pPart2->count()-2;
-OSQLParseNode * pNum_value_exp = pPart2->getChild(nCurentPos);
-OSQLParseNode * pOptEscape = pPart2->getChild(nCurentPos+1);
+OSQLParseNode * pNum_value_exp = pPart2->getChild(nCurrentPos);
+OSQLParseNode * pOptEscape = pPart2->getChild(nCurrentPos+1);
OSL_ENSURE(pNum_value_exp != nullptr,"OSQLParseTreeIterator: error in
parse tree!");
OSL_ENSURE(pOptEscape != nullptr,"OSQLParseTreeIterator: error in
parse tree!");
commit 06c61d3581d95354d627c7de1a7d97b62c8f61c6
Author: Justin Luth
AuthorDate: Wed Apr 19 20:06:28 2023 -0400
Commit: Justin Luth
CommitDate: Thu Apr 20 15:16:32 2023 +0200
tdf#154817 sw UI: no hatch/gradient name if not selected
This fixes a LO 7.2.0 regression caused by
commit 3f6797c29e9672eba354400f24a669244fd746c0.
A unique name was being created for gradients and hatches
every time the paragraph dialog box was OK'd,
even if the Area tab was not selected or natigated to.
Only create the name if the gradient or hatch is actually
selected as the fill type.
Change-Id: I088954db07d025570b0f5ecd5785020052c6f1f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150669
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
Reviewed-by: Justin Luth
diff --git a/sw/source/uibase/shells/textsh1.cxx
b/sw/source/uibase/shells/textsh1.cxx
index e331b290121c..b66772a6dbca 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -51,6 +51,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1585,7 +1586,10 @@ void SwTextShell::Execute(SfxRequest &rReq)
pSet->Put(SfxStringItem(FN_DROP_CHAR_STYLE_NAME,
sCharStyleName));
}
-const XFillGradientItem* pTempGradItem =
pSet->GetItem(XATTR_FILLGRADIENT);
+const XFillStyleItem* pFS =
pSet->GetItem(XATTR_FILLSTYLE);
+bool bSet = pFS && pFS->GetValue() ==
drawing::FillStyle_GRADIENT;
+const XFillGradientItem* pTempGradItem
+= bSet ?
pSet->GetItem(XATTR_FILLGRADIENT) : nullptr;
if (pTempGradItem &&
pTempGradItem->GetName().isEmpty())
{
// MigrateItemSet guarantees unique gradient names
@@ -1594,7 +1598,9 @@ void SwTextShell::Execute(SfxRequest &rReq)
SdrModel::MigrateItemSet(&aMigrateSet, pSet,
pDrawModel);
}
-const XFillHatchItem* pTempHatchItem =
pSet->GetItem(XATTR_FILLHATCH);
+bSet = pFS && pFS->GetValue() ==
drawing::FillStyle_HATCH;
+const XFillHatchItem* pTempHatchItem
+= bSet ?
pSet->GetItem(XATTR_FILLHATCH) : nullptr;
if (pTempHatchItem &&
pTempHatchItem->GetName().isEmpty())
{
SfxItemSetFixed
aMigrateSet(rWrtSh.GetView().GetPool());
[Libreoffice-commits] core.git: 2 commits - connectivity/source sw/source
connectivity/source/drivers/dbase/dindexnode.cxx |1 +
sw/source/filter/ww8/ww8scan.cxx |3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 8ceb8b2d141a249127822bd511e66dd855fb1e59
Author: Caolán McNamara
Date: Thu Nov 24 11:43:38 2016 +
Related: coverity#1371267 copy ctor broken, nPagePos not copied
initially operator= was removed by
commit a0a919d2b541c415ad9b81d2ee91895bf106e9bb
Date: Fri Oct 3 10:39:28 2014 +0200
remove SvRefBase::QueryDelete
and then operator= was restored by
commit faa6455995966e41653204779d055b885b27fc4c
Date: Fri Oct 10 12:02:32 2014 +0200
add copy constructor for ONDXPagePtr class
which I forgot in commit a0a919d2b541c415ad9b81d2ee91895bf106e9bb
"remove SvRefBase::QueryDelete"
but nPagePos was missed
Change-Id: I6497934d4a199f5ea94cf2da840c164910e7a826
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx
b/connectivity/source/drivers/dbase/dindexnode.cxx
index 064660b..7790f74 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -858,6 +858,7 @@ ONDXPagePtr& ONDXPagePtr::operator=(ONDXPagePtr const &
rOther)
}
ONDXPage * pOldObj = mpPage;
mpPage = rOther.mpPage;
+nPagePos = rOther.nPagePos;
if (pOldObj != nullptr) {
pOldObj->ReleaseRef();
}
commit 9868cfb58ae833b54b671bb7a81db33b845251ac
Author: Caolán McNamara
Date: Thu Nov 24 10:04:24 2016 +
coverity#1394416 ensure there's enough data to read
an alternative attempt to silence coverity
Change-Id: Ia62d1c9075ecee1657554a5f0705fc67656848fd
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index b2a1fe3..8b27a3f 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2550,7 +2550,8 @@ WW8PLCFx_Fc_FKP::WW8Fkp::WW8Fkp(const WW8Fib& rFib,
SvStream* pSt,
of the new data
*/
bool bExpand = IsExpandableSprm(nSpId);
-if ((IsReplaceAllSprm(nSpId) || bExpand) &&
aEntry.mnLen >= sizeof(sal_uInt32) + 2)
+const void* pEndAvailableData = maRawData +
sizeof(maRawData);
+if ((IsReplaceAllSprm(nSpId) || bExpand) &&
aEntry.mpData + 2 + sizeof(sal_uInt32) <= pEndAvailableData)
{
sal_uInt32 nCurr = pDataSt->Tell();
sal_uInt32 nPos = SVBT32ToUInt32(aEntry.mpData +
2);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - connectivity/source sw/source
connectivity/source/drivers/jdbc/tools.cxx | 11 ---
sw/source/core/doc/DocumentStatisticsManager.cxx |2 +-
sw/source/core/doc/swstylemanager.cxx|2 +-
sw/source/core/doc/tblafmt.cxx |2 +-
sw/source/core/doc/tblcpy.cxx|2 +-
5 files changed, 4 insertions(+), 15 deletions(-)
New commits:
commit ab30dbe70504213ae318baa88bf81e6eda99a429
Author: Caolán McNamara
Date: Mon May 4 12:00:41 2015 +0100
drop useless temp debugging strings
Change-Id: I41c7053296c634c0fed5b31f2e080c3eaf59bbba
diff --git a/connectivity/source/drivers/jdbc/tools.cxx
b/connectivity/source/drivers/jdbc/tools.cxx
index ee21f07..7ed32d4 100644
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/tools.cxx
@@ -194,18 +194,7 @@ bool connectivity::isExceptionOccurred(JNIEnv *pEnv,bool
_bClear)
{
if ( _bClear )
pEnv->ExceptionClear();
-#if OSL_DEBUG_LEVEL > 1
-
if(pEnv->IsInstanceOf(pThrowable,java_sql_SQLException_BASE::st_getMyClass()))
-{
-
-java_sql_SQLException_BASE* pException = new
java_sql_SQLException_BASE(pEnv,pThrowable);
-OUString sError = pException->getMessage();
-delete pException;
-}
-#else
pEnv->DeleteLocalRef(pThrowable);
-#endif
-
}
return bRet;
commit 3761cf7660e8329670722973c567235bffe40536
Author: Caolán McNamara
Date: Sun May 3 21:01:56 2015 +0100
cppcheck: noExplicitConstructor
Change-Id: I1f5272cdf05b36d1c6958159a29c04ed7374592d
diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx
b/sw/source/core/doc/DocumentStatisticsManager.cxx
index 908abb4..8677456 100644
--- a/sw/source/core/doc/DocumentStatisticsManager.cxx
+++ b/sw/source/core/doc/DocumentStatisticsManager.cxx
@@ -44,7 +44,7 @@ namespace
std::vector m_aViewWasUnLocked;
SwViewShell* m_pViewShell;
public:
-LockAllViews(SwViewShell *pViewShell)
+explicit LockAllViews(SwViewShell *pViewShell)
: m_pViewShell(pViewShell)
{
if (!m_pViewShell)
diff --git a/sw/source/core/doc/swstylemanager.cxx
b/sw/source/core/doc/swstylemanager.cxx
index af8e6d2..11d3b3b 100644
--- a/sw/source/core/doc/swstylemanager.cxx
+++ b/sw/source/core/doc/swstylemanager.cxx
@@ -64,7 +64,7 @@ class SwStyleManager : public IStyleAccess
public:
// accept empty item set for ignorable paragraph items.
-SwStyleManager( SfxItemSet* pIgnorableParagraphItems )
+explicit SwStyleManager( SfxItemSet* pIgnorableParagraphItems )
: aAutoCharPool(),
aAutoParaPool( pIgnorableParagraphItems ),
mpCharCache(0),
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 66bc940..f3a732c 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -128,7 +128,7 @@ namespace
class WriterSpecificAutoFormatBlock : ::boost::noncopyable
{
public:
-WriterSpecificAutoFormatBlock(SvStream &rStream) : _rStream(rStream)
+explicit WriterSpecificAutoFormatBlock(SvStream &rStream) :
_rStream(rStream)
{
_whereToWriteEndOfBlock = BeginSwBlock(rStream);
}
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index d4b39c2..8dbd572 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -91,7 +91,7 @@ namespace
sal_uLong &rnB, sal_uInt16 &rnC,
ColumnStructure::iterator& rpCl,
BoxStructure::iterator& rpSel, bool &rbSel, bool bCover );
void incColSpan( sal_uInt16 nLine, sal_uInt16 nCol );
-TableStructure( const SwTable& rTable );
+explicit TableStructure( const SwTable& rTable );
TableStructure( const SwTable& rTable, _FndBox &rFndBox,
const SwSelBoxes& rSelBoxes,
LineStructure::size_type nMinSize );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - connectivity/source sw/source
connectivity/source/drivers/evoab2/NConnection.cxx | 11 ++-
sw/source/core/doc/DocumentRedlineManager.cxx |2 ++
2 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 3528aea9bbb74aab3fd1035be146110b80e2780e
Author: Caolán McNamara
Date: Fri Jan 30 20:46:06 2015 +
coverity#1267700 Uninitialized scalar field
Change-Id: I1e9d412ccf68996e59e0875c0f0af17592258acb
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx
b/connectivity/source/drivers/evoab2/NConnection.cxx
index c6f0050..17ea5c6 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -40,16 +40,17 @@ using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::lang;
-OEvoabConnection::OEvoabConnection( OEvoabDriver& _rDriver )
-:OSubComponent(
(::cppu::OWeakObject*)(&_rDriver), this )
-,m_rDriver(_rDriver)
-,m_xCatalog(NULL)
+OEvoabConnection::OEvoabConnection(OEvoabDriver& _rDriver)
+: OSubComponent(
(::cppu::OWeakObject*)(&_rDriver), this )
+, m_rDriver(_rDriver)
+, m_eSDBCAddressType(SDBCAddress::EVO_LOCAL)
+, m_xCatalog(NULL)
{
}
OEvoabConnection::~OEvoabConnection()
{
-::osl::MutexGuard aGuard( m_aMutex );
+::osl::MutexGuard aGuard( m_aMutex );
if(!isClosed()) {
acquire();
commit faf55a1db829bfb3f2f47f9d87190e9396676e25
Author: Caolán McNamara
Date: Fri Jan 30 17:31:46 2015 +
lcl_CheckRedline says it check for the list being sorted
Change-Id: Ie86b091f8253fb9464b1bf4823c6f21da969ff90
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 873b4d6..c192cd3 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -104,6 +104,8 @@ using namespace com::sun::star;
SAL_WARN_IF( *pPrev->End() > *pCurrent->Start(), "sw",
_ERROR_PREFIX "overlapping redlines" );
}
+
+assert(std::is_sorted(rTbl.begin(), rTbl.end(),
CompareSwRedlineTbl()));
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - connectivity/source sw/source
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 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 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, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - connectivity/source sw/source
connectivity/source/drivers/postgresql/pq_connection.cxx | 59 ++-
sw/source/core/text/inftxt.cxx |8 +-
sw/source/core/text/inftxt.hxx |4 -
sw/source/core/text/itrcrsr.cxx |4 -
sw/source/core/text/porglue.cxx |8 +-
sw/source/core/text/txttab.cxx |2
6 files changed, 38 insertions(+), 47 deletions(-)
New commits:
commit 8ad743ca8d45e094e433627cf0cf70d11a56084e
Author: Wol
Date: Tue Apr 16 13:30:30 2013 +0100
pgsql-sdbc: conninfo keywords as static table instead of series of "else if"
New keywords can now simply be added to a static array rather than
adding a new "else if" blocks for each keyword.
Change-Id: Ib581b3e834a57e0dfa9d139bcb4ae7a0a52a5472
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx
b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 4bc15e4..4f830a1 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -482,44 +482,30 @@ static void properties2arrays( const Sequence<
PropertyValue > & args,
// I.e. they are prefiltered to have only relevant ones?
// Else, at least support all keywords from
// http://www.postgresql.org/docs/9.0/interactive/libpq-connect.html
+
+static const char* keyword_list[] = {
+"password",
+"user",
+"port",
+"dbname",
+"connect_timeout",
+"options",
+"requiressl"
+};
+
for( int i = 0; i < args.getLength() ; ++i )
{
-bool append = true;
-// TODO: rewrite this as a static table of keywords, and a loop over
these keywords.
-if( args[i].Name.matchIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM( "password" ) ) )
-{
-keywords.push_back( "password", SAL_NO_ACQUIRE );
-}
-else if( args[i].Name.matchIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM( "user" ) ) )
-{
-keywords.push_back( "user", SAL_NO_ACQUIRE );
-}
-else if( args[i].Name.matchIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM( "port" ) ) )
-{
-keywords.push_back( "port", SAL_NO_ACQUIRE );
-}
-else if( args[i].Name.matchIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM( "dbname" ) ) )
-{
-keywords.push_back( "dbname", SAL_NO_ACQUIRE );
-}
-else if( args[i].Name.matchIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM( "connect_timeout" ) ) )
-{
-keywords.push_back( "connect_timeout", SAL_NO_ACQUIRE );
-}
-else if( args[i].Name.matchIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM( "options" ) ) )
-{
-keywords.push_back( "options", SAL_NO_ACQUIRE );
-}
-else if( args[i].Name.matchIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM( "requiressl" ) ) )
+bool append = false;
+for( size_t j = 0; j < SAL_N_ELEMENTS( keyword_list ); j++)
{
-keywords.push_back( "requiressl", SAL_NO_ACQUIRE );
-}
-else
-{
-append = false;
-// ignore for now
-OSL_TRACE("sdbc-postgresql: unknown argument '%s'",
OUStringToOString( args[i].Name, RTL_TEXTENCODING_UTF8 ).getStr() );
+if( args[i].Name.equalsIgnoreAsciiCaseAscii( keyword_list[j] ))
+{
+keywords.push_back( keyword_list[j], SAL_NO_ACQUIRE );
+append = true;
+break;
+}
}
+
if( append )
{
OUString value;
@@ -527,6 +513,11 @@ static void properties2arrays( const Sequence<
PropertyValue > & args,
char *v = strdup(OUStringToOString(value, enc).getStr());
values.push_back ( v );
}
+else
+{
+// ignore for now
+OSL_TRACE("sdbc-postgresql: unknown argument '%s'",
OUStringToOString( args[i].Name, RTL_TEXTENCODING_UTF8 ).getStr() );
+}
}
}
commit 13a0477250793d1ab06329b244f26fffbebb0bab
Author: Miklos Vajna
Date: Mon Apr 29 10:02:24 2013 +0200
SwTxtSizeInfo ctor: take a pointer, not a reference
The ctor later will turn that reference to a pointer anyway, but the old
code made it easy to pass a String, get it implicitly converted to
OUString, and then we took the address of the temporary OUString, later
resulting in accessing already freed memory. Instead, take an OUString
pointer, and then the compiler will warn about a String* -> OUString*
conversion. Adapt one remaining caller accordingly.
Change-Id: I4084dea1d245f0c8919d6afe47c5f391729f6eaf
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 5adc1c5..b1ac0f2 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source
