From 9955dbebbdf1b7d36fec272dfea46f57fab47e19 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Thu, 22 Nov 2012 12:26:52 +0100 Subject: AllSettings with LanguageTag Change-Id: I710ae66e51139662eb442b681fdf9cc9d158551d --- filter/Library_eps.mk | 1 + filter/Library_flash.mk | 1 + filter/Library_pdffilter.mk | 1 + filter/Library_svgfilter.mk | 1 + filter/Library_xsltdlg.mk | 1 + filter/source/flash/swfdialog.cxx | 2 +- filter/source/graphicfilter/eps/eps.cxx | 4 ++-- filter/source/pdf/impdialog.cxx | 2 +- filter/source/pdf/pdfexport.cxx | 2 +- filter/source/svg/svgfontexport.cxx | 2 +- filter/source/svg/svgwriter.cxx | 2 +- filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 2 +- 12 files changed, 13 insertions(+), 8 deletions(-) (limited to 'filter') diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk index 5dda0d59957d..ca6648688b32 100644 --- a/filter/Library_eps.mk +++ b/filter/Library_eps.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Library_use_libraries,eps,\ vcl \ utl \ tl \ + i18nisolang1 \ cppu \ sal \ $(gb_UWINAPI) \ diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk index fd06b4c30f8b..8bf5c32f5662 100644 --- a/filter/Library_flash.mk +++ b/filter/Library_flash.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Library_use_libraries,flash,\ vcl \ utl \ tl \ + i18nisolang1 \ comphelper \ basegfx \ cppuhelper \ diff --git a/filter/Library_pdffilter.mk b/filter/Library_pdffilter.mk index 1f108429f44e..a94c32c568ef 100644 --- a/filter/Library_pdffilter.mk +++ b/filter/Library_pdffilter.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,pdffilter,\ utl \ tl \ svl \ + i18nisolang1 \ comphelper \ basegfx \ cppuhelper \ diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index bc8520b80724..43a890ad43a0 100644 --- a/filter/Library_svgfilter.mk +++ b/filter/Library_svgfilter.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\ svl \ utl \ tl \ + i18nisolang1 \ sax \ comphelper \ basegfx \ diff --git a/filter/Library_xsltdlg.mk b/filter/Library_xsltdlg.mk index 293721047d58..1819177414ba 100644 --- a/filter/Library_xsltdlg.mk +++ b/filter/Library_xsltdlg.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,xsltdlg,\ svl \ utl \ tl \ + i18nisolang1 \ comphelper \ cppuhelper \ cppu \ diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index fe6bf861c46a..1480afeb2421 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -90,7 +90,7 @@ Reference< XInterface > SAL_CALL SWFDialog_createInstance( const Reference< XMul SWFDialog::SWFDialog( const Reference< XMultiServiceFactory > &rxMSF ) : OGenericUnoDialog( rxMSF ) { - mpResMgr = ResMgr::CreateResMgr( "flash", Application::GetSettings().GetUILocale() ); + mpResMgr = ResMgr::CreateResMgr( "flash", Application::GetSettings().GetUILanguageTag().getLocale() ); } // ----------------------------------------------------------------------------- diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index e8e0ab45543f..5304e03d5eac 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -294,7 +294,7 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi { ResMgr* pResMgr; - pResMgr = ResMgr::CreateResMgr( "eps", Application::GetSettings().GetUILocale() ); + pResMgr = ResMgr::CreateResMgr( "eps", Application::GetSettings().GetUILanguageTag().getLocale() ); if( pResMgr ) { @@ -440,7 +440,7 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi if ( mbStatus && mnLevelWarning && pFilterConfigItem ) { ResMgr* pResMgr; - pResMgr = ResMgr::CreateResMgr( "eps", Application::GetSettings().GetUILocale() ); + pResMgr = ResMgr::CreateResMgr( "eps", Application::GetSettings().GetUILanguageTag().getLocale() ); if( pResMgr ) { InfoBox aInfoBox( NULL, String( ResId( KEY_VERSION_CHECK, *pResMgr ) ) ); diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 9c80c9838dc2..870209fb7bd2 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -41,7 +41,7 @@ static ResMgr& getPDFFilterResMgr() { - static ResMgr *pRes = ResMgr::CreateResMgr( "pdffilter", Application::GetSettings().GetUILocale()); + static ResMgr *pRes = ResMgr::CreateResMgr( "pdffilter", Application::GetSettings().GetUILanguageTag().getLocale()); return *pRes; } diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 8051cb810c24..336cda2bd973 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -887,7 +887,7 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue if ( mxStatusIndicator.is() ) { - ResMgr* pResMgr = ResMgr::CreateResMgr( "pdffilter", Application::GetSettings().GetUILocale() ); + ResMgr* pResMgr = ResMgr::CreateResMgr( "pdffilter", Application::GetSettings().GetUILanguageTag().getLocale() ); if ( pResMgr ) { sal_Int32 nTotalPageCount = aRangeEnum.size(); diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index fb6c1b50ff5a..d9e6272db7ad 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -139,7 +139,7 @@ void SVGFontExport::implCollectGlyphs() if( xBI.is() ) { - const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetLocale(); + const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetLanguageTag().getLocale(); sal_Int32 nCurPos = 0, nLastPos = -1; while( ( nCurPos < aText.getLength() ) && ( nCurPos > nLastPos ) ) diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index cf1602fdbc0b..b9e556db95f2 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -2796,7 +2796,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, else { ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > xBI( ::vcl::unohelper::CreateBreakIterator() ); - const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetLocale(); + const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetLanguageTag().getLocale(); sal_Int32 nCurPos = 0, nLastPos = 0, nX = aPos.X(); // write single glyphs at absolute text positions diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index bb6c6b682dfe..0c1cbfd30176 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -351,7 +351,7 @@ sal_Int16 SAL_CALL XMLFilterDialogComponent::execute( ) throw(RuntimeException) if( NULL == pXSLTResMgr ) { - pXSLTResMgr = ResMgr::CreateResMgr( "xsltdlg", Application::GetSettings().GetUILocale() ); + pXSLTResMgr = ResMgr::CreateResMgr( "xsltdlg", Application::GetSettings().GetUILanguageTag().getLocale() ); } if( NULL == mpDialog ) -- cgit