[Libreoffice-commits] .: sw/inc sw/source

Nigel Hawkins nhawkins at kemper.freedesktop.org
Wed Mar 9 13:36:58 PST 2011


 sw/inc/tabcol.hxx                  |    5 -----
 sw/source/core/edit/autofmt.cxx    |    2 --
 sw/source/core/fields/authfld.cxx  |    1 -
 sw/source/core/layout/dbg_lay.cxx  |    1 -
 sw/source/core/layout/paintfrm.cxx |    1 -
 sw/source/filter/html/swhtml.hxx   |    5 +----
 sw/source/ui/envelp/envfmt.cxx     |    1 -
 7 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 6165ef7c953ff7fdd9a52e3a516a0500a8ee5b0f
Author: Nigel Hawkins <n.hawkins at gmx.com>
Date:   Wed Mar 9 21:36:23 2011 +0000

    Remove last traces of SvLongs

diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx
index ad179f3..f5c3bed 100644
--- a/sw/inc/tabcol.hxx
+++ b/sw/inc/tabcol.hxx
@@ -28,11 +28,6 @@
 #ifndef _TABCOL_HXX
 #define _TABCOL_HXX
 
-#ifndef _SVSTDARR_HXX
-#define _SVSTDARR_LONGS
-#include <svl/svstdarr.hxx>
-#endif
-
 #ifndef INCLUDED_VECTOR
 #include <vector>
 #define INCLUDED_VECTOR
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index e83dfa0..00fd59e 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -29,8 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
-#define _SVSTDARR_LONGS
 #define _SVSTDARR_USHORTS
 
 #include <ctype.h>
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index f41ab01..5bc0766 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -32,7 +32,6 @@
 
 #define _SVSTDARR_STRINGSDTOR
 #define _SVSTDARR_USHORTS
-#define _SVSTDARR_LONGS
 #define _SVSTDARR_ULONGS
 #include <hintids.hxx>
 
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 301bb9c..8bdeb15 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -116,7 +116,6 @@
 #ifndef _SVSTDARR_HXX
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_USHORTSSORT
-#define _SVSTDARR_LONGS
 #include <svl/svstdarr.hxx>
 #endif
 
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index da5e5db..d409fb9 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -35,7 +35,6 @@
 
 #include <vcl/sound.hxx>
 #include <tools/poly.hxx>
-#define _SVSTDARR_LONGS
 #include <svl/svstdarr.hxx>
 #include <svx/xoutbmp.hxx>
 #include <sfx2/progress.hxx>
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index a5385da..65ad568 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -28,14 +28,11 @@
 #ifndef _SWHTML_HXX
 #define _SWHTML_HXX
 
-#if !defined(_SVSTDARR_XUB_STRLEN_DECL) || !defined(_SVSTDARR_LONGS_DECL) || \
+#if !defined(_SVSTDARR_XUB_STRLEN_DECL) || \
     !defined(_SVSTDARR_USHORTS_DECL) || !defined(_SVSTDARR_STRINGSDTOR_DECL)
 #ifndef _SVSTDARR_XUB_STRLEN_DECL
 #define _SVSTDARR_XUB_STRLEN
 #endif
-#ifndef _SVSTDARR_LONGS_DECL
-#define _SVSTDARR_LONGS
-#endif
 #ifndef _SVSTDARR_USHORTS_DECL
 #define _SVSTDARR_USHORTS
 #endif
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index d0d608a..de99469 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -38,7 +38,6 @@
 #include <tools/pstm.hxx>
 
 #define _SVSTDARR_LONGSSORT
-#define _SVSTDARR_LONGS
 #include <svl/svstdarr.hxx>
 #include <editeng/paperinf.hxx>
 #include <editeng/tstpitem.hxx>


More information about the Libreoffice-commits mailing list