binfilter: remove some traces

Change-Id: I5b03dcb5d1f8c73c7a308e7ae209cc7872f18c61

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];

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 );
 

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

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;
                             }