[Libreoffice-commits] core.git: extensions/inc extensions/source

[Caolán McNamara]

 extensions/inc/bibliography.hrc           |    1 -
 extensions/source/bibliography/bib.hrc    |    2 +-
 extensions/source/bibliography/bib.src    |    5 +++++
 extensions/source/bibliography/datman.cxx |   10 +++++-----
 4 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 38ee77e52ce122997812c3c931caf5ed0dc17e54
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jun 14 16:10:20 2014 +0100

    we can't use untranslatable strings here
    
    and drop the now unused helpid
    
    Change-Id: I38fb93e50e7715e05f21e08c2e8714a1a52305b8

diff --git a/extensions/inc/bibliography.hrc b/extensions/inc/bibliography.hrc
index ec420e9..480fbdc 100644
--- a/extensions/inc/bibliography.hrc
+++ b/extensions/inc/bibliography.hrc
@@ -61,7 +61,6 @@
 #define HID_BIB_CONTROL_PARENT                          "EXTENSIONS_HID_BIB_CONTROL_PARENT"
 #define UID_BIB_FRAME_WINDOW                            "EXTENSIONS_UID_BIB_FRAME_WINDOW"
 #define HID_BIB_DB_GRIDCTRL                             "EXTENSIONS_HID_BIB_DB_GRIDCTRL"
-#define HID_DLG_MAPPING                                 "EXTENSIONS_HID_DLG_MAPPING"
 
 #endif // EXTENSIONS_BIBLIOGRAPHY_HRC
 
diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc
index 68f9828..fbcf561 100644
--- a/extensions/source/bibliography/bib.hrc
+++ b/extensions/source/bibliography/bib.hrc
@@ -41,7 +41,7 @@
 
 // Strings (500)
 #define RID_BIB_STRING              (RID_BIB_START + 200)
-    // FREE                         (RID_BIB_STRING +  1)
+#define RID_BIB_STR_NONE            (RID_BIB_STRING +  1)
 #define RID_BIB_STR_FIELDSELECTION  (RID_BIB_STRING +  2)
 #define RID_BIB_STR_TABWIN_PREFIX   (RID_BIB_STRING +  3)
 #define RID_BIB_STR_FRAME_TITLE     (RID_BIB_STRING +  4)
diff --git a/extensions/source/bibliography/bib.src b/extensions/source/bibliography/bib.src
index cf11f64..d234a18 100644
--- a/extensions/source/bibliography/bib.src
+++ b/extensions/source/bibliography/bib.src
@@ -36,4 +36,9 @@ String RID_MAP_QUESTION
     Text [ en-US ] = "Do you want to edit the column arrangement?";
 };
 
+String RID_BIB_STR_NONE
+{
+    Text [ en-US ] = "<none>";
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 72da205..7b25247 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -254,11 +254,11 @@ static sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig ,
     return USHRT_MAX;
 }
 
-MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) :
-    ModalDialog(pParent, "MappingDialog", "modules/sbibliography/ui/mappingdialog.ui" ),
-    pDatMan(pMan),
-    sNone("<none>"),
-    bModified(false)
+MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan)
+    : ModalDialog(pParent, "MappingDialog", "modules/sbibliography/ui/mappingdialog.ui")
+    , pDatMan(pMan)
+    , sNone(BIB_RESSTR(RID_BIB_STR_NONE))
+    , bModified(false)
 {
     get(pOKBT, "ok");
     get(pIdentifierLB, "identifierCombobox");