3 files changed, 19 insertions, 25 deletions
diff --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx
index 71d67c9c8d49..b15e63f27d16 100644
--- a/editeng/inc/editeng/svxacorr.hxx
+++ b/editeng/inc/editeng/svxacorr.hxx
@@ -26,10 +26,12 @@
  *
  ************************************************************************/
 
-#ifndef _MySVXACORR_HXX
-#define _MySVXACORR_HXX
+#ifndef EE_SVXACORR_HXX
+#define EE_SVXACORR_HXX
 
 #include <com/sun/star/embed/XStorage.hpp>
+
+#include <o3tl/sorted_vector.hxx>
 #include <tools/rtti.hxx>
 #include <i18npool/lang.h>
 #include <tools/time.hxx>
@@ -45,12 +47,26 @@
 class CharClass;
 class SfxPoolItem;
 class SvxAutoCorrect;
-class SvStringsISortDtor;
 class SfxObjectShell;
 class SotStorageRef;
 class SotStorage;
 class Window;
 
+struct CompareSvStringsISortDtor
+{
+    bool operator()( String* const& lhs, String* const& rhs ) const
+    {
+        return lhs->CompareIgnoreCaseToAscii( *rhs ) == COMPARE_LESS;
+    }
+};
+
+class SvStringsISortDtor
+    : public o3tl::sorted_vector<String*, CompareSvStringsISortDtor>
+{
+public:
+    ~SvStringsISortDtor() { DeleteAndDestroyAll(); }
+};
+
 // Auto correct flags
 const long CptlSttSntnc     = 0x00000001;   // Capital letters at the beginning of a sentence
 const long CptlSttWrd       = 0x00000002;   // not two Capital letters at the beginning of a word
diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index 66fc0fd7a24b..c213b6c45c9f 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -31,25 +31,9 @@
 #include <deque>
 
 #include <tools/string.hxx>
-#include <o3tl/sorted_vector.hxx>
 
 typedef String* StringPtr;
 
-#ifndef _SVSTDARR_STRINGSISORTDTOR_DECL
-
-struct SVL_DLLPUBLIC CompareSvStringsISortDtor
-{
-    bool operator()( String* const& lhs, String* const& rhs ) const;
-};
-class SVL_DLLPUBLIC SvStringsISortDtor : public o3tl::sorted_vector<String*, CompareSvStringsISortDtor >
-{
-public:
-    ~SvStringsISortDtor() { DeleteAndDestroyAll(); }
-};
-
-#define _SVSTDARR_STRINGSISORTDTOR_DECL
-#endif
-
 typedef std::deque< xub_StrLen > SvXub_StrLens;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index 98e7f2a93495..4ea8ac6b5bc3 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -28,10 +28,4 @@ sal_uInt16 SvPtrarr::GetPos( const VoidPtr& aElement ) const
     return ( n >= nA ? USHRT_MAX : n );
 }
 
-
-bool CompareSvStringsISortDtor::operator()( String* const& lhs, String* const& rhs ) const
-{
-    return lhs->CompareIgnoreCaseToAscii( *rhs ) == COMPARE_LESS;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */