diff -urN ooo_SRC680_m236_src.orig/canvas/source/directx/makefile.mk ooo_SRC680_m236_src/canvas/source/directx/makefile.mk
--- ooo_SRC680_m236_src.orig/canvas/source/directx/makefile.mk	2007-11-10 16:40:15.000000000 +0100
+++ ooo_SRC680_m236_src/canvas/source/directx/makefile.mk	2007-11-10 16:41:15.000000000 +0100
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: hr $ $Date: 2007/11/01 18:00:52 $
+#   last change: $Author: obo $ $Date: 2007/11/09 10:41:11 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -116,12 +116,13 @@
 SHL1STDLIBS += gdi32.lib
 SHL1STDLIBS += ddraw.lib
 SHL1STDLIBS += gdiplus.lib
-.IF "$(CCNUMVER)" <= "001399999999"
+
+.IF "$(USE_DIRECTX5)"!=""
 SHL1STDLIBS += d3dx.lib
-.ELSE
-SHL1STDLIBS += d3dx10.lib    # net 2005
-SHL1STDLIBS += dxguid.lib    # net 2005
-.ENDIF
+.ELSE # "$(USE_DIRECTX5)
+SHL1STDLIBS += d3dx9.lib     # directx 9
+SHL1STDLIBS += dxguid.lib    # directx 9
+.ENDIF # "$(USE_DIRECTX5)
 
 .IF "$(dx_debug_images)"!="" || "$(DX_DEBUG_IMAGES)"!=""
 SHL1STDLIBS += imdebug.lib
diff -urN ooo_SRC680_m236_src.orig/config_office/set_soenv.in ooo_SRC680_m236_src/config_office/set_soenv.in
--- ooo_SRC680_m236_src.orig/config_office/set_soenv.in	2007-11-03 11:52:46.000000000 +0100
+++ ooo_SRC680_m236_src/config_office/set_soenv.in	2007-11-10 16:41:59.000000000 +0100
@@ -83,7 +83,8 @@
      $LD_LIBRARY_PATH, $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, 
      $SOLARINC, $LOCALINI, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $PERL, 
      $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME, 
-     $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $NO_HIDS, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
+     $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $NO_HIDS, $TEMP,
+     $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
      $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB,
 	 $PROEXT,
      $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS);
@@ -617,6 +618,7 @@
       $CSC_PATH       = PosixFormat('@CSC_PATH@');
       $PSDK_HOME      = PosixFormat('@PSDK_HOME@');
       $DIRECTXSDK_LIB = PosixFormat('@DIRECTXSDK_LIB@');
+      $USE_DIRECTX5   = "";
       $FRAME_HOME     = PosixFormat('@FRAME_HOME@');
       $USE_NEW_SDK    = "TRUE";
       $CPUNAME        = "INTEL";
@@ -1134,6 +1136,13 @@
                         $ps.'$COMPATH'.$LIB;
       if ( '@ENABLE_DIRECTX@' ne "" ) {
           $ILIB   .= $ps.$DIRECTXSDK_LIB;
+          if ( '@COMEX@' eq "10" ) {
+              # .NET2003 provides and compiles against DirectX 5 libraries and is
+              # hereby still Win9x compatible.
+              $ILIB .= $ps.'$COMPATH'.$ds.'PlatformSDK'.$LIB;
+              $USE_DIRECTX5 = "YES";
+          }
+
       }
    }
    elsif ( $COM eq "GCC" )
@@ -1452,6 +1461,11 @@
                          $I.'$COMPATH'.$ds."include";
       if ( '@ENABLE_DIRECTX@' ne "" ) {
           $SOLARINC   .= $I.PosixFormat('@DIRECTXSDK_HOME@').$INCLUDE;
+          if ( '@COMEX@' eq "10" ) {
+              # .NET2003 provides and compiles against DirectX 5 libraries and is
+              # hereby still Win9x compatible.
+              $SOLARINC .= $I.'$COMPATH'.$ds.'PlatformSDK'.$ds."include";
+          }
       }
    }
    elsif ( $COM eq "GCC" )
@@ -1754,6 +1768,7 @@
 {  ToFile( "CYGWIN_PATH",       $CYGWIN_PATH,       "e" );
    ToFile( "PSDK_HOME",         $PSDK_HOME,         "e" );
    ToFile( "DIRECTXSDK_LIB",    $DIRECTXSDK_LIB,    "e" );
+   ToFile( "USE_DIRECTX5",      $USE_DIRECTX5,      "e" );
    ToFile( "ATL_LIB",           $ATL_LIB,         "e" );
    if ( $MINGW ne "yes" )
    {  ToFile( "ATL_INCLUDE",       $ATL_INCLUDE,       "e" );