[Libreoffice-commits] core.git: 2 commits - filter/source

[Caolán McNamara (via logerrit)]

 filter/source/t602/t602filter.cxx |   19 -------------------
 filter/source/t602/t602filter.hxx |    9 ---------
 2 files changed, 28 deletions(-)

New commits:
commit 262f65a306a8ae206f39a5ebb69ff9e967b24f48
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Oct 24 12:24:49 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Oct 24 16:02:42 2022 +0200

    T602ImportFilterDialog doesn't need to implement XLocalizable
    
    Change-Id: Iae2cb4d068a0fc1cdc3431fe8f736f1f45cc3d18
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141755
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/filter/source/t602/t602filter.cxx 
b/filter/source/t602/t602filter.cxx
index b7c3d4ae77f4..f2c5ed49bd1a 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -857,7 +857,6 @@ Sequence< OUString > SAL_CALL 
T602ImportFilter::getSupportedServiceNames(  )
 }
 
 T602ImportFilterDialog::T602ImportFilterDialog()
-    : maLocale(SvtSysLocale().GetUILanguageTag())
 {
 }
 
@@ -865,20 +864,6 @@ T602ImportFilterDialog::~T602ImportFilterDialog()
 {
 }
 
-// XLocalizable
-
-void SAL_CALL T602ImportFilterDialog::setLocale(const Locale& rLocale)
-{
-    LanguageTag aLocale(rLocale);
-    if (maLocale != aLocale)
-        maLocale = aLocale;
-}
-
-Locale SAL_CALL T602ImportFilterDialog::getLocale()
-{
-    return maLocale.getLocale(false);
-}
-
 bool T602ImportFilterDialog::OptionsDlg()
 {
     Any any;
diff --git a/filter/source/t602/t602filter.hxx 
b/filter/source/t602/t602filter.hxx
index deff9923c492..cd92a22fdf3c 100644
--- a/filter/source/t602/t602filter.hxx
+++ b/filter/source/t602/t602filter.hxx
@@ -25,14 +25,12 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XLocalizable.hpp>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <xmloff/attrlist.hxx>
-#include <i18nlangtag/languagetag.hxx>
 #include <rtl/ref.hxx>
 
 namespace T602ImportFilter {
@@ -77,12 +75,10 @@ struct inistruct
 
 class T602ImportFilterDialog : public cppu::WeakImplHelper <
         css::ui::dialogs::XExecutableDialog,
-        css::lang::XLocalizable,
         css::lang::XServiceInfo,
         css::beans::XPropertyAccess
 >
 {
-    LanguageTag maLocale;
     static bool OptionsDlg();
 
     virtual ~T602ImportFilterDialog() override;
@@ -91,10 +87,6 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper <
        virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
        virtual sal_Int16 SAL_CALL execute() override;
 
-    // XLocalizable
-        virtual void SAL_CALL setLocale( const css::lang::Locale& eLocale ) 
override;
-        virtual css::lang::Locale SAL_CALL getLocale() override;
-
     // XServiceInfo
         virtual OUString SAL_CALL getImplementationName(  ) override;
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName 
) override;
commit e70243e309bf5fd2f352c9de39f18108ea17a713
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Oct 24 12:20:21 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Oct 24 16:02:27 2022 +0200

    drop newly unused std::locale maResLocale
    
    Change-Id: I3d10189968d15dc7e7465cbbd6e19d42041c0a64
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141754
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/filter/source/t602/t602filter.cxx 
b/filter/source/t602/t602filter.cxx
index bea3d11b834b..b7c3d4ae77f4 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -858,7 +858,6 @@ Sequence< OUString > SAL_CALL 
T602ImportFilter::getSupportedServiceNames(  )
 
 T602ImportFilterDialog::T602ImportFilterDialog()
     : maLocale(SvtSysLocale().GetUILanguageTag())
-    , maResLocale(Translate::Create("flt"))
 {
 }
 
@@ -872,10 +871,7 @@ void SAL_CALL T602ImportFilterDialog::setLocale(const 
Locale& rLocale)
 {
     LanguageTag aLocale(rLocale);
     if (maLocale != aLocale)
-    {
         maLocale = aLocale;
-        maResLocale = Translate::Create("flt", maLocale);
-    }
 }
 
 Locale SAL_CALL T602ImportFilterDialog::getLocale()
diff --git a/filter/source/t602/t602filter.hxx 
b/filter/source/t602/t602filter.hxx
index 461876142a7e..deff9923c492 100644
--- a/filter/source/t602/t602filter.hxx
+++ b/filter/source/t602/t602filter.hxx
@@ -83,7 +83,6 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper <
 >
 {
     LanguageTag maLocale;
-    std::locale maResLocale;
     static bool OptionsDlg();
 
     virtual ~T602ImportFilterDialog() override;