diff options
author | Eike Rathke <erack@redhat.com> | 2012-11-22 12:26:52 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2012-11-22 12:34:59 +0100 |
commit | 9955dbebbdf1b7d36fec272dfea46f57fab47e19 (patch) | |
tree | 80705ccc2382e7440ea76f62a544d64d12d1ce4f /sfx2/source/dialog | |
parent | sw: remove WorkaroundForB6375613 (diff) | |
download | core-9955dbebbdf1b7d36fec272dfea46f57fab47e19.tar.gz core-9955dbebbdf1b7d36fec272dfea46f57fab47e19.zip |
AllSettings with LanguageTag
Change-Id: I710ae66e51139662eb442b681fdf9cc9d158551d
Diffstat (limited to 'sfx2/source/dialog')
-rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/dialog/versdlg.cxx | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 3dc9cdb78f1d..fcc09827b3a3 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -724,7 +724,7 @@ namespace { String GetDateTimeString( sal_Int32 _nDate, sal_Int32 _nTime ) { - LocaleDataWrapper aWrapper( Application::GetSettings().GetLocale() ); + LocaleDataWrapper aWrapper( Application::GetSettings().GetLanguageTag().getLocale() ); Date aDate( _nDate ); Time aTime( _nTime ); @@ -878,7 +878,7 @@ IMPL_LINK_NOARG(SfxDocumentPage, DeleteHdl) String aName; if ( bEnableUseUserData && aUseUserDataCB.IsChecked() ) aName = SvtUserOptions().GetFullName(); - LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLocale() ); + LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLanguageTag().getLocale() ); DateTime now( DateTime::SYSTEM ); util::DateTime uDT( now.Get100Sec(), now.GetSec(), now.GetMin(), now.GetHour(), @@ -1148,7 +1148,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet ) // handle access data sal_Bool m_bUseUserData = pInfoItem->IsUseUserData(); - LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLocale() ); + LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLanguageTag().getLocale() ); aCreateValFt.SetText( ConvertDateTime_Impl( pInfoItem->getAuthor(), pInfoItem->getCreationDate(), aLocaleWrapper ) ); util::DateTime aTime( pInfoItem->getModificationDate() ); @@ -1810,7 +1810,7 @@ CustomPropertiesWindow::CustomPropertiesWindow( Window* pParent, const ResId& rR m_aRemoveButton ( this, SfxResId( SFX_PB_PROPERTY_REMOVE ) ), m_nScrollPos (0), m_aNumberFormatter( ::comphelper::getProcessServiceFactory(), - Application::GetSettings().GetLanguage() ) + Application::GetSettings().GetLanguageTag().getLanguageType() ) { m_aEditLoseFocusTimer.SetTimeout( 300 ); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 3e610b6600ba..86002c53a37c 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -537,7 +537,7 @@ sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry* pTarget, const sal_Bool bRet = (sal_Bool)aDropLink.Call(this); rpNewParent = pTarget; lPos=0; - IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() ); + IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLanguageTag().getLocale() ); const CollatorWrapper* pCollator = aIntlWrapper.getCaseCollator(); for(SvTreeListEntry *pTmpEntry=FirstChild(pTarget); pTmpEntry && COMPARE_LESS==pCollator->compareString( @@ -667,7 +667,7 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr) comphelper::string::NaturalStringSorter aSorter( ::comphelper::getProcessComponentContext(), - Application::GetSettings().GetLocale()); + Application::GetSettings().GetLanguageTag().getLocale()); // Arrange all under their Parents sal_uInt16 i; @@ -1308,7 +1308,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) comphelper::string::NaturalStringSorter aSorter( ::comphelper::getProcessComponentContext(), - Application::GetSettings().GetLocale()); + Application::GetSettings().GetLanguageTag().getLocale()); while( pStyle ) { diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index aca4e4aa65f7..6d992cfc134f 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -317,7 +317,7 @@ void SfxVersionDialog::RecalcDateColumn() { // recalculate the datetime column width DateTime aNow( DateTime::SYSTEM ); - mpLocaleWrapper = new LocaleDataWrapper( Application::GetSettings().GetLocale() ); + mpLocaleWrapper = new LocaleDataWrapper( Application::GetSettings().GetLanguageTag().getLocale() ); String sDateTime = ConvertDateTime_Impl( aNow, *mpLocaleWrapper ); long nWidth = aVersionBox.GetTextWidth( sDateTime ); nWidth += 15; // a little offset @@ -451,7 +451,7 @@ SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl ( Window *pParent, SfxVersi { FreeResource(); - LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLocale() ); + LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLanguageTag().getLocale() ); aDateTimeText.SetText( aDateTimeText.GetText().Append(ConvertDateTime_Impl( pInfo->aCreationDate, aLocaleWrapper )) ); aSavedByText.SetText( aSavedByText.GetText().Append(pInfo->aAuthor) ); aEdit.SetText( rInfo.aComment ); |