diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-07-02 16:02:38 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-03 21:24:35 +0100 |
commit | bccf34c19ae022b67565e212fa4ec0d5213947de (patch) | |
tree | 73c2d2e29ad8d15999cbfb2ff554efa1e502a35e /connectivity | |
parent | 285289275d1cf1769080a208b55be984cd269e1e (diff) |
ditch String::CreateFromAscii
Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/drivers/dbase/DConnection.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/dbase/DIndex.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/drivers/dbase/DTable.cxx | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx index bc0d23db6d97..aa88ae2290bf 100644 --- a/connectivity/source/drivers/dbase/DConnection.cxx +++ b/connectivity/source/drivers/dbase/DConnection.cxx @@ -45,7 +45,7 @@ DBG_NAME(ODbaseConnection) ODbaseConnection::ODbaseConnection(ODriver* _pDriver) : OConnection(_pDriver) { DBG_CTOR(ODbaseConnection,NULL); - m_aFilenameExtension = String::CreateFromAscii("dbf"); + m_aFilenameExtension = rtl::OUString("dbf"); } //----------------------------------------------------------------------------- ODbaseConnection::~ODbaseConnection() diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index b56395eb27f5..7285bb0a27b1 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -376,7 +376,7 @@ void ODbaseIndex::createINFEntry() { // synchronize inf-file String sEntry = m_Name; - sEntry += String::CreateFromAscii(".ndx"); + sEntry += rtl::OUString(".ndx"); ::rtl::OUString sCfgFile(m_pTable->getConnection()->getURL()); sCfgFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER); @@ -435,7 +435,7 @@ sal_Bool ODbaseIndex::DropImpl() sal_uInt16 nKeyCnt = aInfFile.GetKeyCount(); rtl::OString aKeyName; String sEntry = m_Name; - sEntry += String::CreateFromAscii(".ndx"); + sEntry += rtl::OUString(".ndx"); // delete entries from the inf file for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++) diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 63e249fbfa6f..d051f3f881cf 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -511,9 +511,9 @@ void ODbaseTable::construct() // nyi: Ugly for Unix and Mac! if ( m_aHeader.db_typ == FoxProMemo || VisualFoxPro == m_aHeader.db_typ || VisualFoxProAuto == m_aHeader.db_typ ) // foxpro uses another extension - aURL.SetExtension(String::CreateFromAscii("fpt")); + aURL.SetExtension(rtl::OUString("fpt")); else - aURL.SetExtension(String::CreateFromAscii("dbt")); + aURL.SetExtension(rtl::OUString("dbt")); // If the memo file isn't found, the data will be displayed anyhow. // However, updates can't be done @@ -677,7 +677,7 @@ void ODbaseTable::refreshIndexes() INetURLObject aURL; aURL.SetURL(getEntry(m_pConnection,m_Name)); - aURL.setExtension(String::CreateFromAscii("inf")); + aURL.setExtension(rtl::OUString("inf")); Config aInfFile(aURL.getFSysPath(INetURLObject::FSYS_DETECT)); aInfFile.SetGroup(dBASE_III_GROUP); sal_uInt16 nKeyCnt = aInfFile.GetKeyCount(); @@ -1090,7 +1090,7 @@ sal_Bool ODbaseTable::CreateImpl() if (bMemoFile) { String aExt = aURL.getExtension(); - aURL.setExtension(String::CreateFromAscii("dbt")); // extension for memo file + aURL.setExtension(rtl::OUString("dbt")); // extension for memo file Content aMemo1Content(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>()); sal_Bool bMemoAlreadyExists = sal_False; @@ -1435,7 +1435,7 @@ sal_Bool ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMem { if (_bHasMemoFields) { // delete the memo fields - aURL.setExtension(String::CreateFromAscii("dbt")); + aURL.setExtension(rtl::OUString("dbt")); bDropped = ::utl::UCBContentHelper::Kill(aURL.GetMainURL(INetURLObject::NO_DECODE)); } @@ -1455,7 +1455,7 @@ sal_Bool ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMem { } } - aURL.setExtension(String::CreateFromAscii("inf")); + aURL.setExtension(rtl::OUString("inf")); // as the inf file does not necessarily exist, we aren't allowed to use UCBContentHelper::Kill try @@ -2348,7 +2348,7 @@ void SAL_CALL ODbaseTable::renameImpl( const ::rtl::OUString& newName ) throw(:: renameFile(m_pConnection,m_Name,newName,m_pConnection->getExtension()); if ( HasMemoFields() ) { // delete the memo fields - String sExt = String::CreateFromAscii("dbt"); + rtl::OUString sExt("dbt"); renameFile(m_pConnection,m_Name,newName,sExt); } } |