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 /dbaccess/source/ui/misc | |
| parent | 285289275d1cf1769080a208b55be984cd269e1e (diff) | |
ditch String::CreateFromAscii
Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691
Diffstat (limited to 'dbaccess/source/ui/misc')
| -rw-r--r-- | dbaccess/source/ui/misc/UITools.cxx | 7 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/WTypeSelect.cxx | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 000ff80d5166..e2af63da73a8 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -926,7 +926,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent, new SvxNumberInfoItem(SID_ATTR_NUMBERFORMAT_INFO) }; - SfxItemPool* pPool = new SfxItemPool(String::CreateFromAscii("GridBrowserProperties"), SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, pDefaults); + SfxItemPool* pPool = new SfxItemPool(rtl::OUString("GridBrowserProperties"), SBA_DEF_RANGEFORMAT, SBA_ATTR_ALIGN_HOR_JUSTIFY, aItemInfos, pDefaults); pPool->SetDefaultMetric( SFX_MAPUNIT_TWIP ); // ripped, don't understand why pPool->FreezeIdRanges(); // the same @@ -1007,8 +1007,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent, //------------------------------------------------------------------------------ const SfxFilter* getStandardDatabaseFilter() { - static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)"); - const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType); + const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)")); OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); return pFilter; } @@ -1401,7 +1400,7 @@ sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText { SolarMutexGuard aGuard; String aMsg = String(ModuleRes(_nText)); - aMsg.SearchAndReplace(String::CreateFromAscii("%1"),String(_sName)); + aMsg.SearchAndReplace(rtl::OUString("%1"),String(_sName)); OSQLMessageBox aAsk(_pParent,String(ModuleRes(_nTitle )),aMsg,WB_YES_NO | WB_DEF_YES,OSQLMessageBox::Query); if ( _bAll ) { diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 60ddd349a259..4b3078b2cb3e 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -242,7 +242,7 @@ OWizTypeSelect::OWizTypeSelect( Window* pParent, SvStream* _pStream ) m_aTypeControl.Show(); m_aTypeControl.Init(); - m_etAuto.SetText(String::CreateFromAscii("10")); + m_etAuto.SetText(rtl::OUString("10")); m_etAuto.SetDecimalDigits(0); m_pbAuto.SetClickHdl(LINK(this,OWizTypeSelect,ButtonClickHdl)); m_lbColumnNames.EnableMultiSelection(sal_True); |