[Libreoffice-commits] .: Branch 'integration/dev300_m101' - binfilter/bf_sw binfilter/filter binfilter/inc

[Norbert Thiebaud]

 binfilter/bf_sw/source/core/inc/pamtyp.hxx               |    1 +
 binfilter/filter/source/bf_migrate/bf_migrateexports.cxx |    4 +---
 binfilter/inc/bf_sw/docary.hxx                           |    1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b707ea03af297ef8fdc1e40fa2a2ac30ee7f0098
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Mar 10 01:04:32 2011 -0600

    fix mis-merge in binfilter

diff --git a/binfilter/bf_sw/source/core/inc/pamtyp.hxx b/binfilter/bf_sw/source/core/inc/pamtyp.hxx
index 888d1b0..668a523 100644
--- a/binfilter/bf_sw/source/core/inc/pamtyp.hxx
+++ b/binfilter/bf_sw/source/core/inc/pamtyp.hxx
@@ -31,6 +31,7 @@
 
 #include <bf_svtools/bf_solar.h>
 
+#include <unotools/textsearch.hxx>
 #include <pam.hxx>
 #include <node.hxx>
 #include <tools/string.hxx>
diff --git a/binfilter/filter/source/bf_migrate/bf_migrateexports.cxx b/binfilter/filter/source/bf_migrate/bf_migrateexports.cxx
index 6880a7f..c60b263 100644
--- a/binfilter/filter/source/bf_migrate/bf_migrateexports.cxx
+++ b/binfilter/filter/source/bf_migrate/bf_migrateexports.cxx
@@ -54,9 +54,7 @@ void SAL_CALL component_getImplementationEnvironment(const sal_Char** ppEnvTypeN
 }
 
 //==================================================================================================
-#endif
-            legacysmgr_component_writeInfo
-                ( reinterpret_cast<XMultiServiceFactory*>( pServiceManager), reinterpret_cast<XRegistryKey*> (pRegistryKey) );
+
 void* SAL_CALL component_getFactory(const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey)
 {
     void* pRet = 0;
diff --git a/binfilter/inc/bf_sw/docary.hxx b/binfilter/inc/bf_sw/docary.hxx
index 56acec0..c679d80 100644
--- a/binfilter/inc/bf_sw/docary.hxx
+++ b/binfilter/inc/bf_sw/docary.hxx
@@ -30,6 +30,7 @@
 
 #include <bf_svtools/bf_solar.h>
 
+namespace binfilter {
 class SwFieldType;
 class SwFrmFmt;
 class SwCharFmt;