diff options
| author | Eike Rathke <erack@redhat.com> | 2013-04-10 21:24:04 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-04-10 21:26:22 +0200 |
| commit | 0ed6aa49a88844c3da82c9d0f5b757108f3b090d (patch) | |
| tree | 1513c31c557048bfdfb542c7b930bcaab2aa3c0d /svtools | |
| parent | c0c96884208aadf66e4219000e1f8384b1cb20fd (diff) | |
SvtPathOptions with LanguageTag
Change-Id: I33f43c6d0249a6681d451a4be8c5548da4987f9c
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/inc/svtools/DocumentInfoPreview.hxx | 4 | ||||
| -rw-r--r-- | svtools/source/contnr/DocumentInfoPreview.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/contnr/templwin.cxx | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/svtools/inc/svtools/DocumentInfoPreview.hxx b/svtools/inc/svtools/DocumentInfoPreview.hxx index c6f493c8cf41..167de92636de 100644 --- a/svtools/inc/svtools/DocumentInfoPreview.hxx +++ b/svtools/inc/svtools/DocumentInfoPreview.hxx @@ -23,7 +23,7 @@ #include "sal/config.h" #include "boost/scoped_ptr.hpp" -#include "com/sun/star/lang/Locale.hpp" +#include "i18nlangtag/languagetag.hxx" #include "com/sun/star/uno/Reference.hxx" #include "svtools/svmedit2.hxx" #include "svtools/svtdllapi.h" @@ -57,7 +57,7 @@ public: private: ExtMultiLineEdit m_pEditWin; boost::scoped_ptr< SvtDocInfoTable_Impl > m_pInfoTable; - com::sun::star::lang::Locale m_aLocale; + LanguageTag m_aLanguageTag; void insertEntry(OUString const & title, OUString const & value); diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx index 7ee9dd96d0c0..3380c14a43e5 100644 --- a/svtools/source/contnr/DocumentInfoPreview.cxx +++ b/svtools/source/contnr/DocumentInfoPreview.cxx @@ -44,7 +44,7 @@ namespace svtools { ODocumentInfoPreview::ODocumentInfoPreview(Window * pParent, WinBits nBits): Window(pParent, WB_DIALOGCONTROL), m_pEditWin(this, nBits), m_pInfoTable(new SvtDocInfoTable_Impl), - m_aLocale(SvtPathOptions().GetLocale()) // detect application language + m_aLanguageTag(SvtPathOptions().GetLanguageTag()) // detect application language { m_pEditWin.SetLeftMargin(10); m_pEditWin.Show(); @@ -91,7 +91,7 @@ void ODocumentInfoPreview::fill( } else { - insertNonempty( DI_MIMETYPE, INetContentTypes::GetPresentation(eTypeID, LanguageTag(m_aLocale))); + insertNonempty( DI_MIMETYPE, INetContentTypes::GetPresentation(eTypeID, m_aLanguageTag)); } } diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index a682b86fdc45..a7ff10cc2de2 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -598,9 +598,6 @@ OUString SvtDocInfoTable_Impl::GetString( long nId ) const SvtFrameWindow_Impl::SvtFrameWindow_Impl( Window* pParent ) : Window( pParent ) { - // detect application language - aLocale = SvtPathOptions().GetLocale(); - // create windows and frame pEditWin = new ODocumentInfoPreview( this ,WB_LEFT | WB_VSCROLL | WB_READONLY | WB_BORDER | WB_3DLOOK); pTextWin = new Window( this ); |