[Libreoffice-commits] core.git: 2 commits - sfx2/sdi sw/inc sw/source

[Thomas Arnhold]

 sfx2/sdi/sfx.sdi                    |   25 -------------------------
 sw/inc/dochdl.hrc                   |    1 +
 sw/source/ui/dochdl/dochdl.src      |    5 +++++
 sw/source/uibase/dochdl/gloshdl.cxx |    1 -
 sw/source/uibase/uiview/view.hrc    |    1 -
 sw/source/uibase/uiview/view.src    |    4 ----
 6 files changed, 6 insertions(+), 31 deletions(-)

New commits:
commit ade2bce3b867efc306380739143a6a79514fbc1f
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Mon Aug 18 06:16:17 2014 +0200

    remove unused HelpDownload
    
    Change-Id: Ib9e8a9a80498ad87df6ab13ded1127d068913347

diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index d5abfb8..d72d23d 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -2696,31 +2696,6 @@ SfxVoidItem GoUpSel SID_CURSORUP_SEL
 ]
 
 
-SfxVoidItem HelpDownload SID_HELP_DOWNLOAD
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = TRUE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Asynchron;
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_EXPLORER;
-]
-
-
 SfxVoidItem HelpIndex SID_HELPINDEX
 ()
 [
commit 51289a16059752d60d932fbd507b517422489450
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Mon Aug 18 05:56:51 2014 +0200

    fix build
    
    apparently I removed the wrong one with 15344d0415f153ba579ad132266c47990a8c9515
    
    with pch I don't see those problems :(
    
    Change-Id: If4cb8b178bdd8f8d68b4921c1993642656fc75ea

diff --git a/sw/inc/dochdl.hrc b/sw/inc/dochdl.hrc
index 0372003..e6dd89f 100644
--- a/sw/inc/dochdl.hrc
+++ b/sw/inc/dochdl.hrc
@@ -23,6 +23,7 @@
 #include "rcid.hrc"
 
 #define STR_NOGLOS                  (RC_DOCHDL_BEGIN + 1)
+#define STR_ERR_INSERT_GLOS         (RC_DOCHDL_BEGIN + 3)
 #define STR_CLPBRD_FORMAT_ERROR     (RC_DOCHDL_BEGIN + 4)
 
 #define STR_NO_TABLE                (RC_DOCHDL_BEGIN + 7)
diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src
index 1cecbbf..2f64780 100644
--- a/sw/source/ui/dochdl/dochdl.src
+++ b/sw/source/ui/dochdl/dochdl.src
@@ -29,6 +29,11 @@ String STR_NO_TABLE
     Text [ en-US ] = "A table cannot be inserted into another table. However, you can paste the data into the document when the cursor is not in a table.";
 };
 
+String STR_ERR_INSERT_GLOS
+{
+    Text [ en-US ] = "AutoText could not be created." ;
+};
+
 String STR_CLPBRD_FORMAT_ERROR
 {
     Text [ en-US ] = "Requested clipboard format is not available." ;
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index 530f8eb..686efcd 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -56,7 +56,6 @@
 #include <editeng/acorrcfg.hxx>
 #include "swabstdlg.hxx"
 #include <misc.hrc>
-#include <view.hrc>
 
 #include <IDocumentFieldsAccess.hxx>
 #include <boost/scoped_ptr.hpp>
diff --git a/sw/source/uibase/uiview/view.hrc b/sw/source/uibase/uiview/view.hrc
index 8f7e78d..0bb2d3e 100644
--- a/sw/source/uibase/uiview/view.hrc
+++ b/sw/source/uibase/uiview/view.hrc
@@ -50,7 +50,6 @@
 
 #define STR_SAVEACOPY_SRC           (RC_VIEW_BEGIN + 34)
 
-#define STR_ERR_INSERT_GLOS         (RC_VIEW_BEGIN + 35)
 #define STR_ERR_NO_FAX              (RC_VIEW_BEGIN + 36)
 #define STR_ERR_SRCSTREAM           (RC_VIEW_BEGIN + 37)
 
diff --git a/sw/source/uibase/uiview/view.src b/sw/source/uibase/uiview/view.src
index 70dcff1..20c851d 100644
--- a/sw/source/uibase/uiview/view.src
+++ b/sw/source/uibase/uiview/view.src
@@ -36,10 +36,6 @@ String STR_NO_MERGE_ENTRY
 {
     Text [ en-US ] = "Could not merge documents." ;
 };
-String STR_ERR_INSERT_GLOS
-{
-    Text [ en-US ] = "AutoText could not be created." ;
-};
 String STR_ERR_SRCSTREAM
 {
     Text [ en-US ] = "The source cannot be loaded." ;