3 files changed, 26 insertions, 11 deletions
diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx
index 21c4387c1c..caf33f39a3 100644
--- a/shell/inc/internal/config.hxx
+++ b/shell/inc/internal/config.hxx
@@ -39,8 +39,13 @@
 #include <tchar.h>
 #endif
 
+#ifdef _AMD64_
+#define MODULE_NAME TEXT("shlxthdl_x64.dll")
+#define MODULE_NAME_FILTER TEXT("ooofilt_x64.dll")
+#else
 #define MODULE_NAME TEXT("shlxthdl.dll")
 #define MODULE_NAME_FILTER TEXT("ooofilt.dll")
+#endif
 
 #define COLUMN_HANDLER_DESCRIPTIVE_NAME    TEXT("OpenOffice.org Column Handler")
 #define INFOTIP_HANDLER_DESCRIPTIVE_NAME   TEXT("OpenOffice.org Infotip Handler")
diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx
index 9d5b43117c..aed96260c3 100644
--- a/shell/inc/internal/utilities.hxx
+++ b/shell/inc/internal/utilities.hxx
@@ -47,6 +47,8 @@
 #include "internal/types.hxx"
 
 #include <string>
+#define STRSAFE_NO_DEPRECATE
+#include <strsafe.h>
 
 //---------------------------------
 /** Convert a string to a wstring
@@ -89,4 +91,23 @@ bool HasOnlySpaces(const std::wstring& String);
 LCID LocaleSetToLCID( const LocaleSet_t & Locale );
 #endif
 
+//----------------------------------------------------------
+#ifdef DEBUG
+inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
+{
+    CHAR    buffer[1024];
+    va_list args;
+
+    va_start( args, pFormat );
+    StringCchVPrintfA( buffer, sizeof(buffer), pFormat, args );
+    OutputDebugStringA( buffer );
+}
+#else
+static inline void OutputDebugStringFormat( LPCSTR, ... )
+{
+}
+#endif
+//----------------------------------------------------------
+
+
 #endif
diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx
index 6080d4c5fd..7e47195f08 100644
--- a/shell/inc/internal/xml_parser.hxx
+++ b/shell/inc/internal/xml_parser.hxx
@@ -31,11 +31,7 @@
 #ifndef _XML_PARSER_HXX_
 #define _XML_PARSER_HXX_
 
-#ifdef SYSTEM_EXPAT
 #include <expat.h>
-#else
-#include <external/expat/xmlparse.h>
-#endif
 #include <stdexcept>
 
 //-----------------------------------------------------
@@ -76,9 +72,6 @@ public:
     xml_parser(const XML_Char* EncodingName = 0);
 
     //########################################################
-    xml_parser(const XML_Char* EncodingName, XML_Char NamespaceSeparator);
-
-    //########################################################
     ~xml_parser();
 
     //########################################################
@@ -126,10 +119,6 @@ public:
     /**	Returns the currently used document handler or null if 
         no document handler was set before.	*/
     i_xml_parser_event_handler* get_document_handler() const;
-
-    //############################################
-    void set_encoding(const XML_Char* Encoding);
-
 private:
     
     void init();