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 /sd | |
parent | 9c5d6ea5efb5f56a4ac96b4a8505ed84abbbc6bf (diff) |
AllSettings with LanguageTag
Change-Id: I710ae66e51139662eb442b681fdf9cc9d158551d
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/core/drawdoc.cxx | 6 | ||||
-rw-r--r-- | sd/source/core/drawdoc2.cxx | 4 | ||||
-rw-r--r-- | sd/source/core/drawdoc4.cxx | 4 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptx-text.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/accessibility/AccessibleTreeNode.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/TemplateScanner.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/Outliner.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drviews5.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/sdview.cxx | 2 |
12 files changed, 16 insertions, 16 deletions
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 6b5603c127e9..c35464fa9d10 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -236,7 +236,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) mpCharClass = new CharClass( *mpLocale ); // If the current application language is a language that uses right-to-left text... - LanguageType eRealCTLLanguage = Application::GetSettings().GetLanguage(); + LanguageType eRealCTLLanguage = Application::GetSettings().GetLanguageTag().getLanguageType(); if( MsLangId::isRightToLeft( eRealCTLLanguage ) ) { // ... then we have to set this as a default @@ -271,7 +271,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) OSL_FAIL("Can't get SpellChecker"); } - rOutliner.SetDefaultLanguage( Application::GetSettings().GetLanguage() ); + rOutliner.SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); if (mpDocSh) { @@ -325,7 +325,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) OSL_FAIL("Can't get SpellChecker"); } - pHitTestOutliner->SetDefaultLanguage( Application::GetSettings().GetLanguage() ); + pHitTestOutliner->SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); sal_uLong nCntrl2 = pHitTestOutliner->GetControlWord(); nCntrl2 |= EE_CNTRL_ALLOWBIGOBJS; diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 354262187df5..8cbc2e82c962 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -922,8 +922,8 @@ void SdDrawDocument::SetLanguage( const LanguageType eLang, const sal_uInt16 nId if( bChanged ) { - GetDrawOutliner().SetDefaultLanguage( Application::GetSettings().GetLanguage() ); - pHitTestOutliner->SetDefaultLanguage( Application::GetSettings().GetLanguage() ); + GetDrawOutliner().SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); + pHitTestOutliner->SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); pItemPool->SetPoolDefaultItem( SvxLanguageItem( eLang, nId ) ); SetChanged( bChanged ); } diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index ad1cde5dd369..5429938aa075 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -1389,7 +1389,7 @@ void SdDrawDocument::getDefaultFonts( Font& rLatinFont, Font& rCJKFont, Font& rC // If the UI language is Korean, the default Latin font has to // be queried for Korean, too (the Latin language from the document can't be Korean). // This is the same logic as in SwDocShell::InitNew. - LanguageType eUiLanguage = Application::GetSettings().GetUILanguage(); + LanguageType eUiLanguage = Application::GetSettings().GetUILanguageTag().getLanguageType(); if (MsLangId::isKorean(eUiLanguage)) eLatin = eUiLanguage; @@ -1401,7 +1401,7 @@ void SdDrawDocument::getDefaultFonts( Font& rLatinFont, Font& rCJKFont, Font& rC /* converts the given western font height to a corresponding ctl font height, deppending on the system language */ sal_uInt32 SdDrawDocument::convertFontHeightToCTL( sal_uInt32 nWesternFontHeight ) { - LanguageType eRealCTLLanguage = Application::GetSettings().GetLanguage(); + LanguageType eRealCTLLanguage = Application::GetSettings().GetLanguageTag().getLanguageType(); if( LANGUAGE_THAI == eRealCTLLanguage ) { // http://specs.openoffice.org/g11n/font_sizes/42775_42725_Individual_configurable_font_size_for_default_fonts.odt diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 76e7202bd93b..3043bac3f44d 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -247,7 +247,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool } } - sal_Int16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( Application::GetSettings().GetLanguage() ); + sal_Int16 nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); if ( mpText && mnTextSize && xPPTBreakIter.is() ) { rtl::OUString sT( mpText, mnTextSize ); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index c470c60d3526..6df80e96c8f6 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -374,7 +374,7 @@ lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale (void) return xParentContext->getLocale(); else // Strange, no parent! Anyway, return the default locale. - return Application::GetSettings().GetLocale(); + return Application::GetSettings().GetLanguageTag().getLocale(); } diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx b/sd/source/ui/accessibility/AccessibleTreeNode.cxx index 5a0c014183db..d59748047dee 100644 --- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx +++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx @@ -339,7 +339,7 @@ lang::Locale SAL_CALL AccessibleTreeNode::getLocale (void) return xParentContext->getLocale(); else // Strange, no parent! Anyway, return the default locale. - return Application::GetSettings().GetLocale(); + return Application::GetSettings().GetLanguageTag().getLocale(); } diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 1f8698e9b4c3..fc803fb3425b 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -232,7 +232,7 @@ ImplStlEffectCategorySortHelper::ImplStlEffectCategorySortHelper() if( mxCollator.is() ) { - const lang::Locale& rLocale = Application::GetSettings().GetLocale(); + const lang::Locale& rLocale = Application::GetSettings().GetLanguageTag().getLocale(); mxCollator->loadDefaultCollator(rLocale, 0); } } diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 0f01371aa0c7..6bacc27a985f 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -146,7 +146,7 @@ namespace sd TemplateEntryCompare::TemplateEntryCompare(): mpStringSorter(new comphelper::string::NaturalStringSorter( ::comphelper::getProcessComponentContext(), - Application::GetSettings().GetLocale())) {} + Application::GetSettings().GetLanguageTag().getLocale())) {} bool TemplateEntryCompare::operator()(TemplateEntry* pA, TemplateEntry* pB) const { diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index a89fe1120fec..28c6b1297189 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1528,7 +1528,7 @@ void ImplPDFExportComments( uno::Reference< drawing::XDrawPage > xPage, vcl::PDF uno::Reference< office::XAnnotationAccess > xAnnotationAccess( xPage, uno::UNO_QUERY_THROW ); uno::Reference< office::XAnnotationEnumeration > xAnnotationEnumeration( xAnnotationAccess->createAnnotationEnumeration() ); - LanguageType eLanguage = Application::GetSettings().GetLanguage(); + LanguageType eLanguage = Application::GetSettings().GetLanguageTag().getLanguageType(); while( xAnnotationEnumeration->hasMoreElements() ) { uno::Reference< office::XAnnotation > xAnnotation( xAnnotationEnumeration->nextElement() ); diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 43aa50210251..47b5768a328a 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -235,7 +235,7 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode ) if( xHyphenator.is() ) SetHyphenator( xHyphenator ); - SetDefaultLanguage( Application::GetSettings().GetLanguage() ); + SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); } diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 62ebfda910c6..230a54e33eff 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -464,7 +464,7 @@ void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin) /* This is done before each text edit, so why not do it before every paint. The default language is only used if the outliner only contains one character in a symbol font */ - GetDoc()->GetDrawOutliner( NULL ).SetDefaultLanguage( Application::GetSettings().GetLanguage() ); + GetDoc()->GetDrawOutliner( NULL ).SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); mpDrawView->CompleteRedraw( pWin, Region( rRect ) ); diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 0912a8a808bb..5ab7bc0e6782 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -737,7 +737,7 @@ sal_Bool View::SdrBeginTextEdit( if( xHyphenator.is() ) pOutl->SetHyphenator( xHyphenator ); - pOutl->SetDefaultLanguage( Application::GetSettings().GetLanguage() ); + pOutl->SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); } sal_Bool bReturn = FmFormView::SdrBeginTextEdit( |