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 /svx | |
parent | 9c5d6ea5efb5f56a4ac96b4a8505ed84abbbc6bf (diff) |
AllSettings with LanguageTag
Change-Id: I710ae66e51139662eb442b681fdf9cc9d158551d
Diffstat (limited to 'svx')
23 files changed, 26 insertions, 25 deletions
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 87840de9b1c0..40bc8a96036c 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_libraries,textconversiondlgs,\ cppuhelper \ cppu \ sal \ + i18nisolang1 \ svl \ svt \ tk \ diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 1def70a851db..a7be107782d8 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -290,7 +290,7 @@ Locale AccFrameSelector::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) { Locale aRet; - SvxLanguageToLocale( aRet, Application::GetSettings().GetUILanguage() ); + SvxLanguageToLocale( aRet, Application::GetSettings().GetUILanguageTag().getLanguageType() ); return aRet; } diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 90c0fc3d8e92..cb9ab5a13087 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -568,7 +568,7 @@ IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd ) String aStr; const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit(); const Point& rMousePos = pWnd->GetMousePos(); - LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLocale() ); + LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLanguageTag().getLocale() ); const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep()[0]; aStr.Assign( GetUnitString( rMousePos.X(), eFieldUnit, cSep ) ); @@ -585,7 +585,7 @@ IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd ) String aStr; const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit(); const Size& rSize = pWnd->GetGraphicSize(); - LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLocale() ); + LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLanguageTag().getLocale() ); const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep()[0]; aStr.Assign( GetUnitString( rSize.Width(), eFieldUnit, cSep ) ); diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index 73c4face8330..7a0de83fc0a2 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -106,7 +106,7 @@ CompressGraphicsDialog::~CompressGraphicsDialog() void CompressGraphicsDialog::Update() { const FieldUnit eFieldUnit = m_rBindings.GetDispatcher()->GetModule()->GetFieldUnit(); - LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLocale() ); + LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLanguageTag().getLocale() ); sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep()[0]; VirtualDevice* pDummyVDev = new VirtualDevice(); diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index ce44493b2e3a..e17ec29abd07 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -442,7 +442,7 @@ void DialControl::Init( const Size& rWinSize, const Font& rWinFont ) void DialControl::Init( const Size& rWinSize ) { Font aFont( OutputDevice::GetDefaultFont( - DEFAULTFONT_UI_SANS, Application::GetSettings().GetUILanguage(), DEFAULTFONT_FLAGS_ONLYONE ) ); + DEFAULTFONT_UI_SANS, Application::GetSettings().GetUILanguageTag().getLanguageType(), DEFAULTFONT_FLAGS_ONLYONE ) ); Init( rWinSize, aFont ); } diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx index cba29102d0b2..099897352965 100644 --- a/svx/source/dialog/dialmgr.cxx +++ b/svx/source/dialog/dialmgr.cxx @@ -41,7 +41,7 @@ static ResMgr* pResMgr=0; ResMgr* DialogsResMgr::GetResMgr() { if ( !pResMgr ) - pResMgr = ResMgr::CreateResMgr( "svx", Application::GetSettings().GetUILocale() ); + pResMgr = ResMgr::CreateResMgr( "svx", Application::GetSettings().GetUILanguageTag().getLocale() ); return pResMgr; } diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index fa07b8153215..38670f0da426 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -665,7 +665,7 @@ IMPL_LINK( SvxIMapDlg, MousePosHdl, IMapWindow*, pWnd ) String aStr; const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit(); const Point& rMousePos = pWnd->GetMousePos(); - LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLocale() ); + LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLanguageTag().getLocale() ); const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep()[0]; aStr.Assign( GetUnitString( rMousePos.X(), eFieldUnit, cSep ) ); @@ -682,7 +682,7 @@ IMPL_LINK( SvxIMapDlg, GraphSizeHdl, IMapWindow*, pWnd ) String aStr; const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit(); const Size& rSize = pWnd->GetGraphicSize(); - LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLocale() ); + LocaleDataWrapper aLocaleWrapper( Application::GetSettings().GetLanguageTag().getLocale() ); const sal_Unicode cSep = aLocaleWrapper.getNumDecimalSep()[0]; aStr.Assign( GetUnitString( rSize.Width(), eFieldUnit, cSep ) ); diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx index 2618e19e7678..bb20aee77d82 100644 --- a/svx/source/dialog/simptabl.cxx +++ b/svx/source/dialog/simptabl.cxx @@ -458,7 +458,7 @@ StringCompare SvxSimpleTable::ColCompare(SvTreeListEntry* pLeft,SvTreeListEntry* if(nRightKind == SV_ITEM_ID_LBOXSTRING && nLeftKind == SV_ITEM_ID_LBOXSTRING ) { - IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() ); + IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLanguageTag().getLocale() ); const CollatorWrapper* pCollator = aIntlWrapper.getCaseCollator(); eCompare=(StringCompare)pCollator->compareString( ((SvLBoxString*)pLeftItem)->GetText(), diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 7825c6f019fc..4a694409d6c1 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -160,7 +160,7 @@ void SvxSwFrameExample::InitAllRects_Impl() if (nAnchor == TextContentAnchorType_AS_CHARACTER || nAnchor == TextContentAnchorType_AT_CHARACTER) { Font aFont = OutputDevice::GetDefaultFont( - DEFAULTFONT_LATIN_TEXT, Application::GetSettings().GetLanguage(), + DEFAULTFONT_LATIN_TEXT, Application::GetSettings().GetLanguageTag().getLanguageType(), DEFAULTFONT_FLAGS_ONLYONE, this ); aFont.SetColor( m_aTxtCol ); aFont.SetFillColor( m_aBgCol ); diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index acbf420435a4..9887575e3526 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -937,7 +937,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe Reference< XPropertySet > xReplaced( xCols->getByIndex( nPos ), UNO_QUERY ); OStaticDataAccessTools().TransferFormComponentProperties( - xReplaced, xNewCol, Application::GetSettings().GetUILocale() ); + xReplaced, xNewCol, Application::GetSettings().GetUILanguageTag().getLocale() ); xCols->replaceByIndex( nPos, makeAny( xNewCol ) ); ::comphelper::disposeComponent( xReplaced ); diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 47ac9d70e189..47117c184873 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1985,7 +1985,7 @@ void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySe static_cast< DoubleNumericField* >( m_pPainter )->SetFormatter( pFormatterUsed ); // und dann ein Format generieren, dass die gewuenschten Nachkommastellen usw. hat - LanguageType aAppLanguage = Application::GetSettings().GetUILanguage(); + LanguageType aAppLanguage = Application::GetSettings().GetUILanguageTag().getLanguageType(); OUString sFormatString = pFormatterUsed->GenerateFormat(0, aAppLanguage, bThousand, sal_False, nScale); static_cast< DoubleNumericField* >( m_pWindow )->SetFormat( sFormatString, aAppLanguage ); @@ -2985,7 +2985,7 @@ sal_Bool DbFilterField::commitControl() { OUString aPreparedText; - ::com::sun::star::lang::Locale aAppLocale = Application::GetSettings().GetUILocale(); + ::com::sun::star::lang::Locale aAppLocale = Application::GetSettings().GetUILanguageTag().getLocale(); Reference< XRowSet > xDataSourceRowSet( (Reference< XInterface >)*m_rColumn.GetParent().getDataSource(), UNO_QUERY); diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 6f7c70056edf..4d993b31c128 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -500,7 +500,7 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls() { Font aApplFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS_UNICODE, - Application::GetSettings().GetUILanguage(), + Application::GetSettings().GetUILanguageTag().getLanguageType(), DEFAULTFONT_FLAGS_ONLYONE, this ); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index ebe4aad2e1ca..9baa79f27f3a 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -799,7 +799,7 @@ namespace svxform // create a resource manager, for the svx resource file // and the UI locale ResMgr* pResMgr = ResMgr::CreateResMgr( - "svx", Application::GetSettings().GetUILocale() ); + "svx", Application::GetSettings().GetUILanguageTag().getLocale() ); // load the resources for the AddSubmission modal dialog. // This will create our own resource context. diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index ee2d8b9ba63a..bc851291456c 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -914,7 +914,7 @@ sal_Bool FmFilterModel::ValidateText(FmFilterItem* pItem, UniString& rText, UniS if ( xParseNode.is() ) { ::rtl::OUString aPreparedText; - Locale aAppLocale = Application::GetSettings().GetUILocale(); + Locale aAppLocale = Application::GetSettings().GetUILanguageTag().getLocale(); xParseNode->parseNodeToPredicateStr( aPreparedText, xConnection, xFormatter, xField, aAppLocale, '.', getParseContext() ); rText = aPreparedText; diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 813d43629c7c..7000608a9d5f 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1188,7 +1188,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent Reference< XPropertySet> xNewSet(xNewModel, UNO_QUERY); - Locale aNewLanguage = Application::GetSettings().GetUILocale(); + Locale aNewLanguage = Application::GetSettings().GetUILanguageTag().getLocale(); TransferFormComponentProperties(xOldSet, xNewSet, aNewLanguage); Sequence< ::com::sun::star::script::ScriptEventDescriptor> aOldScripts; diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index dd3854b5a316..58e9997704ca 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -3171,7 +3171,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) Reference< XNumberFormatsSupplier> xFormatSupplier( aStaticTools.getNumberFormats(xConnection, sal_True)); Reference< XNumberFormatter> xFormatter( NumberFormatter::create(m_aContext.getUNOContext()), UNO_QUERY_THROW ); xFormatter->attachNumberFormatsSupplier(xFormatSupplier); - Locale aAppLocale = Application::GetSettings().GetUILocale(); + Locale aAppLocale = Application::GetSettings().GetUILanguageTag().getLocale(); LocaleDataWrapper aLocaleWrapper( m_aContext.getUNOContext(), aAppLocale ); // retrieving the filter diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 4fd476915e20..8f70e1cec89e 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -76,7 +76,7 @@ ResMgr* GetGalleryResMgr() if( !pGalleryResMgr ) { pGalleryResMgr = ResMgr::CreateResMgr( - "gal", Application::GetSettings().GetUILocale() ); + "gal", Application::GetSettings().GetUILanguageTag().getLocale() ); } return pGalleryResMgr; diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index f0a7b5541419..ab42c7125af0 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -207,7 +207,7 @@ const String SgaObject::GetTitle() const { rtl::OString aMgrName(rtl::OUStringToOString(aResourceName, RTL_TEXTENCODING_UTF8)); ResMgr* pResMgr = ResMgr::CreateResMgr( aMgrName.getStr(), - Application::GetSettings().GetUILocale() ); + Application::GetSettings().GetUILanguageTag().getLocale() ); if ( pResMgr ) { ResId aResId( (sal_uInt16)nResId, *pResMgr ); diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 5e12eb8ace56..5f8314d2ef07 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -1584,7 +1584,7 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vector<rtl::OUString>& rList, } CollatorWrapper aCollator( ::comphelper::getProcessServiceFactory()); - aCollator.loadDefaultCollator( Application::GetSettings().GetLocale(), 0); + aCollator.loadDefaultCollator( Application::GetSettings().GetLanguageTag().getLocale(), 0); const String aTwoSpace( RTL_CONSTASCII_USTRINGPARAM( " ")); diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 9d36dccb0527..8e711f0988fc 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -878,7 +878,7 @@ SfxItemPresentation SdrAngleItem::GetPresentation( if(!pIntlWrapper) pIntlWrapper = pMyIntlWrapper = new IntlWrapper( ::comphelper::getProcessServiceFactory(), - Application::GetSettings().GetLanguage() ); + Application::GetSettings().GetLanguageTag().getLanguageType() ); if(pIntlWrapper->getLocaleData()->isNumLeadingZero()) nAnz++; diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 54d9ae6faa82..8d85e941acd4 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -446,7 +446,7 @@ ResMgr* ImpGetResMgr() if(!rGlobalData.pResMgr) { rGlobalData.pResMgr = - ResMgr::CreateResMgr( "svx", Application::GetSettings().GetUILocale() ); + ResMgr::CreateResMgr( "svx", Application::GetSettings().GetUILanguageTag().getLocale() ); } return rGlobalData.pResMgr; diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 8bcb27df0fbb..073701e1679a 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -787,7 +787,7 @@ void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt SvxFontItem aSvxFontItem( EE_CHAR_FONTINFO) ; SvxFontItem aSvxFontItemCJK(EE_CHAR_FONTINFO_CJK); SvxFontItem aSvxFontItemCTL(EE_CHAR_FONTINFO_CTL); - sal_uInt16 nLanguage(Application::GetSettings().GetLanguage()); + sal_uInt16 nLanguage(Application::GetSettings().GetLanguageTag().getLanguageType()); // get DEFAULTFONT_LATIN_TEXT and set at pool as dynamic default Font aFont(OutputDevice::GetDefaultFont(DEFAULTFONT_LATIN_TEXT, nLanguage, DEFAULTFONT_FLAGS_ONLYONE, 0)); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 63a0f9f7bdde..c4710abcf4d8 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -396,7 +396,7 @@ StringCompare DictionaryList::ColumnCompare( SvTreeListEntry* pLeft, SvTreeListE if(nRightKind == SV_ITEM_ID_LBOXSTRING && nLeftKind == SV_ITEM_ID_LBOXSTRING ) { - IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() ); + IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLanguageTag().getLocale() ); const CollatorWrapper* pCollator = aIntlWrapper.getCaseCollator(); eCompare=(StringCompare)pCollator->compareString( ((SvLBoxString*)pLeftItem)->GetText(), |