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

[Noel Grandin (via logerrit)]

 extensions/inc/helpids.h                          |    1 
 lotuswordpro/source/filter/lwpbackgroundstuff.hxx |   75 ----------------------
 2 files changed, 1 insertion(+), 75 deletions(-)

New commits:
commit 5281a51fec425b06839a37e99036504c5c3f1d12
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Dec 18 09:24:34 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Dec 20 12:12:26 2019 +0100

    loplugin:duplicate-defines
    
    already in lwpstyledef.hxx
    
    Change-Id: I693982c50b3eebd47a843840dc01036e269b4e0e
    Reviewed-on: https://gerrit.libreoffice.org/85555
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
index 424cc44950c1..442913713ec5 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx
@@ -60,80 +60,7 @@
 #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBACKGROUNDSTUFF_HXX
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBACKGROUNDSTUFF_HXX
 #include <lwpcolor.hxx>
-
-/* background patterns */
-#define BACK_TRANSPARENT    0
-#define BACK_FILL           1
-#define BACK_PATTERN        2
-#define BACK_10PCTDOTS      3
-#define BACK_30PCTDOTS      4
-#define BACK_50PCTDOTS      5
-#define BACK_75PCTDOTS      6
-#define BACK_90PCTDOTS      7
-#define BACK_90PCTINVDOTS   8
-#define BACK_75PCTINVDOTS   9
-#define BACK_50PCTINVDOTS   10
-#define BACK_30PCTINVDOTS   11
-#define BACK_10PCTINVDOTS   12
-#define BACK_MARBLES        13
-#define BACK_STARRYNIGHT    14
-#define BACK_DIAGTHICK      15
-#define BACK_DIAGTHIN       16
-#define BACK_DIAGDOUBLE     17
-#define BACK_DIAGDOUBLENARROW 18
-#define BACK_DIAGTRIPLE     19
-#define BACK_DIAGSINGLEWIDE 20
-#define BACK_DIAGTHICKINV   21
-#define BACK_DIAGTHININV    22
-#define BACK_DIAGDOUBLEINV  23
-#define BACK_DIAGDOUBLENARROWINV 24
-#define BACK_DIAGTRIPLEINV      25
-#define BACK_DIAGSINGLEWIDEINV  26
-#define BACK_CHAINLINKSMALLINV  27
-#define BACK_CHAINLINKSMALL     28
-#define BACK_CHAINLINKMEDIUM    29
-#define BACK_CHAINLINKLARGE     30
-#define BACK_HORZSTRIPE1        31
-#define BACK_HORZSTRIPE2        32
-#define BACK_HORZSTRIPE3        33
-#define BACK_HORZSTRIPE4        34
-#define BACK_VERTSTRIPE1        35
-#define BACK_VERTSTRIPE2        36
-#define BACK_VERTSTRIPE3        37
-#define BACK_VERTSTRIPE4        38
-#define BACK_GRIDSMALL          39
-#define BACK_GRIDMEDIUM         40
-#define BACK_GRIDLARGE          41
-#define BACK_BOXDOT             42
-#define BACK_GOLFGREEN          43
-#define BACK_DITZ               44
-#define BACK_HORZWEAVE          45
-#define BACK_APPLEPIE           46
-#define BACK_BRICK              47
-#define BACK_DIAGBRICK          48
-#define BACK_CHECKER1           49
-#define BACK_CHECKER2           50
-#define BACK_CHECKER3           51
-#define BACK_CHECKER4           52
-#define BACK_CHECKER5           53
-#define BACK_SNOWFLAKE          54
-#define BACK_MARGARITA          55
-#define BACK_SIDEHARP           56
-#define BACK_SCALES             57
-#define BACK_TAYLOR             58
-#define BACK_BUBBLES            59
-#define BACK_ARGYLE             60
-#define BACK_INDIAN1            61
-#define BACK_INDIAN3            62
-#define BACK_PEACHPIE           63
-#define BACK_GRADIENT1          64
-#define BACK_GRADIENT2          65
-#define BACK_GRADIENT3          66
-#define BACK_GRADIENT4          67
-#define BACK_GRADIENT5          68
-#define BACK_GRADIENT6          69
-#define BACK_GRADIENT7          70
-#define BACK_GRADIENT8          71
+#include "lwpstyledef.hxx"
 
 class XFBGImage;
 class LwpBackgroundStuff
commit 7cf32b3b1e28b78009e6358cacd47f09b76d6796
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Dec 18 09:21:16 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Dec 20 12:12:14 2019 +0100

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

diff --git a/extensions/inc/helpids.h b/extensions/inc/helpids.h
index 4b3d430b022e..1f55a0fd1995 100644
--- a/extensions/inc/helpids.h
+++ b/extensions/inc/helpids.h
@@ -158,7 +158,6 @@
 #define HID_PROP_SPIN                                   "EXTENSIONS_HID_PROP_SPIN"
 #define HID_PROP_STRICTFORMAT                           "EXTENSIONS_HID_PROP_STRICTFORMAT"
 #define HID_PROP_SHOWTHOUSANDSEP                        "EXTENSIONS_HID_PROP_SHOWTHOUSANDSEP"
-#define HID_PROP_VERTICAL_ALIGN                         "EXTENSIONS_HID_PROP_VERTICAL_ALIGN"
 #define HID_PROP_PRINTABLE                              "EXTENSIONS_HID_PROP_PRINTABLE"
 #define HID_PROP_TARGET_URL                             "EXTENSIONS_HID_PROP_TARGET_URL"
 #define HID_PROP_TARGET_FRAME                           "EXTENSIONS_HID_PROP_TARGET_FRAME"