remove some unused defines

Change-Id: Ib2d50e8c29ccbc5ffcb52cdff4ae3eaae9a62188
Reviewed-on: https://gerrit.libreoffice.org/17332
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

8 files changed, 0 insertions, 170 deletions

diff --git a/include/comphelper/classids.hxx b/include/comphelper/classids.hxx
index 0658f79570bf..edb488573b3b 100644
--- a/include/comphelper/classids.hxx
+++ b/include/comphelper/classids.hxx
@@ -67,18 +67,6 @@
  * StarWriter/Web
  */
 
-/* 4.0 */
-
-#define SO3_SWWEB_CLASSID_40 \
-    0xf0caa840, 0x7821, 0x11d0, 0xa4, 0xa7, 0x0, \
-    0xa0, 0x24, 0x9d, 0x57, 0xb1
-
-/* 5.0 */
-
-#define SO3_SWWEB_CLASSID_50 \
-    0xc20cf9d2, 0x85ae, 0x11d1, 0xaa, 0xb4, 0x0, \
-    0x60, 0x97, 0xda, 0x56, 0x1a
-
 /* 6.0, 7, 8 */
 
 #define SO3_SWWEB_CLASSID_60 \
@@ -93,18 +81,6 @@
  * Globaldokument
  */
 
-/* 4.0 */
-
-#define SO3_SWGLOB_CLASSID_40 \
-    0x340ac970, 0xe30d, 0x11d0, 0xa5, 0x3f, 0x0, \
-    0xa0, 0x24, 0x9d, 0x57, 0xb1
-
-/* 5.0 */
-
-#define SO3_SWGLOB_CLASSID_50 \
-    0xc20cf9d3, 0x85ae, 0x11d1, 0xaa, 0xb4, 0x0, \
-    0x60, 0x97, 0xda, 0x56, 0x1a
-
 /* 6.0, 7, 8 */
 
 #define SO3_SWGLOB_CLASSID_60 \
@@ -286,31 +262,6 @@
     0x80243D39, 0x6741, 0x46C5, 0x92, 0x6E, 0x06, \
     0x91, 0x64, 0xFF, 0x87, 0xBB
 
-/****************************************************
-* StarImage
-****************************************************/
-
-/* 3.0 */
-
-#define SO3_SIM_CLASSID_30 \
-    0xEA60C941L, 0x2C6C, 0x101C, 0x8E, 0x2C, 0x00, \
-    0x00, 0x1B, 0x4C, 0xC7, 0x11
-
-/* 4.0 */
-
-#define SO3_SIM_CLASSID_40 \
-    0x447BB8A0L, 0x41FB, 0x11D0, 0x89, 0xCA, 0x00, \
-    0x80, 0x29, 0xE4, 0xB0, 0xB1
-
-/* 5.0 */
-
-#define SO3_SIM_CLASSID_50 \
-    0x65c68d00L, 0x85de, 0x11d1, 0x89, 0xd0, 0x00, \
-    0x80, 0x29, 0xe4, 0xb0, 0xb1
-
-/* aktuell */
-
-
 /***************************************************
 * StarMath
 ***************************************************/
@@ -379,11 +330,6 @@
     0xd7896d52, 0xb7af, 0x4820, \
     0x9d, 0xfe, 0xd4, 0x04, 0xd0, 0x15, 0x96, 0x0f
 
-#define SO3_RPT_SCH_CLASSID_90 \
-    0x80243d39, 0x6741, 0x46c5, \
-    0x92, 0x6e, 0x06, 0x91, 0x64, 0xff, 0x87, 0xbb
-
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index fdfce88fcbb0..22b0ed1f6792 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -91,17 +91,6 @@ typedef unsigned short LanguageType;
 
 #define LANGUAGE_MASK_PRIMARY 0x03ff
 
-#ifdef __cplusplus
-/* Please use the methods provided in mslangid.hxx for type-safety! */
-#else
-#define MSLANGID_MAKELANGID( nSubLangId, nPriLangId )  \
-   (((nSubLangId) << 10) | (nPriLangId))
-#define MSLANGID_GETPRIMARYLANGUAGE( nLangID )         \
-    ((nLangID) & LANGUAGE_MASK_PRIMARY)
-#define MSLANGID_GETSUBLANGUAGE( nLangID )             \
-    (((nLangID) & ~LANGUAGE_MASK_PRIMARY) >> 10)
-#endif
-
 
 #define LANGUAGE_DONTKNOW                   0x03FF  /* yes, the mask */
 #define LANGUAGE_NONE                       0x00FF
diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
index 855cff7be1e1..bfe3a0822a52 100644
--- a/include/toolkit/helper/macros.hxx
+++ b/include/toolkit/helper/macros.hxx
@@ -275,23 +275,6 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa
                                 return aNames; \
                             } \
 
-
-
-#define DECLIMPL_SERVICEINFO( ImplName, ServiceName ) \
-    OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("stardiv.Toolkit." #ImplName ); } \
-    ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE   \
-                            { \
-                                ::com::sun::star::uno::Sequence< OUString > aNames( 1 ); \
-                                aNames[ 0 ] = OUString::createFromAscii( ServiceName ); \
-                                return aNames; \
-                            } \
-    DECLIMPL_SUPPORTS_SERVICE( )
-
-
-
-
-
-
 #endif // INCLUDED_TOOLKIT_HELPER_MACROS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h
index 55cfe16a4f19..12946154d16b 100644
--- a/include/tools/diagnose_ex.h
+++ b/include/tools/diagnose_ex.h
@@ -125,26 +125,6 @@
         return;   \
     }
 
-/** asserts a given condition (in debug mode), and continues the most-inner
-    loop if the condition is not met
-*/
-#define ENSURE_OR_CONTINUE( c, m ) \
-    if ( !(c) ) \
-    {   \
-        OSL_ENSURE( false, m ); \
-        continue;   \
-    }
-
-/** asserts a given condition (in debug mode), and continues the most-inner
-    loop if the condition is not met
-*/
-#define ENSURE_OR_BREAK( c, m ) \
-    if ( !(c) ) \
-    {   \
-        OSL_ENSURE( false, m ); \
-        break;  \
-    }
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/rtti.hxx b/include/tools/rtti.hxx
index 1bc9c448c3d5..9f178d2ae739 100644
--- a/include/tools/rtti.hxx
+++ b/include/tools/rtti.hxx
@@ -39,13 +39,6 @@ typedef void* (*TypeId)();
         virtual TypeId Type() const SAL_OVERRIDE; \
         virtual bool   IsA( TypeId aSameOrSuperType ) const SAL_OVERRIDE
 
-#define TYPEINFO_VISIBILITY(visibility) \
-        visibility static  void*  CreateType(); \
-        visibility static  TypeId StaticType(); \
-        visibility static  bool   IsOf( TypeId aSameOrSuperType ); \
-        visibility virtual TypeId Type() const; \
-        visibility virtual bool   IsA( TypeId aSameOrSuperType ) const
-
 #define TYPEINFO_VISIBILITY_OVERRIDE(visibility) \
         visibility static  void*  CreateType(); \
         visibility static  TypeId StaticType(); \
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 202e3ff5a6ff..3b9f26891ae5 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -61,12 +61,6 @@ namespace o3tl
     template<> struct typed_flags<StreamMode> : is_typed_flags<StreamMode, 0x0f1f> {};
 }
 
-#define STREAM_READWRITEBITS            (StreamMode::READ | StreamMode::WRITE | \
-                                         StreamMode::NOCREATE | StreamMode::TRUNC)
-
-#define STREAM_SHAREBITS                (StreamMode::SHARE_DENYNONE | StreamMode::SHARE_DENYREAD |\
-                                         StreamMode::SHARE_DENYWRITE | StreamMode::SHARE_DENYALL)
-
 #define STREAM_READWRITE                (StreamMode::READ | StreamMode::WRITE)
 #define STREAM_SHARE_DENYREADWRITE      (StreamMode::SHARE_DENYREAD | StreamMode::SHARE_DENYWRITE)
 
diff --git a/include/tubes/file-transfer-helper.h b/include/tubes/file-transfer-helper.h
index 5754314f86bf..25a4ce9faa7c 100644
--- a/include/tubes/file-transfer-helper.h
+++ b/include/tubes/file-transfer-helper.h
@@ -38,16 +38,8 @@ G_BEGIN_DECLS
 #define EMPATHY_FT_HANDLER(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
    EMPATHY_TYPE_FT_HANDLER, EmpathyFTHandler))
-#define EMPATHY_FT_HANDLER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), \
-   EMPATHY_TYPE_FT_HANDLER, EmpathyFTHandlerClass))
 #define EMPATHY_IS_FT_HANDLER(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_FT_HANDLER))
-#define EMPATHY_IS_FT_HANDLER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), EMPATHY_TYPE_FT_HANDLER))
-#define EMPATHY_FT_HANDLER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-   EMPATHY_TYPE_FT_HANDLER, EmpathyFTHandlerClass))
 
 typedef struct _EmpathyFTHandlerPriv EmpathyFTHandlerPriv;
 
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index b51d7429d8ac..13ebe03ffcb7 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -112,45 +112,6 @@ GETTYPES_IMPL_START( Class )                                                \
     CPPU_TYPE_REF( I5 )                                                     \
 GETTYPES_IMPL_END
 
-// 6 interfaces supported
-#define XTYPEPROVIDER_IMPL_6( Class, I1,I2,I3,I4,I5,I6 )                    \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 ),                                                    \
-    CPPU_TYPE_REF( I2 ),                                                    \
-    CPPU_TYPE_REF( I3 ),                                                    \
-    CPPU_TYPE_REF( I4 ),                                                    \
-    CPPU_TYPE_REF( I5 ),                                                    \
-    CPPU_TYPE_REF( I6 )                                                     \
-GETTYPES_IMPL_END
-
-// 7 interfaces supported
-#define XTYPEPROVIDER_IMPL_7( Class, I1,I2,I3,I4,I5,I6,I7 )                 \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 ),                                                    \
-    CPPU_TYPE_REF( I2 ),                                                    \
-    CPPU_TYPE_REF( I3 ),                                                    \
-    CPPU_TYPE_REF( I4 ),                                                    \
-    CPPU_TYPE_REF( I5 ),                                                    \
-    CPPU_TYPE_REF( I6 ),                                                    \
-    CPPU_TYPE_REF( I7 )                                                     \
-GETTYPES_IMPL_END
-
-// 8 interfaces supported
-#define XTYPEPROVIDER_IMPL_8( Class, I1,I2,I3,I4,I5,I6,I7,I8 )              \
-XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
-GETTYPES_IMPL_START( Class )                                                \
-    CPPU_TYPE_REF( I1 ),                                                    \
-    CPPU_TYPE_REF( I2 ),                                                    \
-    CPPU_TYPE_REF( I3 ),                                                    \
-    CPPU_TYPE_REF( I4 ),                                                    \
-    CPPU_TYPE_REF( I5 ),                                                    \
-    CPPU_TYPE_REF( I6 ),                                                    \
-    CPPU_TYPE_REF( I7 ),                                                    \
-    CPPU_TYPE_REF( I8 )                                                     \
-GETTYPES_IMPL_END
-
 // 9 interfaces supported
 #define XTYPEPROVIDER_IMPL_9( Class, I1,I2,I3,I4,I5,I6,I7,I8,I9 )           \
 XTYPEPROVIDER_COMMON_IMPL( Class )                                          \
@@ -300,14 +261,6 @@ Class::getSupportedServiceNames_Static()                                    \
 // Service with service factory.
 
 // Own implementation of getSupportedServiceNames_Static().
-#define XSERVICEINFO_IMPL_0( Class, ImplName )                              \
-XSERVICEINFO_COMMOM_IMPL( Class, ImplName )                                 \
-XSERVICEINFO_CREATE_INSTANCE_IMPL( Class )                                  \
-                                                                            \
-com::sun::star::uno::Sequence< OUString >                              \
-Class::getSupportedServiceNames_Static()
-
-// Own implementation of getSupportedServiceNames_Static().
 #define XSERVICEINFO_IMPL_0_CTX( Class, ImplName )                              \
 XSERVICEINFO_COMMOM_IMPL( Class, ImplName )                                 \
 XSERVICEINFO_CREATE_INSTANCE_IMPL_CTX( Class )                                  \