[PATCH 8/8] fdo#38831 remove SvStrings definition and obsolete #defines

Brad Sowden code at sowden.org
Wed Dec 28 23:55:21 PST 2011 

---
 basctl/source/basicide/basides1.cxx |    2 --
 sc/source/ui/inc/formula.hxx        |    6 ------
 sc/source/ui/inc/funcpage.hxx       |    6 ------
 sc/source/ui/inc/undotab.hxx        |    7 -------
 sc/source/ui/inc/viewfunc.hxx       |    6 ------
 sc/source/ui/view/viewfun2.cxx      |    1 -
 sfx2/source/appl/appcfg.cxx         |    2 --
 svl/inc/svl/svarray.hxx             |    2 +-
 svl/inc/svl/svstdarr.hxx            |    8 +-------
 svl/source/items/style.cxx          |    1 -
 svl/source/memtools/svarray.cxx     |    2 --
 svx/inc/svx/numfmtsh.hxx            |    3 ---
 sw/source/core/doc/docdde.cxx       |    2 --
 sw/source/filter/basflt/fltini.cxx  |    2 --
 sw/source/filter/html/swhtml.cxx    |    2 --
 sw/source/ui/uno/unoatxt.cxx        |    2 --
 16 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 5de3788..bcf4006 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -27,8 +27,6 @@
  ************************************************************************/
 
 
-#define _SVSTDARR_STRINGS
-
 #include "ide_pch.hxx"
 
 #define _SOLAR__PRIVATE 1
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index 306aaa5..e9e0b34 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -37,12 +37,6 @@
 #include <svtools/svmedit.hxx>
 #include <vcl/tabpage.hxx>
 
-#ifndef _SVSTDARR_STRINGS
-
-#define _SVSTDARR_STRINGS
-#include <svl/svstdarr.hxx>
-
-#endif
 #include "compiler.hxx"
 #include "cell.hxx"
 
diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx
index ca24748..79f8185 100644
--- a/sc/source/ui/inc/funcpage.hxx
+++ b/sc/source/ui/inc/funcpage.hxx
@@ -37,12 +37,6 @@
 #include <svtools/svmedit.hxx>
 #include <vcl/tabpage.hxx>
 
-#ifndef _SVSTDARR_STRINGS
-
-#define _SVSTDARR_STRINGS
-#include <svl/svstdarr.hxx>
-
-#endif
 #include <vcl/tabctrl.hxx>
 #include "parawin.hxx"
 #include <svtools/svtreebx.hxx>
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index c6b7409..d2dfedf 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -34,13 +34,6 @@
 #include <tools/color.hxx>
 #include "tabbgcolor.hxx"
 
-#ifndef _SVSTDARR_STRINGS
-
-#define _SVSTDARR_STRINGS
-#include <svl/svstdarr.hxx>
-
-#endif
-
 #include <com/sun/star/uno/Sequence.hxx>
 
 #include <boost/shared_ptr.hpp>
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 29e10f3..f1273cf 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -32,12 +32,6 @@
 
 #include "tabbgcolor.hxx"
 
-#ifndef _SVSTDARR_STRINGS
-
-#define _SVSTDARR_STRINGS
-#include <svl/svstdarr.hxx>
-
-#endif
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <vector>
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index e2c950c..400d1cb 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -33,7 +33,6 @@
 #include <editeng/eeitem.hxx>
 
 #include <sfx2/app.hxx>
-#define _SVSTDARR_STRINGS
 #include <editeng/boxitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/scripttypeitem.hxx>
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 85e5374..868a07c 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -47,8 +47,6 @@
 #include <svl/szitem.hxx>
 #include <svl/undo.hxx>
 
-#define _SVSTDARR_STRINGS
-#include <svl/svstdarr.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sot/exchange.hxx>
 
diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index 4c8d077..47b8063 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -81,7 +81,7 @@
 *           Sortierung mit Hilfe der Object-operatoren "<" und "=="
 *
 * JP 09.10.96:  vordefinierte Arrays:
-*   PtrArr:     SvStrings, SvStringsDtor
+*   PtrArr:     SvStringsDtor
 *   SortArr:    SvStringsSort, SvStringsSortDtor,
 *               SvStringsISort, SvStringsISortDtor
 ***********************************************************************/
diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index 54f6d2a..1d1b6e8 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -32,7 +32,7 @@
 *   (die defines setzen sich aus "_SVSTDARR_" und dem Namen des Array
 *    ohne "Sv" zusammen)
 *
-*   PtrArr:     SvStrings, SvStringsDtor
+*   PtrArr:     SvStringsDtor
 *   SortArr:    SvStringsSort, SvStringsSortDtor,
 *               SvStringsISort, SvStringsISortDtor,
 ***********************************************************************/
@@ -45,12 +45,6 @@
 
 typedef String* StringPtr;
 
-
-#ifndef _SVSTDARR_STRINGS_DECL
-SV_DECL_PTRARR_VISIBILITY( SvStrings, StringPtr, 1, 1, SVL_DLLPUBLIC )
-#define _SVSTDARR_STRINGS_DECL
-#endif
-
 #ifndef _SVSTDARR_STRINGSDTOR_DECL
 SV_DECL_PTRARR_DEL_VISIBILITY( SvStringsDtor, StringPtr, 1, 1, SVL_DLLPUBLIC )
 #define _SVSTDARR_STRINGSDTOR_DECL
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 75cbdd6..337af7c 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -29,7 +29,6 @@
 
 #include <com/sun/star/lang/XComponent.hpp>
 
-#define _SVSTDARR_STRINGS
 #define _SVSTDARR_STRINGSSORTDTOR
 #define _SVSTDARR_BYTESTRINGS
 #define _SVSTDARR_BYTESTRINGSSORTDTOR
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index 89f6ab1..3302321 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -30,7 +30,6 @@
 #define _SVARRAY_CXX
 
 #define _SVSTDARR_sal_uInt16S
-#define _SVSTDARR_STRINGS
 #define _SVSTDARR_STRINGSDTOR
 #define _SVSTDARR_STRINGSSORT
 #define _SVSTDARR_STRINGSSORTDTOR
@@ -59,7 +58,6 @@ sal_uInt16 SvPtrarr::GetPos( const VoidPtr& aElement ) const
     return ( n >= nA ? USHRT_MAX : n );
 }
 
-SV_IMPL_PTRARR( SvStrings, StringPtr )
 SV_IMPL_PTRARR( SvStringsDtor, StringPtr )
 
 // ---------------- strings -------------------------------------
diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx
index 5c7ce26..a2425a4 100644
--- a/svx/inc/svx/numfmtsh.hxx
+++ b/svx/inc/svx/numfmtsh.hxx
@@ -33,9 +33,6 @@
 #include <tools/string.hxx>
 #include <i18npool/lang.h>
 
-#ifndef _SVSTDARR_STRINGS
-#define _SVSTDARR_STRINGS
-#endif
 #include "svx/svxdllapi.h"
 
 #include <svl/svstdarr.hxx>
diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx
index 2d37606..151840b 100644
--- a/sw/source/core/doc/docdde.cxx
+++ b/sw/source/core/doc/docdde.cxx
@@ -34,8 +34,6 @@
 #include <vcl/svapp.hxx>
 #include <tools/urlobj.hxx>
 
-#define _SVSTDARR_STRINGS
-#include <svl/svstdarr.hxx>
 #include <sfx2/linkmgr.hxx>         // LinkManager
 #include <unotools/charclass.hxx>
 #include <fmtcntnt.hxx>
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index b2da3f9..0babb76 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -26,8 +26,6 @@
  *
  ************************************************************************/
 
-#define _SVSTDARR_STRINGS
-
 #include <string.h>
 #include <stdio.h>                      // sscanf
 #include <hintids.hxx>
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 3dc5337..019c9dd 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -38,8 +38,6 @@
 #endif
 #include <hintids.hxx>
 
-#define _SVSTDARR_STRINGS
-#include <svl/svstdarr.hxx>
 #include <svl/stritem.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/htmltokn.h>
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index dba39b1..413bac6 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -28,8 +28,6 @@
 
 
 
-#define _SVSTDARR_STRINGS
-
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <osl/mutex.hxx>
 #include <osl/diagnose.h>
-- 
1.7.7.4


--------------070604000403000403040905--

More information about the LibreOffice mailing list