CWS-TOOLING: integrate CWS changefileheader2

44 files changed, 376 insertions, 504 deletions

diff --git a/desktop/win32/source/applauncher/launcher.cxx b/desktop/win32/source/applauncher/launcher.cxx
index 107f4db0cab9..386fb7500655 100644
--- a/desktop/win32/source/applauncher/launcher.cxx
+++ b/desktop/win32/source/applauncher/launcher.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: launcher.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/applauncher/makefile.mk b/desktop/win32/source/applauncher/makefile.mk
index 278c8e23e95f..4285476475ca 100644
--- a/desktop/win32/source/applauncher/makefile.mk
+++ b/desktop/win32/source/applauncher/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.12 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/applauncher/ooo/makefile.mk b/desktop/win32/source/applauncher/ooo/makefile.mk
index ad4c7c96b705..9c60ad1b48e4 100644
--- a/desktop/win32/source/applauncher/ooo/makefile.mk
+++ b/desktop/win32/source/applauncher/ooo/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/applauncher/ooo/verinfo.rc b/desktop/win32/source/applauncher/ooo/verinfo.rc
index b96dc400c54d..ce698ba80333 100644
--- a/desktop/win32/source/applauncher/ooo/verinfo.rc
+++ b/desktop/win32/source/applauncher/ooo/verinfo.rc
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2009 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/desktop/win32/source/applauncher/sbase.cxx b/desktop/win32/source/applauncher/sbase.cxx
index db4b992f2d6d..8f50963ca3ff 100644
--- a/desktop/win32/source/applauncher/sbase.cxx
+++ b/desktop/win32/source/applauncher/sbase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sbase.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/applauncher/scalc.cxx b/desktop/win32/source/applauncher/scalc.cxx
index ea8b1b464654..5795cb91d491 100644
--- a/desktop/win32/source/applauncher/scalc.cxx
+++ b/desktop/win32/source/applauncher/scalc.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: scalc.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/applauncher/sdraw.cxx b/desktop/win32/source/applauncher/sdraw.cxx
index e2b47d461c5b..63061aa4994b 100644
--- a/desktop/win32/source/applauncher/sdraw.cxx
+++ b/desktop/win32/source/applauncher/sdraw.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sdraw.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/applauncher/simpress.cxx b/desktop/win32/source/applauncher/simpress.cxx
index 3305a04fa751..c3ff3f697225 100644
--- a/desktop/win32/source/applauncher/simpress.cxx
+++ b/desktop/win32/source/applauncher/simpress.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: simpress.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/applauncher/smath.cxx b/desktop/win32/source/applauncher/smath.cxx
index ee81897bc499..c5574cdb26be 100644
--- a/desktop/win32/source/applauncher/smath.cxx
+++ b/desktop/win32/source/applauncher/smath.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: smath.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/applauncher/sweb.cxx b/desktop/win32/source/applauncher/sweb.cxx
index 6490fc0522e0..a8728f0a1f72 100644
--- a/desktop/win32/source/applauncher/sweb.cxx
+++ b/desktop/win32/source/applauncher/sweb.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sweb.cxx,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/applauncher/swriter.cxx b/desktop/win32/source/applauncher/swriter.cxx
index 058e72fbe8e2..21919e0f3bca 100644
--- a/desktop/win32/source/applauncher/swriter.cxx
+++ b/desktop/win32/source/applauncher/swriter.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: swriter.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/applauncher/verinfo.rc b/desktop/win32/source/applauncher/verinfo.rc
index f1e1bbcefe87..0db55c58c4b2 100644
--- a/desktop/win32/source/applauncher/verinfo.rc
+++ b/desktop/win32/source/applauncher/verinfo.rc
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2009 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/desktop/win32/source/extendloaderenvironment.cxx b/desktop/win32/source/extendloaderenvironment.cxx
index e5b33f5aa2be..0092f04549f9 100644
--- a/desktop/win32/source/extendloaderenvironment.cxx
+++ b/desktop/win32/source/extendloaderenvironment.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: extendloaderenvironment.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/extendloaderenvironment.hxx b/desktop/win32/source/extendloaderenvironment.hxx
index f819047401c9..ba90a1b7bd7e 100644
--- a/desktop/win32/source/extendloaderenvironment.hxx
+++ b/desktop/win32/source/extendloaderenvironment.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: extendloaderenvironment.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/guiloader/genericloader.cxx b/desktop/win32/source/guiloader/genericloader.cxx
index f190c6fd4468..1322c196d8a0 100644
--- a/desktop/win32/source/guiloader/genericloader.cxx
+++ b/desktop/win32/source/guiloader/genericloader.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: genericloader.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/guiloader/makefile.mk b/desktop/win32/source/guiloader/makefile.mk
index ff2a3ac1b0e1..5bb1c523ff19 100644
--- a/desktop/win32/source/guiloader/makefile.mk
+++ b/desktop/win32/source/guiloader/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/guistdio/guistdio.cxx b/desktop/win32/source/guistdio/guistdio.cxx
index af0503bbe9c9..4a0518a75736 100644
--- a/desktop/win32/source/guistdio/guistdio.cxx
+++ b/desktop/win32/source/guistdio/guistdio.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: guistdio.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc
index 024b456efa99..7f2bbe9002d8 100644
--- a/desktop/win32/source/guistdio/guistdio.inc
+++ b/desktop/win32/source/guistdio/guistdio.inc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: guistdio.inc,v $
- * $Revision: 1.3.86.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/guistdio/makefile.mk b/desktop/win32/source/guistdio/makefile.mk
index 24772fb1ea52..660a48bcdca9 100644
--- a/desktop/win32/source/guistdio/makefile.mk
+++ b/desktop/win32/source/guistdio/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/guistdio/unopkgio.cxx b/desktop/win32/source/guistdio/unopkgio.cxx
index 71adec3914d3..59701d08e1ff 100644
--- a/desktop/win32/source/guistdio/unopkgio.cxx
+++ b/desktop/win32/source/guistdio/unopkgio.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unopkgio.cxx,v $
- * $Revision: 1.3.86.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/lwrapa.cxx b/desktop/win32/source/lwrapa.cxx
index 1827f7ec419e..0d1931aafb75 100644
--- a/desktop/win32/source/lwrapa.cxx
+++ b/desktop/win32/source/lwrapa.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lwrapa.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/lwrapw.cxx b/desktop/win32/source/lwrapw.cxx
index 5b7a3f50874d..734ae4497a39 100644
--- a/desktop/win32/source/lwrapw.cxx
+++ b/desktop/win32/source/lwrapw.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lwrapw.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/makefile.mk b/desktop/win32/source/makefile.mk
index ccb165398c18..564ba319eb56 100644
--- a/desktop/win32/source/makefile.mk
+++ b/desktop/win32/source/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/officeloader/makefile.mk b/desktop/win32/source/officeloader/makefile.mk
index 8700867f8a04..10758727b743 100644
--- a/desktop/win32/source/officeloader/makefile.mk
+++ b/desktop/win32/source/officeloader/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx
index 3f5af626e0fc..f36bfc134ded 100644
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: officeloader.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/rebase/Resource.h b/desktop/win32/source/rebase/Resource.h
index 2ebbc5c5bfb7..b8ad7b0f824a 100644
--- a/desktop/win32/source/rebase/Resource.h
+++ b/desktop/win32/source/rebase/Resource.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: Resource.h,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/rebase/makefile.mk b/desktop/win32/source/rebase/makefile.mk
index dbab5a5d0921..724ea0edf465 100644
--- a/desktop/win32/source/rebase/makefile.mk
+++ b/desktop/win32/source/rebase/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/rebase/rebase.cxx b/desktop/win32/source/rebase/rebase.cxx
index e651ad0affcc..98d31a337d4f 100644
--- a/desktop/win32/source/rebase/rebase.cxx
+++ b/desktop/win32/source/rebase/rebase.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: md5.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,164 +24,164 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-

-#include "precompiled_desktop.hxx"

-#define UNICODE

-#define _UNICODE

-

-#define WIN32_LEAN_AND_MEAN

-#if defined _MSC_VER

-#pragma warning(push, 1)

-#endif

-#include <windows.h>

-#include <shellapi.h>

-#include <imagehlp.h>

-#include <wchar.h>

-#if defined _MSC_VER

-#pragma warning(pop)

-#endif

-

-#include <time.h>

-#include "sal/config.h"

-#include "tools/pathutils.hxx"

-

-#define MY_LENGTH(s) (sizeof (s) / sizeof *(s) - 1)

-#define MY_STRING(s) (s), MY_LENGTH(s)

-

-const int   FORMAT_MESSAGE_SIZE = 4096;

-const DWORD PE_Signature        = 0x00004550;

-const DWORD BASEVIRTUALADDRESS  = 0x10000000;

-

-namespace

-{

-

-bool IsValidHandle( HANDLE handle )

-{

-    return ((NULL != handle) && (INVALID_HANDLE_VALUE != handle));

-}

-

-void fail() 

-{

-    LPWSTR buf = NULL;

-    FormatMessageW(

-        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL,

-        GetLastError(), 0, reinterpret_cast< LPWSTR >(&buf), 0, NULL);

-    MessageBoxW(NULL, buf, NULL, MB_OK | MB_ICONERROR);

-    LocalFree(buf);

-    TerminateProcess(GetCurrentProcess(), 255);

-}

-

-bool rebaseImage( wchar_t* pszFilePath, ULONG nNewImageBase)

-{

-    ULONG ulOldImageSize;

-    ULONG_PTR lpOldImageBase;

-    ULONG ulNewImageSize;

-    ULONG_PTR lpNewImageBase  = nNewImageBase;

-    ULONG     ulDateTimeStamp = 0;

-    bool      bResult(false);

-    

-    char cszFilePath[_MAX_PATH+1] = {0};

-    int nResult = WideCharToMultiByte(CP_ACP, 0, pszFilePath, -1, cszFilePath, _MAX_PATH, NULL, NULL);

-    

-    if (nResult != 0)

-    {

-        BOOL bResult = ReBaseImage(

-            cszFilePath,

-            "",

-            TRUE,

-            FALSE,

-            FALSE,

-            0,

-            &ulOldImageSize,

-            &lpOldImageBase,

-            &ulNewImageSize,

-            &lpNewImageBase,

-            ulDateTimeStamp );

-    }

-

-    return bResult;

-}

-

-wchar_t* getBrandPath(wchar_t * path)

-{

-    DWORD n = GetModuleFileNameW(NULL, path, MAX_PATH);

-    if (n == 0 || n >= MAX_PATH) {

-        exit(EXIT_FAILURE);

-    }

-    return tools::filename(path);

-}

-

-void rebaseImagesInFolder( wchar_t* pszFolder, DWORD nNewImageBase )

-{

-    wchar_t szPattern[MAX_PATH];

-    wchar_t *lpLastSlash = wcsrchr( pszFolder, '\\' );

-    if ( lpLastSlash )

-    {

-        size_t len = lpLastSlash - pszFolder + 1;

-        wcsncpy( szPattern, pszFolder, len );

-        wcsncpy( szPattern + len, TEXT("*.dll"), sizeof(szPattern)/sizeof(szPattern[0]) - len );

-    }

-

-    WIN32_FIND_DATA aFindFileData;

-    HANDLE  hFind = FindFirstFile( szPattern, &aFindFileData );

-

-    if ( IsValidHandle(hFind) )

-    {

-        BOOL fSuccess = false;

-

-        do

-        {

-            wchar_t szLibFilePath[MAX_PATH];

-            wchar_t *lpLastSlash = wcsrchr( pszFolder, '\\' );

-            if ( lpLastSlash )

-            {

-                size_t len = lpLastSlash - pszFolder + 1;

-                wcsncpy( szLibFilePath, pszFolder, len );

-                wcsncpy( szLibFilePath + len, aFindFileData.cFileName, sizeof(szLibFilePath)/sizeof(szLibFilePath[0]) - len );

-            }

-

-            rebaseImage( szLibFilePath, nNewImageBase );

-            fSuccess = FindNextFile( hFind, &aFindFileData );

-        }

-        while ( fSuccess );

-

-        FindClose( hFind );

-    }

-}

-

-}

-

-extern "C" int APIENTRY WinMain( HINSTANCE, HINSTANCE, LPSTR, int )

-{

-    wchar_t path[MAX_PATH];

-    

-    wchar_t * pathEnd = getBrandPath(path);

-    

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"")) == NULL)

-        fail();

-    rebaseImagesInFolder(path, BASEVIRTUALADDRESS);

-    

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link")) == NULL)

-        fail();

-    pathEnd = tools::resolveLink(path);

-    

-    if ( pathEnd == NULL )

-        return 0;

-

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\program\\")) == NULL)

-        fail();

-    rebaseImagesInFolder(path, BASEVIRTUALADDRESS);

-    

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) == NULL)

-        fail();

-    pathEnd = tools::resolveLink(path);

-    

-    if ( pathEnd == NULL )

-        return 0;

-    

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\bin\\")) == NULL)

-        fail();

-    rebaseImagesInFolder(path, BASEVIRTUALADDRESS);

-

-    return 0;

-}

+
+#include "precompiled_desktop.hxx"
+#define UNICODE
+#define _UNICODE
+
+#define WIN32_LEAN_AND_MEAN
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
+#include <windows.h>
+#include <shellapi.h>
+#include <imagehlp.h>
+#include <wchar.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+
+#include <time.h>
+#include "sal/config.h"
+#include "tools/pathutils.hxx"
+
+#define MY_LENGTH(s) (sizeof (s) / sizeof *(s) - 1)
+#define MY_STRING(s) (s), MY_LENGTH(s)
+
+const int   FORMAT_MESSAGE_SIZE = 4096;
+const DWORD PE_Signature        = 0x00004550;
+const DWORD BASEVIRTUALADDRESS  = 0x10000000;
+
+namespace
+{
+
+bool IsValidHandle( HANDLE handle )
+{
+    return ((NULL != handle) && (INVALID_HANDLE_VALUE != handle));
+}
+
+void fail()
+{
+    LPWSTR buf = NULL;
+    FormatMessageW(
+        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL,
+        GetLastError(), 0, reinterpret_cast< LPWSTR >(&buf), 0, NULL);
+    MessageBoxW(NULL, buf, NULL, MB_OK | MB_ICONERROR);
+    LocalFree(buf);
+    TerminateProcess(GetCurrentProcess(), 255);
+}
+
+bool rebaseImage( wchar_t* pszFilePath, ULONG nNewImageBase)
+{
+    ULONG ulOldImageSize;
+    ULONG_PTR lpOldImageBase;
+    ULONG ulNewImageSize;
+    ULONG_PTR lpNewImageBase  = nNewImageBase;
+    ULONG     ulDateTimeStamp = 0;
+    bool      bResult(false);
+
+    char cszFilePath[_MAX_PATH+1] = {0};
+    int nResult = WideCharToMultiByte(CP_ACP, 0, pszFilePath, -1, cszFilePath, _MAX_PATH, NULL, NULL);
+
+    if (nResult != 0)
+    {
+        BOOL bResult = ReBaseImage(
+            cszFilePath,
+            "",
+            TRUE,
+            FALSE,
+            FALSE,
+            0,
+            &ulOldImageSize,
+            &lpOldImageBase,
+            &ulNewImageSize,
+            &lpNewImageBase,
+            ulDateTimeStamp );
+    }
+
+    return bResult;
+}
+
+wchar_t* getBrandPath(wchar_t * path)
+{
+    DWORD n = GetModuleFileNameW(NULL, path, MAX_PATH);
+    if (n == 0 || n >= MAX_PATH) {
+        exit(EXIT_FAILURE);
+    }
+    return tools::filename(path);
+}
+
+void rebaseImagesInFolder( wchar_t* pszFolder, DWORD nNewImageBase )
+{
+    wchar_t szPattern[MAX_PATH];
+    wchar_t *lpLastSlash = wcsrchr( pszFolder, '\\' );
+    if ( lpLastSlash )
+    {
+        size_t len = lpLastSlash - pszFolder + 1;
+        wcsncpy( szPattern, pszFolder, len );
+        wcsncpy( szPattern + len, TEXT("*.dll"), sizeof(szPattern)/sizeof(szPattern[0]) - len );
+    }
+
+    WIN32_FIND_DATA aFindFileData;
+    HANDLE  hFind = FindFirstFile( szPattern, &aFindFileData );
+
+    if ( IsValidHandle(hFind) )
+    {
+        BOOL fSuccess = false;
+
+        do
+        {
+            wchar_t szLibFilePath[MAX_PATH];
+            wchar_t *lpLastSlash = wcsrchr( pszFolder, '\\' );
+            if ( lpLastSlash )
+            {
+                size_t len = lpLastSlash - pszFolder + 1;
+                wcsncpy( szLibFilePath, pszFolder, len );
+                wcsncpy( szLibFilePath + len, aFindFileData.cFileName, sizeof(szLibFilePath)/sizeof(szLibFilePath[0]) - len );
+            }
+
+            rebaseImage( szLibFilePath, nNewImageBase );
+            fSuccess = FindNextFile( hFind, &aFindFileData );
+        }
+        while ( fSuccess );
+
+        FindClose( hFind );
+    }
+}
+
+}
+
+extern "C" int APIENTRY WinMain( HINSTANCE, HINSTANCE, LPSTR, int )
+{
+    wchar_t path[MAX_PATH];
+
+    wchar_t * pathEnd = getBrandPath(path);
+
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"")) == NULL)
+        fail();
+    rebaseImagesInFolder(path, BASEVIRTUALADDRESS);
+
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link")) == NULL)
+        fail();
+    pathEnd = tools::resolveLink(path);
+
+    if ( pathEnd == NULL )
+        return 0;
+
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\program\\")) == NULL)
+        fail();
+    rebaseImagesInFolder(path, BASEVIRTUALADDRESS);
+
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) == NULL)
+        fail();
+    pathEnd = tools::resolveLink(path);
+
+    if ( pathEnd == NULL )
+        return 0;
+
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\bin\\")) == NULL)
+        fail();
+    rebaseImagesInFolder(path, BASEVIRTUALADDRESS);
+
+    return 0;
+}
diff --git a/desktop/win32/source/rebase/rebasegui.cxx b/desktop/win32/source/rebase/rebasegui.cxx
index feba7556b74c..99585c105b64 100644
--- a/desktop/win32/source/rebase/rebasegui.cxx
+++ b/desktop/win32/source/rebase/rebasegui.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: md5.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,174 +24,174 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-

-#include "precompiled_desktop.hxx"

-

-#define  UNICODE    1

-#define _UNICODE    1

-

-#ifndef _WINDOWS_

-#   define WIN32_LEAN_AND_MEAN

-#if defined _MSC_VER

-#pragma warning(push, 1)

-#endif

-#   include <windows.h>

-#   include <shellapi.h>

-#   include <wchar.h>

-#if defined _MSC_VER

-#pragma warning(pop)

-#endif

-#endif

-

-#include "Resource.h"

-#include <time.h>

-#include "sal/config.h"

-#include "tools/pathutils.hxx"

-

-const DWORD PE_Signature = 0x00004550;

-

-#define MY_LENGTH(s)        (sizeof (s) / sizeof *(s) - 1)

-#define MY_STRING(s)        (s), MY_LENGTH(s)

-#define MAX_STR_CAPTION     256

-#define MAX_TEXT_LENGTH     1024

-

-static void failPath(wchar_t* pszAppTitle, wchar_t* pszMsg)

-{

-    MessageBoxW(NULL, pszMsg, pszAppTitle, MB_OK | MB_ICONERROR);

-    TerminateProcess(GetCurrentProcess(), 255);

-}

-

-static void fail() 

-{

-    LPWSTR buf = NULL;

-    FormatMessageW(

-        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL,

-        GetLastError(), 0, reinterpret_cast< LPWSTR >(&buf), 0, NULL);

-    MessageBoxW(NULL, buf, NULL, MB_OK | MB_ICONERROR);

-    LocalFree(buf);

-    TerminateProcess(GetCurrentProcess(), 255);

-}

-

-static LPVOID getVirtualBaseAddress( wchar_t* pszFilePath )

-{

-    HANDLE                hFile;

-    HANDLE                hFileMapping;

-    LPVOID                lpFileBase = 0;

-    PIMAGE_DOS_HEADER     lpDosHeader;

-    PIMAGE_NT_HEADERS     lpNTHeader;

-

-    hFile = CreateFile(pszFilePath, 

-                       GENERIC_READ, FILE_SHARE_READ, NULL,

-                       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,

-                       0);

-                    

-    if ( hFile == INVALID_HANDLE_VALUE )

-    {   

-        return NULL;

-    }

-    

-    hFileMapping = CreateFileMapping(hFile, NULL, PAGE_READONLY, 0, 0, NULL);

-    if ( hFileMapping == 0 )

-    {   

-        CloseHandle(hFile);

-        return NULL;

-    }

-    

-    lpFileBase = MapViewOfFile(hFileMapping, FILE_MAP_READ, 0, 0, 0);

-    if ( lpFileBase == 0 )

-    {

-        CloseHandle(hFileMapping);

-        CloseHandle(hFile);

-        return NULL;

-    }

-

-    lpDosHeader = (PIMAGE_DOS_HEADER)lpFileBase;

-    if ( lpDosHeader->e_magic == IMAGE_DOS_SIGNATURE )

-    { 

-        lpNTHeader = (PIMAGE_NT_HEADERS)((char*)lpDosHeader + lpDosHeader->e_lfanew);

-        if (lpNTHeader->Signature == PE_Signature )

-            lpFileBase = reinterpret_cast<LPVOID>( lpNTHeader->OptionalHeader.ImageBase );

-    }

-    

-    UnmapViewOfFile(lpFileBase);

-    CloseHandle(hFileMapping);

-    CloseHandle(hFile);

-    

-    return lpFileBase;

-}

-

-static bool checkImageVirtualBaseAddress(wchar_t* pszFilePath, LPVOID lpVBA)

-{

-    LPVOID lpImageVBA = getVirtualBaseAddress(pszFilePath);

-    if ( lpImageVBA == lpVBA )

-        return true;

-    else

-        return false;

-}

-

-static wchar_t* getBrandPath(wchar_t * pszPath)

-{

-    DWORD n = GetModuleFileNameW(NULL, pszPath, MAX_PATH);

-    if (n == 0 || n >= MAX_PATH) {

-        exit(EXIT_FAILURE);

-    }

-    return tools::filename(pszPath);

-}

-

-extern "C" int APIENTRY WinMain( HINSTANCE hInst, HINSTANCE, LPSTR, int )

-{

-    wchar_t* pAppTitle = new wchar_t[ MAX_STR_CAPTION ];

-             pAppTitle[0]  = '\0';

-    LoadString( hInst, IDS_APP_TITLE, pAppTitle, MAX_STR_CAPTION );

-

-    wchar_t* pTextServer = new wchar_t[ MAX_TEXT_LENGTH ];

-             pTextServer[0]  = '\0';

-    LoadString( hInst, IDS_MSG_OPTIMIZED_FOR_SERVER, pTextServer, MAX_TEXT_LENGTH );

-

-    wchar_t* pTextClient = new wchar_t[ MAX_TEXT_LENGTH ];

-             pTextClient[0]  = '\0';

-    LoadString( hInst, IDS_MSG_OPTIMIZED_FOR_CLIENT, pTextClient, MAX_TEXT_LENGTH );

-

-    wchar_t* pTextNoInstallation = new wchar_t[ MAX_TEXT_LENGTH ];

-             pTextNoInstallation[0]  = '\0';

-    LoadString( hInst, IDS_MSG_NO_INSTALLATION_FOUND, pTextNoInstallation, MAX_TEXT_LENGTH );

-    

-    LPVOID  VBA = (void*)0x10000000;

-    wchar_t path[MAX_PATH];

-    

-    wchar_t * pathEnd = getBrandPath(path);

-    

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"libxml2.dll")) == NULL)

-        fail();

-    bool bFast = checkImageVirtualBaseAddress(path, VBA);

-    

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link")) == NULL)

-        fail();

-    pathEnd = tools::resolveLink(path);

-

-    if (pathEnd == NULL)

-        failPath(pAppTitle, pTextNoInstallation);

-

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\program\\vclmi.dll")) == NULL)

-        fail();

-    bFast &= checkImageVirtualBaseAddress(path, VBA);

-

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) == NULL)

-        fail();

-    pathEnd = tools::resolveLink(path);

-    

-    if (pathEnd == NULL)

-        failPath(pAppTitle, pTextNoInstallation);

-    

-    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\bin\\sal3.dll")) == NULL)

-        fail();

-    bFast &= checkImageVirtualBaseAddress(path, VBA);

-

-    const wchar_t* pOutput = pTextClient;

-    if (!bFast)

-        pOutput = pTextServer;

-        

-    MessageBoxW( NULL, pOutput, pAppTitle, MB_OK );

-    

-    return 0;

-}

+
+#include "precompiled_desktop.hxx"
+
+#define  UNICODE    1
+#define _UNICODE    1
+
+#ifndef _WINDOWS_
+#   define WIN32_LEAN_AND_MEAN
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
+#   include <windows.h>
+#   include <shellapi.h>
+#   include <wchar.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+#endif
+
+#include "Resource.h"
+#include <time.h>
+#include "sal/config.h"
+#include "tools/pathutils.hxx"
+
+const DWORD PE_Signature = 0x00004550;
+
+#define MY_LENGTH(s)        (sizeof (s) / sizeof *(s) - 1)
+#define MY_STRING(s)        (s), MY_LENGTH(s)
+#define MAX_STR_CAPTION     256
+#define MAX_TEXT_LENGTH     1024
+
+static void failPath(wchar_t* pszAppTitle, wchar_t* pszMsg)
+{
+    MessageBoxW(NULL, pszMsg, pszAppTitle, MB_OK | MB_ICONERROR);
+    TerminateProcess(GetCurrentProcess(), 255);
+}
+
+static void fail()
+{
+    LPWSTR buf = NULL;
+    FormatMessageW(
+        FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL,
+        GetLastError(), 0, reinterpret_cast< LPWSTR >(&buf), 0, NULL);
+    MessageBoxW(NULL, buf, NULL, MB_OK | MB_ICONERROR);
+    LocalFree(buf);
+    TerminateProcess(GetCurrentProcess(), 255);
+}
+
+static LPVOID getVirtualBaseAddress( wchar_t* pszFilePath )
+{
+    HANDLE                hFile;
+    HANDLE                hFileMapping;
+    LPVOID                lpFileBase = 0;
+    PIMAGE_DOS_HEADER     lpDosHeader;
+    PIMAGE_NT_HEADERS     lpNTHeader;
+
+    hFile = CreateFile(pszFilePath,
+                       GENERIC_READ, FILE_SHARE_READ, NULL,
+                       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,
+                       0);
+
+    if ( hFile == INVALID_HANDLE_VALUE )
+    {
+        return NULL;
+    }
+
+    hFileMapping = CreateFileMapping(hFile, NULL, PAGE_READONLY, 0, 0, NULL);
+    if ( hFileMapping == 0 )
+    {
+        CloseHandle(hFile);
+        return NULL;
+    }
+
+    lpFileBase = MapViewOfFile(hFileMapping, FILE_MAP_READ, 0, 0, 0);
+    if ( lpFileBase == 0 )
+    {
+        CloseHandle(hFileMapping);
+        CloseHandle(hFile);
+        return NULL;
+    }
+
+    lpDosHeader = (PIMAGE_DOS_HEADER)lpFileBase;
+    if ( lpDosHeader->e_magic == IMAGE_DOS_SIGNATURE )
+    {
+        lpNTHeader = (PIMAGE_NT_HEADERS)((char*)lpDosHeader + lpDosHeader->e_lfanew);
+        if (lpNTHeader->Signature == PE_Signature )
+            lpFileBase = reinterpret_cast<LPVOID>( lpNTHeader->OptionalHeader.ImageBase );
+    }
+
+    UnmapViewOfFile(lpFileBase);
+    CloseHandle(hFileMapping);
+    CloseHandle(hFile);
+
+    return lpFileBase;
+}
+
+static bool checkImageVirtualBaseAddress(wchar_t* pszFilePath, LPVOID lpVBA)
+{
+    LPVOID lpImageVBA = getVirtualBaseAddress(pszFilePath);
+    if ( lpImageVBA == lpVBA )
+        return true;
+    else
+        return false;
+}
+
+static wchar_t* getBrandPath(wchar_t * pszPath)
+{
+    DWORD n = GetModuleFileNameW(NULL, pszPath, MAX_PATH);
+    if (n == 0 || n >= MAX_PATH) {
+        exit(EXIT_FAILURE);
+    }
+    return tools::filename(pszPath);
+}
+
+extern "C" int APIENTRY WinMain( HINSTANCE hInst, HINSTANCE, LPSTR, int )
+{
+    wchar_t* pAppTitle = new wchar_t[ MAX_STR_CAPTION ];
+             pAppTitle[0]  = '\0';
+    LoadString( hInst, IDS_APP_TITLE, pAppTitle, MAX_STR_CAPTION );
+
+    wchar_t* pTextServer = new wchar_t[ MAX_TEXT_LENGTH ];
+             pTextServer[0]  = '\0';
+    LoadString( hInst, IDS_MSG_OPTIMIZED_FOR_SERVER, pTextServer, MAX_TEXT_LENGTH );
+
+    wchar_t* pTextClient = new wchar_t[ MAX_TEXT_LENGTH ];
+             pTextClient[0]  = '\0';
+    LoadString( hInst, IDS_MSG_OPTIMIZED_FOR_CLIENT, pTextClient, MAX_TEXT_LENGTH );
+
+    wchar_t* pTextNoInstallation = new wchar_t[ MAX_TEXT_LENGTH ];
+             pTextNoInstallation[0]  = '\0';
+    LoadString( hInst, IDS_MSG_NO_INSTALLATION_FOUND, pTextNoInstallation, MAX_TEXT_LENGTH );
+
+    LPVOID  VBA = (void*)0x10000000;
+    wchar_t path[MAX_PATH];
+
+    wchar_t * pathEnd = getBrandPath(path);
+
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"libxml2.dll")) == NULL)
+        fail();
+    bool bFast = checkImageVirtualBaseAddress(path, VBA);
+
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link")) == NULL)
+        fail();
+    pathEnd = tools::resolveLink(path);
+
+    if (pathEnd == NULL)
+        failPath(pAppTitle, pTextNoInstallation);
+
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\program\\vclmi.dll")) == NULL)
+        fail();
+    bFast &= checkImageVirtualBaseAddress(path, VBA);
+
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) == NULL)
+        fail();
+    pathEnd = tools::resolveLink(path);
+
+    if (pathEnd == NULL)
+        failPath(pAppTitle, pTextNoInstallation);
+
+    if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\bin\\sal3.dll")) == NULL)
+        fail();
+    bFast &= checkImageVirtualBaseAddress(path, VBA);
+
+    const wchar_t* pOutput = pTextClient;
+    if (!bFast)
+        pOutput = pTextServer;
+
+    MessageBoxW( NULL, pOutput, pAppTitle, MB_OK );
+
+    return 0;
+}
diff --git a/desktop/win32/source/rwrapa.cxx b/desktop/win32/source/rwrapa.cxx
index e3000dcbcff7..de57b2b3f2dc 100644
--- a/desktop/win32/source/rwrapa.cxx
+++ b/desktop/win32/source/rwrapa.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rwrapa.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/rwrapw.cxx b/desktop/win32/source/rwrapw.cxx
index bd40fbba03c4..712d2f954efc 100644
--- a/desktop/win32/source/rwrapw.cxx
+++ b/desktop/win32/source/rwrapw.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: rwrapw.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/setup/Resource.h b/desktop/win32/source/setup/Resource.h
index 99ef720451f3..a40d72994429 100644
--- a/desktop/win32/source/setup/Resource.h
+++ b/desktop/win32/source/setup/Resource.h
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/desktop/win32/source/setup/makefile.mk b/desktop/win32/source/setup/makefile.mk
index d26c9c953861..d9105724035c 100644
--- a/desktop/win32/source/setup/makefile.mk
+++ b/desktop/win32/source/setup/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.12 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/setup/setup.cpp b/desktop/win32/source/setup/setup.cpp
index 6a43f20ebb22..edc27751b110 100755
--- a/desktop/win32/source/setup/setup.cpp
+++ b/desktop/win32/source/setup/setup.cpp
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: setup.cpp,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/setup/setup.hxx b/desktop/win32/source/setup/setup.hxx
index 169254db87ab..1744b1aa427a 100644
--- a/desktop/win32/source/setup/setup.hxx
+++ b/desktop/win32/source/setup/setup.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: setup.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/setup/setup_a.cxx b/desktop/win32/source/setup/setup_a.cxx
index 91f4fdc9a141..2264e96dd919 100644
--- a/desktop/win32/source/setup/setup_a.cxx
+++ b/desktop/win32/source/setup/setup_a.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: setup_a.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/setup/setup_help.hxx b/desktop/win32/source/setup/setup_help.hxx
index c3ccdaf53cbc..2a638ead0811 100644
--- a/desktop/win32/source/setup/setup_help.hxx
+++ b/desktop/win32/source/setup/setup_help.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: setup_help.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/setup/setup_main.cxx b/desktop/win32/source/setup/setup_main.cxx
index 6c96bde46b12..2750c87ae08a 100644
--- a/desktop/win32/source/setup/setup_main.cxx
+++ b/desktop/win32/source/setup/setup_main.cxx
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/desktop/win32/source/setup/setup_main.hxx b/desktop/win32/source/setup/setup_main.hxx
index 28200fcae757..525d5579a256 100644
--- a/desktop/win32/source/setup/setup_main.hxx
+++ b/desktop/win32/source/setup/setup_main.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: setup_main.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/setup/setup_w.cxx b/desktop/win32/source/setup/setup_w.cxx
index 67270cae7c0b..a21dbd685f46 100644
--- a/desktop/win32/source/setup/setup_w.cxx
+++ b/desktop/win32/source/setup/setup_w.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: setup_w.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/sowrapper.cxx b/desktop/win32/source/sowrapper.cxx
index ad13747f51c2..4b0292be41a6 100644
--- a/desktop/win32/source/sowrapper.cxx
+++ b/desktop/win32/source/sowrapper.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: sowrapper.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/unoinfo.cxx b/desktop/win32/source/unoinfo.cxx
index d4458212c3c3..c2a98802ccd3 100644
--- a/desktop/win32/source/unoinfo.cxx
+++ b/desktop/win32/source/unoinfo.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: unoinfo.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/wrappera.cxx b/desktop/win32/source/wrappera.cxx
index efc3df21d660..e121ce12172a 100644
--- a/desktop/win32/source/wrappera.cxx
+++ b/desktop/win32/source/wrappera.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wrappera.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/desktop/win32/source/wrapperw.cxx b/desktop/win32/source/wrapperw.cxx
index 4c7d47e8abf3..700f79f60355 100644
--- a/desktop/win32/source/wrapperw.cxx
+++ b/desktop/win32/source/wrapperw.cxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: wrapperw.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify