--- binfilter/bf_basic/source/comp/codegen.cxx.old	2007-03-15 16:07:02.000000000 +0100
+++ binfilter/bf_basic/source/comp/codegen.cxx	2007-11-16 19:19:12.000000000 +0100
@@ -531,13 +531,8 @@ PCodeBuffConvertor<T,S>::convert()
 	m_nCnvtdSize = static_cast<S>( aTrnsfrmer.buffer().GetSize() );
 }
 
-void NeverRunsEver()
-{
-    // force instatiation of templates... I dunno why, but I have to do
-	// this to force instatiation of the template. Otherwise using the template
-	// in another code module results in link errors :-(
-	PCodeBuffConvertor< UINT16, UINT32 > aInst1(0,0);	
-	PCodeBuffConvertor< UINT32, UINT16 > aInst2(0,0);	
-}
+// instantiate for types needed in SbiImage::Load and SbiImage::Save
+template class PCodeBuffConvertor<UINT16, UINT32 >;
+template class PCodeBuffConvertor<UINT32, UINT16>;
 
 }
--- binfilter/filter/source/bf_offwrp/bf_wrapper.cxx.old	2007-07-17 14:17:15.000000000 +0200
+++ binfilter/filter/source/bf_offwrp/bf_wrapper.cxx	2007-11-16 20:39:17.000000000 +0100
@@ -60,8 +60,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 
-#define DEFINE_CONST_UNICODE(CONSTASCII)        UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII##))
-
 static SwDLL*				pSwDLL = 0L;
 static SdDLL*				pSdDLL = 0L;
 static ScDLL*				pScDLL = 0L;
--- binfilter/inc/bf_sw/flypos.hxx.old	2005-09-09 18:00:57.000000000 +0200
+++ binfilter/inc/bf_sw/flypos.hxx	2007-11-16 20:16:26.000000000 +0100
@@ -70,4 +70,4 @@ typedef SwPosFlyFrm* SwPosFlyFrmPtr;
 SV_DECL_PTRARR_SORT( SwPosFlyFrms, SwPosFlyFrmPtr, 0, 40 )
 
 } //namespace binfilter
-#endif _FLYPOS_HXX
+#endif // _FLYPOS_HXX
--- binfilter/bf_svx/source/inc/fmstatic.hxx.old	2005-09-08 08:04:54.000000000 +0200
+++ binfilter/bf_svx/source/inc/fmstatic.hxx	2007-11-16 20:10:08.000000000 +0100
@@ -86,5 +86,5 @@ inline ConstAsciiString::operator const 
 
 
 }//end of namespace binfilter
-#endif _FM_STATIC_HXX_
+#endif // _FM_STATIC_HXX_
 
--- binfilter/bf_xmloff/source/forms/formcellbinding.hxx.old	2006-10-28 03:47:40.000000000 +0200
+++ binfilter/bf_xmloff/source/forms/formcellbinding.hxx	2007-11-16 20:32:07.000000000 +0100
@@ -299,4 +299,4 @@ namespace xmloff
 //............................................................................
 
 }//end of namespace binfilter
-#endif XMLOFF_FORMS_FORMCELLBINDING
+#endif // XMLOFF_FORMS_FORMCELLBINDING
--- binfilter/inc/bf_xmloff/nmspmap.hxx.old	2007-01-02 19:52:42.000000000 +0100
+++ binfilter/inc/bf_xmloff/nmspmap.hxx	2007-11-16 19:28:59.000000000 +0100
@@ -36,6 +36,8 @@
 #ifndef _XMLOFF_NMSPMAP_HXX
 #define _XMLOFF_NMSPMAP_HXX
 
+#include <limits.h>
+
 #ifndef __SGI_STL_HASH_MAP
 #include <hash_map>
 #endif
--- binfilter/inc/bf_xmloff/PropertySetInfoHash.hxx.old	2005-09-09 19:12:49.000000000 +0200
+++ binfilter/inc/bf_xmloff/PropertySetInfoHash.hxx	2007-11-16 19:26:51.000000000 +0100
@@ -35,6 +35,8 @@
 #ifndef _XMLOFF_PROPERTYSETINFOHASH_HXX
 #define _XMLOFF_PROPERTYSETINFOHASH_HXX
 
+#include <cstring>
+
 #ifndef _XMLOFF_PROPERTYSETINFOKEY_HXX
 #include <bf_xmloff/PropertySetInfoKey.hxx>
 #endif
--- binfilter/bf_sd/source/ui/inc/sdstring.hrc.old	2006-10-27 20:31:24.000000000 +0200
+++ binfilter/bf_sd/source/ui/inc/sdstring.hrc	2007-11-16 20:00:45.000000000 +0100
@@ -35,6 +35,10 @@
 #include <bf_sfx2/sfx.hrc>
 #define SID_SD_STRING_START			RID_APP_START+300
 
+#undef STR_LINESTYLE
+#undef STR_COLOR
+#undef STR_HATCH
+#undef STR_CHANGE
 
 #define STR_GRADIENT				SID_SD_STRING_START+1
 #define STR_DESC_GRADIENT			SID_SD_STRING_START+2
--- binfilter/bf_sch/source/core/sch_chartdoc.cxx.old	2006-10-27 19:22:24.000000000 +0200
+++ binfilter/bf_sch/source/core/sch_chartdoc.cxx	2007-11-16 19:49:40.000000000 +0100
@@ -81,7 +81,6 @@
 #include "docshell.hxx"
 #endif
 #define ITEMID_FONT        EE_CHAR_FONTINFO
-#define ITEMID_COLOR       EE_CHAR_COLOR
 #define ITEMID_FONTHEIGHT  EE_CHAR_FONTHEIGHT
 
 #include "glob.hrc"
--- binfilter/inc/bf_svx/svdstr.hrc.old	2006-10-28 06:11:59.000000000 +0200
+++ binfilter/inc/bf_svx/svdstr.hrc	2007-11-16 20:06:50.000000000 +0100
@@ -77,7 +77,6 @@
 
 #define STR_LayerBegin               (STR_UndoEnd+1)
 #define STR_StandardLayerName        (STR_LayerBegin +0)
-#define STR_LayerEnd                 (STR_StandardLayerName)
 //changed by jmeng begin
 #define STR_LayerEnd                  (STR_LayerBegin +0)
 //changed by jmeng end
--- binfilter/bf_sw/source/core/sw3io/sw3imp.hxx.old	2007-01-02 18:54:42.000000000 +0100
+++ binfilter/bf_sw/source/core/sw3io/sw3imp.hxx	2007-11-16 20:18:46.000000000 +0100
@@ -497,7 +497,7 @@ public:
 
 #ifndef PRODUCT
 	BYTE			  *pRefSdrObjects;
-#endif;
+#endif
 
 	Sw3IoImp( Sw3Io& );
    ~Sw3IoImp();
--- binfilter/bf_sw/source/filter/sw6/sw6par.hxx.old	2006-11-20 13:38:58.000000000 +0100
+++ binfilter/bf_sw/source/filter/sw6/sw6par.hxx	2007-11-16 20:20:35.000000000 +0100
@@ -229,4 +229,4 @@ public:
 
 
 } //namespace binfilter
-#endif _SW6PAR_HXX
+#endif // _SW6PAR_HXX
--- binfilter/inc/bf_sw/TextCursorHelper.hxx.old	2005-09-09 17:45:23.000000000 +0200
+++ binfilter/inc/bf_sw/TextCursorHelper.hxx	2007-11-16 20:14:14.000000000 +0100
@@ -63,6 +63,6 @@ public:
 };
 
 } //namespace binfilter
-#endif _SW_TEXTCURSORHELPER_HXX
+#endif // _SW_TEXTCURSORHELPER_HXX
 
 
--- binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx.old	2007-01-02 19:13:15.000000000 +0100
+++ binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx	2007-11-16 20:30:22.000000000 +0100
@@ -42,8 +42,10 @@
 #include <rtl/memory.h>
 
 #if OSL_DEBUG_LEVEL == 0
+#ifndef NDEBUG
 #define NDEBUG
 #endif
+#endif
 #include <assert.h>
 
 #include "attrlist.hxx"
