Kaydet (Commit) 86b44e8e authored tarafından Noel Grandin's avatar Noel Grandin

fdo#38835 strip out OUString globals

Change-Id: I8bc386ffa88e31988bdc778a845403bec0772799
üst 25c50ff9
......@@ -67,12 +67,12 @@ namespace
CPPUNIT_TEST_SUITE_END();
};
const static OUString cr("\n");
const static OUString rem("REM");
const static OUString asdf("asdf");
const static OUString dot(".");
const static OUString goto_("goto");
const static OUString excl("!");
static const char cr[] = "\n";
static const char rem[] = "REM";
static const char asdf[] = "asdf";
static const char dot[] = ".";
static const char goto_[] = "goto";
static const char excl[] = "!";
std::vector<Symbol> getSymbols(const OUString& source, sal_Int32& errors, bool bCompatible = false)
{
......
......@@ -86,7 +86,7 @@ class EmbeddedDBPerformanceTest
: public DBTestBase
{
private:
const static OUString our_sEnableTestEnvVar;
static const char our_sEnableTestEnvVar[];
// We store the results and print them at the end due to the amount of warning
// noise present which otherwise obscures the results.
......@@ -154,14 +154,14 @@ void EmbeddedDBPerformanceTest::printTimes(
);
}
const OUString EmbeddedDBPerformanceTest::our_sEnableTestEnvVar("DBA_PERFTEST");
const char EmbeddedDBPerformanceTest::our_sEnableTestEnvVar[] = "DBA_PERFTEST";
// TODO: we probably should create a document from scratch instead?
void EmbeddedDBPerformanceTest::testPerformance()
{
OUString sEnabled;
osl_getEnvironment(our_sEnableTestEnvVar.pData, &sEnabled.pData);
osl_getEnvironment(OUString(our_sEnableTestEnvVar).pData, &sEnabled.pData);
if (sEnabled.isEmpty())
return;
......
......@@ -67,8 +67,8 @@ namespace abp
try
{
// the service name of the administration dialog
const static OUString s_sAdministrationServiceName = "com.sun.star.sdb.DatasourceAdministrationDialog";
const static OUString s_sDataSourceTypeChangeDialog = "com.sun.star.sdb.DataSourceTypeChangeDialog";
static const char s_sAdministrationServiceName[] = "com.sun.star.sdb.DatasourceAdministrationDialog";
static const char s_sDataSourceTypeChangeDialog[] = "com.sun.star.sdb.DataSourceTypeChangeDialog";
// the parameters for the call
Sequence< Any > aArguments(3);
......@@ -91,7 +91,8 @@ namespace abp
// creating the dialog service is potentially expensive (if all the libraries invoked need to be loaded)
// so we display a wait cursor
WaitObject aWaitCursor(m_pMessageParent);
xDialog = Reference< XExecutableDialog >( m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(_bFixedType ? s_sAdministrationServiceName : s_sDataSourceTypeChangeDialog, aArguments, m_xContext), UNO_QUERY );
Reference<XInterface> x = m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(_bFixedType ? OUString(s_sAdministrationServiceName) : OUString(s_sDataSourceTypeChangeDialog), aArguments, m_xContext);
xDialog = Reference< XExecutableDialog >( x, UNO_QUERY );
// just for a smoother UI: What the dialog does upon execution, is (amongst other things) creating
// the DriverManager service
......
......@@ -113,11 +113,10 @@ namespace svxform
#if HAVE_FEATURE_DESKTOP
#ifndef DISABLE_DYNLOADING
const static OUString sModuleName( DBTOOLS_DLL_NAME );
// load the dbtools library
s_hDbtoolsModule = osl_loadModuleRelative(
&thisModule, sModuleName.pData, 0);
&thisModule, OUString(DBTOOLS_DLL_NAME).pData, 0);
OSL_ENSURE(NULL != s_hDbtoolsModule, "ODbtoolsClient::registerClient: could not load the dbtools library!");
if (NULL != s_hDbtoolsModule)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment