summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/appserv.cxx2
-rw-r--r--sfx2/source/appl/newhelp.cxx2
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx8
-rw-r--r--sfx2/source/dialog/templdlg.cxx6
-rw-r--r--sfx2/source/dialog/versdlg.cxx4
-rw-r--r--sfx2/source/doc/objcont.cxx2
-rw-r--r--sfx2/source/view/orgmgr.cxx2
7 files changed, 13 insertions, 13 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 73429f14d1e9..7363fc48eefa 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -712,7 +712,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
{
- LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLocale() );
+ LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLanguageTag().getLocale() );
const sal_uInt16 *pRanges = rSet.GetRanges();
DBG_ASSERT(pRanges && *pRanges, "Set without range");
while ( *pRanges )
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index ff6a8fc81d8b..0eca0918af27 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -205,7 +205,7 @@ namespace sfx2
{
String sSearchStr;
sal_Int32 nStartPos = 0;
- const Locale aLocale = Application::GetSettings().GetUILocale();
+ const Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale();
Boundary aBoundary = xBreak->getWordBoundary(
rSearchString, nStartPos, aLocale, WordType::ANYWORD_IGNOREWHITESPACES, sal_True );
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 );
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 8511f63354e9..64d4d4629c0b 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -157,7 +157,7 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent ) const
else if ( SvtCTLOptions::NUMERALS_ARABIC == aCTLOptions.GetCTLTextNumerals() )
eLang = LANGUAGE_ENGLISH;
else
- eLang = (LanguageType) Application::GetSettings().GetLanguage();
+ eLang = (LanguageType) Application::GetSettings().GetLanguageTag().getLanguageType();
aDevice.SetDigitLanguage( eLang );
diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx
index fc74480a544b..4ba59d686ab6 100644
--- a/sfx2/source/view/orgmgr.cxx
+++ b/sfx2/source/view/orgmgr.cxx
@@ -217,7 +217,7 @@ SfxOrganizeMgr::SfxOrganizeMgr( SfxOrganizeListBox_Impl *pLeft,
*/
{
pImpl->pDocList = new SfxObjectList;
- pImpl->pIntlWrapper = new IntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
+ pImpl->pIntlWrapper = new IntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLanguageTag().getLocale() );
const CollatorWrapper* pCollator = pImpl->pIntlWrapper->getCaseCollator();
for ( SfxObjectShell* pTmp = SfxObjectShell::GetFirst(); pTmp; pTmp = SfxObjectShell::GetNext(*pTmp) )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 00:09:22 +0000