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

[Noel Grandin (via logerrit)]

 sw/inc/cmdid.h                   |   15 ++++++++-------
 sw/source/filter/html/swhtml.cxx |    1 +
 sw/source/filter/html/swhtml.hxx |    1 -
 3 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit ee6ce44b4227a9a84b962b458e2209b39e26dc73
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Dec 18 11:56:00 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Dec 20 13:28:50 2019 +0100

    loplugin:duplicate-defines
    
    already defined in wrthtml.hxx, randomly chose a place to keep it
    
    Change-Id: I8aa1d20bee04a5c1e5919b593e6befddb593f18a
    Reviewed-on: https://gerrit.libreoffice.org/85566
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index ddafcc9f0cee..845ca782f394 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -106,6 +106,7 @@
 #include <htmltbl.hxx>
 #include "htmlnum.hxx"
 #include "swhtml.hxx"
+#include "wrthtml.hxx"
 #include <linkenum.hxx>
 #include <breakit.hxx>
 #include <SwAppletImpl.hxx>
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index d4f9876e3ab6..c8d58de80b6a 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -55,7 +55,6 @@ struct SwPending;
 class SvxCSS1PropertyInfo;
 struct ImplSVEvent;
 
-#define HTML_PARSPACE (MM50)
 #define HTML_CJK_PARSPACE (MM50/2)
 #define HTML_CTL_PARSPACE (MM50/2)
 
commit c3f9eba777a508f4fb0bfd5cbe2cbfb399366caa
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Dec 18 10:43:59 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Dec 20 13:28:38 2019 +0100

    loplugin:duplicate-defines
    
    Change-Id: I38694d03dbe2e5d8eba94e2d2a490db7b91efaad
    Reviewed-on: https://gerrit.libreoffice.org/85563
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index f382e820cf0b..30663dbbe670 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -21,24 +21,25 @@
 #define INCLUDED_SW_INC_CMDID_H
 
 #include <sfx2/sfxsids.hrc>
+#include <svx/svxids.hrc>
 #include <svl/solar.hrc>
 
 #define FN_FILE                 SID_SW_START
-#define FN_EDIT                 (SID_SW_START +  100)
+//#define FN_EDIT                 (SID_SW_START +  100) defined in svxids.hrc
 #define FN_VIEW                 (SID_SW_START +  200)
-#define FN_INSERT               (SID_SW_START +  300)
-#define FN_FORMAT               (SID_SW_START +  400)
-#define FN_EXTRA                (SID_SW_START +  600)
-#define FN_SELECTION            (SID_SW_START +  900)
+//#define FN_INSERT               (SID_SW_START +  300) defined in svxids.hrc
+//#define FN_FORMAT               (SID_SW_START +  400) defined in svxids.hrc
+//#define FN_EXTRA                (SID_SW_START +  600) defined in svxids.hrc
+//#define FN_SELECTION            (SID_SW_START +  900) defined in svxids.hrc
 #define FN_QUERY                (SID_SW_START + 1000)
 #define FN_ENVELP               (SID_SW_START + 1050)
 #define FN_PARAM                (SID_SW_START + 1100)
 #define FN_STAT                 (SID_SW_START + 1180)
-#define FN_PGPREVIEW            (SID_SW_START + 1250)
+//#define FN_PGPREVIEW            (SID_SW_START + 1250) defined in svxids.hrc
 #define FN_FRAME                (SID_SW_START + 1300)
 #define FN_INSERT2              (SID_SW_START + 1400)
 #define FN_FORMAT2              (SID_SW_START + 1600)
-#define FN_EDIT2                (SID_SW_START + 1800)
+//#define FN_EDIT2                (SID_SW_START + 1800) defined in svxids.hrc
 #define FN_QUERY2               (SID_SW_START + 2000)
 #define FN_EXTRA2               (SID_SW_START + 2200)
 #define FN_PARAM2               (SID_SW_START + 2400)