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

[Kohei Yoshida]

 svl/inc/svl/svarray.hxx         |    6 +++---
 svl/inc/svl/svstdarr.hxx        |    9 ++-------
 svl/source/memtools/svarray.cxx |    2 --
 3 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit fe4fb1e7480000bcb64e7c7b13cc0e55fc429628
Author: Nigel Hawkins <n.hawkins at gmx.com>
Date:   Thu Jan 27 16:37:29 2011 +0000

    Remove SvShorts

diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index 91c37fc..6b53585 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -91,7 +91,7 @@
 *			ein Stack mit einem PtrArray als Grundlage.
 *
 * JP 09.10.96:  vordefinierte Arrays:
-*	VarArr:		SvBools, SvULongs, SvUShorts, SvLongs, SvShorts
+*	VarArr:		SvBools, SvULongs, SvUShorts, SvLongs
 *	PtrArr:		SvStrings, SvStringsDtor
 *	SortArr:	SvStringsSort, SvStringsSortDtor,
 *				SvStringsISort, SvStringsISortDtor
@@ -901,7 +901,7 @@ _SV_DECL_PTRARR_SORT(nm, AE, IS, GS, )
 
 #define SV_DECL_PTRARR_SORT_VISIBILITY(nm, AE, IS, GS, vis)\
 _SV_DECL_PTRARR_SORT(nm, AE, IS, GS, vis)
-                                                                                                                             
+
 
 #define _SV_DECL_PTRARR_SORT_DEL(nm, AE, IS, GS, vis)\
 _SV_DECL_PTRARR_SORT_ALG(nm, AE, IS, GS, vis)\
diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index c9d107b..5f385b8 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
 *   (die defines setzen sich aus "_SVSTDARR_" und dem Namen des Array
 *    ohne "Sv" zusammen)
 *
-*	VarArr:		SvBools, SvULongs, SvUShorts, SvLongs, SvShorts
+*	VarArr:		SvBools, SvULongs, SvUShorts, SvLongs
 *	PtrArr:		SvStrings, SvStringsDtor
 *	SortArr:	SvStringsSort, SvStringsSortDtor,
 *				SvStringsISort, SvStringsISortDtor,
@@ -122,11 +122,6 @@ SV_DECL_VARARR_SORT_VISIBILITY( SvLongsSort, long, 1, 1, SVL_DLLPUBLIC )
 #define _SVSTDARR_LONGSSORT_DECL
 #endif
 
-#ifndef _SVSTDARR_SHORTS_DECL
-SV_DECL_VARARR_VISIBILITY( SvShorts, short, 1, 1, SVL_DLLPUBLIC )
-#define _SVSTDARR_SHORTS_DECL
-#endif
-
 #include <tools/string.hxx>
 
 typedef String* StringPtr;
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index 92bca4a..cdc49ce 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -38,7 +38,6 @@
 #define _SVSTDARR_USHORTS
 #define _SVSTDARR_LONGS
 #define _SVSTDARR_LONGSSORT
-#define _SVSTDARR_SHORTS
 #define _SVSTDARR_STRINGS
 #define _SVSTDARR_STRINGSDTOR
 #define _SVSTDARR_STRINGSSORT
@@ -82,7 +81,6 @@ SV_IMPL_VARARR( SvBytes, BYTE )
 SV_IMPL_VARARR( SvULongs, ULONG )
 SV_IMPL_VARARR( SvUShorts, USHORT )
 SV_IMPL_VARARR( SvLongs, long)
-SV_IMPL_VARARR( SvShorts, short )
 
 SV_IMPL_VARARR_SORT( SvULongsSort, ULONG )
 SV_IMPL_VARARR_SORT( SvLongsSort, long )