5 files changed, 9 insertions, 47 deletions
diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx b/filter/source/xsltdialog/xmlfiltercommon.hxx
index cb56b7b8ab83..4089993bb905 100644
--- a/filter/source/xsltdialog/xmlfiltercommon.hxx
+++ b/filter/source/xsltdialog/xmlfiltercommon.hxx
@@ -82,6 +82,7 @@ struct application_info_impl
 extern std::vector< application_info_impl* >& getApplicationInfos();
 extern OUString getApplicationUIName( const OUString& rServiceName );
 extern const application_info_impl* getApplicationInfo( const OUString& rServiceName );
+OUString XsltResId(const char* pId);
 
 #endif
 
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 7d6c81f6edae..7f913ad6f9fd 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -58,36 +58,10 @@ using namespace com::sun::star::util;
 
 using ::rtl::Uri;
 
-namespace {
-    static std::locale* pXSLTResLocale = nullptr;
-
-    const std::locale* getXSLTDialogResLocale()
-    {
-        return pXSLTResLocale;
-    }
-}
-
-EnsureResLocale::EnsureResLocale()
+OUString XsltResId(const char* pId)
 {
-    if (!pXSLTResLocale)
-    {
-        m_xResLocale.reset(new std::locale(Translate::Create("flt")));
-        pXSLTResLocale = m_xResLocale.get();
-    }
-}
-
-EnsureResLocale::~EnsureResLocale()
-{
-    if (m_xResLocale)
-        pXSLTResLocale = nullptr;
-}
-
-namespace
-{
-    OUString XsltResId(const char* pId)
-    {
-        return Translate::get(pId, *getXSLTDialogResLocale());
-    }
+    static std::locale loc = Translate::Create("flt");
+    return Translate::get(pId, loc);
 }
 
 XMLFilterSettingsDialog::XMLFilterSettingsDialog(vcl::Window* pParent,
@@ -263,7 +237,7 @@ void XMLFilterSettingsDialog::onNew()
     aTempInfo.maDocumentService = "com.sun.star.text.TextDocument";
 
     // execute XML Filter Dialog
-    ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, *getXSLTDialogResLocale(), mxContext, &aTempInfo );
+    ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, mxContext, &aTempInfo );
     if ( aDlg->Execute() == RET_OK )
     {
         // insert the new filter
@@ -282,7 +256,7 @@ void XMLFilterSettingsDialog::onEdit()
         filter_info_impl* pOldInfo = static_cast<filter_info_impl*>(pEntry->GetUserData());
 
         // execute XML Filter Dialog
-        ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, *getXSLTDialogResLocale(), mxContext, pOldInfo );
+        ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, mxContext, pOldInfo );
         if ( aDlg->Execute() == RET_OK )
         {
             filter_info_impl* pNewInfo = aDlg->getNewFilterInfo();
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 7dfc307ce057..072c5d4542a5 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -55,20 +55,11 @@ public:
     virtual bool EventNotify( NotifyEvent& rNEvt ) override;
 };
 
-class EnsureResLocale
-{
-    std::unique_ptr<std::locale> m_xResLocale;
-public:
-    EnsureResLocale();
-    ~EnsureResLocale();
-};
-
 class HeaderBar;
 
 class XMLFilterListBox : public SvTabListBox
 {
 private:
-    EnsureResLocale    m_aEnsureResLocale;
     VclPtr<HeaderBar>  m_pHeaderBar;
 
     DECL_LINK( TabBoxScrollHdl_Impl, SvTreeListBox*, void );
@@ -127,7 +118,6 @@ private:
     OUString createUniqueInterfaceName( const OUString& rInterfaceName );
 
 private:
-    EnsureResLocale                                       maEnsureResLocale;
     css::uno::Reference< css::uno::XComponentContext >    mxContext;
     css::uno::Reference< css::container::XNameContainer > mxFilterContainer;
     css::uno::Reference< css::container::XNameContainer > mxTypeDetection;
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index 624fed6ef3a1..5cdc8ad82bc0 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -36,11 +36,10 @@ using namespace com::sun::star::container;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
 
-XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent, const std::locale& rResLocale,
+XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent,
     const Reference< XComponentContext >& rxContext, const filter_info_impl* pInfo)
     : TabDialog(pParent, "XSLTFilterDialog","filter/ui/xsltfilterdialog.ui")
     , mxContext(rxContext)
-    , mrResLocale(rResLocale)
 {
     get(m_pOKBtn, "ok");
     get(m_pTabCtrl, "tabcontrol");
@@ -250,7 +249,7 @@ bool XMLFilterTabDialog::onOk()
         m_pTabCtrl->SetCurPageId(nErrorPage);
         ActivatePageHdl(nullptr, m_pTabCtrl);
 
-        OUString aMessage(Translate::get(pErrorId, mrResLocale));
+        OUString aMessage(XsltResId(pErrorId));
 
         if( aReplace2.getLength() )
         {
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
index c51656b84742..0e9b02ac2bff 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
@@ -33,7 +33,7 @@ class XMLFilterTabPageXSLT;
 class XMLFilterTabDialog: public TabDialog
 {
 public:
-    XMLFilterTabDialog(vcl::Window *pParent, const std::locale& rResLocale, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo);
+    XMLFilterTabDialog(vcl::Window *pParent, const css::uno::Reference< css::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo);
     virtual ~XMLFilterTabDialog() override;
     virtual void dispose() override;
 
@@ -47,8 +47,6 @@ private:
     DECL_STATIC_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl*, void );
     DECL_LINK(OkHdl, Button*, void);
 
-    const std::locale& mrResLocale;
-
     const filter_info_impl* mpOldInfo;
     filter_info_impl* mpNewInfo;