Re: [Libreoffice] [PATCH][EasyHacks] Removal of SvBytes

On Wed, 2011-02-09 at 14:57 +0000, Nigel Hawkins wrote:
> This should eradicate it from the main code, but still leaves another
> definition of it inside binfilter.

My mistake. There were still a couple of #defines kicking around for
include guards. The attached should get rid of them. Plus remaining
defines for SvShorts (which were done some time ago).

Nigel

From fa9d9b53ef584a77274393b618d9f279ab088c23 Mon Sep 17 00:00:00 2001
From: Nigel Hawkins <n.hawkins@gmx.com>
Date: Wed, 9 Feb 2011 15:20:37 +0000
Subject: [PATCH] Remove last traces of SvBytes and SvShorts in sw

---
 sw/inc/undobj.hxx                 |    1 -
 sw/source/core/inc/scriptinfo.hxx |    2 --
 sw/source/core/layout/layhelp.hxx |    1 -
 3 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index ae86015..1efb36f 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -40,7 +40,6 @@
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_ULONGS
 #define _SVSTDARR_BOOLS
-#define _SVSTDARR_BYTES
 #define _SVSTDARR_USHORTSSORT
 #include <svl/svstdarr.hxx>
 #endif
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index 4a70226..8f09d68 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -28,8 +28,6 @@
 #ifndef _SCRIPTINFO_HXX
 #define _SCRIPTINFO_HXX
 #ifndef _SVSTDARR_HXX
-#define _SVSTDARR_SHORTS
-#define _SVSTDARR_BYTES
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_XUB_STRLEN
 #include <svl/svstdarr.hxx>
diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx
index 009e462..66a5d85 100644
--- a/sw/source/core/layout/layhelp.hxx
+++ b/sw/source/core/layout/layhelp.hxx
@@ -30,7 +30,6 @@
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_ULONGS
-#define _SVSTDARR_BYTES
 #define _SVSTDARR_XUB_STRLEN
 #include <svl/svstdarr.hxx>
 #endif
-- 
1.7.0.4

From dbc5345757cecf856f45364d06c85dcb80261d7d Mon Sep 17 00:00:00 2001
From: Nigel Hawkins <n.hawkins@gmx.com>
Date: Wed, 9 Feb 2011 15:22:46 +0000
Subject: [PATCH] Remove last traces of SvBytes from svl

---
 svl/source/memtools/svarray.cxx |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index c281904..b104056 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -32,7 +32,6 @@
 #define _SVARRAY_CXX
 
 #define _SVSTDARR_BOOLS
-#define _SVSTDARR_BYTES
 #define _SVSTDARR_ULONGS
 #define _SVSTDARR_ULONGSSORT
 #define _SVSTDARR_USHORTS
-- 
1.7.0.4

From 070670a7b0fb3b49db8d70749b7d3f815c798718 Mon Sep 17 00:00:00 2001
From: Nigel Hawkins <n.hawkins@gmx.com>
Date: Wed, 9 Feb 2011 15:22:09 +0000
Subject: [PATCH] Remove last traces of SvBytes from svx

---
 svx/source/inc/fmshimp.hxx |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 8ae5b1b..2424658 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -57,7 +57,6 @@
 #include <svl/lstner.hxx>
 
 #define _SVSTDARR_BOOLS
-#define _SVSTDARR_BYTES
 #define _SVSTDARR_LONGS
 #define _SVSTDARR_ULONGS
 #define _SVSTDARR_USHORTS
-- 
1.7.0.4

From 0cf0ff68eb86bafe6431701f55a4f1cb9fff36a1 Mon Sep 17 00:00:00 2001
From: Nigel Hawkins <n.hawkins@gmx.com>
Date: Wed, 9 Feb 2011 15:21:35 +0000
Subject: [PATCH] Remove last traces of SvShorts from sc

---
 sc/source/ui/inc/undotab.hxx  |    7 -------
 sc/source/ui/inc/viewfunc.hxx |    6 ------
 2 files changed, 0 insertions(+), 13 deletions(-)

diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index 26eb8a2..f37c2a3 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -35,13 +35,6 @@
 #include <tools/color.hxx>
 #include "tabbgcolor.hxx"
 
-#ifndef _SVSTDARR_SHORTS
-
-#define _SVSTDARR_SHORTS
-#include <svl/svstdarr.hxx>
-
-#endif
-
 #ifndef _SVSTDARR_STRINGS
 
 #define _SVSTDARR_STRINGS
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index b07bf00..77fbc43 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -32,12 +32,6 @@
 
 #include "tabbgcolor.hxx"
 
-#ifndef _SVSTDARR_SHORTS
-#define _SVSTDARR_SHORTS
-#include <svl/svstdarr.hxx>
-
-#endif
-
 #ifndef _SVSTDARR_STRINGS
 
 #define _SVSTDARR_STRINGS
-- 
1.7.0.4