binfilter: remove some traces

Change-Id: I5b03dcb5d1f8c73c7a308e7ae209cc7872f18c61

5 files changed, 5 insertions, 233 deletions

diff --git a/comphelper/inc/comphelper/classids.hxx b/comphelper/inc/comphelper/classids.hxx
index 416715b24808..39ab6095802e 100644
--- a/comphelper/inc/comphelper/classids.hxx
+++ b/comphelper/inc/comphelper/classids.hxx
@@ -29,42 +29,24 @@
     0xDC5C7E40L, 0xB35C, 0x101B, 0x99, 0x61, 0x04, \
     0x02, 0x1C, 0x00, 0x70, 0x02
 
-// #110743#
-#define BF_SO3_SW_CLASSID_30 \
-    0xDC5C7E40L, 0xB35C, 0x101B, 0x99, 0x61, 0x04, \
-    0x02, 0x1C, 0x00, 0x70, 0x02
 /* 4.0 */
 
 #define SO3_SW_CLASSID_40 \
     0x8b04e9b0,  0x420e, 0x11d0, 0xa4, 0x5e, 0x0, \
     0xa0, 0x24, 0x9d, 0x57, 0xb1
 
-// #110743#
-#define BF_SO3_SW_CLASSID_40 \
-    0x8b04e9b0,  0x420e, 0x11d0, 0xa4, 0x5e, 0x0, \
-    0xa0, 0x24, 0x9d, 0x57, 0xb1
 /* 5.0 */
 
 #define SO3_SW_CLASSID_50 \
     0xc20cf9d1, 0x85ae, 0x11d1, 0xaa, 0xb4, 0x0, \
     0x60, 0x97, 0xda, 0x56, 0x1a
 
-// #110743#
-#define BF_SO3_SW_CLASSID_50 \
-    0xc20cf9d1, 0x85ae, 0x11d1, 0xaa, 0xb4, 0x0, \
-    0x60, 0x97, 0xda, 0x56, 0x1a
-
  /* 6.0, 7, 8 */
 
 #define SO3_SW_CLASSID_60 \
     0x8BC6B165, 0xB1B2, 0x4EDD, 0xAA, 0x47, 0xDA, \
     0xE2, 0xEE, 0x68, 0x9D, 0xD6
 
-// #110743#
-#define BF_SO3_SW_CLASSID_60 \
-    0x8BC6B165, 0xB1B2, 0x4EDD, 0xAA, 0x47, 0xDA, \
-    0xE2, 0xEE, 0x68, 0x9D, 0xD6
-
  /* ole embed 6.0, 7 */
 
 #define SO3_SW_OLE_EMBED_CLASSID_60 \
@@ -81,9 +63,6 @@
 
 #define SO3_SW_CLASSID SO3_SW_CLASSID_60
 
-// #110743#
-#define BF_SO3_SW_CLASSID BF_SO3_SW_CLASSID_50
-
 /*
  * StarWriter/Web
  */
@@ -94,38 +73,22 @@
     0xf0caa840, 0x7821, 0x11d0, 0xa4, 0xa7, 0x0, \
     0xa0, 0x24, 0x9d, 0x57, 0xb1
 
-// #110743#
-#define BF_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
 
-// #110743#
-#define BF_SO3_SWWEB_CLASSID_50 \
-    0xc20cf9d2, 0x85ae, 0x11d1, 0xaa, 0xb4, 0x0, \
-    0x60, 0x97, 0xda, 0x56, 0x1a
 /* 6.0, 7, 8 */
 
 #define SO3_SWWEB_CLASSID_60 \
     0xA8BBA60C, 0x7C60, 0x4550, 0x91, 0xCE, 0x39, \
     0xC3, 0x90, 0x3F, 0xAC, 0x5E
 
-// #110743#
-#define BF_SO3_SWWEB_CLASSID_60 \
-    0xA8BBA60C, 0x7C60, 0x4550, 0x91, 0xCE, 0x39, \
-    0xC3, 0x90, 0x3F, 0xAC, 0x5E
-
 /* aktuell */
 
 #define SO3_SWWEB_CLASSID SO3_SWWEB_CLASSID_60
 
-// #110743#
-#define BF_SO3_SWWEB_CLASSID BF_SO3_SWWEB_CLASSID_50
-
 /*
  * Globaldokument
  */
@@ -136,38 +99,22 @@
     0x340ac970, 0xe30d, 0x11d0, 0xa5, 0x3f, 0x0, \
     0xa0, 0x24, 0x9d, 0x57, 0xb1
 
-// #110743#
-#define BF_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
 
-// #110743#
-#define BF_SO3_SWGLOB_CLASSID_50 \
-    0xc20cf9d3, 0x85ae, 0x11d1, 0xaa, 0xb4, 0x0, \
-    0x60, 0x97, 0xda, 0x56, 0x1a
 /* 6.0, 7, 8 */
 
 #define SO3_SWGLOB_CLASSID_60 \
     0xB21A0A7C, 0xE403, 0x41FE, 0x95, 0x62, 0xBD, \
     0x13, 0xEA, 0x6F, 0x15, 0xA0
 
-// #110743#
-#define BF_SO3_SWGLOB_CLASSID_60 \
-    0xB21A0A7C, 0xE403, 0x41FE, 0x95, 0x62, 0xBD, \
-    0x13, 0xEA, 0x6F, 0x15, 0xA0
 /* aktuell */
 
 #define SO3_SWGLOB_CLASSID SO3_SWGLOB_CLASSID_60
 
-// #110743#
-#define BF_SO3_SWGLOB_CLASSID BF_SO3_SWGLOB_CLASSID_50
-
 //---------------------------------------------------
 
 /*
@@ -180,41 +127,24 @@
     0x3F543FA0L, 0xB6A6, 0x101B, 0x99, 0x61, 0x04, \
     0x02, 0x1C, 0x00, 0x70, 0x02
 
-// #110743#
-#define BF_SO3_SC_CLASSID_30 \
-    0x3F543FA0L, 0xB6A6, 0x101B, 0x99, 0x61, 0x04, \
-    0x02, 0x1C, 0x00, 0x70, 0x02
 /* 4.0 */
 
 #define SO3_SC_CLASSID_40 \
     0x6361d441L, 0x4235, 0x11d0, 0x89, 0xcb, 0x00, \
     0x80, 0x29, 0xe4, 0xb0, 0xb1
 
-// #110743#
-#define BF_SO3_SC_CLASSID_40 \
-    0x6361d441L, 0x4235, 0x11d0, 0x89, 0xcb, 0x00, \
-    0x80, 0x29, 0xe4, 0xb0, 0xb1
 /* 5.0 */
 
 #define SO3_SC_CLASSID_50 \
     0xc6a5b861L, 0x85d6, 0x11d1, 0x89, 0xcb, 0x00, \
     0x80, 0x29, 0xe4, 0xb0, 0xb1
 
-// #110743#
-#define BF_SO3_SC_CLASSID_50 \
-    0xc6a5b861L, 0x85d6, 0x11d1, 0x89, 0xcb, 0x00, \
-    0x80, 0x29, 0xe4, 0xb0, 0xb1
 /* 6.0 */
 
 #define SO3_SC_CLASSID_60 \
     0x47BBB4CB, 0xCE4C, 0x4E80, 0xA5, 0x91, 0x42, \
     0xD9, 0xAE, 0x74, 0x95, 0x0F
 
-// #110743#
-#define BF_SO3_SC_CLASSID_60 \
-    0x47BBB4CB, 0xCE4C, 0x4E80, 0xA5, 0x91, 0x42, \
-    0xD9, 0xAE, 0x74, 0x95, 0x0F
-
 /* ole embed 6.0, 7 */
 
 #define SO3_SC_OLE_EMBED_CLASSID_60 \
@@ -231,9 +161,6 @@
 
 #define SO3_SC_CLASSID SO3_SC_CLASSID_60
 
-// #110743#
-#define BF_SO3_SC_CLASSID BF_SO3_SC_CLASSID_50
-
 /****************************************************
 * StarImpress
 ****************************************************/
@@ -244,41 +171,24 @@
     0xAF10AAE0L, 0xB36D, 0x101B, 0x99, 0x61, 0x04, \
     0x02, 0x1C, 0x00, 0x70, 0x02
 
-// #110743#
-#define BF_SO3_SIMPRESS_CLASSID_30 \
-    0xAF10AAE0L, 0xB36D, 0x101B, 0x99, 0x61, 0x04, \
-    0x02, 0x1C, 0x00, 0x70, 0x02
 /* 4.0 */
 
 #define SO3_SIMPRESS_CLASSID_40 \
     0x12d3cc0L, 0x4216, 0x11d0, 0x89, 0xcb, 0x0, \
     0x80, 0x29, 0xe4, 0xb0, 0xb1
 
-// #110743#
-#define BF_SO3_SIMPRESS_CLASSID_40 \
-    0x12d3cc0L, 0x4216, 0x11d0, 0x89, 0xcb, 0x0, \
-    0x80, 0x29, 0xe4, 0xb0, 0xb1
 /* 5.0 */
 
 #define SO3_SIMPRESS_CLASSID_50 \
     0x565c7221L, 0x85bc, 0x11d1, 0x89, 0xd0, 0x0, \
     0x80, 0x29, 0xe4, 0xb0, 0xb1
 
-// #110743#
-#define BF_SO3_SIMPRESS_CLASSID_50 \
-    0x565c7221L, 0x85bc, 0x11d1, 0x89, 0xd0, 0x0, \
-    0x80, 0x29, 0xe4, 0xb0, 0xb1
 /* 6.0 */
 
 #define SO3_SIMPRESS_CLASSID_60 \
     0x9176E48A, 0x637A, 0x4D1F, 0x80, 0x3B, 0x99, \
     0xD9, 0xBF, 0xAC, 0x10, 0x47
 
-// #110743#
-#define BF_SO3_SIMPRESS_CLASSID_60 \
-    0x9176E48A, 0x637A, 0x4D1F, 0x80, 0x3B, 0x99, \
-    0xD9, 0xBF, 0xAC, 0x10, 0x47
-
 /* ole embed 6.0, 7 */
 
 #define SO3_SIMPRESS_OLE_EMBED_CLASSID_60 \
@@ -295,9 +205,6 @@
 
 #define SO3_SIMPRESS_CLASSID  SO3_SIMPRESS_CLASSID_60
 
-// #110743#
-#define BF_SO3_SIMPRESS_CLASSID  BF_SO3_SIMPRESS_CLASSID_50
-
 /****************************************************
 * StarDraw
 ****************************************************/
@@ -308,20 +215,11 @@
     0x2e8905a0L, 0x85bd, 0x11d1, 0x89, 0xd0, 0x0, \
     0x80, 0x29, 0xe4, 0xb0, 0xb1
 
-// #110743#
-#define BF_SO3_SDRAW_CLASSID_50 \
-    0x2e8905a0L, 0x85bd, 0x11d1, 0x89, 0xd0, 0x0, \
-    0x80, 0x29, 0xe4, 0xb0, 0xb1
 /* 6.0 */
 #define SO3_SDRAW_CLASSID_60 \
     0x4BAB8970, 0x8A3B, 0x45B3, 0x99, 0x1C, 0xCB, \
     0xEE, 0xAC, 0x6B, 0xD5, 0xE3
 
-// #110743#
-#define BF_SO3_SDRAW_CLASSID_60 \
-    0x4BAB8970, 0x8A3B, 0x45B3, 0x99, 0x1C, 0xCB, \
-    0xEE, 0xAC, 0x6B, 0xD5, 0xE3
-
 /* ole embed 6.0, 7 */
 
 #define SO3_SDRAW_OLE_EMBED_CLASSID_60 \
@@ -338,9 +236,6 @@
 
 #define SO3_SDRAW_CLASSID  SO3_SDRAW_CLASSID_60
 
-// #110743#
-#define BF_SO3_SDRAW_CLASSID  BF_SO3_SDRAW_CLASSID_50
-
 /****************************************************
 * StarChart
 ****************************************************/
@@ -351,41 +246,24 @@
     0xFB9C99E0L, 0x2C6D, 0x101C, 0x8E, 0x2C, 0x00, \
     0x00, 0x1B, 0x4C, 0xC7, 0x11
 
-// #110743#
-#define BF_SO3_SCH_CLASSID_30 \
-    0xFB9C99E0L, 0x2C6D, 0x101C, 0x8E, 0x2C, 0x00, \
-    0x00, 0x1B, 0x4C, 0xC7, 0x11
 /* 4.0 */
 
 #define SO3_SCH_CLASSID_40 \
     0x2b3b7e0L, 0x4225, 0x11d0, 0x89, 0xca, 0x00, \
     0x80, 0x29, 0xe4, 0xb0, 0xb1
 
-// #110743#
-#define BF_SO3_SCH_CLASSID_40 \
-    0x2b3b7e0L, 0x4225, 0x11d0, 0x89, 0xca, 0x00, \
-    0x80, 0x29, 0xe4, 0xb0, 0xb1
 /* 5.0 */
 
 #define SO3_SCH_CLASSID_50 \
     0xbf884321L, 0x85dd, 0x11d1, 0x89, 0xd0, 0x00, \
     0x80, 0x29, 0xe4, 0xb0, 0xb1
 
-// #110743#
-#define BF_SO3_SCH_CLASSID_50 \
-    0xbf884321L, 0x85dd, 0x11d1, 0x89, 0xd0, 0x00, \
-    0x80, 0x29, 0xe4, 0xb0, 0xb1
 /* 6.0 */
 
 #define SO3_SCH_CLASSID_60 \
     0x12DCAE26, 0x281F, 0x416F, 0xA2, 0x34, 0xC3, \
     0x08, 0x61, 0x27, 0x38, 0x2E
 
-// #110743#
-#define BF_SO3_SCH_CLASSID_60 \
-    0x12DCAE26, 0x281F, 0x416F, 0xA2, 0x34, 0xC3, \
-    0x08, 0x61, 0x27, 0x38, 0x2E
-
 /* ole embed 6.0, 7 */
 
 #define SO3_SCH_OLE_EMBED_CLASSID_60 \
@@ -402,9 +280,6 @@
 
 #define SO3_SCH_CLASSID  SO3_SCH_CLASSID_60
 
-// #110743#
-#define BF_SO3_SCH_CLASSID  BF_SO3_SCH_CLASSID_50
-
 /****************************************************
 * StarImage
 ****************************************************/
@@ -415,38 +290,22 @@
     0xEA60C941L, 0x2C6C, 0x101C, 0x8E, 0x2C, 0x00, \
     0x00, 0x1B, 0x4C, 0xC7, 0x11
 
-// #110743#
-#define BF_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
 
-// #110743#
-#define BF_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
 
-// #110743#
-#define BF_SO3_SIM_CLASSID_50 \
-    0x65c68d00L, 0x85de, 0x11d1, 0x89, 0xd0, 0x00, \
-    0x80, 0x29, 0xe4, 0xb0, 0xb1
-
 /* aktuell */
 
 #define SO3_SIM_CLASSID  SO3_SIM_CLASSID_50
 
-// #110743#
-#define BF_SO3_SIM_CLASSID  BF_SO3_SIM_CLASSID_50
-
 /***************************************************
 * StarMath
 ***************************************************/
@@ -457,41 +316,24 @@
     0xD4590460L, 0x35FD, 0x101C, 0xB1, 0x2A, 0x04, \
     0x02, 0x1C, 0x00, 0x70, 0x02
 
-// #110743#
-#define BF_SO3_SM_CLASSID_30 \
-    0xD4590460L, 0x35FD, 0x101C, 0xB1, 0x2A, 0x04, \
-    0x02, 0x1C, 0x00, 0x70, 0x02
 /* 4.0 */
 
 #define SO3_SM_CLASSID_40 \
     0x2b3b7e1L, 0x4225, 0x11d0, 0x89, 0xca, 0x00, \
     0x80, 0x29, 0xe4, 0xb0, 0xb1
 
-// #110743#
-#define BF_SO3_SM_CLASSID_40 \
-    0x2b3b7e1L, 0x4225, 0x11d0, 0x89, 0xca, 0x00, \
-    0x80, 0x29, 0xe4, 0xb0, 0xb1
 /* 5.0 */
 
 #define SO3_SM_CLASSID_50 \
     0xffb5e640L, 0x85de, 0x11d1, 0x89, 0xd0, 0x00, \
     0x80, 0x29, 0xe4, 0xb0, 0xb1
 
-// #110743#
-#define BF_SO3_SM_CLASSID_50 \
-    0xffb5e640L, 0x85de, 0x11d1, 0x89, 0xd0, 0x00, \
-    0x80, 0x29, 0xe4, 0xb0, 0xb1
 /* 6.0, 7, 8 */
 
 #define SO3_SM_CLASSID_60 \
     0x078B7ABA, 0x54FC, 0x457F, 0x85, 0x51, 0x61, \
     0x47, 0xE7, 0x76, 0xA9, 0x97
 
-// #110743#
-#define BF_SO3_SM_CLASSID_60 \
-    0x078B7ABA, 0x54FC, 0x457F, 0x85, 0x51, 0x61, \
-    0x47, 0xE7, 0x76, 0xA9, 0x97
-
 /* ole embed 6.0, 7 */
 
 #define SO3_SM_OLE_EMBED_CLASSID_60 \
@@ -508,18 +350,10 @@
 
 #define SO3_SM_CLASSID  SO3_SM_CLASSID_60
 
-// #110743#
-#define BF_SO3_SM_CLASSID  BF_SO3_SM_CLASSID_50
-
 #define SO3_OUT_CLASSID \
     0x970b1e82, 0xcf2d, 0x11cf, 0x89, 0xca, 0x00, \
     0x80, 0x29, 0xe4, 0xb0, 0xb1
 
-// #110743#
-#define BF_SO3_OUT_CLASSID \
-    0x970b1e83, 0xcf2d, 0x11cf, 0x89, 0xca, 0x00, \
-    0x80, 0x29, 0xe4, 0xb0, 0xb1
-
 #define SO3_DUMMY_CLASSID \
     0x970b1fff, 0xcf2d, 0x11cf, \
     0x89,0xca,0x00,0x80,0x29,0xe4,0xb0,0xb1
@@ -528,28 +362,14 @@
     0x970b1e81, 0xcf2d, 0x11cf, \
     0x89,0xca,0x00,0x80,0x29,0xe4,0xb0,0xb1
 
-// #110743#
-#define BF_SO3_APPLET_CLASSID \
-    0x970b1e82, 0xcf2d, 0x11cf, \
-    0x89,0xca,0x00,0x80,0x29,0xe4,0xb0,0xb1
 #define SO3_PLUGIN_CLASSID \
     0x4caa7761, 0x6b8b, 0x11cf, \
     0x89,0xca,0x0,0x80,0x29,0xe4,0xb0,0xb1
 
-// #110743#
-#define BF_SO3_PLUGIN_CLASSID \
-    0x4caa7762, 0x6b8b, 0x11cf, \
-    0x89,0xca,0x0,0x80,0x29,0xe4,0xb0,0xb1
-
 #define SO3_IFRAME_CLASSID \
     0x1a8a6701, 0xde58, 0x11cf, \
     0x89, 0xca, 0x0, 0x80, 0x29, 0xe4, 0xb0, 0xb1
 
-// #110743#
-#define BF_SO3_IFRAME_CLASSID \
-    0x1a8a6702, 0xde58, 0x11cf, \
-    0x89, 0xca, 0x0, 0x80, 0x29, 0xe4, 0xb0, 0xb2
-
 #define SO3_GLOBAL_CLASSID \
      0x475198a8, 0x694c, 0x4bd8, \
     0xb0, 0x2f, 0xd9, 0xb7, 0x6b, 0xcf, 0x31, 0x28
diff --git a/tools/inc/tools/bigint.hxx b/tools/inc/tools/bigint.hxx
index 85708569c3a6..ffbc542cd172 100644
--- a/tools/inc/tools/bigint.hxx
+++ b/tools/inc/tools/bigint.hxx
@@ -29,7 +29,6 @@ class SvStream;
 #ifdef _TLBIGINT_INT64
 struct SbxINT64;
 struct SbxUINT64;
-namespace binfilter { class SbxINT64Converter; }
 #endif
 
 #define MAX_DIGITS 8
@@ -38,10 +37,6 @@ class Fraction;
 
 class TOOLS_DLLPUBLIC SAL_WARN_UNUSED BigInt
 {
-#ifdef _TLBIGINT_INT64
-    friend class ::binfilter::SbxINT64Converter;
-#endif
-
 private:
     long            nVal;
     unsigned short  nNum[MAX_DIGITS];
diff --git a/tools/inc/tools/shl.hxx b/tools/inc/tools/shl.hxx
index 404298ac288f..43a5d8a02d3d 100644
--- a/tools/inc/tools/shl.hxx
+++ b/tools/inc/tools/shl.hxx
@@ -79,25 +79,7 @@
 #define SHL_BRUSHITEM   51
 //52 (SHL_SFONTITEM) removed
 
-// #110743#
-// #define SHL_COUNT        53
-// the following added for binary filter project
-// Since an array is created for that values, it is necessary to
-// put them directly behind the defined ones. Else, some space is
-// wasted.
-#define BF_SHL_SVX      53
-#define BF_SHL_ITEM     54
-#define BF_SHL_SVD      55
-#define BF_SHL_EDIT     56
-#define BF_SHL_SCH      57
-#define BF_SHL_SM       58
-#define BF_SHL_CALC     59
-#define BF_SHL_DRAW     60
-#define BF_SHL_WRITER   61
-#define BF_SHL_SVT      62
-#define BF_SHL_SVDDE    63
-
-#define SHL_COUNT       64
+#define SHL_COUNT        53
 
 TOOLS_DLLPUBLIC void** GetAppData( sal_uInt16 nSharedLib );
 
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index d94305abc1fd..2e39f93e27ff 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -1078,28 +1078,9 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl(
         mrAutoStylePool( rASPool ),
         mbHasSeriesLabels( sal_False ),
         mbHasCategoryLabels( sal_False ),
-        mbRowSourceColumns( sal_True )
-        // #110680#
-        // this id depends on the ServiceManager used due to the binary filter stripping.
-        // ,msCLSID( rtl::OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName()))
+        mbRowSourceColumns( sal_True ),
+        msCLSID( rtl::OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName()))
 {
-    // #110680#
-    // changed initialisation for msCLSID. Compare the ServiceInfo name with
-    // the known name of the LegacyServiceManager.
-    Reference<lang::XServiceInfo> xServiceInfo( mrExport.getComponentContext()->getServiceManager(), uno::UNO_QUERY );
-    DBG_ASSERT( xServiceInfo.is(), "XMultiServiceFactory without xServiceInfo (!)" );
-    OUString rdbURL = xServiceInfo->getImplementationName();
-    OUString implLegacyServiceManagerName(  "com.sun.star.comp.office.LegacyServiceManager"  );
-
-    if( rdbURL.equals( implLegacyServiceManagerName ))
-    {
-        msCLSID = OUString( SvGlobalName( BF_SO3_SCH_CLASSID ).GetHexName());
-    }
-    else
-    {
-        msCLSID = OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName());
-    }
-
     msTableName = OUString( "local-table" );
 
     // create factory
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 1f8cd878f271..30c814c2e777 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1083,12 +1083,7 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x
                             {
                                 eShapeType = XmlShapeTypeDrawChartShape;
                             }
-                            else if (
-                                sCLSID.equals(rtl::OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName()))
-                                // #110680#
-                                // same reaction for binfilter
-                                || sCLSID.equals(rtl::OUString( SvGlobalName( BF_SO3_SC_CLASSID ).GetHexName()))
-                                )
+                            else if (sCLSID.equals(rtl::OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName())))
                             {
                                 eShapeType = XmlShapeTypeDrawSheetShape;
                             }
@@ -1134,8 +1129,7 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x
                         rtl::OUString sCLSID;
                         if(xPropSet->getPropertyValue(OUString("CLSID")) >>= sCLSID)
                         {
-                            if( sCLSID.equals(OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName())) ||
-                                sCLSID.equals(OUString( SvGlobalName( BF_SO3_SC_CLASSID ).GetHexName())) )
+                            if( sCLSID.equals(OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName())) )
                             {
                                 eShapeType = XmlShapeTypePresSheetShape;
                             }