[Libreoffice-commits] .: Branch 'feature/calc-xml-source' - sc/AllLangResTarget_sc.mk sc/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Sep 26 18:11:48 PDT 2012


 sc/AllLangResTarget_sc.mk               |    1 +
 sc/source/ui/src/xmlsourcedlg.src       |    2 +-
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 75b006b9cb7828ed628efcae759405b3daf4ab05
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Wed Sep 26 21:12:11 2012 -0400

    Use the resource file correctly.
    
    Change-Id: I40af0beaf0de25347e8241c08e3be5f92ac16f93

diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 2d3c64c..9ff824f 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
     sc/source/ui/src/colorformat.src \
     sc/source/ui/src/condformatdlg.src \
     sc/source/ui/src/condformatmgr.src \
+    sc/source/ui/src/xmlsourcedlg.src \
     sc/source/ui/cctrl/checklistmenu.src \
     sc/source/ui/navipi/navipi.src \
     sc/source/ui/docshell/tpstat.src \
diff --git a/sc/source/ui/src/xmlsourcedlg.src b/sc/source/ui/src/xmlsourcedlg.src
index 7d67abe..ba80a99 100644
--- a/sc/source/ui/src/xmlsourcedlg.src
+++ b/sc/source/ui/src/xmlsourcedlg.src
@@ -1,4 +1,3 @@
-
 /*
  * This file is part of the LibreOffice project.
  *
@@ -17,3 +16,4 @@ ModalDialog RID_SCDLG_XML_SOURCE
     Moveable = TRUE ;
     Closeable = TRUE ;
 };
+
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 01a09dd..58f764e 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -10,9 +10,12 @@
 #include "xmlsourcedlg.hxx"
 #include "xmlsourcedlg.hrc"
 
+#include "scresid.hxx"
+
 ScXMLSourceDlg::ScXMLSourceDlg(Window* pParent) :
-    ModalDialog(pParent, RID_SCDLG_XML_SOURCE)
+    ModalDialog(pParent, ScResId(RID_SCDLG_XML_SOURCE))
 {
+    FreeResource();
 }
 
 ScXMLSourceDlg::~ScXMLSourceDlg()


More information about the Libreoffice-commits mailing list