changefileheader2: #i10000#: convert files with CR/LF characters to CR only

12 files changed, 742 insertions, 742 deletions

diff --git a/migrationanalysis/prj/build.lst b/migrationanalysis/prj/build.lst
index 37f2413afcc1..54f0af004187 100644
--- a/migrationanalysis/prj/build.lst
+++ b/migrationanalysis/prj/build.lst
@@ -1,7 +1,7 @@
-at  migrationanalysis   :   soltools shell NULL

-at	migrationanalysis\src\msokill           nmake    -  w  at_src NULL

-at  migrationanalysis\src\driver_docs       nmake    -  w  at_src_driver NULL

-at  migrationanalysis\src\resources         nmake    -  w  at_src_resources NULL

-at  migrationanalysis\src\wizard            nmake    -  w  at_src_wizard NULL

-at  migrationanalysis\util                  nmake    -  w  at_util at_src.w at_src_driver.w at_src_resources.w at_src_wizard.w NULL

-

+at  migrationanalysis   :   soltools shell NULL
+at	migrationanalysis\src\msokill           nmake    -  w  at_src NULL
+at  migrationanalysis\src\driver_docs       nmake    -  w  at_src_driver NULL
+at  migrationanalysis\src\resources         nmake    -  w  at_src_resources NULL
+at  migrationanalysis\src\wizard            nmake    -  w  at_src_wizard NULL
+at  migrationanalysis\util                  nmake    -  w  at_util at_src.w at_src_driver.w at_src_resources.w at_src_wizard.w NULL
+
diff --git a/migrationanalysis/prj/d.lst b/migrationanalysis/prj/d.lst
index 9d07d2e618fa..226e3980d1a9 100644
--- a/migrationanalysis/prj/d.lst
+++ b/migrationanalysis/prj/d.lst
@@ -1,3 +1,3 @@
-..\%__SRC%\bin\ProAnalysisWizard\ProAnalysisWizard.exe %_DEST%\bin%_EXT%\ProAnalysisWizard.exe

-..\%__SRC%\bin\ProAnalysisWizard.zip %_DEST%\bin%_EXT%\ProAnalysisWizard.zip

-

+..\%__SRC%\bin\ProAnalysisWizard\ProAnalysisWizard.exe %_DEST%\bin%_EXT%\ProAnalysisWizard.exe
+..\%__SRC%\bin\ProAnalysisWizard.zip %_DEST%\bin%_EXT%\ProAnalysisWizard.zip
+
diff --git a/migrationanalysis/src/driver_docs/makefile.mk b/migrationanalysis/src/driver_docs/makefile.mk
index 70f370574055..23b8d5f7b330 100644
--- a/migrationanalysis/src/driver_docs/makefile.mk
+++ b/migrationanalysis/src/driver_docs/makefile.mk
@@ -1,5 +1,5 @@
-#*************************************************************************

-#

+#*************************************************************************
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -23,105 +23,105 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#*************************************************************************

-

-PRJ=..$/..

-

-PRJNAME=migrationanalysis

-TARGET=driverdocs

-

-# --- Settings -----------------------------------------------------

-

-.INCLUDE :	settings.mk

-

-# --- Files --------------------------------------------------------

-

-PAW_DOCDEST:=$(BIN)$/ProAnalysisWizard$/Resources

-PAW_DATDEST:=$(BIN)$/ProAnalysisWizard$/Resources$/lang

-

-PAW_DRIVER_DOCS:= \

-    $(PAW_DOCDEST)$/_OOoDocAnalysisExcelDriver.xls \

-    $(PAW_DOCDEST)$/_OOoDocAnalysisWordDriver.doc \

-    $(PAW_DOCDEST)$/_OOoDocAnalysisPPTDriver.ppt

-

-PAW_DRIVER_DOCS_SRC:= \

-    .$/PAW$/_OOoDocAnalysisExcelDriver.xls \

-    .$/PAW$/_OOoDocAnalysisWordDriver.doc \

-    .$/PAW$/_OOoDocAnalysisPPTDriver.ppt

-

-PAW_DAT_FILES= \

-    $(foreach,i,$(alllangiso) $(PAW_DATDEST)$/$i.dat)

-

-DAT_DATA_FILE=allstrings.ulf

-DAT_DON_FILE_PAW=$(MISC)$/$(DAT_DATA_FILE).paw

-

-ULFFILES=$(DAT_DATA_FILE)

-.IF "$(WITH_LANG)"!=""

-ULFDIR:=$(COMMONMISC)$/$(TARGET)

-.ELSE			# "$(WITH_LANG)"!=""

-ULFDIR:=.

-.ENDIF			# "$(WITH_LANG)"!=""

-

-COMMON_SRC:= \

-    .$/sources$/AnalysisDriver.bas \

-    .$/sources$/CollectedFiles.cls \

-    .$/sources$/CommonMigrationAnalyser.bas \

-    .$/sources$/CommonPreparation.bas \

-    .$/sources$/DocumentAnalysis.cls \

-    .$/sources$/FileTypeAssociation.cls \

-    .$/sources$/IssueInfo.cls \

-    .$/sources$/LocalizeResults.bas \

-    .$/sources$/PrepareInfo.cls \

-    .$/sources$/StringDataManager.cls \

-    .$/sources$/Stripped_OOoDocAnalysisExcelDriver.xls \

-    .$/sources$/Stripped_OOoDocAnalysisPPTDriver.ppt \

-    .$/sources$/Stripped_OOoDocAnalysisWordDriver.doc \

-    .$/sources$/common_res.bas \

-    .$/sources$/results_res.bas

-

-EXCEL_SRC:= \

-    .$/sources$/excel$/ApplicationSpecific.bas \

-    .$/sources$/excel$/MigrationAnalyser.cls \

-    .$/sources$/excel$/Preparation.bas \

-    .$/sources$/excel$/excel_res.bas

-

-PP_SRC:= \

-    .$/sources$/powerpoint$/ApplicationSpecific.bas \

-    .$/sources$/powerpoint$/MigrationAnalyser.cls \

-    .$/sources$/powerpoint$/Preparation.bas \

-    .$/sources$/powerpoint$/powerpoint_res.bas

-

-WORD_SRC:= \

-    .$/sources$/word$/ApplicationSpecific.bas \

-    .$/sources$/word$/MigrationAnalyser.cls \

-    .$/sources$/word$/Preparation.bas \

-    .$/sources$/word$/word_res.bas

-

-# --- Targets ------------------------------------------------------

-

-.INCLUDE :	target.mk

-

-ALLTAR : $(PAW_DRIVER_DOCS) $(DAT_DON_FILE_PAW)

-

-$(PAW_DRIVER_DOCS) : .$/PAW$/$$(@:f)

-    -$(MKDIRHIER) $(@:d)

-    $(COPY) .$/PAW$/$(@:f) $@

-

-$(PAW_DAT_FILES) : $(ULFDIR)$/$(DAT_DATA_FILE)

-    -$(MKDIRHIER) $(@:d)

-    $(TOUCH) $@

-

-$(DAT_DON_FILE_PAW) :  $(PAW_DAT_FILES)

-    @echo --------------------------------

-    @echo building $@

-    -$(MKDIRHIER) $(@:d)

-    @echo making  $(PAW_DAT_FILES)

-    $(PERL) ulf2dat.pl -i $(ULFDIR)$/$(DAT_DATA_FILE) $(PAW_DAT_FILES) && $(TOUCH) $@

-

-.IF "$(VB6_LOCATION)" != ""

-$(PAW_DRIVER_DOCS_SRC) : $(COMMON_SRC) $(EXCEL_SRC) $(PP_SRC) $(WORD_SRC)

-    @echo --------------------------------

-    @echo create driver docs

-    cscript CreateDriverDocs.wsf

-.ENDIF

-

+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=migrationanalysis
+TARGET=driverdocs
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+PAW_DOCDEST:=$(BIN)$/ProAnalysisWizard$/Resources
+PAW_DATDEST:=$(BIN)$/ProAnalysisWizard$/Resources$/lang
+
+PAW_DRIVER_DOCS:= \
+    $(PAW_DOCDEST)$/_OOoDocAnalysisExcelDriver.xls \
+    $(PAW_DOCDEST)$/_OOoDocAnalysisWordDriver.doc \
+    $(PAW_DOCDEST)$/_OOoDocAnalysisPPTDriver.ppt
+
+PAW_DRIVER_DOCS_SRC:= \
+    .$/PAW$/_OOoDocAnalysisExcelDriver.xls \
+    .$/PAW$/_OOoDocAnalysisWordDriver.doc \
+    .$/PAW$/_OOoDocAnalysisPPTDriver.ppt
+
+PAW_DAT_FILES= \
+    $(foreach,i,$(alllangiso) $(PAW_DATDEST)$/$i.dat)
+
+DAT_DATA_FILE=allstrings.ulf
+DAT_DON_FILE_PAW=$(MISC)$/$(DAT_DATA_FILE).paw
+
+ULFFILES=$(DAT_DATA_FILE)
+.IF "$(WITH_LANG)"!=""
+ULFDIR:=$(COMMONMISC)$/$(TARGET)
+.ELSE			# "$(WITH_LANG)"!=""
+ULFDIR:=.
+.ENDIF			# "$(WITH_LANG)"!=""
+
+COMMON_SRC:= \
+    .$/sources$/AnalysisDriver.bas \
+    .$/sources$/CollectedFiles.cls \
+    .$/sources$/CommonMigrationAnalyser.bas \
+    .$/sources$/CommonPreparation.bas \
+    .$/sources$/DocumentAnalysis.cls \
+    .$/sources$/FileTypeAssociation.cls \
+    .$/sources$/IssueInfo.cls \
+    .$/sources$/LocalizeResults.bas \
+    .$/sources$/PrepareInfo.cls \
+    .$/sources$/StringDataManager.cls \
+    .$/sources$/Stripped_OOoDocAnalysisExcelDriver.xls \
+    .$/sources$/Stripped_OOoDocAnalysisPPTDriver.ppt \
+    .$/sources$/Stripped_OOoDocAnalysisWordDriver.doc \
+    .$/sources$/common_res.bas \
+    .$/sources$/results_res.bas
+
+EXCEL_SRC:= \
+    .$/sources$/excel$/ApplicationSpecific.bas \
+    .$/sources$/excel$/MigrationAnalyser.cls \
+    .$/sources$/excel$/Preparation.bas \
+    .$/sources$/excel$/excel_res.bas
+
+PP_SRC:= \
+    .$/sources$/powerpoint$/ApplicationSpecific.bas \
+    .$/sources$/powerpoint$/MigrationAnalyser.cls \
+    .$/sources$/powerpoint$/Preparation.bas \
+    .$/sources$/powerpoint$/powerpoint_res.bas
+
+WORD_SRC:= \
+    .$/sources$/word$/ApplicationSpecific.bas \
+    .$/sources$/word$/MigrationAnalyser.cls \
+    .$/sources$/word$/Preparation.bas \
+    .$/sources$/word$/word_res.bas
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :	target.mk
+
+ALLTAR : $(PAW_DRIVER_DOCS) $(DAT_DON_FILE_PAW)
+
+$(PAW_DRIVER_DOCS) : .$/PAW$/$$(@:f)
+    -$(MKDIRHIER) $(@:d)
+    $(COPY) .$/PAW$/$(@:f) $@
+
+$(PAW_DAT_FILES) : $(ULFDIR)$/$(DAT_DATA_FILE)
+    -$(MKDIRHIER) $(@:d)
+    $(TOUCH) $@
+
+$(DAT_DON_FILE_PAW) :  $(PAW_DAT_FILES)
+    @echo --------------------------------
+    @echo building $@
+    -$(MKDIRHIER) $(@:d)
+    @echo making  $(PAW_DAT_FILES)
+    $(PERL) ulf2dat.pl -i $(ULFDIR)$/$(DAT_DATA_FILE) $(PAW_DAT_FILES) && $(TOUCH) $@
+
+.IF "$(VB6_LOCATION)" != ""
+$(PAW_DRIVER_DOCS_SRC) : $(COMMON_SRC) $(EXCEL_SRC) $(PP_SRC) $(WORD_SRC)
+    @echo --------------------------------
+    @echo create driver docs
+    cscript CreateDriverDocs.wsf
+.ENDIF
+
diff --git a/migrationanalysis/src/driver_docs/ulf2dat.pl b/migrationanalysis/src/driver_docs/ulf2dat.pl
index b413fa8b91d8..25b1fe2f7ebc 100644
--- a/migrationanalysis/src/driver_docs/ulf2dat.pl
+++ b/migrationanalysis/src/driver_docs/ulf2dat.pl
@@ -1,8 +1,8 @@
-:

-eval 'exec perl -wS $0 ${1+"$@"}'

-    if 0;

-#*************************************************************************

-#

+:
+eval 'exec perl -wS $0 ${1+"$@"}'
+    if 0;
+#*************************************************************************
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -26,128 +26,128 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#***********************************************************************/

-

-

-#### script id #####

-

-( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;

-

-$id_str = ' $Revision: 1.4.108.1 $ ';

-$id_str =~ /Revision:\s+(\S+)\s+\$/

-  ? ($script_rev = $1) : ($script_rev = "-");

-

-#########################

-#                       #

-#   Globale Variablen   #

-#                       #

-#########################

-

-use Encode;

-use Encode::Alias;

-

-

-my ($in_name, $ID, $new_ID);

-my ($help);

-

-print STDERR "$script_name -- Version: $script_rev\n" ;

-

-&get_options;

-

-if ( $help ) {

-    &usage();

-    exit 0;

-};

-

-

-open IN, "<$in_name" or die "Could not open $in_name for reading $! $^E";

-

-foreach $lang ( keys %files ) 

-{

-    open "F_$lang",">$files{$lang}" or die "Could not open $files{$lang} for writing $! $^E";

-    binmode "F_$lang";

-    $files{$lang} = "F_$lang";

-}

-

-%transunit = ();

-

-while ( <IN> )

-{

-    chomp;

-    $line = $_;

-    $line =~ s/\r$//;

-    # [RID_RESXLS_COST_Print_Area]

-    if ( $line =~ /^\[(.*)\]$/ )

-    {

-        $new_ID = $1;

-        

-        write_transunit();

-        $ID = $new_ID;

-        %transunit = ();

-    }

-    # de = "Druckbereich"

-    elsif ( $line =~ /^(\S*)\s*=\s*\"(.*)\"$/ )

-    {

-        $lang = $1;

-        $string = $2;

-        $transunit{ $lang } = $string;

-    }

-    elsif ( $line !~ /^\s*$/ )

-    {

-        die "unknown lineformat in $in_name: $line\n";

-    }

-}

-write_transunit();

-

-

-sub write_transunit

-{

-    if ( ! $ID )

-    {

-        return;

-    }

-    foreach $lang ( keys %files )

-    {

-        my $string;

-        if ( defined $transunit{ $lang } )

-        {

-            $string = $transunit{ $lang };

-        }

-        else

-        {

-            $string = $transunit{ "en-US" };

-        }

-        

-        my $dat_line = "$ID=$string";

-        Encode::from_to( $dat_line, "utf8", "UTF-16LE");

-        print { $files{$lang} } "$dat_line\015\000\012\000";

-    }       

-}

-

-

-sub get_options {

-    my ($arg,$lang);

-

-    while ($arg = shift @ARGV) {

-        $arg =~ /^-i$/  and $in_name = shift @ARGV and next;

-        $arg =~ /^-help$/  and $help = 1 and next; #show help

-        

-        $arg =~ /.*[\/\\]([^\/\\]*)\.dat$/;

-#       $arg =~ /.*[/\]([^/\]*)\.dat$/;

-        $lang = $1;

-        print "got $lang = $arg\n";

-        $files{ $lang } = $arg;

-    }

-}

-

-

-

-sub usage {

-    print STDERR "\n\n";

-    print STDERR "Syntax:   $script_name [-help|-i <ulf-filename>] <dat-filename> ... \n";

-    print STDERR "Example:  $script_name -i strings.ulf en-US.dat de.dat\n";

-    print STDERR "Options:\n\n";

-    print STDERR "    -i      input ulf file\n";

-    print STDERR "    -help   print this help info\n\n";

-};

-

+#***********************************************************************/
+
+
+#### script id #####
+
+( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
+
+$id_str = ' $Revision: 1.4.108.1 $ ';
+$id_str =~ /Revision:\s+(\S+)\s+\$/
+  ? ($script_rev = $1) : ($script_rev = "-");
+
+#########################
+#                       #
+#   Globale Variablen   #
+#                       #
+#########################
+
+use Encode;
+use Encode::Alias;
+
+
+my ($in_name, $ID, $new_ID);
+my ($help);
+
+print STDERR "$script_name -- Version: $script_rev\n" ;
+
+&get_options;
+
+if ( $help ) {
+    &usage();
+    exit 0;
+};
+
+
+open IN, "<$in_name" or die "Could not open $in_name for reading $! $^E";
+
+foreach $lang ( keys %files )
+{
+    open "F_$lang",">$files{$lang}" or die "Could not open $files{$lang} for writing $! $^E";
+    binmode "F_$lang";
+    $files{$lang} = "F_$lang";
+}
+
+%transunit = ();
+
+while ( <IN> )
+{
+    chomp;
+    $line = $_;
+    $line =~ s/\r$//;
+    # [RID_RESXLS_COST_Print_Area]
+    if ( $line =~ /^\[(.*)\]$/ )
+    {
+        $new_ID = $1;
+
+        write_transunit();
+        $ID = $new_ID;
+        %transunit = ();
+    }
+    # de = "Druckbereich"
+    elsif ( $line =~ /^(\S*)\s*=\s*\"(.*)\"$/ )
+    {
+        $lang = $1;
+        $string = $2;
+        $transunit{ $lang } = $string;
+    }
+    elsif ( $line !~ /^\s*$/ )
+    {
+        die "unknown lineformat in $in_name: $line\n";
+    }
+}
+write_transunit();
+
+
+sub write_transunit
+{
+    if ( ! $ID )
+    {
+        return;
+    }
+    foreach $lang ( keys %files )
+    {
+        my $string;
+        if ( defined $transunit{ $lang } )
+        {
+            $string = $transunit{ $lang };
+        }
+        else
+        {
+            $string = $transunit{ "en-US" };
+        }
+
+        my $dat_line = "$ID=$string";
+        Encode::from_to( $dat_line, "utf8", "UTF-16LE");
+        print { $files{$lang} } "$dat_line\015\000\012\000";
+    }
+}
+
+
+sub get_options {
+    my ($arg,$lang);
+
+    while ($arg = shift @ARGV) {
+        $arg =~ /^-i$/  and $in_name = shift @ARGV and next;
+        $arg =~ /^-help$/  and $help = 1 and next; #show help
+
+        $arg =~ /.*[\/\\]([^\/\\]*)\.dat$/;
+#       $arg =~ /.*[/\]([^/\]*)\.dat$/;
+        $lang = $1;
+        print "got $lang = $arg\n";
+        $files{ $lang } = $arg;
+    }
+}
+
+
+
+sub usage {
+    print STDERR "\n\n";
+    print STDERR "Syntax:   $script_name [-help|-i <ulf-filename>] <dat-filename> ... \n";
+    print STDERR "Example:  $script_name -i strings.ulf en-US.dat de.dat\n";
+    print STDERR "Options:\n\n";
+    print STDERR "    -i      input ulf file\n";
+    print STDERR "    -help   print this help info\n\n";
+};
+
diff --git a/migrationanalysis/src/msokill/StdAfx.cpp b/migrationanalysis/src/msokill/StdAfx.cpp
index 0f1ffe0adec5..a0ae86acbb47 100644
--- a/migrationanalysis/src/msokill/StdAfx.cpp
+++ b/migrationanalysis/src/msokill/StdAfx.cpp
@@ -1,5 +1,5 @@
-/*************************************************************************

- *

+/*************************************************************************
+ *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -23,13 +23,13 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************/

-

-// stdafx.cpp : source file that includes just the standard includes

-//  msokill.pch will be the pre-compiled header

-//  stdafx.obj will contain the pre-compiled type information

-

-#include "stdafx.h"

-

-// TODO: reference any additional headers you need in STDAFX.H

-// and not in this file

+ ************************************************************************/
+
+// stdafx.cpp : source file that includes just the standard includes
+//  msokill.pch will be the pre-compiled header
+//  stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file
diff --git a/migrationanalysis/src/msokill/StdAfx.h b/migrationanalysis/src/msokill/StdAfx.h
index ac8fd27f9861..a1826f7ce4a7 100644
--- a/migrationanalysis/src/msokill/StdAfx.h
+++ b/migrationanalysis/src/msokill/StdAfx.h
@@ -1,5 +1,5 @@
-/*************************************************************************

- *

+/*************************************************************************
+ *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -23,32 +23,32 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************/

-

-/*

- *

- * Description: Put MSO in a state where it can be closed using

- *              automation or kill it completely

- *

- */

-

-#if !defined(AFX_STDAFX_H__12149A50_72AF_409A_9B43_8ACCD98F50CE__INCLUDED_)

-#define AFX_STDAFX_H__12149A50_72AF_409A_9B43_8ACCD98F50CE__INCLUDED_

-

-#if _MSC_VER > 1000

-#pragma once

-#endif // _MSC_VER > 1000

-

-#define WIN32_LEAN_AND_MEAN     // Exclude rarely-used stuff from Windows headers

-

-#include <stdio.h>

-#pragma warning(push, 1)

-#include <windows.h>

-#pragma warning(pop)

-

-// TODO: reference additional headers your program requires here

-

-//{{AFX_INSERT_LOCATION}}

-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.

-

-#endif // !defined(AFX_STDAFX_H__12149A50_72AF_409A_9B43_8ACCD98F50CE__INCLUDED_)

+ ************************************************************************/
+
+/*
+ *
+ * Description: Put MSO in a state where it can be closed using
+ *              automation or kill it completely
+ *
+ */
+
+#if !defined(AFX_STDAFX_H__12149A50_72AF_409A_9B43_8ACCD98F50CE__INCLUDED_)
+#define AFX_STDAFX_H__12149A50_72AF_409A_9B43_8ACCD98F50CE__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#define WIN32_LEAN_AND_MEAN     // Exclude rarely-used stuff from Windows headers
+
+#include <stdio.h>
+#pragma warning(push, 1)
+#include <windows.h>
+#pragma warning(pop)
+
+// TODO: reference additional headers your program requires here
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_STDAFX_H__12149A50_72AF_409A_9B43_8ACCD98F50CE__INCLUDED_)
diff --git a/migrationanalysis/src/msokill/makefile.mk b/migrationanalysis/src/msokill/makefile.mk
index 287d716c5846..918c7c4c7184 100644
--- a/migrationanalysis/src/msokill/makefile.mk
+++ b/migrationanalysis/src/msokill/makefile.mk
@@ -1,5 +1,5 @@
-#*************************************************************************

-#

+#*************************************************************************
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -23,61 +23,61 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#*************************************************************************

-

-PRJ=..$/..

-

-PRJNAME		=	migrationanalysis

-TARGET		=	msokill

-LIBTARGET	=	NO

-TARGETTYPE	=	CUI

-

-ENABLE_EXCEPTIONS	=	TRUE

-

-# --- Settings ------------------------------------------------------------

-

-.INCLUDE : settings.mk

-

-# --- Allgemein -----------------------------------------------------------

-

-OBJFILES= 	$(OBJ)$/msokill.obj \

-            $(OBJ)$/StdAfx.obj

-

-# --- Targets ------------------------------------------------------

-

-UWINAPILIB=

-LIBSALCPPRT=

-

-APP1NOSAL=		TRUE

-APP1TARGET=		msokill

-

-#APP1STDLIB

-STDLIB1=msi.lib\

-    shell32.lib\

-    oleaut32.lib\

-    gdi32.lib\

-    comdlg32.lib\

-    advapi32.lib\

-    comctl32.lib\

-    shlwapi.lib\

-    oledlg.lib\

-    ole32.lib\

-    uuid.lib\

-    oleacc.lib\

-    winspool.lib\

-

-APP1OBJS=		$(OBJFILES)

-

-PAW_RES_DIR:=$(BIN)$/ProAnalysisWizard$/Resources

-PAW_RES_EXE:=$(PAW_RES_DIR)$/$(APP1TARGET).exe

-

-# --- setup --------------------------------------------------------------

-

-.INCLUDE :  target.mk

-

-ALLTAR : $(PAW_RES_EXE)

-

-$(PAW_RES_EXE) : $(BIN)$/$$(@:f)

-    -$(MKDIRHIER) $(@:d)

-    $(COPY) $(BIN)$/$(@:f) $@

-

+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME		=	migrationanalysis
+TARGET		=	msokill
+LIBTARGET	=	NO
+TARGETTYPE	=	CUI
+
+ENABLE_EXCEPTIONS	=	TRUE
+
+# --- Settings ------------------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Allgemein -----------------------------------------------------------
+
+OBJFILES= 	$(OBJ)$/msokill.obj \
+            $(OBJ)$/StdAfx.obj
+
+# --- Targets ------------------------------------------------------
+
+UWINAPILIB=
+LIBSALCPPRT=
+
+APP1NOSAL=		TRUE
+APP1TARGET=		msokill
+
+#APP1STDLIB
+STDLIB1=msi.lib\
+    shell32.lib\
+    oleaut32.lib\
+    gdi32.lib\
+    comdlg32.lib\
+    advapi32.lib\
+    comctl32.lib\
+    shlwapi.lib\
+    oledlg.lib\
+    ole32.lib\
+    uuid.lib\
+    oleacc.lib\
+    winspool.lib\
+
+APP1OBJS=		$(OBJFILES)
+
+PAW_RES_DIR:=$(BIN)$/ProAnalysisWizard$/Resources
+PAW_RES_EXE:=$(PAW_RES_DIR)$/$(APP1TARGET).exe
+
+# --- setup --------------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+ALLTAR : $(PAW_RES_EXE)
+
+$(PAW_RES_EXE) : $(BIN)$/$$(@:f)
+    -$(MKDIRHIER) $(@:d)
+    $(COPY) $(BIN)$/$(@:f) $@
+
diff --git a/migrationanalysis/src/msokill/msokill.cpp b/migrationanalysis/src/msokill/msokill.cpp
index 7ff5a2ec6e58..e848715d935e 100644
--- a/migrationanalysis/src/msokill/msokill.cpp
+++ b/migrationanalysis/src/msokill/msokill.cpp
@@ -1,5 +1,5 @@
-/*************************************************************************

- *

+/*************************************************************************
+ *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -23,237 +23,237 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************/

-

-/*

- * Description: Put MSO in a state where it can be closed using

- *              automation or kill it completely

- */

-

-#include "stdafx.h"

-#include <stdio.h>

-

-

-void KillOffice();

-BOOL KillAppFromWindow(HWND hWnd, char *appName);

-BOOL CloseActiveDialogs();

-void printUsage();

-

-//Callbacks used in closing

-BOOL CALLBACK CloseOfficeDlgProc(HWND hwndChild, LPARAM lParam);

-BOOL CALLBACK CountOfficeDlgProc(HWND hwndChild, LPARAM lParam);

-

-//Global counters for number of windows found

-int gWDDlgCount = 0;

-int gXLDlgCount = 0;

-int gPPDlgCount = 0;

-

-//Dialog window class names for excel, powerpoint and word

-//These are "Best guess" dialog names

-const char *pWordDlg2k  = "bosa_sdm_Microsoft Word 9.0";

-const char *pWordDlg2k3 = "bosa_sdm_Microsoft Office Word";

-const char *pXLDlg2k    = "bosa_sdm_XL9";

-const char *pPPDlg2k    = "#32770";

-const char *pXLDlg2k3   = "bosa_sdm_XL9";

-const char *pPPDlg2k3   = "#32770";

-const char *pGenMSODlg  = "bosa_sdm_Mso96";

-//consider adding - bosa_sdm_Mso96

-

-//Command Line Argument constants

-const char *ARG_HELP  = "--help";

-const char *ARG_KILL  = "--kill";

-const char *ARG_CLOSE = "--close";

-

-//Window class names for MSO apps - if we need to look at other office instances

-//then this list would need to be expanded

-#define NUM_WINDOWCLASSNAMES 4

-char *wndClassName[NUM_WINDOWCLASSNAMES] = {"OpusApp", "XLMAIN", "PP9FrameClass", "PP10FrameClass"};

-

-int main(int argc, char* argv[])

-{

-    if (argc < 2) {

-        printUsage();

-        return 0;

-    }

-

-    if (strcmpi(argv[1], ARG_HELP) == 0) {

-        printUsage();

-        return 0;

-    }

-

-    if (strcmpi(argv[1], ARG_KILL) == 0) {

-        KillOffice();

-        return 0;

-    }

-

-    if (strcmpi(argv[1], ARG_CLOSE) == 0) {

-        CloseActiveDialogs();

-        return 0;

-    }

-

-    return 0;

-}

-

-/*--------------------------------------------------------------

-  Find the MSO window if it is available and explictly kill it

-  MSO apps in this case are Excel, Word and PP

-  Use FindWindow Win32 API to detect if they are available

-

-  -------------------------------------------------------------*/

-void KillOffice() {

-    HWND hWnd;

-

-    for (int i=0;i<NUM_WINDOWCLASSNAMES;i++) {

-        int j = 0;

-        while (((hWnd = FindWindow(wndClassName[i], NULL )) != NULL) && (j < 10)) {

-            KillAppFromWindow(hWnd, wndClassName[i]);

-            j++;

-        }

-    }

-}

-

-/*--------------------------------------------------------------

-  Using window handle, get process handle and try to kill the

-  app. This may not be successful if you do not have enough

-  privileges to kill the app.

-

-  --------------------------------------------------------------*/

-BOOL KillAppFromWindow(

-    HWND hWnd,

-    char *

-#ifdef _DEBUG

-    appName

-#endif

-)

-{

-    BOOL bRet = TRUE;

-

-    if(hWnd == NULL) {

-        //The app doesn't appear to be running

-#ifdef _DEBUG

-        printf("App %s: window not found.\n,", appName);

-#endif

-        bRet = FALSE;

-    } else {        

-        DWORD pid;  // Variable to hold the process ID.

-        DWORD dThread;  // Variable to hold (unused) thread ID.

-        dThread = GetWindowThreadProcessId(hWnd, &pid);

-        HANDLE hProcess; // Handle to existing process

-        

-        hProcess = OpenProcess(SYNCHRONIZE | PROCESS_ALL_ACCESS, TRUE, pid);

-        if (hProcess == NULL) {

-#ifdef _DEBUG

-            printf("App %s : Failed to get process handle",appName);

-#endif

-            bRet = FALSE;

-        } else {

-            if (!TerminateProcess(hProcess, 0)) {

-                LPTSTR lpMsgBuf;

-                FormatMessage( 

-                    FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,

-                    NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),

-                    (LPTSTR) &lpMsgBuf, 0, NULL );

-                printf("%s\n", lpMsgBuf);

-                LocalFree( lpMsgBuf );

-                bRet = FALSE;

-            }

-#ifdef _DEBUG

-            else {

-                printf("Kill %s appears to be successful.\n", appName);

-            }

-#endif

-        }

-    }

-    return bRet;

-}

-

-/*--------------------------------------------------------------

-  Close the dialogs if possible based on their window class

-  Use the EnumChildWindows win32 api for this

-  --------------------------------------------------------------*/

-BOOL CloseActiveDialogs() {

-    char buff[1024];

-

-    gWDDlgCount = 0;

-    gXLDlgCount = 0;

-    gPPDlgCount = 0;

-

-    EnumChildWindows(GetDesktopWindow(), CloseOfficeDlgProc, (LPARAM) 0);

-    sprintf(buff, "Word: %d\tExcel: %d\tPP: %d", gWDDlgCount, gXLDlgCount, gPPDlgCount);

-    return TRUE;

-}

-

-/*--------------------------------------------------------------

-  Callback for EnumChildWindows that sends close message to 

-  any dialogs that match window class of MSO dialogs

-

-  --------------------------------------------------------------*/

-BOOL CALLBACK CloseOfficeDlgProc(HWND hwndChild, LPARAM) 

-{ 

-    //bosa_sdm_Microsoft Word 9.0

-    //bosa_sdm_XL9

-    //#32770 (Dialog)

-

-     char szBuff[4096];

-    if (GetClassName(hwndChild, szBuff, 4096) == 0) {

-        

-    } else {

-        if ((strcmpi(szBuff, pWordDlg2k) == 0) || (strcmpi(szBuff, pWordDlg2k3) == 0)) {

-            gWDDlgCount++;

-            SendMessage(hwndChild, WM_CLOSE, 0, 0);

-        }

-        if (strcmpi(szBuff, pXLDlg2k) == 0) {

-            gXLDlgCount++;

-            SendMessage(hwndChild, WM_CLOSE, 0, 0);

-        }

-        if (strcmpi(szBuff, pPPDlg2k) == 0) {

-            gPPDlgCount++;

-            SendMessage(hwndChild, WM_CLOSE, 0, 0);

-        }

-        if (strcmpi(szBuff, pGenMSODlg) == 0) {

-            SendMessage(hwndChild, WM_CLOSE, 0, 0);

-        }

-    }

- 

-    return TRUE; 

-} 

-

-

-/*--------------------------------------------------------------

-  Callback for EnumChildWindows that counts numnnber of  

-  dialogs that match window class of MSO dialogs

-

-  --------------------------------------------------------------*/

-BOOL CALLBACK CountOfficeDlgProc(HWND hwndChild, LPARAM) 

-{

-     char szBuff[4096];

-    if (GetClassName(hwndChild, szBuff, 4096) == 0) {

-        

-    } else {

-        if ((strcmpi(szBuff, pWordDlg2k) == 0) || (strcmpi(szBuff, pWordDlg2k3) == 0)) {

-            gWDDlgCount++;

-        }

-        if (strcmpi(szBuff, pXLDlg2k) == 0) {

-            gXLDlgCount++;

-        }

-        if (strcmpi(szBuff, pPPDlg2k) == 0) {

-            gPPDlgCount++;

-        }

-    }

-

-    return TRUE; 

-} 

-

-/*--------------------------------------------------------------

-  Simple usage message...

- 

-  -------------------------------------------------------------*/

-void printUsage() {

-    printf("Recovery Assistant Utility - try and put MSO apps in a recoverable state\n");

-    printf("Copyright Sun Microsystems 2008\n");

-    printf("Options:\n");

-    printf("   --help : This message\n");

-    printf("   --close: Attempt to close any open dialogs owned by \n");

-    printf("            MSO apps so Application.Quit() can succeed\n");

-    printf("   --kill : Kill any open MSO apps. Use with caution and only as a last resort\n\n");

+ ************************************************************************/
+
+/*
+ * Description: Put MSO in a state where it can be closed using
+ *              automation or kill it completely
+ */
+
+#include "stdafx.h"
+#include <stdio.h>
+
+
+void KillOffice();
+BOOL KillAppFromWindow(HWND hWnd, char *appName);
+BOOL CloseActiveDialogs();
+void printUsage();
+
+//Callbacks used in closing
+BOOL CALLBACK CloseOfficeDlgProc(HWND hwndChild, LPARAM lParam);
+BOOL CALLBACK CountOfficeDlgProc(HWND hwndChild, LPARAM lParam);
+
+//Global counters for number of windows found
+int gWDDlgCount = 0;
+int gXLDlgCount = 0;
+int gPPDlgCount = 0;
+
+//Dialog window class names for excel, powerpoint and word
+//These are "Best guess" dialog names
+const char *pWordDlg2k  = "bosa_sdm_Microsoft Word 9.0";
+const char *pWordDlg2k3 = "bosa_sdm_Microsoft Office Word";
+const char *pXLDlg2k    = "bosa_sdm_XL9";
+const char *pPPDlg2k    = "#32770";
+const char *pXLDlg2k3   = "bosa_sdm_XL9";
+const char *pPPDlg2k3   = "#32770";
+const char *pGenMSODlg  = "bosa_sdm_Mso96";
+//consider adding - bosa_sdm_Mso96
+
+//Command Line Argument constants
+const char *ARG_HELP  = "--help";
+const char *ARG_KILL  = "--kill";
+const char *ARG_CLOSE = "--close";
+
+//Window class names for MSO apps - if we need to look at other office instances
+//then this list would need to be expanded
+#define NUM_WINDOWCLASSNAMES 4
+char *wndClassName[NUM_WINDOWCLASSNAMES] = {"OpusApp", "XLMAIN", "PP9FrameClass", "PP10FrameClass"};
+
+int main(int argc, char* argv[])
+{
+    if (argc < 2) {
+        printUsage();
+        return 0;
+    }
+
+    if (strcmpi(argv[1], ARG_HELP) == 0) {
+        printUsage();
+        return 0;
+    }
+
+    if (strcmpi(argv[1], ARG_KILL) == 0) {
+        KillOffice();
+        return 0;
+    }
+
+    if (strcmpi(argv[1], ARG_CLOSE) == 0) {
+        CloseActiveDialogs();
+        return 0;
+    }
+
+    return 0;
+}
+
+/*--------------------------------------------------------------
+  Find the MSO window if it is available and explictly kill it
+  MSO apps in this case are Excel, Word and PP
+  Use FindWindow Win32 API to detect if they are available
+
+  -------------------------------------------------------------*/
+void KillOffice() {
+    HWND hWnd;
+
+    for (int i=0;i<NUM_WINDOWCLASSNAMES;i++) {
+        int j = 0;
+        while (((hWnd = FindWindow(wndClassName[i], NULL )) != NULL) && (j < 10)) {
+            KillAppFromWindow(hWnd, wndClassName[i]);
+            j++;
+        }
+    }
+}
+
+/*--------------------------------------------------------------
+  Using window handle, get process handle and try to kill the
+  app. This may not be successful if you do not have enough
+  privileges to kill the app.
+
+  --------------------------------------------------------------*/
+BOOL KillAppFromWindow(
+    HWND hWnd,
+    char *
+#ifdef _DEBUG
+    appName
+#endif
+)
+{
+    BOOL bRet = TRUE;
+
+    if(hWnd == NULL) {
+        //The app doesn't appear to be running
+#ifdef _DEBUG
+        printf("App %s: window not found.\n,", appName);
+#endif
+        bRet = FALSE;
+    } else {
+        DWORD pid;  // Variable to hold the process ID.
+        DWORD dThread;  // Variable to hold (unused) thread ID.
+        dThread = GetWindowThreadProcessId(hWnd, &pid);
+        HANDLE hProcess; // Handle to existing process
+
+        hProcess = OpenProcess(SYNCHRONIZE | PROCESS_ALL_ACCESS, TRUE, pid);
+        if (hProcess == NULL) {
+#ifdef _DEBUG
+            printf("App %s : Failed to get process handle",appName);
+#endif
+            bRet = FALSE;
+        } else {
+            if (!TerminateProcess(hProcess, 0)) {
+                LPTSTR lpMsgBuf;
+                FormatMessage(
+                    FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+                    NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                    (LPTSTR) &lpMsgBuf, 0, NULL );
+                printf("%s\n", lpMsgBuf);
+                LocalFree( lpMsgBuf );
+                bRet = FALSE;
+            }
+#ifdef _DEBUG
+            else {
+                printf("Kill %s appears to be successful.\n", appName);
+            }
+#endif
+        }
+    }
+    return bRet;
+}
+
+/*--------------------------------------------------------------
+  Close the dialogs if possible based on their window class
+  Use the EnumChildWindows win32 api for this
+  --------------------------------------------------------------*/
+BOOL CloseActiveDialogs() {
+    char buff[1024];
+
+    gWDDlgCount = 0;
+    gXLDlgCount = 0;
+    gPPDlgCount = 0;
+
+    EnumChildWindows(GetDesktopWindow(), CloseOfficeDlgProc, (LPARAM) 0);
+    sprintf(buff, "Word: %d\tExcel: %d\tPP: %d", gWDDlgCount, gXLDlgCount, gPPDlgCount);
+    return TRUE;
+}
+
+/*--------------------------------------------------------------
+  Callback for EnumChildWindows that sends close message to
+  any dialogs that match window class of MSO dialogs
+
+  --------------------------------------------------------------*/
+BOOL CALLBACK CloseOfficeDlgProc(HWND hwndChild, LPARAM)
+{
+    //bosa_sdm_Microsoft Word 9.0
+    //bosa_sdm_XL9
+    //#32770 (Dialog)
+
+     char szBuff[4096];
+    if (GetClassName(hwndChild, szBuff, 4096) == 0) {
+
+    } else {
+        if ((strcmpi(szBuff, pWordDlg2k) == 0) || (strcmpi(szBuff, pWordDlg2k3) == 0)) {
+            gWDDlgCount++;
+            SendMessage(hwndChild, WM_CLOSE, 0, 0);
+        }
+        if (strcmpi(szBuff, pXLDlg2k) == 0) {
+            gXLDlgCount++;
+            SendMessage(hwndChild, WM_CLOSE, 0, 0);
+        }
+        if (strcmpi(szBuff, pPPDlg2k) == 0) {
+            gPPDlgCount++;
+            SendMessage(hwndChild, WM_CLOSE, 0, 0);
+        }
+        if (strcmpi(szBuff, pGenMSODlg) == 0) {
+            SendMessage(hwndChild, WM_CLOSE, 0, 0);
+        }
+    }
+
+    return TRUE;
+}
+
+
+/*--------------------------------------------------------------
+  Callback for EnumChildWindows that counts numnnber of
+  dialogs that match window class of MSO dialogs
+
+  --------------------------------------------------------------*/
+BOOL CALLBACK CountOfficeDlgProc(HWND hwndChild, LPARAM)
+{
+     char szBuff[4096];
+    if (GetClassName(hwndChild, szBuff, 4096) == 0) {
+
+    } else {
+        if ((strcmpi(szBuff, pWordDlg2k) == 0) || (strcmpi(szBuff, pWordDlg2k3) == 0)) {
+            gWDDlgCount++;
+        }
+        if (strcmpi(szBuff, pXLDlg2k) == 0) {
+            gXLDlgCount++;
+        }
+        if (strcmpi(szBuff, pPPDlg2k) == 0) {
+            gPPDlgCount++;
+        }
+    }
+
+    return TRUE;
+}
+
+/*--------------------------------------------------------------
+  Simple usage message...
+
+  -------------------------------------------------------------*/
+void printUsage() {
+    printf("Recovery Assistant Utility - try and put MSO apps in a recoverable state\n");
+    printf("Copyright Sun Microsystems 2008\n");
+    printf("Options:\n");
+    printf("   --help : This message\n");
+    printf("   --close: Attempt to close any open dialogs owned by \n");
+    printf("            MSO apps so Application.Quit() can succeed\n");
+    printf("   --kill : Kill any open MSO apps. Use with caution and only as a last resort\n\n");
 }
\ No newline at end of file
diff --git a/migrationanalysis/src/resources/makefile.mk b/migrationanalysis/src/resources/makefile.mk
index 90d90e156851..574f5b966844 100644
--- a/migrationanalysis/src/resources/makefile.mk
+++ b/migrationanalysis/src/resources/makefile.mk
@@ -1,5 +1,5 @@
-#*************************************************************************

-#

+#*************************************************************************
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -23,37 +23,37 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#*************************************************************************

-

-PRJ=..$/..

-

-PRJNAME=migrationanalysis

-TARGET=resources

-

-# --- Settings -----------------------------------------------------

-

-.INCLUDE :	settings.mk

-

-# --- Files --------------------------------------------------------

-

-PAW_DEST:=$(BIN)$/ProAnalysisWizard$/Resources

-PAW_RESULT:= $(PAW_DEST)$/results.xlt

-PAW_RESULTSRC:= results_paw.xlt

-

-ANALYSIS_DTD:=analysis.dtd

-PAW_ANALYSIS_DTD:=$(PAW_DEST)$/analysis.dtd

-

-# --- Targets ------------------------------------------------------

-

-.INCLUDE :	target.mk

-

-ALLTAR : $(PAW_RESULT) $(PAW_ANALYSIS_DTD)

-

-$(PAW_RESULT) : $(PAW_RESULTSRC)

-    -$(MKDIRHIER) $(@:d)

-    $(COPY) $(PAW_RESULTSRC) $@

-

-$(PAW_ANALYSIS_DTD) : $(ANALYSIS_DTD)

-    -$(MKDIRHIER) $(@:d)

-    $(COPY) $(ANALYSIS_DTD) $@

-

+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=migrationanalysis
+TARGET=resources
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+PAW_DEST:=$(BIN)$/ProAnalysisWizard$/Resources
+PAW_RESULT:= $(PAW_DEST)$/results.xlt
+PAW_RESULTSRC:= results_paw.xlt
+
+ANALYSIS_DTD:=analysis.dtd
+PAW_ANALYSIS_DTD:=$(PAW_DEST)$/analysis.dtd
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :	target.mk
+
+ALLTAR : $(PAW_RESULT) $(PAW_ANALYSIS_DTD)
+
+$(PAW_RESULT) : $(PAW_RESULTSRC)
+    -$(MKDIRHIER) $(@:d)
+    $(COPY) $(PAW_RESULTSRC) $@
+
+$(PAW_ANALYSIS_DTD) : $(ANALYSIS_DTD)
+    -$(MKDIRHIER) $(@:d)
+    $(COPY) $(ANALYSIS_DTD) $@
+
diff --git a/migrationanalysis/src/wizard/makefile.mk b/migrationanalysis/src/wizard/makefile.mk
index 7feb9d3e2a78..f421379a6aa3 100644
--- a/migrationanalysis/src/wizard/makefile.mk
+++ b/migrationanalysis/src/wizard/makefile.mk
@@ -1,5 +1,5 @@
-#*************************************************************************

-#

+#*************************************************************************
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -23,94 +23,94 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#*************************************************************************

-

-PRJ=..$/..

-

-PRJNAME=migrationanalysis

-TARGET=wizard

-

-# --- Settings -----------------------------------------------------

-

-.INCLUDE :	settings.mk

-

-# --- Files --------------------------------------------------------

-

-PAW_APPSDEST:=$(BIN)$/ProAnalysisWizard

-ALTERNATE_SRC:=..$/exe

-

-PAW_DATDEST:=$(PAW_APPSDEST)$/Resources

-

-PROJECTDEST:=$(BIN)$/ProAnalysisWizard

-RCFILES:=$(RES)$/$(TARGET).rc

-RESFILE:=$(RES)$/$(TARGET).res

-ULFFILES:=$(TARGET).ulf

-.IF "$(WITH_LANG)"!=""

-ULFDIR:=$(COMMONMISC)$/$(TARGET)

-.ELSE			# "$(WITH_LANG)"!=""

-ULFDIR:=.

-.ENDIF			# "$(WITH_LANG)"!=""

-MANIFEST:=$(RES)$/DocAnalysisWizard.exe.manifest

-

-LAUNCHER_APP:= $(BIN)$/LaunchDrivers.exe

-

-BASIC_APPS:= \

-    $(LAUNCHER_APP) \

-    $(PAW_APPSDEST)$/ProAnalysisWizard.exe

-

-BASIC_VBP:= \

-    $(BIN)$/LaunchDrivers.vbp \

-    $(PAW_APPSDEST)$/ProAnalysisWizard.vbp

-

-PAW_RES_DLLS:=$(PAW_DATDEST)$/Resources.dll

-PAW_LAUNCHER:=$(PAW_DATDEST)$/LaunchDrivers.exe

-

-# --- Targets ------------------------------------------------------

-

-.INCLUDE :	target.mk

-

-ALLTAR : $(BASIC_APPS) $(PAW_RES_DLLS) $(PAW_LAUNCHER)

-

-$(MANIFEST) : $$(@:f)

-    -$(MKDIRHIER) $(@:d)

-    $(COPY) $< $@

-

-.IF "$(VB6_LOCATION)" != ""

-

-$(BASIC_VBP) : $$(@:b).vbp

-    -$(MKDIRHIER) $(@:d)

-    $(COPY) $(@:f) $@

-

-$(BASIC_APPS) : $(BASIC_VBP)

-    -$(MKDIRHIER) $(@:d)

-    cd $(@:d) && "$(VB6_LOCATION)$/vb6.exe" /m $(@:b).vbp

-

-$(PAW_LAUNCHER) : $(LAUNCHER_APP)

-    -$(MKDIRHIER) $(@:d)

-    $(COPY) $(LAUNCHER_APP) $@

-

-.ELSE          # "$(VB6_LOCATION)" != ""

-

-$(BASIC_APPS) : $(ALTERNATE_SRC)$/$$(@:f)

-    @echo "------------------------------------"

-    @echo "No VB6 found: using prebuild wizards"

-    @echo "------------------------------------"

-    -$(MKDIRHIER) $(@:d)

-    $(COPY) $(ALTERNATE_SRC)$/$(@:f) $@

-

-$(PAW_LAUNCHER) : $(ALTERNATE_SRC)$/$$(@:f)

-    -$(MKDIRHIER) $(@:d)

-    $(COPY) $(ALTERNATE_SRC)$/$(@:f) $@

-

-.ENDIF          # "$(VB6_LOCATION)" != ""

-

-# Generate the native Windows resource file

-# using lngconvex.exe 

-

-$(RCFILES) : $(MANIFEST) $(ULFDIR)$/$(TARGET).ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt

-    $(LNGCONVEX) -ulf $(ULFDIR)$/$(TARGET).ulf -rc $(RES)$/$(TARGET).rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt

-

-$(PAW_RES_DLLS) : $(RCFILES)

-    -$(MKDIRHIER) $(@:d)

-    link /NOENTRY /DLL /MACHINE:X86 /OUT:$@ $(RESFILE)

-

+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=migrationanalysis
+TARGET=wizard
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+PAW_APPSDEST:=$(BIN)$/ProAnalysisWizard
+ALTERNATE_SRC:=..$/exe
+
+PAW_DATDEST:=$(PAW_APPSDEST)$/Resources
+
+PROJECTDEST:=$(BIN)$/ProAnalysisWizard
+RCFILES:=$(RES)$/$(TARGET).rc
+RESFILE:=$(RES)$/$(TARGET).res
+ULFFILES:=$(TARGET).ulf
+.IF "$(WITH_LANG)"!=""
+ULFDIR:=$(COMMONMISC)$/$(TARGET)
+.ELSE			# "$(WITH_LANG)"!=""
+ULFDIR:=.
+.ENDIF			# "$(WITH_LANG)"!=""
+MANIFEST:=$(RES)$/DocAnalysisWizard.exe.manifest
+
+LAUNCHER_APP:= $(BIN)$/LaunchDrivers.exe
+
+BASIC_APPS:= \
+    $(LAUNCHER_APP) \
+    $(PAW_APPSDEST)$/ProAnalysisWizard.exe
+
+BASIC_VBP:= \
+    $(BIN)$/LaunchDrivers.vbp \
+    $(PAW_APPSDEST)$/ProAnalysisWizard.vbp
+
+PAW_RES_DLLS:=$(PAW_DATDEST)$/Resources.dll
+PAW_LAUNCHER:=$(PAW_DATDEST)$/LaunchDrivers.exe
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :	target.mk
+
+ALLTAR : $(BASIC_APPS) $(PAW_RES_DLLS) $(PAW_LAUNCHER)
+
+$(MANIFEST) : $$(@:f)
+    -$(MKDIRHIER) $(@:d)
+    $(COPY) $< $@
+
+.IF "$(VB6_LOCATION)" != ""
+
+$(BASIC_VBP) : $$(@:b).vbp
+    -$(MKDIRHIER) $(@:d)
+    $(COPY) $(@:f) $@
+
+$(BASIC_APPS) : $(BASIC_VBP)
+    -$(MKDIRHIER) $(@:d)
+    cd $(@:d) && "$(VB6_LOCATION)$/vb6.exe" /m $(@:b).vbp
+
+$(PAW_LAUNCHER) : $(LAUNCHER_APP)
+    -$(MKDIRHIER) $(@:d)
+    $(COPY) $(LAUNCHER_APP) $@
+
+.ELSE          # "$(VB6_LOCATION)" != ""
+
+$(BASIC_APPS) : $(ALTERNATE_SRC)$/$$(@:f)
+    @echo "------------------------------------"
+    @echo "No VB6 found: using prebuild wizards"
+    @echo "------------------------------------"
+    -$(MKDIRHIER) $(@:d)
+    $(COPY) $(ALTERNATE_SRC)$/$(@:f) $@
+
+$(PAW_LAUNCHER) : $(ALTERNATE_SRC)$/$$(@:f)
+    -$(MKDIRHIER) $(@:d)
+    $(COPY) $(ALTERNATE_SRC)$/$(@:f) $@
+
+.ENDIF          # "$(VB6_LOCATION)" != ""
+
+# Generate the native Windows resource file
+# using lngconvex.exe 
+
+$(RCFILES) : $(MANIFEST) $(ULFDIR)$/$(TARGET).ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt
+    $(LNGCONVEX) -ulf $(ULFDIR)$/$(TARGET).ulf -rc $(RES)$/$(TARGET).rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt
+
+$(PAW_RES_DLLS) : $(RCFILES)
+    -$(MKDIRHIER) $(@:d)
+    link /NOENTRY /DLL /MACHINE:X86 /OUT:$@ $(RESFILE)
+
diff --git a/migrationanalysis/util/delzip b/migrationanalysis/util/delzip
index e2b3a64d3ade..594f345bdece 100644
--- a/migrationanalysis/util/delzip
+++ b/migrationanalysis/util/delzip
@@ -1 +1 @@
-ECHO is off

+ECHO is off
diff --git a/migrationanalysis/util/makefile.mk b/migrationanalysis/util/makefile.mk
index 50a0f1620831..550af0ab40f9 100644
--- a/migrationanalysis/util/makefile.mk
+++ b/migrationanalysis/util/makefile.mk
@@ -1,5 +1,5 @@
-#*************************************************************************

-#

+#*************************************************************************
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
 # Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -23,31 +23,31 @@
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-#*************************************************************************

-

-PRJ=..

-

-PRJNAME=migrationanalysis

-TARGET=paw

-

-no_common_build_zip=TRUE

-

-# --- Settings -----------------------------------------------------

-

-.INCLUDE :	settings.mk

-

-# --- Files --------------------------------------------------------

-

-ZIPFLAGS        =

-ZIP1DIR         = $(BIN)$/ProAnalysisWizard

-ZIP1TARGET      = MigrationAnalysis

-ZIP1LIST        = ProAnalysisWizard.exe Resources$/* Resources$/lang$/*

-

-ZIP2DIR         = $(BIN)$/ProAnalysisWizard

-ZIP2TARGET      = ProAnalysisWizard

-ZIP2LIST        = Resources$/* Resources$/lang$/*

-

-# --- Targets ------------------------------------------------------

-

-.INCLUDE :	target.mk

-

+#*************************************************************************
+
+PRJ=..
+
+PRJNAME=migrationanalysis
+TARGET=paw
+
+no_common_build_zip=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+ZIPFLAGS        =
+ZIP1DIR         = $(BIN)$/ProAnalysisWizard
+ZIP1TARGET      = MigrationAnalysis
+ZIP1LIST        = ProAnalysisWizard.exe Resources$/* Resources$/lang$/*
+
+ZIP2DIR         = $(BIN)$/ProAnalysisWizard
+ZIP2TARGET      = ProAnalysisWizard
+ZIP2LIST        = Resources$/* Resources$/lang$/*
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :	target.mk
+