Some minor clean up.

13 files changed, 29 insertions, 70 deletions

diff --git a/binfilter/bf_offmgr/source/offapp/app/offmgr_app.cxx b/binfilter/bf_offmgr/source/offapp/app/offmgr_app.cxx
index f6e72c3b5..61b486a6c 100644
--- a/binfilter/bf_offmgr/source/offapp/app/offmgr_app.cxx
+++ b/binfilter/bf_offmgr/source/offapp/app/offmgr_app.cxx
@@ -36,7 +36,9 @@
 #include <bf_svx/svdoutl.hxx>
 #include <bf_svx/svxerr.hxx>
 #include <com/sun/star/container/XSet.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
+#include <cppuhelper/factory.hxx>
 #include <bf_svtools/pathoptions.hxx>
 #include <bf_svx/fmobjfac.hxx>
 #include <bf_svx/siimport.hxx>
diff --git a/binfilter/bf_svx/source/xoutdev/svx__xfont.cxx b/binfilter/bf_svx/source/xoutdev/svx__xfont.cxx
index 0e963a1a7..fb2b6d660 100644
--- a/binfilter/bf_svx/source/xoutdev/svx__xfont.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx__xfont.cxx
@@ -35,9 +35,10 @@
 #include "xoutx.hxx"
 #include "outliner.hxx"
 
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
-#include <com/sun/star/i18n/CharacterIteratorMode.hdl>
+#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include "unolingu.hxx"
 #include <legacysmgr/legacy_binfilters_smgr.hxx>
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_breakit.cxx b/binfilter/bf_sw/source/core/bastyp/sw_breakit.cxx
index 1bb4b90e6..c1fbd9284 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_breakit.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_breakit.cxx
@@ -31,7 +31,8 @@
 #pragma hdrstop
 #endif
 
-#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <unotools/localedatawrapper.hxx>
 #include <bf_svx/unolingu.hxx>
 #include <bf_svx/scripttypeitem.hxx>
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_checkit.cxx b/binfilter/bf_sw/source/core/bastyp/sw_checkit.cxx
index a8a2dae07..fcbf345ec 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_checkit.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_checkit.cxx
@@ -32,6 +32,7 @@
 #endif
 
 #include <checkit.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <legacysmgr/legacy_binfilters_smgr.hxx>
 namespace binfilter {
 using namespace ::com::sun::star::uno;
diff --git a/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx b/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
index 6be3059a4..317a8d282 100644
--- a/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
+++ b/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
@@ -118,12 +118,6 @@ Reference< XInterface >  SAL_CALL bf_OfficeWrapper_CreateInstance( const Referen
     return (XComponent*)0;
 }
 
-extern "C"
-{
-    //added for #i31251#
-    void legcy_setBinfilterInitState(void);
-}
-
 bf_OfficeWrapper::bf_OfficeWrapper( const Reference < XMultiServiceFactory >& )
     : pApp( new OfficeApplication )
     , aListeners( aMutex )
@@ -158,8 +152,6 @@ bf_OfficeWrapper::bf_OfficeWrapper( const Reference < XMultiServiceFactory >& )
         pSmDLL = new SmDLL;
         SmDLL::LibInit();
     }
-    //added i#31251#
-    legcy_setBinfilterInitState();
 }
 
 void SAL_CALL bf_OfficeWrapper::initialize( const Sequence< Any >& ) throw( Exception )
diff --git a/binfilter/inc/bf_sd/build.lst b/binfilter/inc/bf_sd/build.lst
deleted file mode 100644
index fadbbe8d7..000000000
--- a/binfilter/inc/bf_sd/build.lst
+++ /dev/null
@@ -1,20 +0,0 @@
-sd	bf_sd	:	bf_offmgr bf_sc NULL
-sd	bf_sd										usr1	-	all	sd_mkout NULL
-sd	bf_sd\inc									get		-	all	sd_inc NULL
-sd	bf_sd\prj									get		-	all	sd_prj NULL
-sd	bf_sd\jobs									get		-	all	sd_jobs NULL
-sd	bf_sd\source\ui\inc						get		-	all	sd_sinc NULL
-sd	bf_sd\res									get		-	all	sd_res NULL
-sd	bf_sd\res\imagelst							get		-	all	sd_resil NULL
-sd	bf_sd\sdi									nmake	-	all	sd_sdi NULL
-sd	bf_sd\source\ui\func						nmake	-	all	sd_func sd_sdi NULL
-sd	bf_sd\source\ui\view						nmake	-	all	sd_view sd_sdi NULL
-sd	bf_sd\source\ui\app						nmake	-	all	sd_app sd_sdi NULL
-sd	bf_sd\source\ui\dlg						nmake	-	all	sd_dlg sd_sdi NULL
-sd	bf_sd\source\core							nmake	-	all	sd_core sd_sdi NULL
-sd	bf_sd\source\ui\docshell					nmake	-	all	sd_docsh sd_sdi NULL
-sd	bf_sd\source\ui\unoidl						nmake	-	all	sd_unid sd_sdi NULL
-sd	bf_sd\source\filter						nmake	-	all	sd_filt sd_sdi NULL
-sd	bf_sd\source\filter\bin					nmake	-	all	sd_bin NULL
-sd	bf_sd\source\filter\xml					nmake	-	all	sd_xml NULL
-sd	bf_sd\util									nmake	-	all	sd_util sd_app sd_bin sd_core sd_dlg sd_docsh sd_filt sd_func sd_unid sd_view sd_xml NULL
diff --git a/binfilter/inc/legacysmgr/build.lst b/binfilter/inc/legacysmgr/build.lst
deleted file mode 100644
index 876a05599..000000000
--- a/binfilter/inc/legacysmgr/build.lst
+++ /dev/null
@@ -1,4 +0,0 @@
-lg	legacy	:	
-lg	legacy									usr1	-	all	lg_mkout		NULL
-lg	legacysmgr\prj								get		-	all	lg_prj			NULL
-lg	legacysmgr\source\legacy			nmake	-	all	lg_legacy	NULL
diff --git a/binfilter/inc/legacysmgr/legacy_binfilters_smgr.hxx b/binfilter/inc/legacysmgr/legacy_binfilters_smgr.hxx
index a11952367..84ba9810a 100644
--- a/binfilter/inc/legacysmgr/legacy_binfilters_smgr.hxx
+++ b/binfilter/inc/legacysmgr/legacy_binfilters_smgr.hxx
@@ -2,10 +2,16 @@
 #ifndef _LEGACYBINFILTERSMGR_HXX
 #define _LEGACYBINFILTERSMGR_HXX
 
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include "cppuhelper/factory.hxx"
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Reference.hxx"
+#include "sal/types.h"
+
+namespace com { namespace sun { namespace star {
+    namespace lang { class XMultiServiceFactory; }
+    namespace registry { class XRegistryKey; }
+} } }
+
 namespace legacy_binfilters
 {
 
@@ -13,13 +19,10 @@ namespace legacy_binfilters
 
 } //namespace legacy_binfilters
 
-extern "C"
-{
-void SAL_CALL legacy_component_getImplementationEnvironment(
-    sal_Char const ** ppEnvTypeName, uno_Environment ** ppEnv );
-void * SAL_CALL legacysmgr_component_getFactory(
-    sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * smgr, ::com::sun::star::registry::XRegistryKey * key );
-}
+extern "C" void * SAL_CALL legacysmgr_component_getFactory(
+    char const * implName, com::sun::star::lang::XMultiServiceFactory * smgr,
+    com::sun::star::registry::XRegistryKey * key);
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/legacysmgr/source/legacy/gcc3.map b/binfilter/legacysmgr/source/legacy/gcc3.map
index 7ab94d328..db0d1a891 100644
--- a/binfilter/legacysmgr/source/legacy/gcc3.map
+++ b/binfilter/legacysmgr/source/legacy/gcc3.map
@@ -2,7 +2,6 @@ UDK_3_0_0 {
     global:
         legacysmgr_component_getFactory;
         _ZN17legacy_binfilters30getLegacyProcessServiceFactoryEv;
-        legcy_setBinfilterInitState;
     local:
     *;
 };
diff --git a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
index 51d838c4c..952e2784e 100644
--- a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
+++ b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx
@@ -2023,7 +2023,6 @@ void * SAL_CALL legacysmgr_component_getFactory(
                 rtl::OUString rdbUrl(
                     RTL_CONSTASCII_USTRINGPARAM(
                         "$BRAND_BASE_DIR/program/legacy_binfilters.rdb"));
-                fprintf(stderr, "1: trying to open %s\n", rtl::OUStringToOString(rdbUrl, RTL_TEXTENCODING_UTF8).getStr());
                 rtl::Bootstrap::expandMacros(rdbUrl); //TODO: detect failure
                 xSimReg->open(
                     rdbUrl, sal_True /* read-only */, sal_False /* ! create */ );
@@ -2034,7 +2033,6 @@ void * SAL_CALL legacysmgr_component_getFactory(
                     RTL_CONSTASCII_USTRINGPARAM(
                         "$BRAND_BASE_DIR/legacy_binfilters.rdb"));
                 rtl::Bootstrap::expandMacros(rdbUrl);
-                fprintf(stderr, "2: trying to open %s\n", rtl::OUStringToOString(rdbUrl, RTL_TEXTENCODING_UTF8).getStr());
                 xSimReg->open(
                     rdbUrl, sal_True /* read-only */, sal_False /* ! create */ );
             }
@@ -2087,28 +2085,17 @@ void * SAL_CALL legacysmgr_component_getFactory(
     }
     catch (const Exception & exc)
     {
-#if OSL_DEBUG_LEVEL > 1
-        OUStringBuffer buf( 128 );
-        buf.appendAscii(
-            RTL_CONSTASCII_STRINGPARAM(
-                "### unexpected exception occurred in binfilters "
-                "component_getFactory(): ") );
-        buf.append( exc.Message );
-        OString cstr(
-            OUStringToOString(
-                buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) );
-        OSL_FAIL( cstr.getStr() );
-#else
-        (void)exc;
-#endif
+        (void) exc; // avoid warnings
+        OSL_FAIL(
+            OSL_FORMAT(
+                ("unexpected exception in legacysmgr_component_getFactory:"
+                 " \"%s\""),
+                (rtl::OUStringToOString(exc.Message, RTL_TEXTENCODING_UTF8).
+                 getStr())));
     }
     return 0;
 }
 
-// added by jmeng for i31251 begin
-static sal_Bool  IsBinfilterInit =  sal_False;
-void legcy_setBinfilterInitState(void){IsBinfilterInit =  sal_True;}
-//added by jmeng for i31251 end
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/legacysmgr/source/legacy/mingw_intel.map b/binfilter/legacysmgr/source/legacy/mingw_intel.map
index 7ab94d328..db0d1a891 100644
--- a/binfilter/legacysmgr/source/legacy/mingw_intel.map
+++ b/binfilter/legacysmgr/source/legacy/mingw_intel.map
@@ -2,7 +2,6 @@ UDK_3_0_0 {
     global:
         legacysmgr_component_getFactory;
         _ZN17legacy_binfilters30getLegacyProcessServiceFactoryEv;
-        legcy_setBinfilterInitState;
     local:
     *;
 };
diff --git a/binfilter/legacysmgr/source/legacy/msci.map b/binfilter/legacysmgr/source/legacy/msci.map
index 2f10520a2..c50797a1b 100644
--- a/binfilter/legacysmgr/source/legacy/msci.map
+++ b/binfilter/legacysmgr/source/legacy/msci.map
@@ -2,7 +2,6 @@ UDK_3_0_0 {
     global:
         legacysmgr_component_getFactory;
         getLegacyProcessServiceFactory;
-        legcy_setBinfilterInitState;
     local:
     *;
 };
diff --git a/binfilter/legacysmgr/source/legacy/sols.map b/binfilter/legacysmgr/source/legacy/sols.map
index ce9c4d212..43a044cc2 100644
--- a/binfilter/legacysmgr/source/legacy/sols.map
+++ b/binfilter/legacysmgr/source/legacy/sols.map
@@ -2,7 +2,6 @@ UDK_3_0_0 {
     global:
         legacysmgr_component_getFactory;
         __1cRlegacy_binfiltersbEgetLegacyProcessServiceFactory6F_rknDcomDsunEstarDunoJReference4n0DElangUXMultiServiceFactory____;
-        legcy_setBinfilterInitState;
     local:
     *;
 };