mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crashreport: change addKeyValue to lower-case camel

Browse Source 
Change-Id: Ife5775d3a570da1fc2e4dd627456523705b64e1d
Reviewed-on: https://gerrit.libreoffice.org/79601
Reviewed-by: Juergen Funk (CIB) <juergen.funk_ml@cib.de>
Tested-by: Juergen Funk (CIB) <juergen.funk_ml@cib.de>
This commit is contained in:
Juergen Funk
2019-09-25 11:21:17 +02:00
committed by Juergen Funk (CIB)
parent 7388db1b63
commit b5adb2433d
10 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/source/app/app.cxx
View File

@@ -2086,7 +2086,7 @@ void Desktop::OpenClients()
#if HAVE_FEATURE_BREAKPAD #if HAVE_FEATURE_BREAKPAD
CrashReporter::writeCommonInfo(); CrashReporter::writeCommonInfo();
// write this information here to avoid depending on vcl in the crash reporter lib // write this information here to avoid depending on vcl in the crash reporter lib
CrashReporter::AddKeyValue("Language", Application::GetSettings().GetLanguageTag().getBcp47()); CrashReporter::addKeyValue("Language", Application::GetSettings().GetLanguageTag().getBcp47());
#endif #endif
RequestHandler::EnableRequests(); RequestHandler::EnableRequests();

2
desktop/source/app/crashreport.cxx
View File

@@ -52,7 +52,7 @@ void writeToStream(std::ofstream& strm, const OUString& rKey, const OUString& rV
} }
void CrashReporter::AddKeyValue(const OUString& rKey, const OUString& rValue) void CrashReporter::addKeyValue(const OUString& rKey, const OUString& rValue)
{ {
osl::MutexGuard aGuard(maMutex); osl::MutexGuard aGuard(maMutex);
if (mbInit) if (mbInit)

2
framework/source/services/desktop.cxx
View File

@@ -320,7 +320,7 @@ sal_Bool SAL_CALL Desktop::terminate()
// see dispose() for further information. // see dispose() for further information.
/* SAFE AREA --------------------------------------------------------------------------------------- */ /* SAFE AREA --------------------------------------------------------------------------------------- */
SolarMutexClearableGuard aWriteLock; SolarMutexClearableGuard aWriteLock;
CrashReporter::AddKeyValue("ShutDown", OUString::boolean(true)); CrashReporter::addKeyValue("ShutDown", OUString::boolean(true));
m_bIsTerminated = true; m_bIsTerminated = true;
aWriteLock.clear(); aWriteLock.clear();
/* UNSAFE AREA ------------------------------------------------------------------------------------- */ /* UNSAFE AREA ------------------------------------------------------------------------------------- */

4
include/desktop/crashreport.hxx
View File

@@ -41,7 +41,7 @@ CRASHREPORT_DLLPUBLIC
/*class*/ CrashReporter /*class*/ CrashReporter
{ {
public: public:
static void AddKeyValue(const OUString& rKey, const OUString& rValue); static void addKeyValue(const OUString& rKey, const OUString& rValue);
static std::string getIniFileName(); static std::string getIniFileName();
@@ -69,7 +69,7 @@ private:
// everywhere we want to log something to the crash report system. // everywhere we want to log something to the crash report system.
#if HAVE_FEATURE_BREAKPAD #if HAVE_FEATURE_BREAKPAD
#else #else
inline void CrashReporter::AddKeyValue(SAL_UNUSED_PARAMETER const OUString& /*rKey*/, SAL_UNUSED_PARAMETER const OUString& /*rValue*/) inline void CrashReporter::addKeyValue(SAL_UNUSED_PARAMETER const OUString& /*rKey*/, SAL_UNUSED_PARAMETER const OUString& /*rValue*/)
{ {
} }
#endif #endif

6
vcl/opengl/win/WinDeviceInfo.cxx
View File

@@ -531,9 +531,9 @@ void writeToLog(SvStream& rStrm, const char* pKey, const OUString & rVal)
bool WinOpenGLDeviceInfo::isDeviceBlocked() bool WinOpenGLDeviceInfo::isDeviceBlocked()
{ {
CrashReporter::AddKeyValue("OpenGLVendor", maAdapterVendorID); CrashReporter::addKeyValue("OpenGLVendor", maAdapterVendorID);
CrashReporter::AddKeyValue("OpenGLDevice", maAdapterDeviceID); CrashReporter::addKeyValue("OpenGLDevice", maAdapterDeviceID);
CrashReporter::AddKeyValue("OpenGLDriver", maDriverVersion); CrashReporter::addKeyValue("OpenGLDriver", maDriverVersion);
SAL_INFO("vcl.opengl", maDriverVersion); SAL_INFO("vcl.opengl", maDriverVersion);
SAL_INFO("vcl.opengl", maDriverDate); SAL_INFO("vcl.opengl", maDriverDate);

4
vcl/opengl/x11/X11DeviceInfo.cxx
View File

@@ -283,8 +283,8 @@ bool X11OpenGLDeviceInfo::isDeviceBlocked()
if (mnGLMajorVersion == 1) if (mnGLMajorVersion == 1)
return true; return true;
CrashReporter::AddKeyValue("AdapterVendorId", OStringToOUString(maVendor, RTL_TEXTENCODING_UTF8)); CrashReporter::addKeyValue("AdapterVendorId", OStringToOUString(maVendor, RTL_TEXTENCODING_UTF8));
CrashReporter::AddKeyValue("AdapterDeviceId", OStringToOUString(maRenderer, RTL_TEXTENCODING_UTF8)); CrashReporter::addKeyValue("AdapterDeviceId", OStringToOUString(maRenderer, RTL_TEXTENCODING_UTF8));
SAL_INFO("vcl.opengl", "Vendor: " << maVendor); SAL_INFO("vcl.opengl", "Vendor: " << maVendor);
SAL_INFO("vcl.opengl", "Renderer: " << maRenderer); SAL_INFO("vcl.opengl", "Renderer: " << maRenderer);

2
vcl/source/app/salplug.cxx
View File

@@ -295,7 +295,7 @@ void SalAbort( const OUString& rErrorText, bool bDumpCore )
std::fprintf( stderr, "Application Error\n" ); std::fprintf( stderr, "Application Error\n" );
else else
{ {
CrashReporter::AddKeyValue("AbortMessage", rErrorText); CrashReporter::addKeyValue("AbortMessage", rErrorText);
std::fprintf( stderr, "%s\n", OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() ); std::fprintf( stderr, "%s\n", OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() );
} }
if( bDumpCore ) if( bDumpCore )

2
vcl/source/opengl/OpenGLHelper.cxx
View File

@@ -1024,7 +1024,7 @@ bool OpenGLHelper::isVCLOpenGLEnabled()
if (!getenv("SAL_DISABLE_GL_WATCHDOG")) if (!getenv("SAL_DISABLE_GL_WATCHDOG"))
OpenGLWatchdogThread::start(); OpenGLWatchdogThread::start();
} }
CrashReporter::AddKeyValue("UseOpenGL", OUString::boolean(bRet)); CrashReporter::addKeyValue("UseOpenGL", OUString::boolean(bRet));
return bRet; return bRet;
} }

2
vcl/source/window/builder.cxx
View File

@@ -442,7 +442,7 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const OUString& sUIDir, const OUStr
catch (const css::uno::Exception &rExcept) catch (const css::uno::Exception &rExcept)
{ {
DBG_UNHANDLED_EXCEPTION("vcl.layout", "Unable to read .ui file"); DBG_UNHANDLED_EXCEPTION("vcl.layout", "Unable to read .ui file");
CrashReporter::AddKeyValue("VclBuilderException", "Unable to read .ui file: " + rExcept.Message); CrashReporter::addKeyValue("VclBuilderException", "Unable to read .ui file: " + rExcept.Message);
throw; throw;
} }

2
vcl/win/app/salinst.cxx
View File

@@ -79,7 +79,7 @@ void SalAbort( const OUString& rErrorText, bool )
} }
else else
{ {
CrashReporter::AddKeyValue("AbortMessage", rErrorText); CrashReporter::addKeyValue("AbortMessage", rErrorText);
// make sure crash reporter is triggered // make sure crash reporter is triggered
RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, nullptr ); RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, nullptr );
FatalAppExitW( 0, o3tl::toW(rErrorText.getStr()) ); FatalAppExitW( 0, o3tl::toW(rErrorText.getStr()) );