summaryrefslogtreecommitdiff
path: root/extensions/source/oooimprovement
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/source/oooimprovement')
-rw-r--r--extensions/source/oooimprovement/config.cxx56
-rw-r--r--extensions/source/oooimprovement/corecontroller.cxx4
-rw-r--r--extensions/source/oooimprovement/invite_job.cxx17
-rw-r--r--extensions/source/oooimprovement/logpacker.cxx6
-rw-r--r--extensions/source/oooimprovement/logstorage.cxx14
-rw-r--r--extensions/source/oooimprovement/myconfigurationhelper.cxx14
-rw-r--r--extensions/source/oooimprovement/onlogrotate_job.cxx8
-rw-r--r--extensions/source/oooimprovement/soaprequest.cxx2
-rw-r--r--extensions/source/oooimprovement/soapsender.cxx14
9 files changed, 63 insertions, 72 deletions
diff --git a/extensions/source/oooimprovement/config.cxx b/extensions/source/oooimprovement/config.cxx
index 296df200d50d..751adf3c965d 100644
--- a/extensions/source/oooimprovement/config.cxx
+++ b/extensions/source/oooimprovement/config.cxx
@@ -43,32 +43,32 @@ namespace
{
using namespace oooimprovement;
- static const OUString CFG_COUNTERS = OUString::createFromAscii("Counters");
- static const OUString CFG_ENABLINGALLOWED = OUString::createFromAscii("EnablingAllowed");
- static const OUString CFG_EVENTSCOUNT = OUString::createFromAscii("LoggedEvents");
- static const OUString CFG_EXTENSION = OUString::createFromAscii("ooSetupExtension");
- static const OUString CFG_FAILEDATTEMPTS = OUString::createFromAscii("FailedAttempts");
- static const OUString CFG_INVACCEPT = OUString::createFromAscii("InvitationAccepted");
- static const OUString CFG_L10N = OUString::createFromAscii("L10N");
- static const OUString CFG_LOCALE = OUString::createFromAscii("ooLocale");
- static const OUString CFG_LOGGING = OUString::createFromAscii("/org.openoffice.Office.Logging");
- static const OUString CFG_LOGPATH = OUString::createFromAscii("LogPath");
- static const OUString CFG_NAME = OUString::createFromAscii("ooName");
- static const OUString CFG_OFFICESTARTCOUNTDOWN = OUString::createFromAscii("OfficeStartCounterdown");
- static const OUString CFG_OOOIMPROVEMENT = OUString::createFromAscii("OOoImprovement");
- static const OUString CFG_OOOIMPROVEMENTPACK = OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings");
- static const OUString CFG_PARTICIPATION = OUString::createFromAscii("Participation");
- static const OUString CFG_PRODUCT = OUString::createFromAscii("Product");
- static const OUString CFG_REPORTCOUNT = OUString::createFromAscii("UploadedReports");
- static const OUString CFG_REPORTEREMAIL = OUString::createFromAscii("ReporterEmail");
- static const OUString CFG_SETUP = OUString::createFromAscii("/org.openoffice.Setup");
- static const OUString CFG_SHOWEDINV = OUString::createFromAscii("ShowedInvitation");
- static const OUString CFG_SOAPIDADD = OUString::createFromAscii("SoapIdAdditions");
- static const OUString CFG_SOAPURL = OUString::createFromAscii("SoapUrl");
- static const OUString CFG_UPLOAD = OUString::createFromAscii("Upload");
- static const OUString CFG_VERSION = OUString::createFromAscii("ooSetupVersion");
-
- static const OUString SOAPID = OUString::createFromAscii("OpenOffice.org Improvement Report - Version 1\n");
+ static const OUString CFG_COUNTERS(RTL_CONSTASCII_USTRINGPARAM("Counters"));
+ static const OUString CFG_ENABLINGALLOWED(RTL_CONSTASCII_USTRINGPARAM("EnablingAllowed"));
+ static const OUString CFG_EVENTSCOUNT(RTL_CONSTASCII_USTRINGPARAM("LoggedEvents"));
+ static const OUString CFG_EXTENSION(RTL_CONSTASCII_USTRINGPARAM("ooSetupExtension"));
+ static const OUString CFG_FAILEDATTEMPTS(RTL_CONSTASCII_USTRINGPARAM("FailedAttempts"));
+ static const OUString CFG_INVACCEPT(RTL_CONSTASCII_USTRINGPARAM("InvitationAccepted"));
+ static const OUString CFG_L10N(RTL_CONSTASCII_USTRINGPARAM("L10N"));
+ static const OUString CFG_LOCALE(RTL_CONSTASCII_USTRINGPARAM("ooLocale"));
+ static const OUString CFG_LOGGING(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Logging"));
+ static const OUString CFG_LOGPATH(RTL_CONSTASCII_USTRINGPARAM("LogPath"));
+ static const OUString CFG_NAME(RTL_CONSTASCII_USTRINGPARAM("ooName"));
+ static const OUString CFG_OFFICESTARTCOUNTDOWN(RTL_CONSTASCII_USTRINGPARAM("OfficeStartCounterdown"));
+ static const OUString CFG_OOOIMPROVEMENT(RTL_CONSTASCII_USTRINGPARAM("OOoImprovement"));
+ static const OUString CFG_OOOIMPROVEMENTPACK(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings"));
+ static const OUString CFG_PARTICIPATION(RTL_CONSTASCII_USTRINGPARAM("Participation"));
+ static const OUString CFG_PRODUCT(RTL_CONSTASCII_USTRINGPARAM("Product"));
+ static const OUString CFG_REPORTCOUNT(RTL_CONSTASCII_USTRINGPARAM("UploadedReports"));
+ static const OUString CFG_REPORTEREMAIL(RTL_CONSTASCII_USTRINGPARAM("ReporterEmail"));
+ static const OUString CFG_SETUP(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup"));
+ static const OUString CFG_SHOWEDINV(RTL_CONSTASCII_USTRINGPARAM("ShowedInvitation"));
+ static const OUString CFG_SOAPIDADD(RTL_CONSTASCII_USTRINGPARAM("SoapIdAdditions"));
+ static const OUString CFG_SOAPURL(RTL_CONSTASCII_USTRINGPARAM("SoapUrl"));
+ static const OUString CFG_UPLOAD(RTL_CONSTASCII_USTRINGPARAM("Upload"));
+ static const OUString CFG_VERSION(RTL_CONSTASCII_USTRINGPARAM("ooSetupVersion"));
+
+ static const OUString SOAPID(RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org Improvement Report - Version 1\n"));
static sal_Int32 incrementCfgValue(
const Reference<XMultiServiceFactory> sm,
@@ -183,14 +183,14 @@ namespace oooimprovement
MyConfigurationHelper::E_READONLY) >>= value;
result.append(value);
- value = OUString::createFromAscii("");
+ value = OUString();
MyConfigurationHelper::readDirectKey(
m_ServiceFactory,
CFG_SETUP, CFG_PRODUCT, CFG_VERSION,
MyConfigurationHelper::E_READONLY) >>= value;
if(value.getLength()) result.appendAscii(" ").append(value);
- value = OUString::createFromAscii("");
+ value = OUString();
MyConfigurationHelper::readDirectKey(
m_ServiceFactory,
CFG_SETUP, CFG_PRODUCT, CFG_EXTENSION,
diff --git a/extensions/source/oooimprovement/corecontroller.cxx b/extensions/source/oooimprovement/corecontroller.cxx
index 8a9bae0f62dd..269d947c3e08 100644
--- a/extensions/source/oooimprovement/corecontroller.cxx
+++ b/extensions/source/oooimprovement/corecontroller.cxx
@@ -76,12 +76,12 @@ namespace oooimprovement
{ return getSupportedServiceNames_static(); }
OUString SAL_CALL CoreController::getImplementationName_static()
- { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovement.CoreController"); }
+ { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovement.CoreController")); }
Sequence<OUString> SAL_CALL CoreController::getSupportedServiceNames_static()
{
Sequence<OUString> aServiceNames(1);
- aServiceNames[0] = OUString::createFromAscii("com.sun.star.oooimprovement.CoreController");
+ aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.CoreController"));
return aServiceNames;
}
diff --git a/extensions/source/oooimprovement/invite_job.cxx b/extensions/source/oooimprovement/invite_job.cxx
index 1b96c0c181cd..c62ab07671c0 100644
--- a/extensions/source/oooimprovement/invite_job.cxx
+++ b/extensions/source/oooimprovement/invite_job.cxx
@@ -50,7 +50,7 @@ namespace
// [add additional conditions here]
static bool lcl_IsInvitationAllowed()
{
- static OUString sNoFirstStartWizard = OUString::createFromAscii("-nofirststartwizard");
+ static OUString sNoFirstStartWizard(RTL_CONSTASCII_USTRINGPARAM("-nofirststartwizard"));
sal_Int32 nCount = rtl_getAppCommandArgCount();
for(sal_Int32 nCurrent=0; nCurrent<nCount; nCurrent++)
{
@@ -65,12 +65,6 @@ namespace
namespace oooimprovement
{
-// InviteJob::InviteJob(const Reference<XComponentContext>& context)
-// : m_ServiceFactory(Reference<XMultiServiceFactory>(
-// context->getServiceManager()->createInstanceWithContext(
-// OUString::createFromAscii("com.sun.star.lang.XMultiServiceFactory"), context),
-// UNO_QUERY))
-// { }
InviteJob::InviteJob(const Reference<XMultiServiceFactory>& sf)
: m_ServiceFactory(sf)
@@ -93,7 +87,7 @@ namespace oooimprovement
if(lcl_IsInvitationAllowed() && !config.getShowedInvitation())
{
Reference<XCore> core(
- m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.oooimprovement.Core")),
+ m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.Core"))),
UNO_QUERY);
if(core.is()) core->inviteUser();
}
@@ -117,18 +111,15 @@ namespace oooimprovement
{ return getSupportedServiceNames_static(); }
OUString SAL_CALL InviteJob::getImplementationName_static()
- { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovement.InviteJob"); }
+ { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovement.InviteJob")); }
Sequence<OUString> SAL_CALL InviteJob::getSupportedServiceNames_static()
{
Sequence<OUString> aServiceNames(1);
- aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.XAsyncJob");
+ aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.XAsyncJob"));
return aServiceNames;
}
-// Reference<XInterface> InviteJob::Create(const Reference<XComponentContext>& context)
-// { return *(new InviteJob(context)); }
-
Reference<XInterface> InviteJob::Create(const Reference<XMultiServiceFactory>& sm)
{ return *(new InviteJob(sm)); }
}
diff --git a/extensions/source/oooimprovement/logpacker.cxx b/extensions/source/oooimprovement/logpacker.cxx
index 4defc2ab2cbe..e74b74c31982 100644
--- a/extensions/source/oooimprovement/logpacker.cxx
+++ b/extensions/source/oooimprovement/logpacker.cxx
@@ -74,13 +74,13 @@ namespace oooimprovement
sal_Int32 LogPacker::pack(const OUString& fileurl)
{
Reference<XSimpleFileAccess> file_access(
- m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")),
+ m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))),
UNO_QUERY_THROW);
Reference<XStorage> storage;
{
Reference<XSingleServiceFactory> storage_factory(
- m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.embed.StorageFactory")),
+ m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory"))),
UNO_QUERY_THROW);
Sequence<Any> storage_init_args(2);
storage_init_args[0] = Any(getZipfileurl(fileurl));
@@ -91,7 +91,7 @@ namespace oooimprovement
}
Reference<XOutputStream> zipped_stream = storage->openStreamElement(
- OUString::createFromAscii("logdata.csv"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("logdata.csv")),
ElementModes::WRITE)->getOutputStream();
Reference<XInputStream> unzipped_stream = file_access->openFileRead(fileurl);
const sal_Int32 bufsize = 1024;
diff --git a/extensions/source/oooimprovement/logstorage.cxx b/extensions/source/oooimprovement/logstorage.cxx
index 7181ed2fdce6..7bf3ef10ff10 100644
--- a/extensions/source/oooimprovement/logstorage.cxx
+++ b/extensions/source/oooimprovement/logstorage.cxx
@@ -47,7 +47,7 @@ namespace
{
using namespace oooimprovement;
- static const OUString CSSU_PATHSUB = OUString::createFromAscii("com.sun.star.util.PathSubstitution");
+ static const OUString CSSU_PATHSUB(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSubstitution"));
static OUString getLogPathFromCfg(const Reference<XMultiServiceFactory>& sf)
{
@@ -63,14 +63,14 @@ namespace
static bool isZipfile(const OUString& fileurl)
{
- static const OUString file_extension = OUString::createFromAscii(".zip");
+ static const OUString file_extension(RTL_CONSTASCII_USTRINGPARAM(".zip"));
return fileurl.match(file_extension, fileurl.getLength()-file_extension.getLength());
};
static bool isLogfile(const OUString& fileurl)
{
- static const OUString file_extension = OUString::createFromAscii(".csv");
- static const OUString current = OUString::createFromAscii("Current.csv");
+ static const OUString file_extension(RTL_CONSTASCII_USTRINGPARAM(".csv"));
+ static const OUString current(RTL_CONSTASCII_USTRINGPARAM("Current.csv"));
return
fileurl.match(file_extension, fileurl.getLength()-file_extension.getLength())
&& !fileurl.match(current, fileurl.getLength()-current.getLength());
@@ -84,7 +84,7 @@ namespace
static Sequence<OUString> getAllLogStoragefiles(const Reference<XMultiServiceFactory>& sf)
{
Reference<XSimpleFileAccess> file_access(
- sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")),
+ sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))),
UNO_QUERY_THROW);
return file_access->getFolderContents(
getLogPathFromCfg(sf),
@@ -107,7 +107,7 @@ namespace
static void assureLogStorageExists(const Reference<XMultiServiceFactory>& sf)
{
Reference<XSimpleFileAccess> file_access(
- sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")),
+ sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))),
UNO_QUERY_THROW);
OUString log_path(getLogPathFromCfg(sf));
if(!file_access->isFolder(log_path))
@@ -130,7 +130,7 @@ namespace oooimprovement
void LogStorage::clear()
{
Reference<XSimpleFileAccess> file_access(
- m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")),
+ m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))),
UNO_QUERY_THROW);
vector<OUString> files_to_kill = getLogStoragefiles(m_ServiceFactory, &isZipOrLogFile);
for(vector<OUString>::iterator item = files_to_kill.begin();
diff --git a/extensions/source/oooimprovement/myconfigurationhelper.cxx b/extensions/source/oooimprovement/myconfigurationhelper.cxx
index d9ff3ecd03dc..b211fdb6756c 100644
--- a/extensions/source/oooimprovement/myconfigurationhelper.cxx
+++ b/extensions/source/oooimprovement/myconfigurationhelper.cxx
@@ -74,28 +74,28 @@ namespace oooimprovement
sal_Int32 eMode)
{
Reference<XMultiServiceFactory> xConfigProvider(
- xSMGR->createInstance(OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")),
+ xSMGR->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))),
UNO_QUERY_THROW);
vector<Any> lParams;
css::beans::PropertyValue aParam;
// set root path
- aParam.Name = OUString::createFromAscii("nodepath");
+ aParam.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
aParam.Value <<= sPackage;
lParams.push_back(makeAny(aParam));
// enable all locales mode
if ((eMode & MyConfigurationHelper::E_ALL_LOCALES)==MyConfigurationHelper::E_ALL_LOCALES)
{
- aParam.Name = OUString::createFromAscii("locale");
- aParam.Value <<= OUString::createFromAscii("*");
+ aParam.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("locale"));
+ aParam.Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
lParams.push_back(makeAny(aParam));
}
// enable lazy writing
sal_Bool bLazy = ((eMode & MyConfigurationHelper::E_LAZY_WRITE)==MyConfigurationHelper::E_LAZY_WRITE);
- aParam.Name = OUString::createFromAscii("lazywrite");
+ aParam.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("lazywrite"));
aParam.Value = makeAny(bLazy);
lParams.push_back(makeAny(aParam));
@@ -105,11 +105,11 @@ namespace oooimprovement
sal_Bool bReadOnly = ((eMode & MyConfigurationHelper::E_READONLY)==MyConfigurationHelper::E_READONLY);
if (bReadOnly)
xCFG = xConfigProvider->createInstanceWithArguments(
- OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
sequenceFromVector(lParams));
else
xCFG = xConfigProvider->createInstanceWithArguments(
- OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")),
sequenceFromVector(lParams));
return xCFG;
}
diff --git a/extensions/source/oooimprovement/onlogrotate_job.cxx b/extensions/source/oooimprovement/onlogrotate_job.cxx
index 18108df7629e..5407c4b6edf0 100644
--- a/extensions/source/oooimprovement/onlogrotate_job.cxx
+++ b/extensions/source/oooimprovement/onlogrotate_job.cxx
@@ -74,7 +74,7 @@ namespace
{
Config config(sf);
Reference<XSimpleFileAccess> file_access(
- sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")),
+ sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))),
UNO_QUERY_THROW);
SoapSender sender(sf, config.getSoapUrl());
OUString soap_id = config.getSoapId();
@@ -148,7 +148,7 @@ namespace oooimprovement
OnLogRotateJob::OnLogRotateJob(const Reference<XComponentContext>& context)
: m_ServiceFactory(Reference<XMultiServiceFactory>(
context->getServiceManager()->createInstanceWithContext(
- OUString::createFromAscii("com.sun.star.lang.XMultiServiceFactory"), context),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.XMultiServiceFactory")), context),
UNO_QUERY))
{ }
@@ -186,12 +186,12 @@ namespace oooimprovement
{ return getSupportedServiceNames_static(); }
OUString SAL_CALL OnLogRotateJob::getImplementationName_static()
- { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovement.OnLogRotateJob"); }
+ { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovement.OnLogRotateJob")); }
Sequence<OUString> SAL_CALL OnLogRotateJob::getSupportedServiceNames_static()
{
Sequence<OUString> aServiceNames(1);
- aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.XAsyncJob");
+ aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.XAsyncJob"));
return aServiceNames;
}
diff --git a/extensions/source/oooimprovement/soaprequest.cxx b/extensions/source/oooimprovement/soaprequest.cxx
index aad080ed9520..d4b1c8a2d85b 100644
--- a/extensions/source/oooimprovement/soaprequest.cxx
+++ b/extensions/source/oooimprovement/soaprequest.cxx
@@ -116,7 +116,7 @@ namespace
static void writeFile(const Reference<XMultiServiceFactory>& sf, const Reference<XOutputStream>& target, const OUString& fileurl)
{
Reference<XSimpleFileAccess> file_access(
- sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")),
+ sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))),
UNO_QUERY);
Reference<XInputStream> file = file_access->openFileRead(fileurl);
const sal_Int32 bufsize = 3;
diff --git a/extensions/source/oooimprovement/soapsender.cxx b/extensions/source/oooimprovement/soapsender.cxx
index 17a3252fb608..8cb9c2e9104f 100644
--- a/extensions/source/oooimprovement/soapsender.cxx
+++ b/extensions/source/oooimprovement/soapsender.cxx
@@ -78,13 +78,13 @@ namespace oooimprovement
void SoapSender::send(const SoapRequest& request) const
{
Reference<XTempFile> temp_file(
- m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.io.TempFile")),
+ m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile"))),
UNO_QUERY_THROW);
Reference<XSimpleFileAccess> file_access(
- m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")),
+ m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))),
UNO_QUERY_THROW);
Reference<XURLTransformer> url_trans(
- m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.util.URLTransformer")),
+ m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
UNO_QUERY_THROW);
// writing request to tempfile
@@ -109,7 +109,7 @@ namespace oooimprovement
oslSocketResult result = socket->connect(addr);
if(result != osl_Socket_Ok)
throw RuntimeException(
- OUString::createFromAscii("unable to connect to SOAP server"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("unable to connect to SOAP server")),
Reference<XInterface>());
}
@@ -121,7 +121,7 @@ namespace oooimprovement
const OString header = getHttpPostHeader(path_on_server.makeStringAndClear(), file_access->getSize(temp_file->getUri()));
if(socket->write(header.getStr(), header.getLength()) != static_cast<sal_Int32>(header.getLength()))
throw RuntimeException(
- OUString::createFromAscii("error while sending HTTP header"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("error while sending HTTP header")),
Reference<XInterface>());
}
@@ -140,7 +140,7 @@ namespace oooimprovement
buf2[idx] = buf[idx];
if(socket->write(buf2, bytes_read) != bytes_read)
throw RuntimeException(
- OUString::createFromAscii("error while sending SOAP request"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("error while sending SOAP request")),
Reference<XInterface>());
} while(bytes_read == bufsize);
}
@@ -154,7 +154,7 @@ namespace oooimprovement
const sal_Int32 returncode_start = answer.indexOf(' ');
if(returncode_start==-1 || !answer.copy(returncode_start, 4).equals(OString(" 200")))
throw RuntimeException(
- OUString::createFromAscii("SOAP server returns a error"),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("SOAP server returns a error")),
Reference<XInterface>());
}
}