summaryrefslogtreecommitdiff
path: root/dbaccess/source/filter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-11-04 13:33:17 +0200
committerNoel Grandin <noel@peralex.com>2013-11-11 11:21:24 +0200
commit3ef88d370e5b448c8c62a759ec073bb33a9f6965 (patch)
treed6f198f3ffa1573eb692f89214da685d2eb995bf /dbaccess/source/filter
parent3e70dda33548a5392baaf99a3c4675285de7da46 (diff)
remove unnecessary use of OUString constructor in DBACCESS module
Change-Id: I831a6506211be30c5b743c20724904c903c5b3c0
Diffstat (limited to 'dbaccess/source/filter')
-rw-r--r--dbaccess/source/filter/xml/dbloader2.cxx6
-rw-r--r--dbaccess/source/filter/xml/xmlConnectionResource.cxx6
-rw-r--r--dbaccess/source/filter/xml/xmlDataSource.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceInfo.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlExport.cxx22
-rw-r--r--dbaccess/source/filter/xml/xmlHierarchyCollection.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlLogin.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlServerDatabase.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlTable.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx6
10 files changed, 29 insertions, 29 deletions
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index 3b38fffa2f14..dcd8b8c134b7 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -209,7 +209,7 @@ Sequence< OUString > SAL_CALL DBTypeDetection::getSupportedServiceNames(void) th
Sequence< OUString > DBTypeDetection::getSupportedServiceNames_Static(void) throw( )
{
Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString("com.sun.star.document.ExtendedTypeDetection");
+ aSNS[0] = "com.sun.star.document.ExtendedTypeDetection";
return aSNS;
}
@@ -304,7 +304,7 @@ Sequence< OUString > SAL_CALL DBContentLoader::getSupportedServiceNames(void) th
Sequence< OUString > DBContentLoader::getSupportedServiceNames_Static(void) throw( )
{
Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[0] = OUString("com.sun.star.frame.FrameLoader");
+ aSNS[0] = "com.sun.star.frame.FrameLoader";
return aSNS;
}
@@ -573,7 +573,7 @@ IMPL_LINK( DBContentLoader, OnStartTableWizard, void*, /*NOTINTERESTEDIN*/ )
{
Sequence< Any > aWizArgs(1);
PropertyValue aValue;
- aValue.Name = OUString("DatabaseLocation");
+ aValue.Name = "DatabaseLocation";
aValue.Value <<= m_sCurrentURL;
aWizArgs[0] <<= aValue;
diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.cxx b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
index f2fb02a3d515..d5625e895d06 100644
--- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
@@ -56,7 +56,7 @@ OXMLConnectionResource::OXMLConnectionResource( ODBFilter& rImport,
const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName );
const OUString sValue = _xAttrList->getValueByIndex( i );
- aProperty.Name = OUString();
+ aProperty.Name = "";
aProperty.Value = Any();
switch( rTokenMap.Get( nPrefix, sLocalName ) )
@@ -75,10 +75,10 @@ OXMLConnectionResource::OXMLConnectionResource( ODBFilter& rImport,
aProperty.Name = PROPERTY_TYPE;
break;
case XML_TOK_SHOW:
- aProperty.Name = OUString("Show");
+ aProperty.Name = "Show";
break;
case XML_TOK_ACTUATE:
- aProperty.Name = OUString("Actuate");
+ aProperty.Name = "Actuate";
break;
}
if ( !aProperty.Name.isEmpty() )
diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx
index 530b49e19136..e39966eeab9e 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@ -67,7 +67,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName );
OUString sValue = _xAttrList->getValueByIndex( i );
- aProperty.Name = OUString();
+ aProperty.Name = "";
aProperty.Value = Any();
switch( rTokenMap.Get( nPrefix, sLocalName ) )
@@ -156,7 +156,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
aProperty.Value <<= sValue.toInt32();
break;
case XML_TOK_JAVA_CLASSPATH:
- aProperty.Name = OUString("JavaDriverClassPath");
+ aProperty.Name = "JavaDriverClassPath";
break;
}
if ( !aProperty.Name.isEmpty() )
diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
index e59f26757499..b2c8a7a0ea6b 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
@@ -60,7 +60,7 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport
sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName );
OUString sValue = _xAttrList->getValueByIndex( i );
- aProperty.Name = OUString();
+ aProperty.Name = "";
sal_uInt16 nToken = rTokenMap.Get( nPrefix, sLocalName );
aTokens.push_back(nToken);
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 9dd10c6f1ec7..3e9a8be04b62 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -112,7 +112,7 @@ namespace dbaxml
Sequence< OUString > SAL_CALL ODBExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
Sequence< OUString > aSupported(1);
- aSupported[0] = OUString("com.sun.star.document.ExportFilter");
+ aSupported[0] = "com.sun.star.document.ExportFilter";
return aSupported;
}
@@ -127,7 +127,7 @@ namespace dbaxml
Sequence< OUString > SAL_CALL ODBFullExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException)
{
Sequence< OUString > aSupported(1);
- aSupported[0] = OUString("com.sun.star.document.ExportFilter");
+ aSupported[0] = "com.sun.star.document.ExportFilter";
return aSupported;
}
@@ -396,13 +396,13 @@ void ODBExport::exportDataSource()
sal_Int32 nValue = 0;
aValue >>= nValue;
if ( sValue == "0" )
- sValue = OUString("equal-integer");
+ sValue = "equal-integer";
else if ( sValue == "1" )
- sValue = OUString("is-boolean");
+ sValue = "is-boolean";
else if ( sValue == "2" )
- sValue = OUString("equal-boolean");
+ sValue = "equal-boolean";
else if ( sValue == "3" )
- sValue = OUString("equal-use-only-zero");
+ sValue = "equal-use-only-zero";
if ( sValue == "equal-integer" )
continue;
eToken = XML_BOOLEAN_COMPARISON_MODE;
@@ -570,7 +570,7 @@ void ODBExport::exportConnectionData()
{
OUString sExtension;
if ( eType == dbaccess::DST_MSACCESS )
- sExtension = OUString("mdb");
+ sExtension = "mdb";
else
{
Reference< XPropertySet > xDataSourceSettings;
@@ -857,9 +857,9 @@ void ODBExport::exportComponent(XPropertySet* _xProp)
sal_Bool bIsForm = sal_True;
_xProp->getPropertyValue("IsForm") >>= bIsForm;
if ( bIsForm )
- sValue = OUString("forms/") + sValue;
+ sValue = "forms/" + sValue;
else
- sValue = OUString("reports/") + sValue;
+ sValue = "reports/" + sValue;
AddAttribute(XML_NAMESPACE_XLINK, XML_HREF,sValue);
sal_Bool bAsTemplate = sal_False;
@@ -1305,7 +1305,7 @@ void ODBExport::GetViewSettings(Sequence<PropertyValue>& aProps)
{
sal_Int32 nLength = aProps.getLength();
aProps.realloc(nLength + 1);
- aProps[nLength].Name = OUString("Queries");
+ aProps[nLength].Name = "Queries";
Sequence< OUString> aSeq = xCollection->getElementNames();
const OUString* pIter = aSeq.getConstArray();
const OUString* pEnd = pIter + aSeq.getLength();
@@ -1345,7 +1345,7 @@ void ODBExport::GetConfigurationSettings(Sequence<PropertyValue>& aProps)
if ( aPropValues.getLength() )
{
aProps.realloc(nLength + 1);
- aProps[nLength].Name = OUString("layout-settings");
+ aProps[nLength].Name = "layout-settings";
aProps[nLength].Value = aValue;
}
}
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index 30e8a8649c39..8a1313d06928 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@ -78,11 +78,11 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
Sequence< Any > aArguments(2);
PropertyValue aValue;
// set as folder
- aValue.Name = OUString("Name");
+ aValue.Name = "Name";
aValue.Value <<= m_sName;
aArguments[0] <<= aValue;
//parent
- aValue.Name = OUString("Parent");
+ aValue.Name = "Parent";
aValue.Value <<= _xParentContainer;
aArguments[1] <<= aValue;
diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx b/dbaccess/source/filter/xml/xmlLogin.cxx
index bef6968de0cb..8565ffeaea78 100644
--- a/dbaccess/source/filter/xml/xmlLogin.cxx
+++ b/dbaccess/source/filter/xml/xmlLogin.cxx
@@ -92,7 +92,7 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport,
{
bUserFound = true;
PropertyValue aProperty;
- aProperty.Name = OUString("UseSystemUser");
+ aProperty.Name = "UseSystemUser";
aProperty.Value <<= (sValue == s_sTRUE ? sal_True : sal_False);
rImport.addInfo(aProperty);
}
diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
index 987e9f7d6ccd..e055d9c6bb37 100644
--- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
@@ -69,7 +69,7 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport,
sPortNumber = sValue;
break;
case XML_TOK_LOCAL_SOCKET:
- aProperty.Name = OUString("LocalSocket");
+ aProperty.Name = "LocalSocket";
aProperty.Value <<= sValue;
rImport.addInfo(aProperty);
break;
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx
index 647d4c358f06..2d1b69827500 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -92,11 +92,11 @@ OXMLTable::OXMLTable( ODBFilter& _rImport
Sequence< Any > aArguments(2);
PropertyValue aValue;
// set as folder
- aValue.Name = OUString("Name");
+ aValue.Name = "Name";
aValue.Value <<= m_sName;
aArguments[0] <<= aValue;
//parent
- aValue.Name = OUString("Parent");
+ aValue.Name = "Parent";
aValue.Value <<= m_xParentContainer;
aArguments[1] <<= aValue;
m_xTable.set(
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index b94e0ce9c65a..31743f2185a4 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -139,13 +139,13 @@ namespace dbaxml
{
uno::Sequence < beans::PropertyValue > aArgs( 3);
sal_Int32 nLen = 0;
- aArgs[nLen].Name = OUString("AsTemplate");
+ aArgs[nLen].Name = "AsTemplate";
aArgs[nLen++].Value <<= sal_False;
- aArgs[nLen].Name = OUString("ReadOnly");
+ aArgs[nLen].Name = "ReadOnly";
aArgs[nLen++].Value <<= sal_True;
- aArgs[nLen].Name = OUString("Hidden");
+ aArgs[nLen].Name = "Hidden";
aArgs[nLen++].Value <<= sal_True;
::comphelper::MimeConfigurationHelper aHelper( m_xContext );