[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - include/svx svx/source

[Julien Nabet]

 include/svx/strings.hrc       |    1 +
 svx/source/dialog/imapdlg.cxx |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 714ceda6db9dbe8e2b4911872dfba146e9faa68f
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Feb 10 20:32:34 2018 +0100

    tdf#115601: make ImageMap dialog translatable
    
    Change-Id: Ie1ecb5cd3356144c28de366dbe5e13a3997604e2
    Reviewed-on: https://gerrit.libreoffice.org/49547
    (cherry picked from commit 6bcd433fe13ab402d2cc8433d98a78db140858e9)
    Reviewed-on: https://gerrit.libreoffice.org/49582
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index a528db2322c1..2f09ea00f289 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -849,6 +849,7 @@
 #define RID_SVXSTR_DASH10                                   NC_("RID_SVXSTR_DASH10", "Dashed")
 #define RID_SVXSTR_DASH11                                   NC_("RID_SVXSTR_DASH11", "Dashed")
 #define RID_SVXSTR_DASH12                                   NC_("RID_SVXSTR_DASH12", "Line Style")
+#define RID_SVXSTR_IMAP_ALL_FILTER                          NC_("RID_SVXSTR_IMAP_ALL_FILTER", "All formats")
 #define RID_SVXSTR_LEND0                                    NC_("RID_SVXSTR_LEND0", "Arrow concave")
 #define RID_SVXSTR_LEND1                                    NC_("RID_SVXSTR_LEND1", "Square 45")
 #define RID_SVXSTR_LEND2                                    NC_("RID_SVXSTR_LEND2", "Small arrow")
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index a8792b246d04..8972b9155282 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -56,7 +56,6 @@
 #include <memory>
 
 #define SELF_TARGET         "_self"
-#define IMAP_ALL_FILTER     OUString("<Alle>")
 #define IMAP_CERN_FILTER    "MAP - CERN"
 #define IMAP_NCSA_FILTER    "MAP - NCSA"
 #define IMAP_BINARY_FILTER  "SIP - StarView ImageMap"
@@ -452,7 +451,7 @@ void SvxIMapDlg::DoOpen()
         FileDialogFlags::NONE, this);
 
     ImageMap        aLoadIMap;
-    const OUString  aFilter( IMAP_ALL_FILTER );
+    const OUString  aFilter(SvxResId(RID_SVXSTR_IMAP_ALL_FILTER));
 
     aDlg.AddFilter( aFilter, IMAP_ALL_TYPE );
     aDlg.AddFilter( IMAP_CERN_FILTER, IMAP_CERN_TYPE );