ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Drop loplugin:stringadd exclusion for pyuno_runtime.cxx

Browse Source 
Change-Id: I362f4322fd0948b83272234e4fe52a957aea5f9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191578
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2025-09-28 19:03:11 +02:00
parent 7ff6d60175
commit 641e8b1875
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compilerplugins/clang/stringadd.cxx
-3
View File
@@ -56,9 +56,6 @@ public:
return false;
if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sal/qa/OStringBuffer/"))
return false;
// there is an ifdef here, but my check is not working, not sure why
if (fn == SRCDIR "/pyuno/source/module/pyuno_runtime.cxx")
return false;
// TODO this file has a boatload of buffer appends' and I don't feel like fixing them all now
if (fn == SRCDIR "/vcl/source/gdi/pdfwriter_impl.cxx")
return false;
pyuno/source/module/pyuno_runtime.cxx
+5 -10
View File
@@ -191,8 +191,7 @@ static PyRef importUnoModule( )
// Who knows, a future Python might print something better.
PyRef str( PyObject_Str( excTraceback.get() ), SAL_NO_ACQUIRE );
OUStringBuffer buf;
buf.append( "python object raised an unknown exception (" );
OUStringBuffer buf("python object raised an unknown exception (");
PyRef valueRep( PyObject_Repr( excValue.get() ), SAL_NO_ACQUIRE );
buf.appendAscii( PyUnicode_AsUTF8( valueRep.get())).append( ", traceback follows\n" );
buf.appendAscii( PyUnicode_AsUTF8( str.get() ) );
@@ -254,8 +253,7 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE **ppFile )
if (osl_getProcessInfo(
nullptr , osl_Process_IDENTIFIER , &data ) == osl_Process_E_None)
{
o += ".";
o += OString::number(data.Ident);
o += "." + OString::number(data.Ident);
}
*ppFile = fopen( o.getStr() , "w" );
@@ -606,15 +604,13 @@ static Sequence< Type > invokeGetTypes( const Runtime & r , PyObject * o )
static OUString
lcl_ExceptionMessage(PyObject *const o, OUString const*const pWrapped)
{
OUStringBuffer buf;
buf.append("Couldn't convert ");
OUStringBuffer buf("Couldn't convert ");
PyRef reprString( PyObject_Str(o), SAL_NO_ACQUIRE );
buf.appendAscii( PyUnicode_AsUTF8(reprString.get()) );
buf.append(" to a UNO type");
if (pWrapped)
{
buf.append("; caught exception: ");
buf.append(*pWrapped);
buf.append("; caught exception: " + *pWrapped);
}
return buf.makeStringAndClear();
}
@@ -943,8 +939,7 @@ Any Runtime::extractUnoException( const PyRef & excType, const PyRef &excValue,
buf.append( ", traceback follows\n" );
if( !str.isEmpty() )
{
buf.append( str );
buf.append( "\n" );
buf.append(str + "\n");
}
else
{