I'm sending two patches, the first is the main one and the latter is
because, i'm ashamed to say, i've made some mistakes and realised after
commiting.
So i corrected them, commited again and prepared the new patch.
Hope it's helpful! It's released under MPL 1.1 / GPLv3+ / LGPLv3+
--
Santiago Alessandri
From 0c8bb705e6e6d4d50c1efa0b0c69c459ad3f79f3 Mon Sep 17 00:00:00 2001
From: Santiago Alessandri <salessandri@nasel.com.ar>
Date: Fri, 12 Nov 2010 19:31:35 -0300
Subject: [PATCH 1/2] Replaced createFromAscii in all dbaccess tree under base repo
---
dbaccess/source/core/dataaccess/ModelImpl.hxx | 2 +-
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 2 +-
dbaccess/source/ext/adabas/ANewDb.cxx | 4 +-
dbaccess/source/ext/adabas/Acomponentmodule.cxx | 2 +-
.../source/ext/macromigration/migrationengine.cxx | 2 +-
dbaccess/source/filter/migration/cfgimport.cxx | 6 +-
dbaccess/source/filter/xml/dbloader2.cxx | 18 +++---
dbaccess/source/filter/xml/xmlExport.cxx | 8 +-
dbaccess/source/filter/xml/xmlfilter.cxx | 2 +-
dbaccess/source/ui/dlg/dbfindex.cxx | 4 +-
dbaccess/source/ui/misc/controllerframe.cxx | 2 +-
.../source/ui/querydesign/ConnectionLineAccess.cxx | 2 +-
dbaccess/source/ui/querydesign/JAccess.cxx | 2 +-
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 38 +++++-----
dbaccess/source/ui/querydesign/TableWindow.cxx | 2 +-
.../source/ui/querydesign/TableWindowAccess.cxx | 6 +-
.../source/ui/querydesign/querycontainerwindow.cxx | 2 +-
dbaccess/source/ui/querydesign/querycontroller.cxx | 73 +++++++++++---------
.../ui/relationdesign/RelationController.cxx | 4 +-
dbaccess/source/ui/tabledesign/TEditControl.cxx | 8 +-
dbaccess/source/ui/tabledesign/TableController.cxx | 8 +-
.../source/ui/tabledesign/TableDesignControl.cxx | 2 +-
.../source/ui/tabledesign/TableFieldControl.cxx | 2 +-
dbaccess/source/ui/uno/unosqlmessage.cxx | 4 +-
reportdesign/source/filter/xml/xmlfilter.cxx | 6 +-
reportdesign/source/ui/report/ReportController.cxx | 4 +-
reportdesign/source/ui/report/propbrw.cxx | 2 +-
27 files changed, 111 insertions(+), 106 deletions(-)
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx
b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index 223654c..fe4cf4f 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -573,7 +573,7 @@ public:
inline void checkDisposed() const
{
if ( !m_pImpl.is() )
- throw ::com::sun::star::lang::DisposedException( ::rtl::OUString::createFromAscii(
"Component is already disposed." ), getThis() );
+ throw ::com::sun::star::lang::DisposedException(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Component is already disposed.")), getThis() );
}
inline void lockModify()
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index 59053fe..66a2896 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -119,7 +119,7 @@ uno::Any DatabaseDataProvider::queryInterface(uno::Type const & type) throw (uno
//------------------------------------------------------------------------------
rtl::OUString DatabaseDataProvider::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return rtl::OUString::createFromAscii("com.sun.star.comp.chart2.data.DatabaseDataProvider");
+ return
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.data.DatabaseDataProvider"));
}
// -----------------------------------------------------------------------------
// -------------------------------------------------------------------------
diff --git a/dbaccess/source/ext/adabas/ANewDb.cxx b/dbaccess/source/ext/adabas/ANewDb.cxx
index 7db2de7..834102c 100644
--- a/dbaccess/source/ext/adabas/ANewDb.cxx
+++ b/dbaccess/source/ext/adabas/ANewDb.cxx
@@ -87,7 +87,7 @@ Reference< XInterface > SAL_CALL OAdabasCreateDialog::Create(const Reference< XM
//-------------------------------------------------------------------------
::rtl::OUString OAdabasCreateDialog::getImplementationName_Static() throw(RuntimeException)
{
- return ::rtl::OUString::createFromAscii("org.openoffice.comp.adabasui.AdabasCreateDialog");
+ return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.adabasui.AdabasCreateDialog"));
}
//-------------------------------------------------------------------------
@@ -100,7 +100,7 @@ Reference< XInterface > SAL_CALL OAdabasCreateDialog::Create(const Reference< XM
::comphelper::StringSequence OAdabasCreateDialog::getSupportedServiceNames_Static()
throw(RuntimeException)
{
::comphelper::StringSequence aSupported(1);
- aSupported.getArray()[0] =
::rtl::OUString::createFromAscii("com.sun.star.sdb.AdabasCreationDialog");
+ aSupported.getArray()[0] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.AdabasCreationDialog"));
return aSupported;
}
diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.cxx
b/dbaccess/source/ext/adabas/Acomponentmodule.cxx
index 943e60d..a1d147e 100644
--- a/dbaccess/source/ext/adabas/Acomponentmodule.cxx
+++ b/dbaccess/source/ext/adabas/Acomponentmodule.cxx
@@ -266,7 +266,7 @@ namespace COMPMOD_NAMESPACE
{
::rtl::OUString aMainKeyName(sRootKey);
aMainKeyName += *pImplName;
- aMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES");
+ aMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
try
{
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx
b/dbaccess/source/ext/macromigration/migrationengine.cxx
index 230a8a4..d40c4e4 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -1223,7 +1223,7 @@ namespace dbmm
const ::rtl::OUString& _rSourceLibName, const Reference< XNameAccess >&
_rxTargetContainer )
{
// The new library name is composed from the prefix, the base name, and the old
library name.
- const ::rtl::OUString sPrefix( ::rtl::OUString::createFromAscii( _rDocument.eType ==
eForm ? "Form_" : "Report_" ) );
+ const ::rtl::OUString sPrefix(_rDocument.eType == eForm ?
RTL_CONSTASCII_USTRINGPARAM("Form_") : RTL_CONSTASCII_USTRINGPARAM("Report_"));
::rtl::OUString sBaseName( _rDocument.sHierarchicalName.copy(
_rDocument.sHierarchicalName.lastIndexOf( '/' ) + 1 ) );
diff --git a/dbaccess/source/filter/migration/cfgimport.cxx
b/dbaccess/source/filter/migration/cfgimport.cxx
index 4bf16b1..ccfc2f6 100644
--- a/dbaccess/source/filter/migration/cfgimport.cxx
+++ b/dbaccess/source/filter/migration/cfgimport.cxx
@@ -393,7 +393,7 @@ sal_Bool isDocumentReport(const Reference< XMultiServiceFactory >& _xORB,const :
aMedDescr[nPos++].Value <<= sal_False;
aMedDescr[nPos].Name = PROPERTY_URL;
aMedDescr[nPos++].Value <<= _sDocumentLocation;
- aMedDescr[nPos].Name = ::rtl::OUString::createFromAscii( "ReadOnly" );
+ aMedDescr[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
aMedDescr[nPos++].Value <<= sal_True;
Reference< XTypeDetection > xTypeDetection(_xORB->createInstance(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection")) ),UNO_QUERY );
@@ -1108,8 +1108,8 @@ void SAL_CALL OCfgImport::setPropertyValue(
if ( aInputSequence.getLength() )
{
Reference< XInputStream> xInStreamHelper = new
SequenceInputStream(aInputSequence);; // used for wrapping sequence to xinput
- Reference< XObjectInputStream> xInStream = Reference<
XObjectInputStream
(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.io.ObjectInputStream")),UNO_QUERY);
- Reference< XInputStream> xMarkInStream = Reference< XInputStream
(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.io.MarkableInputStream")),UNO_QUERY);
+ Reference< XObjectInputStream> xInStream = Reference<
XObjectInputStream
(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.ObjectInputStream"))),UNO_QUERY);
+ Reference< XInputStream> xMarkInStream = Reference< XInputStream
(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableInputStream"))),UNO_QUERY);
Reference< XActiveDataSink
(xMarkInStream,UNO_QUERY)->setInputStream(xInStreamHelper);
Reference< XActiveDataSink > xInDataSource(xInStream, UNO_QUERY);
OSL_ENSURE(xInDataSource.is(),"Couldn't create
com.sun.star.io.ObjectInputStream!");
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index c293c84..ac27b1d 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -122,7 +122,7 @@ public:
// static methods
static ::rtl::OUString getImplementationName_Static() throw( )
{
- return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbflt.DBTypeDetection");
+ return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbflt.DBTypeDetection"));
}
static Sequence< ::rtl::OUString> getSupportedServiceNames_Static(void) throw( );
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
@@ -231,7 +231,7 @@ Sequence< ::rtl::OUString > SAL_CALL DBTypeDetection::getSupportedServiceNames(v
Sequence< ::rtl::OUString > DBTypeDetection::getSupportedServiceNames_Static(void) throw( )
{
Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS.getArray()[0] =
::rtl::OUString::createFromAscii("com.sun.star.document.ExtendedTypeDetection");
+ aSNS.getArray()[0] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExtendedTypeDetection"));
return aSNS;
}
// -------------------------------------------------------------------------
@@ -262,7 +262,7 @@ public:
// static methods
static ::rtl::OUString getImplementationName_Static() throw( )
{
- return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbflt.DBContentLoader2");
+ return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbflt.DBContentLoader2"));
}
static Sequence< ::rtl::OUString> getSupportedServiceNames_Static(void) throw( );
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
@@ -330,7 +330,7 @@ Sequence< ::rtl::OUString > SAL_CALL DBContentLoader::getSupportedServiceNames(v
Sequence< ::rtl::OUString > DBContentLoader::getSupportedServiceNames_Static(void) throw( )
{
Sequence< ::rtl::OUString > aSNS( 1 );
- aSNS.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.FrameLoader");
+ aSNS.getArray()[0] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.FrameLoader"));
return aSNS;
}
@@ -643,17 +643,17 @@ extern "C" void SAL_CALL writeDBLoaderInfo2(void* pRegistryKey)
Reference< XRegistryKey> xKey(reinterpret_cast< XRegistryKey*>(pRegistryKey));
// register content loader for dispatch
- ::rtl::OUString aImpl = ::rtl::OUString::createFromAscii("/");
+ ::rtl::OUString aImpl(RTL_CONSTASCII_USTRINGPARAM("/"));
aImpl += ::dbaxml::DBContentLoader::getImplementationName_Static();
::rtl::OUString aImpltwo = aImpl;
- aImpltwo += ::rtl::OUString::createFromAscii("/UNO/Loader");
+ aImpltwo += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/Loader"));
Reference< XRegistryKey> xNewKey = xKey->createKey( aImpltwo );
aImpltwo = aImpl;
- aImpltwo += ::rtl::OUString::createFromAscii("/Loader");
+ aImpltwo += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Loader"));
Reference< XRegistryKey > xLoaderKey = xKey->createKey( aImpltwo );
- xNewKey = xLoaderKey->createKey( ::rtl::OUString::createFromAscii("Pattern") );
- xNewKey->setAsciiValue( ::rtl::OUString::createFromAscii("private:factory/sdatabase") );
+ xNewKey = xLoaderKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pattern")) );
+ xNewKey->setAsciiValue(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/sdatabase")) );
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index a9cf210..a8ab562 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -118,13 +118,13 @@ namespace dbaxml
//---------------------------------------------------------------------
::rtl::OUString SAL_CALL ODBExportHelper::getImplementationName_Static( ) throw
(RuntimeException)
{
- return ::rtl::OUString::createFromAscii("com.sun.star.comp.sdb.XMLSettingsExporter");
+ return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdb.XMLSettingsExporter"));
}
//---------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL ODBExportHelper::getSupportedServiceNames_Static( )
throw(RuntimeException)
{
Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter");
+ aSupported[0] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter"));
return aSupported;
}
@@ -137,13 +137,13 @@ namespace dbaxml
//---------------------------------------------------------------------
::rtl::OUString SAL_CALL ODBFullExportHelper::getImplementationName_Static( ) throw
(RuntimeException)
{
- return ::rtl::OUString::createFromAscii("com.sun.star.comp.sdb.XMLFullExporter");
+ return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdb.XMLFullExporter"));
}
//---------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL ODBFullExportHelper::getSupportedServiceNames_Static( )
throw(RuntimeException)
{
Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter");
+ aSupported[0] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter"));
return aSupported;
}
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 53d1c57..ae12214 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -241,7 +241,7 @@ sal_Int32 ReadThroughComponent(
// get parser
uno::Reference< XParser > xParser(
rFactory->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.xml.sax.Parser") ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))),
UNO_QUERY );
DBG_ASSERT( xParser.is(), "Can't create parser" );
if( !xParser.is() )
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 7577c9f..0b0b88c 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -348,8 +348,8 @@ void ODbaseIndexDialog::Init()
Sequence< ::rtl::OUString> aFolderContent(
::utl::LocalFileHelper::GetFolderContents(m_aDSN,bFolder));
- ::rtl::OUString aIndexExt = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ndx"));
- ::rtl::OUString aTableExt = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dbf"));
+ ::rtl::OUString aIndexExt(RTL_CONSTASCII_USTRINGPARAM("ndx"));
+ ::rtl::OUString aTableExt(RTL_CONSTASCII_USTRINGPARAM("dbf"));
::std::vector< String > aUsedIndexes;
diff --git a/dbaccess/source/ui/misc/controllerframe.cxx
b/dbaccess/source/ui/misc/controllerframe.cxx
index 39a5027..d53de6c 100644
--- a/dbaccess/source/ui/misc/controllerframe.cxx
+++ b/dbaccess/source/ui/misc/controllerframe.cxx
@@ -236,7 +236,7 @@ namespace dbaui
{
if ( _rData.m_xDocEventBroadcaster.is() )
{
- ::rtl::OUString sEventName( ::rtl::OUString::createFromAscii( _bActive ? "OnFocus"
: "OnUnfocus" ) );
+ ::rtl::OUString sEventName( _bActive ? RTL_CONSTASCII_USTRINGPARAM("OnFocus") :
RTL_CONSTASCII_USTRINGPARAM("OnUnfocus"));
Reference< XController2 > xController( _rData.m_rController.getXController(),
UNO_QUERY_THROW );
_rData.m_xDocEventBroadcaster->notifyDocumentEvent( sEventName, xController, Any()
);
}
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
index ba68d70..0a0419c 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@@ -81,7 +81,7 @@ namespace dbaui
// -----------------------------------------------------------------------------
::rtl::OUString OConnectionLineAccess::getImplementationName_Static(void) throw(
RuntimeException )
{
- return
::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.ConnectionLineAccessibility");
+ return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ConnectionLineAccessibility"));
}
// -----------------------------------------------------------------------------
// XAccessibleContext
diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx
index beb41de..010b710 100644
--- a/dbaccess/source/ui/querydesign/JAccess.cxx
+++ b/dbaccess/source/ui/querydesign/JAccess.cxx
@@ -57,7 +57,7 @@ namespace dbaui
// -----------------------------------------------------------------------------
::rtl::OUString OJoinDesignViewAccess::getImplementationName_Static(void) throw(
RuntimeException )
{
- return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.JoinViewAccessibility");
+ return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.JoinViewAccessibility"));
}
// -----------------------------------------------------------------------------
void OJoinDesignViewAccess::clearTableView()
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 27a3c9c..1f24d18 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -83,8 +83,8 @@ using namespace ::com::sun::star::container;
// please look at the book LargeScale C++ to know why
namespace
{
- static const ::rtl::OUString C_AND = ::rtl::OUString::createFromAscii(" AND ");
- static const ::rtl::OUString C_OR = ::rtl::OUString::createFromAscii(" OR ");
+ static const ::rtl::OUString C_AND(RTL_CONSTASCII_USTRINGPARAM(" AND "));
+ static const ::rtl::OUString C_OR(RTL_CONSTASCII_USTRINGPARAM(" OR "));
// forward declarations
sal_Bool InsertJoin( const OQueryDesignView* _pView,
@@ -389,9 +389,9 @@ namespace
::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString();
if ( _bForce || isAppendTableAliasEnabled( _xConnection ) ||
pEntryTab->GetAliasName() != aDBName )
{
- aTableListStr += ::rtl::OUString::createFromAscii(" ");
+ aTableListStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
if ( generateAsBeforeTableAlias( _xConnection ) )
- aTableListStr += ::rtl::OUString::createFromAscii("AS ");
+ aTableListStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AS "));
aTableListStr += ::dbtools::quoteName( aQuote, pEntryTab->GetAliasName() );
}
aDBName = aTableListStr;
@@ -975,7 +975,7 @@ namespace
eErrorCode = eStatementTooLong;
else
{
- _rsRet = ::rtl::OUString::createFromAscii(" ORDER BY ");
+ _rsRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY "));
_rsRet += aWorkStr;
}
}
@@ -1210,7 +1210,7 @@ namespace
if ( aGroupByStr.getLength() )
{
aGroupByStr = aGroupByStr.replaceAt(aGroupByStr.getLength()-1,1, ::rtl::OUString('
') );
- ::rtl::OUString aGroupByStr2 = ::rtl::OUString::createFromAscii(" GROUP BY ");
+ ::rtl::OUString aGroupByStr2(RTL_CONSTASCII_USTRINGPARAM(" GROUP BY "));
aGroupByStr2 += aGroupByStr;
aGroupByStr = aGroupByStr2;
}
@@ -1575,7 +1575,7 @@ namespace
for(;aIter != aTabEnd;++aIter)
{
OQueryTableWindow* pTabWin =
static_cast<OQueryTableWindow*>(aIter->second);
- if (pTabWin->ExistsField( ::rtl::OUString::createFromAscii("*"), aDragLeft
))
+ if (pTabWin->ExistsField(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aDragLeft ))
{
aDragLeft->SetAlias(String());
aDragLeft->SetTable(String());
@@ -1689,22 +1689,22 @@ namespace
case SQL_NODE_LESS:
// take the opposite as we change the order
i--;
- aCondition = aCondition + ::rtl::OUString::createFromAscii(">");
+ aCondition = aCondition +
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">"));
break;
case SQL_NODE_LESSEQ:
// take the opposite as we change the order
i--;
- aCondition = aCondition + ::rtl::OUString::createFromAscii(">=");
+ aCondition = aCondition +
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">="));
break;
case SQL_NODE_GREAT:
// take the opposite as we change the order
i--;
- aCondition = aCondition + ::rtl::OUString::createFromAscii("<");
+ aCondition = aCondition +
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<"));
break;
case SQL_NODE_GREATEQ:
// take the opposite as we change the order
i--;
- aCondition = aCondition + ::rtl::OUString::createFromAscii("<=");
+ aCondition = aCondition +
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<="));
break;
default:
break;
@@ -2232,7 +2232,7 @@ namespace
for(;aIter != aEnd;++aIter)
{
OQueryTableWindow* pTabWin =
static_cast<OQueryTableWindow*>(aIter->second);
- if (pTabWin->ExistsField(
::rtl::OUString::createFromAscii("*"), aInfo ))
+ if (pTabWin->ExistsField(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aInfo ))
{
aInfo->SetAlias(String());
aInfo->SetTable(String());
@@ -2903,9 +2903,9 @@ sal_Bool OQueryDesignView::checkStatement()
GenerateInnerJoinCriterias(xConnection,aJoinCrit,pConnList);
if(aJoinCrit.getLength())
{
- ::rtl::OUString aTmp = ::rtl::OUString::createFromAscii("( ");
+ ::rtl::OUString aTmp(RTL_CONSTASCII_USTRINGPARAM("( "));
aTmp += aJoinCrit;
- aTmp += ::rtl::OUString::createFromAscii(" )");
+ aTmp += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" )"));
if(aCriteriaListStr.getLength())
{
aTmp += C_AND;
@@ -2914,16 +2914,16 @@ sal_Bool OQueryDesignView::checkStatement()
aCriteriaListStr = aTmp;
}
// ----------------- Statement aufbauen ----------------------
- ::rtl::OUStringBuffer aSqlCmd(::rtl::OUString::createFromAscii("SELECT "));
+ ::rtl::OUStringBuffer aSqlCmd(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ")));
if(static_cast<OQueryController&>(getController()).isDistinct())
- aSqlCmd.append(::rtl::OUString::createFromAscii(" DISTINCT "));
+ aSqlCmd.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DISTINCT ")));
aSqlCmd.append(aFieldListStr);
- aSqlCmd.append(::rtl::OUString::createFromAscii(" FROM "));
+ aSqlCmd.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ")));
aSqlCmd.append(aTableListStr);
if (aCriteriaListStr.getLength())
{
- aSqlCmd.append(::rtl::OUString::createFromAscii(" WHERE "));
+ aSqlCmd.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE ")));
aSqlCmd.append(aCriteriaListStr.makeStringAndClear());
}
// ----------------- GroupBy aufbauen und Anh"angen ------------
@@ -2938,7 +2938,7 @@ sal_Bool OQueryDesignView::checkStatement()
// ----------------- having Anh"angen ------------
if(aHavingStr.getLength())
{
- aSqlCmd.append(::rtl::OUString::createFromAscii(" HAVING "));
+ aSqlCmd.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" HAVING ")));
aSqlCmd.append(aHavingStr.makeStringAndClear());
}
// ----------------- Sortierung aufbauen und Anh"angen ------------
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx
b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 01c8c3b..c3f56de 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -194,7 +194,7 @@ BOOL OTableWindow::FillListBox()
if (GetData()->IsShowAll())
{
- SvLBoxEntry* pEntry = m_pListBox->InsertEntry( ::rtl::OUString::createFromAscii("*") );
+ SvLBoxEntry* pEntry = m_pListBox->InsertEntry(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) );
pEntry->SetUserData( createUserData(NULL,false) );
}
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index 71a044f..da43c14 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -100,14 +100,14 @@ namespace dbaui
Sequence< ::rtl::OUString > OTableWindowAccess::getSupportedServiceNames_Static(void) throw(
RuntimeException )
{
Sequence< ::rtl::OUString > aSupported(2);
- aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.accessibility.Accessible");
- aSupported[1] =
::rtl::OUString::createFromAscii("com.sun.star.accessibility.AccessibleContext");
+ aSupported[0] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.Accessible"));
+ aSupported[1] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext"));
return aSupported;
}
// -----------------------------------------------------------------------------
::rtl::OUString OTableWindowAccess::getImplementationName_Static(void) throw( RuntimeException
)
{
- return
::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.TableWindowAccessibility");
+ return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.TableWindowAccessibility"));
}
// -----------------------------------------------------------------------------
// XAccessibleContext
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 1744e06..fea12cd 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -207,7 +207,7 @@ namespace dbaui
::dbaui::notifySystemWindow(this,m_pBeamer,::comphelper::mem_fun(&TaskPaneList::AddWindow));
- Reference < XFrame > xBeamerFrame(
m_pViewSwitch->getORB()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Frame")),UNO_QUERY
);
+ Reference < XFrame > xBeamerFrame(
m_pViewSwitch->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame"))),UNO_QUERY
);
m_xBeamer.set( xBeamerFrame );
OSL_ENSURE(m_xBeamer.is(),"No frame created!");
m_xBeamer->initialize( VCLUnoHelper::GetInterface ( m_pBeamer ) );
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx
b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 66afd04..b08e616 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -124,12 +124,12 @@ namespace dbaui
// need by registration
static ::rtl::OUString getImplementationName_Static() throw( RuntimeException )
{
- return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OViewDesign");
+ return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OViewDesign"));
}
static Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw(
RuntimeException )
{
Sequence< ::rtl::OUString> aSupported(1);
- aSupported.getArray()[0] =
::rtl::OUString::createFromAscii("com.sun.star.sdb.ViewDesign");
+ aSupported.getArray()[0] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ViewDesign"));
return aSupported;
}
static Reference< XInterface > SAL_CALL Create(const Reference< XMultiServiceFactory >&
_rM)
@@ -156,11 +156,11 @@ namespace dbaui
if (!_pNode->isToken())
{
// Regelnamen als rule: ...
- rString = ::rtl::OUString::createFromAscii("RULE_ID: ");
+ rString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RULE_ID: "));
rString += ::rtl::OUString::valueOf( (sal_Int32)_pNode->getRuleID());
- rString+= ::rtl::OUString::createFromAscii("(");
+ rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("("));
rString += OSQLParser::RuleIDToStr(_pNode->getRuleID());
- rString+= ::rtl::OUString::createFromAscii(")");
+ rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
_pParent = _pBox->InsertEntry(rString,_pParent);
@@ -181,50 +181,55 @@ namespace dbaui
case SQL_NODE_KEYWORD:
{
- rString+= ::rtl::OUString::createFromAscii("SQL_KEYWORD:");
+ rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_KEYWORD:"));
::rtl::OString sT = OSQLParser::TokenIDToStr(_pNode->getTokenID());
rString += ::rtl::OUString(sT,sT.getLength(),RTL_TEXTENCODING_UTF8);
break;}
case SQL_NODE_COMPARISON:
- {rString+= ::rtl::OUString::createFromAscii("SQL_COMPARISON:");
- rString += _pNode->getTokenValue(); // haenge Nodevalue an
+ {
+ rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_COMPARISON:"));
+ rString += _pNode->getTokenValue(); // haenge Nodevalue an
// und beginne neu Zeile
- break;}
+ break;}
case SQL_NODE_NAME:
- {rString+= ::rtl::OUString::createFromAscii("SQL_NAME:");
- rString+= ::rtl::OUString::createFromAscii("\"");
- rString += _pNode->getTokenValue();
- rString+= ::rtl::OUString::createFromAscii("\"");
-
- break;}
+ {
+ rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_NAME:"));
+ rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""));
+ rString += _pNode->getTokenValue();
+ rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""));
+ break;}
case SQL_NODE_STRING:
- {rString += ::rtl::OUString::createFromAscii("SQL_STRING:'");
- rString += _pNode->getTokenValue();
- break;}
+ {
+ rString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_STRING:'"));
+ rString += _pNode->getTokenValue();
+ break;}
case SQL_NODE_INTNUM:
- {rString += ::rtl::OUString::createFromAscii("SQL_INTNUM:");
- rString += _pNode->getTokenValue();
- break;}
+ {
+ rString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_INTNUM:"));
+ rString += _pNode->getTokenValue();
+ break;}
case SQL_NODE_APPROXNUM:
- {rString += ::rtl::OUString::createFromAscii("SQL_APPROXNUM:");
- rString += _pNode->getTokenValue();
- break;}
+ {
+ rString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_APPROXNUM:"));
+ rString += _pNode->getTokenValue();
+ break;}
case SQL_NODE_PUNCTUATION:
- {rString += ::rtl::OUString::createFromAscii("SQL_PUNCTUATION:");
- rString += _pNode->getTokenValue(); // haenge Nodevalue an
- break;}
+ {
+ rString +=
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_PUNCTUATION:"));
+ rString += _pNode->getTokenValue(); // haenge Nodevalue an
+ break;}
case SQL_NODE_AMMSC:
- {rString += ::rtl::OUString::createFromAscii("SQL_AMMSC:");
- rString += _pNode->getTokenValue(); // haenge Nodevalue an
-
- break;}
+ {
+ rString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_AMMSC:"));
+ rString += _pNode->getTokenValue(); // haenge Nodevalue an
+ break;}
default:
OSL_ASSERT("OSQLParser::ShowParseTree: unzulaessiger NodeType");
@@ -303,13 +308,13 @@ namespace
//------------------------------------------------------------------------------
::rtl::OUString OQueryController::getImplementationName_Static() throw( RuntimeException )
{
- return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OQueryDesign");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OQueryDesign"));
}
//------------------------------------------------------------------------------
Sequence< ::rtl::OUString> OQueryController::getSupportedServiceNames_Static(void) throw(
RuntimeException )
{
Sequence< ::rtl::OUString> aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.QueryDesign");
+ aSupported.getArray()[0] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.QueryDesign"));
return aSupported;
}
//-------------------------------------------------------------------------
@@ -1290,7 +1295,7 @@ void OQueryController::executeQuery()
InvalidateFeature(SID_DB_QUERY_PREVIEW);
URL aWantToDispatch;
- aWantToDispatch.Complete =
::rtl::OUString::createFromAscii(".component:DB/DataSourceBrowser");
+ aWantToDispatch.Complete =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".component:DB/DataSourceBrowser"));
::rtl::OUString sFrameName( FRAME_NAME_QUERY_PREVIEW );
sal_Int32 nSearchFlags = FrameSearchFlag::CHILDREN;
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx
b/dbaccess/source/ui/relationdesign/RelationController.cxx
index bd4269f..3721d32 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -112,13 +112,13 @@ using namespace ::osl;
//------------------------------------------------------------------------------
::rtl::OUString ORelationController::getImplementationName_Static() throw( RuntimeException )
{
- return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.ORelationDesign");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ORelationDesign"));
}
//------------------------------------------------------------------------------
Sequence< ::rtl::OUString> ORelationController::getSupportedServiceNames_Static(void) throw(
RuntimeException )
{
Sequence< ::rtl::OUString> aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.RelationDesign");
+ aSupported.getArray()[0] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.RelationDesign"));
return aSupported;
}
//-------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx
b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 86c5dc6..f1e0b0e 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -415,7 +415,7 @@ CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId)
Reference<XPropertySet> xTable = GetView()->getController().getTable();
if (IsReadOnly() || ( xTable.is() &&
xTable->getPropertySetInfo()->hasPropertyByName(PROPERTY_TYPE) &&
- ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) ==
::rtl::OUString::createFromAscii("VIEW")))
+ ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) ==
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))))
return NULL;
//////////////////////////////////////////////////////////////////////
@@ -1361,7 +1361,7 @@ sal_Bool OTableEditorCtrl::IsCutAllowed( long nRow )
}
// Reference<XPropertySet> xTable = GetView()->getController().getTable();
-// if( !IsCopyAllowed(nRow) || (xTable.is() &&
::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) ==
::rtl::OUString::createFromAscii("VIEW")))
+// if( !IsCopyAllowed(nRow) || (xTable.is() &&
::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) ==
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))))
// return sal_False;
// return bCutAllowed && IsDeleteAllowed( nRow );
@@ -1382,7 +1382,7 @@ sal_Bool OTableEditorCtrl::IsCopyAllowed( long /*nRow*/ )
else if(m_eChildFocus == ROW)
{
Reference<XPropertySet> xTable = GetView()->getController().getTable();
- if( !GetSelectRowCount() || (xTable.is() &&
::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) ==
::rtl::OUString::createFromAscii("VIEW")))
+ if( !GetSelectRowCount() || (xTable.is() &&
::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) ==
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))))
return sal_False;
//////////////////////////////////////////////////////////////////////
@@ -1551,7 +1551,7 @@ sal_Bool OTableEditorCtrl::IsPrimaryKeyAllowed( long /*nRow*/ )
// Key darf nicht veraendert werden
// Dies gilt jedoch nur, wenn die Tabelle nicht neu ist und keine
::com::sun::star::sdbcx::View. Ansonsten wird kein DROP ausgeführt
- if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) ==
::rtl::OUString::createFromAscii("VIEW"))
+ if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) ==
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")))
return sal_False;
//////////////////////////////////////////////////////////////
// Wenn leeres Feld, kein PrimKey
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx
b/dbaccess/source/ui/tabledesign/TableController.cxx
index cb4d9af..03ba37f 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -145,13 +145,13 @@ namespace
//------------------------------------------------------------------------------
::rtl::OUString OTableController::getImplementationName_Static() throw( RuntimeException )
{
- return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OTableDesign");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OTableDesign"));
}
//------------------------------------------------------------------------------
Sequence< ::rtl::OUString> OTableController::getSupportedServiceNames_Static(void) throw(
RuntimeException )
{
Sequence< ::rtl::OUString> aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.TableDesign");
+ aSupported.getArray()[0] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.TableDesign"));
return aSupported;
}
//-------------------------------------------------------------------------
@@ -1020,7 +1020,7 @@ sal_Bool OTableController::checkColumns(sal_Bool _bNew)
throw(::com::sun::star::
pActFieldDescr->SetAutoIncrement(sal_False); // #95927# pTypeInfo->bAutoIncrement
pActFieldDescr->SetIsNullable(ColumnValue::NO_NULLS);
- pActFieldDescr->SetName( createUniqueName(::rtl::OUString::createFromAscii("ID") ));
+ pActFieldDescr->SetName(
createUniqueName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")) ));
pActFieldDescr->SetPrimaryKey( sal_True );
m_vRowList.insert(m_vRowList.begin(),pNewRow);
@@ -1279,7 +1279,7 @@ void OTableController::alterColumns()
SQLException aNewException;
aNewException.Message = sError;
- aNewException.SQLState = ::rtl::OUString::createFromAscii( "S1000" );
+ aNewException.SQLState = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000"));
aNewException.NextException = ::cppu::getCaughtException();
throw aNewException;
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 826f65c..344604c 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -113,7 +113,7 @@ void OTableRowView::KeyInput( const KeyEvent& rEvt )
if( rEvt.GetKeyCode().GetCode() == KEY_F2 )
{
::com::sun::star::util::URL aUrl;
- aUrl.Complete =::rtl::OUString::createFromAscii(".uno:DSBEditDoc");
+ aUrl.Complete =::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DSBEditDoc"));
GetView()->getController().dispatch( aUrl,Sequence< PropertyValue >() );
}
}
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
index 8c3492e..60cc7ea 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
@@ -68,7 +68,7 @@ sal_Bool OTableFieldControl::IsReadOnly()
{
// Die Spalten einer ::com::sun::star::sdbcx::View können nicht verändert werden
Reference<XPropertySet> xTable = GetCtrl()->GetView()->getController().getTable();
- if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) ==
::rtl::OUString::createFromAscii("VIEW"))
+ if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) ==
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")))
bRead = sal_True;
else
{
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx
index d7084a9..e72062f 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -89,7 +89,7 @@ Reference< XInterface > SAL_CALL OSQLMessageDialog::Create(const Reference< XMul
//-------------------------------------------------------------------------
::rtl::OUString OSQLMessageDialog::getImplementationName_Static() throw(RuntimeException)
{
- return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OSQLMessageDialog");
+ return
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OSQLMessageDialog"));
}
//-------------------------------------------------------------------------
@@ -102,7 +102,7 @@ Reference< XInterface > SAL_CALL OSQLMessageDialog::Create(const Reference< XMul
::comphelper::StringSequence OSQLMessageDialog::getSupportedServiceNames_Static()
throw(RuntimeException)
{
::comphelper::StringSequence aSupported(1);
- aSupported.getArray()[0] =
::rtl::OUString::createFromAscii("com.sun.star.sdb.ErrorMessageDialog");
+ aSupported.getArray()[0] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ErrorMessageDialog"));
return aSupported;
}
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx
b/reportdesign/source/filter/xml/xmlfilter.cxx
index 8574b94..d14c811 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -151,7 +151,7 @@ sal_Int32 ReadThroughComponent(
// get parser
uno::Reference< XParser > xParser(
rFactory->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.xml.sax.Parser") ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))),
UNO_QUERY );
DBG_ASSERT( xParser.is(), "Can't create parser" );
if( !xParser.is() )
@@ -1109,8 +1109,8 @@ SvXMLImportContext* ORptFilter::CreateMetaContext(const ::rtl::OUString&
rLocalN
if ( (getImportFlags() & IMPORT_META) )
{
uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
- getServiceFactory()->createInstance(::rtl::OUString::createFromAscii(
- "com.sun.star.xml.dom.SAXDocumentBuilder")),
+ getServiceFactory()->createInstance(::rtl::OUString(
+ RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.dom.SAXDocumentBuilder"))),
uno::UNO_QUERY_THROW);
uno::Reference<document::XDocumentPropertiesSupplier> xDPS(GetModel(),
uno::UNO_QUERY_THROW);
pContext = new SvXMLMetaDocumentContext(*this,XML_NAMESPACE_OFFICE,
rLocalName,xDPS->getDocumentProperties(), xDocBuilder);
diff --git a/reportdesign/source/ui/report/ReportController.cxx
b/reportdesign/source/ui/report/ReportController.cxx
index eeb35f2..c3f7067 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1710,7 +1710,7 @@ void OReportController::impl_initialize( )
throw Exception();
::comphelper::NamedValueCollection aArgs(getModel()->getArgs());
- setMode(aArgs.getOrDefault("Mode", rtl::OUString::createFromAscii("normal")));
+ setMode(aArgs.getOrDefault("Mode",
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("normal"))));
listen(true);
setEditable( !m_aReportModel->IsReadOnly() );
@@ -1812,7 +1812,7 @@ void OReportController::doOpenHelpAgent()
{
if (getFrame().is())
{
- rtl::OUString suURL =
rtl::OUString::createFromAscii("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter");
+ rtl::OUString
suURL(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help://shared/text/shared/explorer/database/rep_main.xhp?UseDB=no&DbPAR=swriter"));
openHelpAgent(suURL);
// openHelpAgent(68245 /* HID_REPORT_DESIGN... UNKNOWN */ );
// HID_APP_REPORT_TREE
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 5bfb868..e21620d 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -121,7 +121,7 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window*
pParent,
if (m_xMeAsFrame.is())
{
m_xMeAsFrame->initialize( VCLUnoHelper::GetInterface ( this ) );
- m_xMeAsFrame->setName(::rtl::OUString::createFromAscii("report property browser"));
// change name!
+ m_xMeAsFrame->setName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("report property
browser"))); // change name!
}
}
catch (Exception&)
--
1.7.0.4
From 3c4577da21f9bf5b1762a1b9f43ddd3a1f2fc375 Mon Sep 17 00:00:00 2001
From: Santiago Alessandri <salessandri@nasel.com.ar>
Date: Sat, 13 Nov 2010 11:59:03 -0300
Subject: [PATCH 2/2] Fixed bugs in previous commit
---
.../source/ext/macromigration/migrationengine.cxx | 2 +-
dbaccess/source/ui/misc/controllerframe.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx
b/dbaccess/source/ext/macromigration/migrationengine.cxx
index d40c4e4..c573d03 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -1223,7 +1223,7 @@ namespace dbmm
const ::rtl::OUString& _rSourceLibName, const Reference< XNameAccess >&
_rxTargetContainer )
{
// The new library name is composed from the prefix, the base name, and the old
library name.
- const ::rtl::OUString sPrefix(_rDocument.eType == eForm ?
RTL_CONSTASCII_USTRINGPARAM("Form_") : RTL_CONSTASCII_USTRINGPARAM("Report_"));
+ const ::rtl::OUString sPrefix = (_rDocument.eType ==
eForm)?rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Form_")):
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Report_"));
::rtl::OUString sBaseName( _rDocument.sHierarchicalName.copy(
_rDocument.sHierarchicalName.lastIndexOf( '/' ) + 1 ) );
diff --git a/dbaccess/source/ui/misc/controllerframe.cxx
b/dbaccess/source/ui/misc/controllerframe.cxx
index d53de6c..f374308 100644
--- a/dbaccess/source/ui/misc/controllerframe.cxx
+++ b/dbaccess/source/ui/misc/controllerframe.cxx
@@ -236,7 +236,7 @@ namespace dbaui
{
if ( _rData.m_xDocEventBroadcaster.is() )
{
- ::rtl::OUString sEventName( _bActive ? RTL_CONSTASCII_USTRINGPARAM("OnFocus") :
RTL_CONSTASCII_USTRINGPARAM("OnUnfocus"));
+ ::rtl::OUString sEventName = _bActive ?
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnFocus")) :
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnUnfocus"));
Reference< XController2 > xController( _rData.m_rController.getXController(),
UNO_QUERY_THROW );
_rData.m_xDocEventBroadcaster->notifyDocumentEvent( sEventName, xController, Any()
);
}
--
1.7.0.4
Context
- [Libreoffice] [PATCH] Replaced createFromAscii with RTL_CONSTASCII_USTRINGPARAM in all /dbaccess/in base repo · Santiago Alessandri
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.