diff options
Diffstat (limited to 'migrationanalysis/src')
| -rw-r--r-- | migrationanalysis/src/driver_docs/ulf2dat.pl | 14 | ||||
| -rw-r--r-- | migrationanalysis/src/msokill/StdAfx.cpp | 6 | ||||
| -rw-r--r-- | migrationanalysis/src/msokill/StdAfx.h | 4 | ||||
| -rw-r--r-- | migrationanalysis/src/msokill/msokill.cpp | 34 | ||||
| -rw-r--r-- | migrationanalysis/src/wizard/res_defines.h | 158 |
5 files changed, 108 insertions, 108 deletions
diff --git a/migrationanalysis/src/driver_docs/ulf2dat.pl b/migrationanalysis/src/driver_docs/ulf2dat.pl index 25b1fe2f7ebc..e97eb32e0f62 100644 --- a/migrationanalysis/src/driver_docs/ulf2dat.pl +++ b/migrationanalysis/src/driver_docs/ulf2dat.pl @@ -4,7 +4,7 @@ eval 'exec perl -wS $0 ${1+"$@"}' #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ if ( $help ) { open IN, "<$in_name" or die "Could not open $in_name for reading $! $^E"; -foreach $lang ( keys %files ) +foreach $lang ( keys %files ) { open "F_$lang",">$files{$lang}" or die "Could not open $files{$lang} for writing $! $^E"; binmode "F_$lang"; @@ -80,7 +80,7 @@ while ( <IN> ) if ( $line =~ /^\[(.*)\]$/ ) { $new_ID = $1; - + write_transunit(); $ID = $new_ID; %transunit = (); @@ -117,11 +117,11 @@ sub write_transunit { $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"; - } + } } @@ -131,9 +131,9 @@ sub get_options { 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$/; +# $arg =~ /.*[/\]([^/\]*)\.dat$/; $lang = $1; print "got $lang = $arg\n"; $files{ $lang } = $arg; diff --git a/migrationanalysis/src/msokill/StdAfx.cpp b/migrationanalysis/src/msokill/StdAfx.cpp index 79d505fb449a..2785112a345b 100644 --- a/migrationanalysis/src/msokill/StdAfx.cpp +++ b/migrationanalysis/src/msokill/StdAfx.cpp @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,8 +27,8 @@ ************************************************************************/ // 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 +// msokill.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information #include "stdafx.h" diff --git a/migrationanalysis/src/msokill/StdAfx.h b/migrationanalysis/src/msokill/StdAfx.h index 1a26d751fd5d..88357f68f3f1 100644 --- a/migrationanalysis/src/msokill/StdAfx.h +++ b/migrationanalysis/src/msokill/StdAfx.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ #pragma once #endif // _MSC_VER > 1000 -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #include <stdio.h> #pragma warning(push, 1) diff --git a/migrationanalysis/src/msokill/msokill.cpp b/migrationanalysis/src/msokill/msokill.cpp index 2125b3f773c7..32f602290b5b 100644 --- a/migrationanalysis/src/msokill/msokill.cpp +++ b/migrationanalysis/src/msokill/msokill.cpp @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -135,12 +135,12 @@ BOOL KillAppFromWindow( printf("App %s: window not found.\n,", appName); #endif bRet = FALSE; - } else { + } 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 @@ -150,7 +150,7 @@ BOOL KillAppFromWindow( } else { if (!TerminateProcess(hProcess, 0)) { LPTSTR lpMsgBuf; - FormatMessage( + FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &lpMsgBuf, 0, NULL ); @@ -185,19 +185,19 @@ BOOL CloseActiveDialogs() { } /*-------------------------------------------------------------- - Callback for EnumChildWindows that sends close message to + Callback for EnumChildWindows that sends close message to any dialogs that match window class of MSO dialogs --------------------------------------------------------------*/ -BOOL CALLBACK CloseOfficeDlgProc(HWND hwndChild, LPARAM) -{ +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++; @@ -215,21 +215,21 @@ BOOL CALLBACK CloseOfficeDlgProc(HWND hwndChild, LPARAM) SendMessage(hwndChild, WM_CLOSE, 0, 0); } } - - return TRUE; -} + + return TRUE; +} /*-------------------------------------------------------------- - Callback for EnumChildWindows that counts numnnber of + Callback for EnumChildWindows that counts numnnber of dialogs that match window class of MSO dialogs --------------------------------------------------------------*/ -BOOL CALLBACK CountOfficeDlgProc(HWND hwndChild, LPARAM) +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++; @@ -242,12 +242,12 @@ BOOL CALLBACK CountOfficeDlgProc(HWND hwndChild, LPARAM) } } - return TRUE; -} + return TRUE; +} /*-------------------------------------------------------------- Simple usage message... - + -------------------------------------------------------------*/ void printUsage() { printf("Recovery Assistant Utility - try and put MSO apps in a recoverable state\n"); diff --git a/migrationanalysis/src/wizard/res_defines.h b/migrationanalysis/src/wizard/res_defines.h index 046e6fc71dc7..63c63c8026e8 100644 --- a/migrationanalysis/src/wizard/res_defines.h +++ b/migrationanalysis/src/wizard/res_defines.h @@ -3,85 +3,85 @@ #define RES_DEFINES_H_INCLUDED
#define RID_STR_ANALYZE_SETUP_COMPLETE 1400
-#define RID_STR_ANALYZE_NUM_DOCS 1401
-#define RID_STR_ANALYZE_RUN_TOOL 1404
-#define RID_STR_ANALYZE_VIEW_RESULTS 1406
-#define RID_STR_ANALYZE_COMPLETED 1412
-#define RID_STR_ANALYZE_START 1413
-#define RID_STR_ANALYZE_VIEW_NOW 1414
-#define RID_STR_ANALYZE_VIEW_LATER 1415
+#define RID_STR_ANALYZE_NUM_DOCS 1401
+#define RID_STR_ANALYZE_RUN_TOOL 1404
+#define RID_STR_ANALYZE_VIEW_RESULTS 1406
+#define RID_STR_ANALYZE_COMPLETED 1412
+#define RID_STR_ANALYZE_START 1413
+#define RID_STR_ANALYZE_VIEW_NOW 1414
+#define RID_STR_ANALYZE_VIEW_LATER 1415
#define RID_STR_ANALYSE_NOT_RUN 1416
#define RID_STR_ANALYZE_PREPARE_DOCS 1411
-#define RID_STR_ANALYZE_DOCUMENTS 1402
-#define RID_STR_ANALYZE_TEMPLATES 1403
-#define RID_STR_ANALYZE_DOCUMENTS_XLS 1408
-#define RID_STR_ANALYZE_DOCUMENTS_PPT 1409
+#define RID_STR_ANALYZE_DOCUMENTS 1402
+#define RID_STR_ANALYZE_TEMPLATES 1403
+#define RID_STR_ANALYZE_DOCUMENTS_XLS 1408
+#define RID_STR_ANALYZE_DOCUMENTS_PPT 1409
-#define RID_STR_ERROR_AUTOMATION_SERVER_FAILED 1920
+#define RID_STR_ERROR_AUTOMATION_SERVER_FAILED 1920
#define RID_STR_ERROR_CANNOT_CREATE_RESULTS_DIRECTORY 1904
#define RID_STR_ERROR_CHOOSE_DOCUMENT_TYPE 1902
-#define RID_STR_ERROR_CREATE_FILE 1922
+#define RID_STR_ERROR_CREATE_FILE 1922
#define RID_STR_ERROR_EXCEL_ANALYSIS_FAILED 1907
#define RID_STR_ERROR_EXCEL_OPEN 1918
#define RID_STR_ERROR_MACRO_SECURITY_SET 1919
#define RID_STR_ERROR_MISSING_DOCUMENTS_DIRECTORY 1901
-#define RID_STR_ERROR_MISSING_EXCEL_DRIVER 1906
-#define RID_STR_ERROR_MISSING_ISSUES_LIST 1915
-#define RID_STR_ERROR_MISSING_MIGRATION_RESULTS 1900
-#define RID_STR_ERROR_MISSING_POWERPOINT_DRIVER 1911
-#define RID_STR_ERROR_MISSING_README 1910
-#define RID_STR_ERROR_MISSING_RESULTS_TEMPLATE 1905
-#define RID_STR_ERROR_MISSING_WORD_DRIVER 1908
-#define RID_STR_ERROR_MSOFFICE_9_REQUIRED 1913
-#define RID_STR_ERROR_NO_RESULTS_DIRECTORY 1921
-#define RID_STR_ERROR_POWERPOINT_ANALYSIS_FAILED 1912
-#define RID_STR_ERROR_RESULTS_DIRECTORY_DOES_NOT_EXIST 1903
-#define RID_STR_ERROR_RESULTS_SPREADSHEET_OPEN 1917
-#define RID_STR_ERROR_VERSION_MISMATCH 1914
-#define RID_STR_ERROR_WIN2000_REQUIRED 1916
-#define RID_STR_ERROR_WORD_ANALYSIS_FAILED 1909
-#define RID_STR_ERROR_APP_NOT_INSTALLED 1924
-#define RID_STR_ERROR_CDROM_NOT_ALLOWED 1925
-#define RID_STR_ERROR_CDROM_NOT_READY 1926
-#define RID_STR_ERROR_NO_WRITE_TO_READ_ONLY_FOLDER 1927
-#define RID_STR_ERROR_APPLICATION_STILL_RUNNING 1928
-#define RID_STR_ERROR_MISSING_IMPORTANT_FILE 1929
-
-
-#define RID_STR_INTRODUCTION 1100
-#define RID_STR_INTRODUCTION_INTRO1 1101
-#define RID_STR_INTRODUCTION_INTRO2 1102
-#define RID_STR_INTRODUCTION_INTRO3 1104
-
-#define RID_STR_NAVBAR_BACK_BTN 1021
-#define RID_STR_NAVBAR_EXIT_BTN 1024
-#define RID_STR_NAVBAR_FINISH_BTN 1023
-#define RID_STR_NAVBAR_HELP_BTN 1020
-#define RID_STR_NAVBAR_NEXT_BTN 1022
+#define RID_STR_ERROR_MISSING_EXCEL_DRIVER 1906
+#define RID_STR_ERROR_MISSING_ISSUES_LIST 1915
+#define RID_STR_ERROR_MISSING_MIGRATION_RESULTS 1900
+#define RID_STR_ERROR_MISSING_POWERPOINT_DRIVER 1911
+#define RID_STR_ERROR_MISSING_README 1910
+#define RID_STR_ERROR_MISSING_RESULTS_TEMPLATE 1905
+#define RID_STR_ERROR_MISSING_WORD_DRIVER 1908
+#define RID_STR_ERROR_MSOFFICE_9_REQUIRED 1913
+#define RID_STR_ERROR_NO_RESULTS_DIRECTORY 1921
+#define RID_STR_ERROR_POWERPOINT_ANALYSIS_FAILED 1912
+#define RID_STR_ERROR_RESULTS_DIRECTORY_DOES_NOT_EXIST 1903
+#define RID_STR_ERROR_RESULTS_SPREADSHEET_OPEN 1917
+#define RID_STR_ERROR_VERSION_MISMATCH 1914
+#define RID_STR_ERROR_WIN2000_REQUIRED 1916
+#define RID_STR_ERROR_WORD_ANALYSIS_FAILED 1909
+#define RID_STR_ERROR_APP_NOT_INSTALLED 1924
+#define RID_STR_ERROR_CDROM_NOT_ALLOWED 1925
+#define RID_STR_ERROR_CDROM_NOT_READY 1926
+#define RID_STR_ERROR_NO_WRITE_TO_READ_ONLY_FOLDER 1927
+#define RID_STR_ERROR_APPLICATION_STILL_RUNNING 1928
+#define RID_STR_ERROR_MISSING_IMPORTANT_FILE 1929
+
+
+#define RID_STR_INTRODUCTION 1100
+#define RID_STR_INTRODUCTION_INTRO1 1101
+#define RID_STR_INTRODUCTION_INTRO2 1102
+#define RID_STR_INTRODUCTION_INTRO3 1104
+
+#define RID_STR_NAVBAR_BACK_BTN 1021
+#define RID_STR_NAVBAR_EXIT_BTN 1024
+#define RID_STR_NAVBAR_FINISH_BTN 1023
+#define RID_STR_NAVBAR_HELP_BTN 1020
+#define RID_STR_NAVBAR_NEXT_BTN 1022
#define RID_STR_RESULTS_CHOOSE_OPTIONS 1300
#define RID_STR_RESULTS_RESULTS_SPREADSHEET 1301
-#define RID_STR_RESULTS_ANALYSIS_XLS 1302
+#define RID_STR_RESULTS_ANALYSIS_XLS 1302
#define RID_STR_RESULTS_RESULTS_DIRECTORY 1304
-#define RID_STR_RESULTS_CHOOSE_SAVE_OPTIONS 1311
-#define RID_STR_RESULTS_CHOOSE_PROMPT 1312
-#define RID_STR_RESULTS_CHOOSE_OVERWRITE 1313
-#define RID_STR_RESULTS_CHOOSE_APPEND 1314
-
-#define RID_STR_OTHER_APPLICATON_LOG_PATH 1812
-#define RID_STR_OTHER_RUNNING 1810
-#define RID_STR_OTHER_SELECT_ANALYZE_DIRECTORY 1806
-#define RID_STR_OTHER_SELECT_RESULTS_DIRECTORY 1807
-#define RID_STR_OTHER_XML_RESULTS 1815
-#define RID_STR_OTHER_README_PATH 1805
-
-#define RID_STR_DOCUMENTS_CHOOSE_DOCUMENTS 1200
-#define RID_STR_DOCUMENTS_DOCUMENTS_DIRECTORY 1201
-#define RID_STR_DOCUMENTS_INCLUDE_SUBDIRECTORIES 1202
-#define RID_STR_DOCUMENTS_ROOT_C 1205
+#define RID_STR_RESULTS_CHOOSE_SAVE_OPTIONS 1311
+#define RID_STR_RESULTS_CHOOSE_PROMPT 1312
+#define RID_STR_RESULTS_CHOOSE_OVERWRITE 1313
+#define RID_STR_RESULTS_CHOOSE_APPEND 1314
+
+#define RID_STR_OTHER_APPLICATON_LOG_PATH 1812
+#define RID_STR_OTHER_RUNNING 1810
+#define RID_STR_OTHER_SELECT_ANALYZE_DIRECTORY 1806
+#define RID_STR_OTHER_SELECT_RESULTS_DIRECTORY 1807
+#define RID_STR_OTHER_XML_RESULTS 1815
+#define RID_STR_OTHER_README_PATH 1805
+
+#define RID_STR_DOCUMENTS_CHOOSE_DOCUMENTS 1200
+#define RID_STR_DOCUMENTS_DOCUMENTS_DIRECTORY 1201
+#define RID_STR_DOCUMENTS_INCLUDE_SUBDIRECTORIES 1202
+#define RID_STR_DOCUMENTS_ROOT_C 1205
#define RID_STR_DOCUMENTS_CHOOSE_DOC_TYPES 1206
#define RID_STR_DOCUMENTS_CHOOSE_WORD 1207
#define RID_STR_DOCUMENTS_CHOOSE_DOC 1208
@@ -93,26 +93,26 @@ #define RID_STR_DOCUMENTS_CHOOSE_PPT 1214
#define RID_STR_DOCUMENTS_CHOOSE_POT 1215
-#define RID_STR_SIDEBAR_STEPS 1040
-#define RID_STR_SIDEBAR_INTRODUCTION 1041
-#define RID_STR_SIDEBAR_DOCUMENTS 1042
-#define RID_STR_SIDEBAR_RESULTS 1043
-#define RID_STR_SIDEBAR_ANALYZE 1044
+#define RID_STR_SIDEBAR_STEPS 1040
+#define RID_STR_SIDEBAR_INTRODUCTION 1041
+#define RID_STR_SIDEBAR_DOCUMENTS 1042
+#define RID_STR_SIDEBAR_RESULTS 1043
+#define RID_STR_SIDEBAR_ANALYZE 1044
-#define RID_STR_TITLE 1000
-#define RID_STR_PRODUCTNAME 1001
+#define RID_STR_TITLE 1000
+#define RID_STR_PRODUCTNAME 1001
// Preparation
#define RID_STR_SIDEBAR_ANALYZE_PREP 1074
#define RID_STR_TITLE_PREP 1030
-#define RID_STR_INTRODUCTION_INTRO1_PREP 1131
-#define RID_STR_INTRODUCTION_INTRO2_PREP 1132
-#define RID_STR_INTRODUCTION_INTRO3_PREP 1134
+#define RID_STR_INTRODUCTION_INTRO1_PREP 1131
+#define RID_STR_INTRODUCTION_INTRO2_PREP 1132
+#define RID_STR_INTRODUCTION_INTRO3_PREP 1134
-#define RID_STR_DOCUMENTS_CHOOSE_DOCUMENTS_PREP 1230
-#define RID_STR_DOCUMENTS_INCLUDE_SUBDIRECTORIES_PREP 1232
+#define RID_STR_DOCUMENTS_CHOOSE_DOCUMENTS_PREP 1230
+#define RID_STR_DOCUMENTS_INCLUDE_SUBDIRECTORIES_PREP 1232
#define RID_STR_DOCUMENTS_CHOOSE_DOC_TYPES_PREP 1236
#define RID_STR_IGNORE_OLDER_CB_ID 1231
@@ -121,16 +121,16 @@ #define RID_STR_IGNORE_OLDER_12_MONTHS_ID 1235
#define RID_STR_RESULTS_CHOOSE_OPTIONS_PREP 1330
-#define RID_STR_RESULTS_ANALYSIS_XLS_PREP 1332
+#define RID_STR_RESULTS_ANALYSIS_XLS_PREP 1332
-#define RID_STR_ANALYZE_NUM_DOCS_PREP 1431
-#define RID_STR_ANALYZE_SETUP_COMPLETE_PREP 1430
+#define RID_STR_ANALYZE_NUM_DOCS_PREP 1431
+#define RID_STR_ANALYZE_SETUP_COMPLETE_PREP 1430
#define RID_STR_ANALYZE_IGNORED_DOCS 1435
#define RID_STR_OTHER_PLEASE_REFER_TO_README_PREP 1838
#define RID_STR_OTHER_XML_RESULTS_PREP 1845
#define RID_STR_OTHER_PREPARE_PROMPT_PREP 1846
-#define RID_STR_OTHER_PREPARE_COMPLETED_PREP 1847
+#define RID_STR_OTHER_PREPARE_COMPLETED_PREP 1847
// Progress
#define RID_STR_PROGRESS_CAPTION 1820
|