[Libreoffice-commits] core.git: extensions/source
Tor Lillqvist
tml at iki.fi
Thu Feb 14 07:28:15 PST 2013
extensions/source/update/check/updatecheckconfig.cxx | 2 +-
extensions/source/update/check/updatecheckjob.cxx | 2 +-
extensions/source/update/ui/updatecheckui.cxx | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9d67b621c5c3247d8b7c983a81248d7dbde582fb
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Feb 14 17:25:55 2013 +0200
Fix compilation error with older GCC
The GCC 4.0 we still use for the "official" Mac OS X build says:
"error: conversion from âconst char*â to non-scalar type
ârtl::OUStringâ requested." Sigh, I guess there might be lots more of
these elsewhere in the code.
Change-Id: Ifad5722bbadd465ebfca1ac3f0b55f07a6895e12
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index 554cf0d..344fc87 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -505,7 +505,7 @@ UpdateCheckConfig::getServiceNames()
rtl::OUString
UpdateCheckConfig::getImplName()
{
- return "vnd.sun.UpdateCheckConfig";
+ return rtl::OUString("vnd.sun.UpdateCheckConfig");
}
//------------------------------------------------------------------------------
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index 8b30e4d..e4ff941 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -175,7 +175,7 @@ UpdateCheckJob::getServiceNames()
rtl::OUString
UpdateCheckJob::getImplName()
{
- return "vnd.sun.UpdateCheck";
+ return rtl::OUString("vnd.sun.UpdateCheck");
}
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index f5565f3..4176cab 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -75,7 +75,7 @@ static uno::Sequence< rtl::OUString > getServiceNames()
static rtl::OUString getImplementationName()
{
- return "vnd.sun.UpdateCheckUI";
+ return rtl::OUString("vnd.sun.UpdateCheckUI");
}
//------------------------------------------------------------------------------
More information about the Libreoffice-commits
mailing list