recreated tag libreoffice-3.3.3.1 which had these commits:

commit 8ad61991552caa3f97cc10dc468ce722f2a7217a (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 17:39:04 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1) commit 4e3b67b32df4df0f1afe0abe0c0dc9a56829986c Author: Andras Timar <atimar@suse.com> Date: Sun May 29 21:38:41 2011 +0200 l10n: add br, et, and tr to NLPSolver + fixes to fr and nb nlpsolver/locale/NLPSolverCommon_bg.properties | 22 +++++++++++++++ nlpsolver/locale/NLPSolverCommon_et.properties | 22 +++++++++++++++ nlpsolver/locale/NLPSolverCommon_nb.properties | 2 +- nlpsolver/locale/NLPSolverCommon_tr.properties | 22 +++++++++++++++ .../locale/NLPSolverStatusDialog_bg.properties | 28 ++++++++++++++++++++ .../locale/NLPSolverStatusDialog_et.properties | 28 ++++++++++++++++++++ .../locale/NLPSolverStatusDialog_fr.properties | 4 +- .../locale/NLPSolverStatusDialog_tr.properties | 28 ++++++++++++++++++++ 8 files changed, 153 insertions(+), 3 deletions(-)
author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> 2011-08-23 15:08:13 +0200
committer: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> 2011-08-23 15:08:13 +0200
commit: 3bb01d6eda13bf1b4a538a24707605153fe4e37e (patch)
tree: 65089ad2a2c6268e4c4ffc753ae2374bd2169089
parent: 1dd3ecc26716372f4e0aeb7578acfd997f125a61 (diff)
433 files changed, 7171 insertions, 7021 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
diff --git a/mysqlc/source/description.xml b/mysqlc/source/description.xml
index 458ee6efb4d1..cc32c2531043 100755
--- a/mysqlc/source/description.xml
+++ b/mysqlc/source/description.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006"
+<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" 
     xmlns:xlink="http://www.w3.org/1999/xlink">
 
     <identifier value="UPDATED_IDENTIFIER"/>
-    <version value="#VERSION#" />
+    <version value="#VERSION#" />    
     <platform value="UPDATED_SUPPORTED_PLATFORM" />
     <display-name>
         <name lang="en-US">#TITLE#</name>
@@ -21,4 +21,4 @@
     <extension-description>
         <src lang="#LANG#" xlink:href="description/description_#LANG#.txt"/>
     </extension-description>
-</description>
+</description> 
diff --git a/mysqlc/source/mysqlc.xml b/mysqlc/source/mysqlc.xml
index 04e7d4ae708e..5c19802f162c 100644
--- a/mysqlc/source/mysqlc.xml
+++ b/mysqlc/source/mysqlc.xml
@@ -11,69 +11,69 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="final"/>
-        <supported-service> com.sun.star.sdbc.Driver    </supported-service>
-        <service-dependency>    ... </service-dependency>
-    </component-description>
-    <project-build-dependency>  cppuhelper  </project-build-dependency>
-    <project-build-dependency>  cppu        </project-build-dependency>
-    <project-build-dependency>  sal         </project-build-dependency>
+        <supported-service>	com.sun.star.sdbc.Driver	</supported-service>
+        <service-dependency>	...	</service-dependency>
+    </component-description>	  
+    <project-build-dependency>	cppuhelper	</project-build-dependency>
+    <project-build-dependency>	cppu		</project-build-dependency>
+    <project-build-dependency>	sal			</project-build-dependency>
 
-    <runtime-module-dependency> cppuhelper  </runtime-module-dependency>
-    <runtime-module-dependency> cppu1       </runtime-module-dependency>
-    <runtime-module-dependency> sal1        </runtime-module-dependency>
+    <runtime-module-dependency>	cppuhelper	</runtime-module-dependency>
+    <runtime-module-dependency>	cppu1		</runtime-module-dependency>
+    <runtime-module-dependency>	sal1		</runtime-module-dependency>
 
-    <type>  com.sun.star.registry.XRegistryKey          </type>
-    <type>  com.sun.star.util.XCancellable              </type>
-    <type>  com.sun.star.util.XNumberFormatter          </type>
-    <type>  com.sun.star.uno.TypeClass                  </type>
-    <type>  com.sun.star.uno.XWeak                      </type>
-    <type>  com.sun.star.uno.XAggregation               </type>
-    <type>  com.sun.star.uno.XComponentContext          </type>
-    <type>  com.sun.star.beans.PropertyAttribute        </type>
-    <type>  com.sun.star.beans.XPropertyState           </type>
-    <type>  com.sun.star.beans.XPropertySet             </type>
-    <type>  com.sun.star.beans.PropertyValue            </type>
-    <type>  com.sun.star.beans.XMultiPropertySet        </type>
-    <type>  com.sun.star.beans.XFastPropertySet         </type>
-    <type>  com.sun.star.lang.XSingleServiceFactory     </type>
-    <type>  com.sun.star.lang.XTypeProvider             </type>
-    <type>  com.sun.star.lang.XSingleComponentFactory   </type>
-    <type>  com.sun.star.lang.EventObject               </type>
-    <type>  com.sun.star.lang.XComponent                </type>
-    <type>  com.sun.star.lang.IllegalArgumentException  </type>
-    <type>  com.sun.star.lang.DisposedException         </type>
-    <type>  com.sun.star.lang.XMultiServiceFactory      </type>
-    <type>  com.sun.star.lang.XServiceInfo              </type>
-    <type>  com.sun.star.lang.XUnoTunnel                </type>
-    <type>  com.sun.star.java.XJavaThreadRegister_11    </type>
-    <type>  com.sun.star.java.XJavaVM                   </type>
-    <type>  com.sun.star.sdbc.FetchDirection            </type>
-    <type>  com.sun.star.sdbc.XConnection               </type>
-    <type>  com.sun.star.sdbc.XStatement                </type>
-    <type>  com.sun.star.sdbc.XResultSet                </type>
-    <type>  com.sun.star.sdbc.XResultSetMetaDataSupplier</type>
-    <type>  com.sun.star.sdbc.XColumnLocate             </type>
-    <type>  com.sun.star.sdbc.XResultSetUpdate          </type>
-    <type>  com.sun.star.sdbc.XWarningsSupplier         </type>
-    <type>  com.sun.star.sdbc.XRowUpdate                </type>
-    <type>  com.sun.star.sdbc.XMultipleResults          </type>
-    <type>  com.sun.star.sdbc.XBatchExecution           </type>
-    <type>  com.sun.star.sdbc.XPreparedBatchExecution   </type>
-    <type>  com.sun.star.sdbc.XParameters               </type>
-    <type>  com.sun.star.sdbc.XOutParameters            </type>
-    <type>  com.sun.star.sdbc.DriverPropertyInfo        </type>
-    <type>  com.sun.star.sdbc.SQLWarning                </type>
-    <type>  com.sun.star.sdbc.XRow                      </type>
-    <type>  com.sun.star.sdbc.ColumnSearch              </type>
-    <type>  com.sun.star.sdbc.ColumnValue               </type>
-    <type>  com.sun.star.sdbc.DataType                  </type>
-    <type>  com.sun.star.sdbc.XDriver                   </type>
-    <type>  com.sun.star.sdbc.TransactionIsolation      </type>
-    <type>  com.sun.star.sdbc.ResultSetType             </type>
-    <type>  com.sun.star.sdbc.ResultSetConcurrency      </type>
-    <type>  com.sun.star.sdbcx.XRowLocate               </type>
-    <type>  com.sun.star.sdbcx.XDeleteRows              </type>
-    <type>  com.sun.star.sdbcx.CompareBookmark          </type>
-    <type>  com.sun.star.sdb.XColumnUpdate              </type>
-    <type>  com.sun.star.sdb.XColumn                    </type>
+    <type>	com.sun.star.registry.XRegistryKey			</type>
+    <type>	com.sun.star.util.XCancellable				</type>
+    <type>	com.sun.star.util.XNumberFormatter			</type>
+    <type>	com.sun.star.uno.TypeClass					</type>
+    <type>	com.sun.star.uno.XWeak						</type>
+    <type>	com.sun.star.uno.XAggregation				</type>
+    <type>	com.sun.star.uno.XComponentContext			</type>
+    <type>	com.sun.star.beans.PropertyAttribute		</type>
+    <type>	com.sun.star.beans.XPropertyState			</type>
+    <type>	com.sun.star.beans.XPropertySet				</type>
+    <type>	com.sun.star.beans.PropertyValue			</type>
+    <type>	com.sun.star.beans.XMultiPropertySet		</type>
+    <type>	com.sun.star.beans.XFastPropertySet			</type>
+    <type>	com.sun.star.lang.XSingleServiceFactory		</type>
+    <type>	com.sun.star.lang.XTypeProvider				</type>
+    <type>	com.sun.star.lang.XSingleComponentFactory	</type>
+    <type>	com.sun.star.lang.EventObject				</type>
+    <type>	com.sun.star.lang.XComponent				</type>
+    <type>	com.sun.star.lang.IllegalArgumentException	</type>
+    <type>	com.sun.star.lang.DisposedException			</type>
+    <type>	com.sun.star.lang.XMultiServiceFactory		</type>
+    <type>	com.sun.star.lang.XServiceInfo				</type>
+    <type>	com.sun.star.lang.XUnoTunnel				</type>
+    <type>	com.sun.star.java.XJavaThreadRegister_11	</type>
+    <type>	com.sun.star.java.XJavaVM					</type>	
+    <type>	com.sun.star.sdbc.FetchDirection			</type>
+    <type>	com.sun.star.sdbc.XConnection				</type>
+    <type>	com.sun.star.sdbc.XStatement				</type>
+    <type>	com.sun.star.sdbc.XResultSet				</type>
+    <type>	com.sun.star.sdbc.XResultSetMetaDataSupplier</type>
+    <type>	com.sun.star.sdbc.XColumnLocate				</type>
+    <type>	com.sun.star.sdbc.XResultSetUpdate			</type>
+    <type>	com.sun.star.sdbc.XWarningsSupplier			</type>
+    <type>	com.sun.star.sdbc.XRowUpdate				</type>
+    <type>	com.sun.star.sdbc.XMultipleResults			</type>
+    <type>	com.sun.star.sdbc.XBatchExecution			</type>
+    <type>	com.sun.star.sdbc.XPreparedBatchExecution	</type>
+    <type>	com.sun.star.sdbc.XParameters				</type>
+    <type>	com.sun.star.sdbc.XOutParameters			</type>
+    <type>	com.sun.star.sdbc.DriverPropertyInfo		</type>
+    <type>	com.sun.star.sdbc.SQLWarning				</type>
+    <type>	com.sun.star.sdbc.XRow						</type>
+    <type>	com.sun.star.sdbc.ColumnSearch				</type>
+    <type>	com.sun.star.sdbc.ColumnValue				</type>
+    <type>	com.sun.star.sdbc.DataType					</type>
+    <type>	com.sun.star.sdbc.XDriver					</type>
+    <type>	com.sun.star.sdbc.TransactionIsolation		</type>
+    <type>	com.sun.star.sdbc.ResultSetType				</type>
+    <type>	com.sun.star.sdbc.ResultSetConcurrency		</type>
+    <type>	com.sun.star.sdbcx.XRowLocate				</type>
+    <type>	com.sun.star.sdbcx.XDeleteRows				</type>
+    <type>	com.sun.star.sdbcx.CompareBookmark			</type>
+    <type>	com.sun.star.sdb.XColumnUpdate				</type>
+    <type>	com.sun.star.sdb.XColumn					</type>
 </module-description>
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index ac601e24465a..124d10861b1c 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -74,7 +74,7 @@ using ::rtl::OUString;
 
 
 /* {{{ OConnection::OConnection() -I- */
-OConnection::OConnection(MysqlCDriver& _rDriver, sql::Driver * _cppDriver)
+OConnection::OConnection(MysqlCDriver& _rDriver, sql::Driver * _cppDriver) 
     :OMetaConnection_BASE(m_aMutex)
     ,OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)&_rDriver, this)
     ,m_xMetaData(NULL)
@@ -116,7 +116,7 @@ void SAL_CALL OConnection::release()
 #endif
 
 /* {{{ OConnection::construct() -I- */
-void OConnection::construct(const OUString& url, const Sequence< PropertyValue >& info)
+void OConnection::construct(const OUString& url, const Sequence< PropertyValue >& info) 
     throw(SQLException)
 {
     OSL_TRACE("OConnection::construct");
@@ -161,8 +161,8 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
     }
 
     // get user and password for mysql connection
-    const PropertyValue *pIter  = info.getConstArray();
-    const PropertyValue *pEnd   = pIter + info.getLength();
+    const PropertyValue *pIter	= info.getConstArray();
+    const PropertyValue *pEnd	= pIter + info.getLength();
     OUString aUser, aPass, sUnixSocket, sNamedPipe;
     bool unixSocketPassed = false;
     bool namedPipePassed = false;
@@ -402,7 +402,7 @@ void SAL_CALL OConnection::commit()
         m_settings.cppConnection->commit();
     } catch (sql::SQLException & e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
-    }
+    }	
 }
 /* }}} */
 
@@ -475,7 +475,7 @@ void SAL_CALL OConnection::setReadOnly(sal_Bool readOnly)
 /* {{{ OConnection::createStatement() -I- */
 sal_Bool SAL_CALL OConnection::isReadOnly()
     throw(SQLException, RuntimeException)
-{
+{	
     OSL_TRACE("OConnection::isReadOnly");
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -495,11 +495,11 @@ void SAL_CALL OConnection::setCatalog(const OUString& catalog)
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
 
     try {
-//      m_settings.cppConnection->setCatalog(OUStringToOString(catalog, m_settings.encoding).getStr());
+//		m_settings.cppConnection->setCatalog(OUStringToOString(catalog, m_settings.encoding).getStr());
         m_settings.cppConnection->setSchema(OUStringToOString(catalog, getConnectionEncoding()).getStr());
     } catch (sql::SQLException & e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
-    }
+    }	
 }
 /* }}} */
 
@@ -548,7 +548,7 @@ void SAL_CALL OConnection::setTransactionIsolation(sal_Int32 level)
             break;
         case TransactionIsolation::NONE:
             cpplevel = sql::TRANSACTION_SERIALIZABLE;
-            break;
+            break;			
         default:;
             /* XXX: Exception ?? */
     }
@@ -571,16 +571,16 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation()
 
     try {
         switch (m_settings.cppConnection->getTransactionIsolation()) {
-            case sql::TRANSACTION_SERIALIZABLE:     return TransactionIsolation::SERIALIZABLE;
-            case sql::TRANSACTION_REPEATABLE_READ:  return TransactionIsolation::REPEATABLE_READ;
-            case sql::TRANSACTION_READ_COMMITTED:   return TransactionIsolation::READ_COMMITTED;
-            case sql::TRANSACTION_READ_UNCOMMITTED: return TransactionIsolation::READ_UNCOMMITTED;
+            case sql::TRANSACTION_SERIALIZABLE:		return TransactionIsolation::SERIALIZABLE;
+            case sql::TRANSACTION_REPEATABLE_READ:	return TransactionIsolation::REPEATABLE_READ;
+            case sql::TRANSACTION_READ_COMMITTED:	return TransactionIsolation::READ_COMMITTED;
+            case sql::TRANSACTION_READ_UNCOMMITTED:	return TransactionIsolation::READ_UNCOMMITTED;
             default:
                 ;
         }
     } catch (sql::SQLException & e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
-    }
+    }	
     return TransactionIsolation::NONE;
 }
 /* }}} */
@@ -683,8 +683,8 @@ void OConnection::disposing()
     }
     m_aStatements.clear();
 
-    m_bClosed   = sal_True;
-    m_xMetaData = WeakReference< XDatabaseMetaData >();
+    m_bClosed	= sal_True;
+    m_xMetaData	= WeakReference< XDatabaseMetaData >();
 
     dispose_ChildImpl();
     OConnection_BASE::disposing();
@@ -710,14 +710,14 @@ OUString OConnection::getMysqlVariable(const char *varname)
 
     try {
         XStatement * stmt = new OStatement(this, m_settings.cppConnection->createStatement());
-        Reference< XResultSet > rs = stmt->executeQuery( aStatement.makeStringAndClear() );
+        Reference< XResultSet > rs = stmt->executeQuery( aStatement.makeStringAndClear() );	
         if (rs.is() && rs->next()) {
             Reference< XRow > xRow(rs, UNO_QUERY);
             ret = xRow->getString(2);
         }
     } catch (sql::SQLException & e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
-    }
+    }								
 
     return ret;
 }
@@ -749,17 +749,17 @@ sal_Int32 OConnection::getMysqlVersion()
 // TODO: Not used
 //sal_Int32 OConnection::sdbcColumnType(OUString typeName)
 //{
-//  OSL_TRACE("OConnection::sdbcColumnType");
-//  int i = 0;
-//  while (mysqlc_types[i].typeName) {
-//      if (OUString::createFromAscii(mysqlc_types[i].typeName).equals(
-//          typeName.toAsciiUpperCase()))
-//      {
-//          return mysqlc_types[i].dataType;
-//      }
-//      i++;
-//  }
-//  return 0;
+//	OSL_TRACE("OConnection::sdbcColumnType");
+//	int i = 0;
+//	while (mysqlc_types[i].typeName) {
+//		if (OUString::createFromAscii(mysqlc_types[i].typeName).equals(
+//			typeName.toAsciiUpperCase()))
+//		{
+//			return mysqlc_types[i].dataType;
+//		}
+//		i++;
+//	}
+//	return 0;
 //}
 // -----------------------------------------------------------------------------
 ::rtl::OUString OConnection::transFormPreparedStatement(const ::rtl::OUString& _sSQL)
@@ -775,7 +775,7 @@ sal_Int32 OConnection::getMysqlVersion()
         } catch(const Exception&) {}
     }
     if ( m_xParameterSubstitution.is() ) {
-        try {
+        try	{
             sSqlStatement = m_xParameterSubstitution->substituteVariables(sSqlStatement,sal_True);
         } catch(const Exception&) { }
     }
diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx
index 20f9ffac141c..ac3c4ccd79a2 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -79,7 +79,7 @@ namespace connectivity
         typedef ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > my_XNameAccessRef;
         typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > my_XDatabaseMetaDataRef;
 
-        typedef ::cppu::WeakComponentImplHelper3<   ::com::sun::star::sdbc::XConnection,
+        typedef ::cppu::WeakComponentImplHelper3<	::com::sun::star::sdbc::XConnection,
                                                     ::com::sun::star::sdbc::XWarningsSupplier,
                                                     ::com::sun::star::lang::XServiceInfo
                                                 > OMetaConnection_BASE;
@@ -112,33 +112,33 @@ namespace connectivity
             ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_typeMap;
             ::com::sun::star::uno::Reference< com::sun::star::util::XStringSubstitution > m_xParameterSubstitution;
         protected:
-
+            
             //====================================================================
             // Data attributes
             //====================================================================
             ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
 
-            OWeakRefArray   m_aStatements;  // vector containing a list
+            OWeakRefArray	m_aStatements;	// vector containing a list
                                             // of all the Statement objects
                                             // for this Connection
 
-            SQLWarning      m_aLastWarning; // Last SQLWarning generated by an operation
-            OUString        m_aURL;         // URL of connection
-            OUString        m_sUser;        // the user name
-            MysqlCDriver&   m_rDriver;      // Pointer to the owning driver object
+            SQLWarning	    m_aLastWarning;	// Last SQLWarning generated by an operation
+            OUString	    m_aURL;			// URL of connection
+            OUString	    m_sUser;		// the user name
+            MysqlCDriver&   m_rDriver;	    // Pointer to the owning driver object
             sql::Driver*    cppDriver;
 
-            sal_Bool    m_bClosed;
-            sal_Bool    m_bUseCatalog;  // should we use the catalog on filebased databases
-            sal_Bool    m_bUseOldDateFormat;
+            sal_Bool	m_bClosed;
+            sal_Bool	m_bUseCatalog;	// should we use the catalog on filebased databases
+            sal_Bool	m_bUseOldDateFormat;
 
 
-            void        buildTypeInfo() throw(SQLException);
+            void		buildTypeInfo() throw(SQLException);
         public:
             OUString getMysqlVariable(const char *varname)
                                                                 throw(SQLException, RuntimeException);
 
-            sal_Int32 getMysqlVersion()
+            sal_Int32 getMysqlVersion() 
                                                                 throw(SQLException, RuntimeException);
 
             virtual void construct(const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info)
@@ -147,7 +147,7 @@ namespace connectivity
             OConnection(MysqlCDriver& _rDriver, sql::Driver * cppDriver);
             virtual ~OConnection();
 
-            void closeAllStatements ()                          throw(SQLException);
+            void closeAllStatements ()							throw(SQLException);
 
 
             rtl_TextEncoding getConnectionEncoding() { return m_settings.encoding; }
@@ -157,7 +157,7 @@ namespace connectivity
             virtual void SAL_CALL disposing(void);
 
             // XInterface
-            virtual void SAL_CALL release()                     throw();
+            virtual void SAL_CALL release()						throw();
 
             // XServiceInfo
             DECLARE_SERVICE_INFO();
@@ -228,12 +228,12 @@ namespace connectivity
             //sal_Int32 sdbcColumnType(OUString typeName);
             inline const ConnectionSettings& getConnectionSettings() const { return m_settings; }
             ::rtl::OUString transFormPreparedStatement(const ::rtl::OUString& _sSQL);
-
+            
             // should we use the catalog on filebased databases
-            inline sal_Bool             isCatalogUsed()     const { return m_bUseCatalog; }
-            inline OUString             getUserName()       const { return m_sUser; }
-            inline const MysqlCDriver&  getDriver()         const { return m_rDriver;}
-            inline rtl_TextEncoding     getTextEncoding()   const { return m_settings.encoding; }
+            inline sal_Bool			    isCatalogUsed()     const { return m_bUseCatalog; }
+            inline OUString			    getUserName()       const { return m_sUser; }
+            inline const MysqlCDriver&  getDriver()			const { return m_rDriver;}
+            inline rtl_TextEncoding	    getTextEncoding()	const { return m_settings.encoding; }
 
         }; /* OConnection */
         // TODO: Not used.
diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx
index a0ecf2ab854c..498ed77cd275 100644
--- a/mysqlc/source/mysqlc_databasemetadata.cxx
+++ b/mysqlc/source/mysqlc_databasemetadata.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -255,8 +255,8 @@ sal_Bool ODatabaseMetaData::impl_getRSTypeMetaData(const sal_Char* _methodName,
 {
     int resultSetType(sql::ResultSet::TYPE_FORWARD_ONLY);
     switch ( _resultSetType ) {
-        case ResultSetType::SCROLL_INSENSITIVE: resultSetType = sql::ResultSet::TYPE_SCROLL_INSENSITIVE;    break;
-        case ResultSetType::SCROLL_SENSITIVE:   resultSetType = sql::ResultSet::TYPE_SCROLL_SENSITIVE;      break;
+        case ResultSetType::SCROLL_INSENSITIVE:	resultSetType = sql::ResultSet::TYPE_SCROLL_INSENSITIVE;	break;
+        case ResultSetType::SCROLL_SENSITIVE:	resultSetType = sql::ResultSet::TYPE_SCROLL_SENSITIVE;		break;
     }
 
     return impl_getBoolMetaData(_methodName, _Method, resultSetType);
@@ -1200,10 +1200,10 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation()
     OSL_TRACE("ODatabaseMetaData::getDefaultTransactionIsolation");
     try {
         switch (meta->getDefaultTransactionIsolation()) {
-            case sql::TRANSACTION_SERIALIZABLE:     return TransactionIsolation::SERIALIZABLE;
-            case sql::TRANSACTION_REPEATABLE_READ:  return TransactionIsolation::REPEATABLE_READ;
-            case sql::TRANSACTION_READ_COMMITTED:   return TransactionIsolation::READ_COMMITTED;
-            case sql::TRANSACTION_READ_UNCOMMITTED: return TransactionIsolation::READ_UNCOMMITTED;
+            case sql::TRANSACTION_SERIALIZABLE:		return TransactionIsolation::SERIALIZABLE;
+            case sql::TRANSACTION_REPEATABLE_READ:	return TransactionIsolation::REPEATABLE_READ;
+            case sql::TRANSACTION_READ_COMMITTED:	return TransactionIsolation::READ_COMMITTED;
+            case sql::TRANSACTION_READ_UNCOMMITTED:	return TransactionIsolation::READ_UNCOMMITTED;
         }
     } catch (sql::MethodNotImplementedException) {
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getDriverMajorVersion", *this);
@@ -1380,7 +1380,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency(sal_Int32 setT
     try {
         return meta->supportsResultSetConcurrency(setType, concurrency==com::sun::star::sdbc::TransactionIsolation::READ_COMMITTED?
                                                     sql::TRANSACTION_READ_COMMITTED:
-                                                    (concurrency == com::sun::star::sdbc::TransactionIsolation::SERIALIZABLE?
+                                                    (concurrency == com::sun::star::sdbc::TransactionIsolation::SERIALIZABLE? 
                                                         sql::TRANSACTION_SERIALIZABLE:sql::TRANSACTION_SERIALIZABLE))? sal_True:sal_False;
     } catch (sql::MethodNotImplementedException) {
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::supportsResultSetConcurrency", *this);
@@ -1658,7 +1658,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
-    ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+    ext_std::string	cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
                 sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
                 tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()),
                 cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr());
@@ -1690,17 +1690,17 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
 
 
 /* {{{ ODatabaseMetaData::getColumns() -I- */
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( 
         const Any& catalog,
         const OUString& schemaPattern,
-        const OUString& tableNamePattern,
+        const OUString& tableNamePattern, 
         const OUString& columnNamePattern)
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("ODatabaseMetaData::getColumns");
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
-    ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+    ext_std::string	cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
                 sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
                 tNamePattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr()),
                 cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr());
@@ -1739,9 +1739,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
 
 
 /* {{{ ODatabaseMetaData::getTables() -I- */
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( 
         const Any& catalog,
-        const OUString& schemaPattern,
+        const OUString& schemaPattern, 
         const OUString& tableNamePattern,
         const Sequence< OUString >& types )
     throw(SQLException, RuntimeException)
@@ -1803,7 +1803,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
 /* {{{ ODatabaseMetaData::getProcedureColumns() -I- */
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
         const Any& /* catalog */,
-        const OUString& /* schemaPattern */,
+        const OUString& /* schemaPattern */, 
         const OUString& /* procedureNamePattern */,
         const OUString& /* columnNamePattern */)
     throw(SQLException, RuntimeException)
@@ -1830,7 +1830,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
                 sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
                 pNamePattern(OUStringToOString(procedureNamePattern, m_rConnection.getConnectionEncoding()).getStr());
 
-
+    
     try {
         std::auto_ptr< sql::ResultSet> rset( meta->getProcedures(cat,
                                                    sPattern.compare("")? sPattern:wild,
@@ -1886,7 +1886,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
     OSL_TRACE("ODatabaseMetaData::getExportedKeys");
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
-    ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+    ext_std::string	cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
                 sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
                 tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
 
@@ -1928,7 +1928,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
-    ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+    ext_std::string	cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
                 sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
                 tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
 
@@ -2012,7 +2012,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
-    ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+    ext_std::string	cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
                 sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
                 tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
 
@@ -2043,7 +2043,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
 
 
 /* {{{ ODatabaseMetaData::getBestRowIdentifier() -I- */
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( 
         const Any& catalog,
         const OUString& schema,
         const OUString& table,
@@ -2055,7 +2055,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
-    ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+    ext_std::string	cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
                 sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
                 tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
 
@@ -2096,7 +2096,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
-    ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
+    ext_std::string	cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
                 sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
                 tPattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr());
 
@@ -2161,7 +2161,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
     Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY);
     std::vector< std::vector< Any > > rRows;
 
-    ext_std::string primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""),
+    ext_std::string	primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""),
                 foreignCat(foreignCatalog.hasValue()? OUStringToOString(getStringFromAny(foreignCatalog), m_rConnection.getConnectionEncoding()).getStr():""),
                 pSchema(OUStringToOString(primarySchema, m_rConnection.getConnectionEncoding()).getStr()),
                 pTable(OUStringToOString(primaryTable, m_rConnection.getConnectionEncoding()).getStr()),
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx
index 3904df0cb04f..5b9941430cd3 100644
--- a/mysqlc/source/mysqlc_databasemetadata.hxx
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -58,12 +58,12 @@ namespace connectivity
 
         class ODatabaseMetaData : public ODatabaseMetaData_BASE
         {
-            OConnection&    m_rConnection;
-            sal_Bool        m_bUseCatalog;
+            OConnection&	m_rConnection;
+            sal_Bool		m_bUseCatalog;
         protected:
             sql::DatabaseMetaData * meta;
-            OUString        identifier_quote_string;
-            bool            identifier_quote_string_set;
+            OUString		identifier_quote_string;
+            bool			identifier_quote_string_set;
 
         private:
             OUString impl_getStringMetaData( const sal_Char* _methodName, const ext_std::string& (sql::DatabaseMetaData::*_Method)() );
@@ -83,127 +83,127 @@ namespace connectivity
 
             // as I mentioned before this interface is really BIG
             // XDatabaseMetaData
-            sal_Bool SAL_CALL allProceduresAreCallable()            throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL allTablesAreSelectable()              throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getURL()                      throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getUserName()                 throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL isReadOnly()                          throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL nullsAreSortedHigh()                  throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL nullsAreSortedLow()                   throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL nullsAreSortedAtStart()               throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL nullsAreSortedAtEnd()                 throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getDatabaseProductName()      throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getDatabaseProductVersion()   throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getDriverName()               throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getDriverVersion()                throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getDriverMajorVersion()              throw(my_RuntimeException);
-            sal_Int32 SAL_CALL getDriverMinorVersion()              throw(my_RuntimeException);
-            sal_Bool SAL_CALL usesLocalFiles()                      throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL usesLocalFilePerTable()               throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsMixedCaseIdentifiers()        throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL storesUpperCaseIdentifiers()          throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL storesLowerCaseIdentifiers()          throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL storesMixedCaseIdentifiers()          throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers()  throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers()    throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers()    throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers()    throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getIdentifierQuoteString()    throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getSQLKeywords()              throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getNumericFunctions()         throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getStringFunctions()          throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getSystemFunctions()          throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getTimeDateFunctions()            throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getSearchStringEscape()       throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getExtraNameCharacters()      throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsAlterTableWithAddColumn()     throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsAlterTableWithDropColumn()    throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsColumnAliasing()              throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL nullPlusNonNullIsNull()               throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsTypeConversion()              throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL allProceduresAreCallable()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL allTablesAreSelectable()				throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getURL()						throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getUserName()					throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL isReadOnly()							throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL nullsAreSortedHigh()					throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL nullsAreSortedLow()					throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL nullsAreSortedAtStart()				throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL nullsAreSortedAtEnd()					throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getDatabaseProductName()		throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getDatabaseProductVersion()	throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getDriverName()				throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getDriverVersion()				throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getDriverMajorVersion()				throw(my_RuntimeException);
+            sal_Int32 SAL_CALL getDriverMinorVersion()				throw(my_RuntimeException);
+            sal_Bool SAL_CALL usesLocalFiles()						throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL usesLocalFilePerTable()				throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsMixedCaseIdentifiers()		throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL storesUpperCaseIdentifiers()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL storesLowerCaseIdentifiers()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL storesMixedCaseIdentifiers()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers()	throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers()	throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers()	throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers()	throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getIdentifierQuoteString() 	throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getSQLKeywords()				throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getNumericFunctions()			throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getStringFunctions()			throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getSystemFunctions()			throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getTimeDateFunctions()			throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getSearchStringEscape()		throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getExtraNameCharacters()		throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsAlterTableWithAddColumn()		throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsAlterTableWithDropColumn()	throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsColumnAliasing()				throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL nullPlusNonNullIsNull()				throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsTypeConversion()				throw(my_SQLException, my_RuntimeException);
             sal_Bool SAL_CALL supportsConvert(sal_Int32 fromType, sal_Int32 toType)
                                                                     throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsTableCorrelationNames()       throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsTableCorrelationNames()		throw(my_SQLException, my_RuntimeException);
             sal_Bool SAL_CALL supportsDifferentTableCorrelationNames() throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsExpressionsInOrderBy()        throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsOrderByUnrelated()            throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsGroupBy()                     throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsGroupByUnrelated()            throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsGroupByBeyondSelect()         throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsLikeEscapeClause()            throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsMultipleResultSets()          throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsMultipleTransactions()        throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsNonNullableColumns()          throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsMinimumSQLGrammar()           throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsCoreSQLGrammar()              throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsExtendedSQLGrammar()          throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsANSI92EntryLevelSQL()         throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsANSI92IntermediateSQL()       throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsANSI92FullSQL()               throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsExpressionsInOrderBy()		throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsOrderByUnrelated()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsGroupBy()						throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsGroupByUnrelated()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsGroupByBeyondSelect()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsLikeEscapeClause()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsMultipleResultSets()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsMultipleTransactions()		throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsNonNullableColumns()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsMinimumSQLGrammar()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsCoreSQLGrammar()				throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsExtendedSQLGrammar()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsANSI92EntryLevelSQL()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsANSI92IntermediateSQL()		throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsANSI92FullSQL()				throw(my_SQLException, my_RuntimeException);
             sal_Bool SAL_CALL supportsIntegrityEnhancementFacility()throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsOuterJoins()                  throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsFullOuterJoins()              throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsLimitedOuterJoins()           throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getSchemaTerm()               throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getProcedureTerm()                throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getCatalogTerm()              throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL isCatalogAtStart()                    throw(my_SQLException, my_RuntimeException);
-            OUString SAL_CALL getCatalogSeparator()         throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsSchemasInDataManipulation()   throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsSchemasInProcedureCalls()     throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsSchemasInTableDefinitions()   throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsSchemasInIndexDefinitions()   throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsOuterJoins()					throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsFullOuterJoins()				throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsLimitedOuterJoins()			throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getSchemaTerm()				throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getProcedureTerm()				throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getCatalogTerm()				throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL isCatalogAtStart()					throw(my_SQLException, my_RuntimeException);
+            OUString SAL_CALL getCatalogSeparator()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsSchemasInDataManipulation()	throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsSchemasInProcedureCalls()		throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsSchemasInTableDefinitions()	throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsSchemasInIndexDefinitions()	throw(my_SQLException, my_RuntimeException);
             sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions() throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsCatalogsInDataManipulation()  throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsCatalogsInProcedureCalls()    throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsCatalogsInTableDefinitions()  throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions()  throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsCatalogsInDataManipulation()	throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsCatalogsInProcedureCalls()	throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsCatalogsInTableDefinitions()	throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions()	throw(my_SQLException, my_RuntimeException);
             sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions() throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsPositionedDelete()            throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsPositionedUpdate()            throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsSelectForUpdate()             throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsStoredProcedures()            throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsSubqueriesInComparisons()     throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsSubqueriesInExists()          throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsSubqueriesInIns()             throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsSubqueriesInQuantifieds()     throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsCorrelatedSubqueries()        throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsUnion()                       throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsUnionAll()                    throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit()     throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback()   throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit()  throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsPositionedDelete()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsPositionedUpdate()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsSelectForUpdate()				throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsStoredProcedures()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsSubqueriesInComparisons()		throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsSubqueriesInExists()			throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsSubqueriesInIns()				throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsSubqueriesInQuantifieds()		throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsCorrelatedSubqueries()		throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsUnion()						throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsUnionAll()					throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit()		throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback()	throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit()	throw(my_SQLException, my_RuntimeException);
             sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback() throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxBinaryLiteralLength()          throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxCharLiteralLength()            throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxColumnNameLength()             throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxColumnsInGroupBy()             throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxColumnsInIndex()               throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxColumnsInOrderBy()             throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxColumnsInSelect()              throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxColumnsInTable()               throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxConnections()                  throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxCursorNameLength()             throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxIndexLength()                  throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxSchemaNameLength()             throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxProcedureNameLength()          throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxCatalogNameLength()            throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxRowSize()                      throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs()          throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxStatementLength()              throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxStatements()                   throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxTableNameLength()              throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxTablesInSelect()               throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getMaxUserNameLength()               throw(my_SQLException, my_RuntimeException);
-            sal_Int32 SAL_CALL getDefaultTransactionIsolation()     throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL supportsTransactions()                throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxBinaryLiteralLength()			throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxCharLiteralLength()			throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxColumnNameLength()				throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxColumnsInGroupBy()				throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxColumnsInIndex()				throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxColumnsInOrderBy()				throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxColumnsInSelect()				throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxColumnsInTable()				throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxConnections()					throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxCursorNameLength()				throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxIndexLength()					throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxSchemaNameLength()				throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxProcedureNameLength()			throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxCatalogNameLength()			throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxRowSize()						throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs()			throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxStatementLength()				throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxStatements()					throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxTableNameLength()				throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxTablesInSelect()				throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getMaxUserNameLength()				throw(my_SQLException, my_RuntimeException);
+            sal_Int32 SAL_CALL getDefaultTransactionIsolation()		throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL supportsTransactions()				throw(my_SQLException, my_RuntimeException);
             sal_Bool SAL_CALL supportsTransactionIsolationLevel(sal_Int32 level)
                                                                     throw(my_SQLException, my_RuntimeException);
             sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions()
                                                                     throw(my_SQLException, my_RuntimeException);
             sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly()throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit()   throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions()     throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit()	throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions()		throw(my_SQLException, my_RuntimeException);
             my_XResultSetRef SAL_CALL getProcedures(const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern) throw(my_SQLException, my_RuntimeException);
             my_XResultSetRef SAL_CALL getProcedureColumns(const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern) throw(my_SQLException, my_RuntimeException);
             my_XResultSetRef SAL_CALL getTables(const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types) throw(my_SQLException, my_RuntimeException);
@@ -223,15 +223,15 @@ namespace connectivity
             my_XResultSetRef SAL_CALL getIndexInfo(const Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate) throw(my_SQLException, my_RuntimeException);
             sal_Bool SAL_CALL supportsResultSetType(sal_Int32 setType) throw(my_SQLException, my_RuntimeException);
             sal_Bool SAL_CALL supportsResultSetConcurrency(sal_Int32 setType, sal_Int32 concurrency) throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL ownUpdatesAreVisible(sal_Int32 setType)   throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL ownDeletesAreVisible(sal_Int32 setType)   throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL ownInsertsAreVisible(sal_Int32 setType)   throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL ownUpdatesAreVisible(sal_Int32 setType)	throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL ownDeletesAreVisible(sal_Int32 setType)	throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL ownInsertsAreVisible(sal_Int32 setType)	throw(my_SQLException, my_RuntimeException);
             sal_Bool SAL_CALL othersUpdatesAreVisible(sal_Int32 setType)throw(my_SQLException, my_RuntimeException);
             sal_Bool SAL_CALL othersDeletesAreVisible(sal_Int32 setType)throw(my_SQLException, my_RuntimeException);
             sal_Bool SAL_CALL othersInsertsAreVisible(sal_Int32 setType)throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL updatesAreDetected(sal_Int32 setType)     throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL deletesAreDetected(sal_Int32 setType)     throw(my_SQLException, my_RuntimeException);
-            sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType)     throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL updatesAreDetected(sal_Int32 setType)		throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL deletesAreDetected(sal_Int32 setType)		throw(my_SQLException, my_RuntimeException);
+            sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType)		throw(my_SQLException, my_RuntimeException);
             sal_Bool SAL_CALL supportsBatchUpdates() throw(my_SQLException, my_RuntimeException);
             my_XResultSetRef SAL_CALL getUDTs(const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types) throw(my_SQLException, my_RuntimeException);
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(my_SQLException, my_RuntimeException);
diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx
index 6b77cd94b2e2..1d4d27890dc7 100644
--- a/mysqlc/source/mysqlc_driver.cxx
+++ b/mysqlc/source/mysqlc_driver.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -67,7 +67,7 @@ void MysqlCDriver::disposing()
 {
     OSL_TRACE("MysqlCDriver::disposing");
     ::osl::MutexGuard aGuard(m_aMutex);
-
+    
     // when driver will be destroied so all our connections have to be destroied as well
     for (OWeakRefArray::iterator i = m_xConnections.begin(); m_xConnections.end() != i; ++i)
     {
@@ -99,7 +99,7 @@ Sequence< OUString > MysqlCDriver::getSupportedServiceNames_Static()
     throw(RuntimeException)
 {
     OSL_TRACE("MysqlCDriver::getSupportedServiceNames_Static");
-    // which service is supported
+    // which service is supported 
     // for more information @see com.sun.star.sdbc.Driver
     Sequence< OUString > aSNS(1);
     aSNS[0] = OUString::createFromAscii("com.sun.star.sdbc.Driver");
@@ -231,7 +231,7 @@ Reference< XConnection > SAL_CALL MysqlCDriver::connect(const OUString& url, con
     }
     catch (sql::SQLException &e)
     {
-        mysqlc_sdbc_driver::translateAndThrow(e, *this, getDefaultEncoding());
+        mysqlc_sdbc_driver::translateAndThrow(e, *this, getDefaultEncoding());	
     }
     return xConn;
 }
@@ -312,7 +312,7 @@ Reference< XInterface >  SAL_CALL MysqlCDriver_CreateInstance(const Reference< X
 /* {{{ connectivity::mysqlc::release() -I- */
 void release(oslInterlockedCount& _refCount,
              ::cppu::OBroadcastHelper& rBHelper,
-             Reference< XInterface >& _xInterface,
+             Reference< XInterface >& _xInterface, 
              ::com::sun::star::lang::XComponent* _pObject)
 {
     if (osl_decrementInterlockedCount(&_refCount) == 0) {
diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx
index d3c367ad4549..3a17fd531425 100644
--- a/mysqlc/source/mysqlc_driver.hxx
+++ b/mysqlc/source/mysqlc_driver.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,7 @@ namespace connectivity
         using ::com::sun::star::uno::Sequence;
         Reference< ::com::sun::star::uno::XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw(Exception);
 
-        typedef ::cppu::WeakComponentImplHelper2<   ::com::sun::star::sdbc::XDriver,
+        typedef ::cppu::WeakComponentImplHelper2<	::com::sun::star::sdbc::XDriver, 
                                                     ::com::sun::star::lang::XServiceInfo > ODriver_BASE;
 
         typedef void* (SAL_CALL * OMysqlCConnection_CreateInstanceFunction)(void* _pDriver);
@@ -63,8 +63,8 @@ namespace connectivity
         {
         protected:
             Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
-            ::osl::Mutex    m_aMutex;       // mutex is need to control member access
-            OWeakRefArray   m_xConnections; // vector containing a list
+            ::osl::Mutex	m_aMutex;		// mutex is need to control member access
+            OWeakRefArray	m_xConnections;	// vector containing a list
                                             // of all the Connection objects
                                             // for this Driver
 #ifndef SYSTEM_MYSQL_CPPCONN
@@ -81,13 +81,13 @@ namespace connectivity
             // OComponentHelper
             void SAL_CALL disposing(void);
             // XInterface
-            static OUString getImplementationName_Static()                  throw(RuntimeException);
-            static Sequence< OUString > getSupportedServiceNames_Static()   throw(RuntimeException);
+            static OUString getImplementationName_Static()					throw(RuntimeException);
+            static Sequence< OUString > getSupportedServiceNames_Static()	throw(RuntimeException);
 
             // XServiceInfo
-            OUString SAL_CALL getImplementationName()                       throw(RuntimeException);
-            sal_Bool SAL_CALL supportsService(const OUString& ServiceName)  throw(RuntimeException);
-            Sequence< OUString > SAL_CALL getSupportedServiceNames()        throw(RuntimeException);
+            OUString SAL_CALL getImplementationName()						throw(RuntimeException);
+            sal_Bool SAL_CALL supportsService(const OUString& ServiceName)	throw(RuntimeException);
+            Sequence< OUString > SAL_CALL getSupportedServiceNames()		throw(RuntimeException);
 
             // XDriver
             Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect(const OUString& url, const Sequence< ::com::sun::star::beans::PropertyValue >& info)
@@ -97,8 +97,8 @@ namespace connectivity
             Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo(const OUString& url, const Sequence< ::com::sun::star::beans::PropertyValue >& info)
                                                                             throw(SQLException, RuntimeException);
 
-            sal_Int32 SAL_CALL getMajorVersion()                            throw(RuntimeException);
-            sal_Int32 SAL_CALL getMinorVersion()                            throw(RuntimeException);
+            sal_Int32 SAL_CALL getMajorVersion()							throw(RuntimeException);
+            sal_Int32 SAL_CALL getMinorVersion()							throw(RuntimeException);
 
             inline Reference< ::com::sun::star::lang::XMultiServiceFactory > getFactory() const { return m_xFactory; }
 
diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx
index e4fa7a58254c..03e1264d3cc1 100644
--- a/mysqlc/source/mysqlc_general.cxx
+++ b/mysqlc/source/mysqlc_general.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -129,19 +129,19 @@ int mysqlToOOOType(int cppConnType)
         case sql::DataType::SET:
         case sql::DataType::VARCHAR:
             return com::sun::star::sdbc::DataType::VARCHAR;
-
+        
         case sql::DataType::VARBINARY:
             return com::sun::star::sdbc::DataType::VARBINARY;
 
         case sql::DataType::LONGVARCHAR:
             return com::sun::star::sdbc::DataType::LONGVARCHAR;
-
+        
         case sql::DataType::LONGVARBINARY:
             return com::sun::star::sdbc::DataType::LONGVARBINARY;
 
         case sql::DataType::TIMESTAMP:
             return com::sun::star::sdbc::DataType::TIMESTAMP;
-
+        
         case sql::DataType::DATE:
             return com::sun::star::sdbc::DataType::DATE;
 
@@ -150,7 +150,7 @@ int mysqlToOOOType(int cppConnType)
 
         case sql::DataType::GEOMETRY:
             return com::sun::star::sdbc::DataType::VARCHAR;
-
+        
         case sql::DataType::SQLNULL:
             return com::sun::star::sdbc::DataType::SQLNULL;
 
diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx
index 113301eaa666..5e4463bec38d 100644
--- a/mysqlc/source/mysqlc_general.hxx
+++ b/mysqlc/source/mysqlc_general.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx
index f81865849450..89507b64b14d 100644
--- a/mysqlc/source/mysqlc_preparedstatement.cxx
+++ b/mysqlc/source/mysqlc_preparedstatement.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -146,7 +146,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData()
     OSL_TRACE("OPreparedStatement::getMetaData");
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
-
+    
     try {
         if (!m_xMetaData.is()) {
             m_xMetaData = new OResultSetMetaData(
@@ -172,7 +172,7 @@ void SAL_CALL OPreparedStatement::close()
 
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
-
+        
     try {
         clearWarnings();
         clearParameters();
@@ -213,7 +213,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate()
     OSL_TRACE("OPreparedStatement::executeUpdate");
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
-
+    
     sal_Int32 affectedRows = sal_False;
     try {
         affectedRows = ((sql::PreparedStatement *)cppStatement)->executeUpdate();
@@ -241,7 +241,7 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const OUString&
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearParameters", *this);
     } catch (sql::SQLException &e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
-    }
+    }	
 }
 /* }}} */
 
@@ -311,7 +311,7 @@ void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 parameter, sal_Bool x)
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setBoolean", *this);
     } catch (sql::SQLException &e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
-    }
+    }	
 }
 /* }}} */
 
@@ -331,7 +331,7 @@ void SAL_CALL OPreparedStatement::setByte(sal_Int32 parameter, sal_Int8 x)
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setByte", *this);
     } catch (sql::SQLException &e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
-    }
+    }	
 }
 /* }}} */
 
@@ -359,7 +359,7 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 parameter, const Date& aData
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setDate", *this);
     } catch (sql::SQLException &e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
-    }
+    }	
 }
 /* }}} */
 
@@ -387,7 +387,7 @@ void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const Time& aVal)
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setTime", *this);
     } catch (sql::SQLException &e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
-    }
+    }	
 }
 /* }}} */
 
@@ -423,7 +423,7 @@ void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 parameter, const DateTi
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setTimestamp", *this);
     } catch (sql::SQLException &e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
-    }
+    }	
 }
 /* }}} */
 
@@ -443,7 +443,7 @@ void SAL_CALL OPreparedStatement::setDouble(sal_Int32 parameter, double x)
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setDouble", *this);
     } catch (sql::SQLException &e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
-    }
+    }	
 }
 /* }}} */
 
@@ -463,7 +463,7 @@ void SAL_CALL OPreparedStatement::setFloat(sal_Int32 parameter, float x)
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setFloat", *this);
     } catch (sql::SQLException &e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
-    }
+    }	
 }
 /* }}} */
 
@@ -483,7 +483,7 @@ void SAL_CALL OPreparedStatement::setInt(sal_Int32 parameter, sal_Int32 x)
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setInt", *this);
     } catch (sql::SQLException &e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
-    }
+    }	
 }
 /* }}} */
 
@@ -503,7 +503,7 @@ void SAL_CALL OPreparedStatement::setLong(sal_Int32 parameter, sal_Int64 aVal)
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setLong", *this);
     } catch (sql::SQLException &e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
-    }
+    }	
 }
 /* }}} */
 
@@ -523,7 +523,7 @@ void SAL_CALL OPreparedStatement::setNull(sal_Int32 parameter, sal_Int32 sqlType
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setNull", *this);
     } catch (sql::SQLException &e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
-    }
+    }	
 }
 /* }}} */
 
@@ -792,7 +792,7 @@ void SAL_CALL OPreparedStatement::setShort(sal_Int32 parameter, sal_Int16 x)
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setShort", *this);
     } catch (sql::SQLException &e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
-    }
+    }	
 }
 /* }}} */
 
@@ -806,14 +806,14 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 parameter, const Sequence<
     checkDisposed(OPreparedStatement::rBHelper.bDisposed);
     checkParameterIndex(parameter);
 
-    ext_std::string blobby((char *)x.getConstArray(), x.getLength());
+    ext_std::string blobby((char *)x.getConstArray(), x.getLength()); 
     try {
         ((sql::PreparedStatement *)cppStatement)->setString(parameter, blobby);
     } catch (sql::MethodNotImplementedException) {
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setBytes", *this);
     } catch (sql::SQLException &e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
-    }
+    }	
 }
 /* }}} */
 
@@ -864,7 +864,7 @@ void SAL_CALL OPreparedStatement::clearParameters()
         mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearParameters", *this);
     } catch (sql::SQLException &e) {
         mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
-    }
+    }	
 }
 /* }}} */
 
diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx b/mysqlc/source/mysqlc_preparedstatement.hxx
index daf2610f996d..65d9492b76dd 100644
--- a/mysqlc/source/mysqlc_preparedstatement.hxx
+++ b/mysqlc/source/mysqlc_preparedstatement.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -55,18 +55,18 @@ namespace connectivity
         using ::com::sun::star::sdbc::XResultSetMetaData;
 
         class OBoundParam;
-        typedef ::cppu::ImplHelper5<    ::com::sun::star::sdbc::XPreparedStatement,
+        typedef ::cppu::ImplHelper5<	::com::sun::star::sdbc::XPreparedStatement,
                                         ::com::sun::star::sdbc::XParameters,
                                         ::com::sun::star::sdbc::XPreparedBatchExecution,
                                         ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
                                         ::com::sun::star::lang::XServiceInfo> OPreparedStatement_BASE;
 
-        class OPreparedStatement :  public OCommonStatement,
+        class OPreparedStatement :	public OCommonStatement,
                                     public OPreparedStatement_BASE
         {
         protected:
-            unsigned int        m_paramCount;   // number of placeholders
-            sal_Int32           m_nNumParams;   // Number of parameter markers for the prepared statement
+            unsigned int		m_paramCount;	// number of placeholders
+            sal_Int32			m_nNumParams;	// Number of parameter markers for the prepared statement
             Reference< XResultSetMetaData > m_xMetaData;
 
             void checkParameterIndex(sal_Int32 parameter);
@@ -80,7 +80,7 @@ namespace connectivity
             OPreparedStatement(OConnection* _pConnection, sql::PreparedStatement * cppPrepStmt);
 
             //XInterface
-            Any SAL_CALL queryInterface(const Type & rType) throw(RuntimeException);
+            Any SAL_CALL queryInterface(const Type & rType)	throw(RuntimeException);
             void SAL_CALL acquire() throw();
             void SAL_CALL release() throw();
 
@@ -89,7 +89,7 @@ namespace connectivity
                                                                                     throw(RuntimeException);
 
             // XPreparedStatement
-            Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery() throw(SQLException, RuntimeException);
+            Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery()	throw(SQLException, RuntimeException);
             sal_Int32 SAL_CALL executeUpdate() throw(SQLException, RuntimeException);
             sal_Bool SAL_CALL execute() throw(SQLException, RuntimeException);
             Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(SQLException, RuntimeException);
@@ -103,26 +103,26 @@ namespace connectivity
                                                 throw(SQLException, RuntimeException);
 
             // XParameters
-            void SAL_CALL setNull(sal_Int32 parameter, sal_Int32 sqlType)           throw(SQLException, RuntimeException);
+            void SAL_CALL setNull(sal_Int32 parameter, sal_Int32 sqlType)			throw(SQLException, RuntimeException);
 
             void SAL_CALL setObjectNull(sal_Int32 parameter, sal_Int32 sqlType, const OUString& typeName)
                                                                                     throw(SQLException, RuntimeException);
 
-            void SAL_CALL setBoolean(sal_Int32 parameter, sal_Bool x)               throw(SQLException, RuntimeException);
+            void SAL_CALL setBoolean(sal_Int32 parameter, sal_Bool x)				throw(SQLException, RuntimeException);
 
-            void SAL_CALL setByte(sal_Int32 parameter, sal_Int8 x)                  throw(SQLException, RuntimeException);
+            void SAL_CALL setByte(sal_Int32 parameter, sal_Int8 x)					throw(SQLException, RuntimeException);
 
-            void SAL_CALL setShort(sal_Int32 parameter, sal_Int16 x)                throw(SQLException, RuntimeException);
+            void SAL_CALL setShort(sal_Int32 parameter, sal_Int16 x)				throw(SQLException, RuntimeException);
 
-            void SAL_CALL setInt(sal_Int32 parameter, sal_Int32 x)                  throw(SQLException, RuntimeException);
+            void SAL_CALL setInt(sal_Int32 parameter, sal_Int32 x)					throw(SQLException, RuntimeException);
 
-            void SAL_CALL setLong(sal_Int32 parameter, sal_Int64 x)                 throw(SQLException, RuntimeException);
+            void SAL_CALL setLong(sal_Int32 parameter, sal_Int64 x)					throw(SQLException, RuntimeException);
 
-            void SAL_CALL setFloat(sal_Int32 parameter, float x)                    throw(SQLException, RuntimeException);
+            void SAL_CALL setFloat(sal_Int32 parameter, float x)					throw(SQLException, RuntimeException);
 
-            void SAL_CALL setDouble(sal_Int32 parameter, double x)                  throw(SQLException, RuntimeException);
+            void SAL_CALL setDouble(sal_Int32 parameter, double x)					throw(SQLException, RuntimeException);
 
-            void SAL_CALL setString(sal_Int32 parameter, const OUString& x)         throw(SQLException, RuntimeException);
+            void SAL_CALL setString(sal_Int32 parameter, const OUString& x)			throw(SQLException, RuntimeException);
 
             void SAL_CALL setBytes(sal_Int32 parameter, const ::com::sun::star::uno::Sequence< sal_Int8 >& x)
                                                                                     throw(SQLException, RuntimeException);
@@ -141,7 +141,7 @@ namespace connectivity
             void SAL_CALL setCharacterStream(sal_Int32 parameter, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length)
                                                                                     throw(SQLException, RuntimeException);
 
-            void SAL_CALL setObject(sal_Int32 parameter, const Any& x)              throw(SQLException, RuntimeException);
+            void SAL_CALL setObject(sal_Int32 parameter, const Any& x)				throw(SQLException, RuntimeException);
 
             void SAL_CALL setObjectWithInfo(sal_Int32 parameter, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale)
                                                                                     throw(SQLException, RuntimeException);
@@ -163,7 +163,7 @@ namespace connectivity
             // XPreparedBatchExecution
             void SAL_CALL addBatch() throw(SQLException, RuntimeException);
             void SAL_CALL clearBatch() throw(SQLException, RuntimeException);
-            ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch()    throw(SQLException, RuntimeException);
+            ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch()	throw(SQLException, RuntimeException);
 
             // XCloseable
             void SAL_CALL close() throw(SQLException, RuntimeException);
@@ -184,6 +184,6 @@ namespace connectivity
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/mysqlc/source/mysqlc_propertyids.cxx b/mysqlc/source/mysqlc_propertyids.cxx
index 77cfa7b01b9e..ecd6e2b4a8f2 100644
--- a/mysqlc/source/mysqlc_propertyids.cxx
+++ b/mysqlc/source/mysqlc_propertyids.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -37,64 +37,64 @@ namespace connectivity
 {
 namespace mysqlc
 {
-const sal_Char* getPROPERTY_QUERYTIMEOUT()          { return "QueryTimeOut"; }
-const sal_Char* getPROPERTY_MAXFIELDSIZE()          { return "MaxFieldSize"; }
-const sal_Char* getPROPERTY_MAXROWS()               { return "MaxRows"; }
-const sal_Char* getPROPERTY_CURSORNAME()            { return "CursorName"; }
-const sal_Char* getPROPERTY_RESULTSETCONCURRENCY()  { return "ResultSetConcurrency"; }
-const sal_Char* getPROPERTY_RESULTSETTYPE()         { return "ResultSetType"; }
-const sal_Char* getPROPERTY_FETCHDIRECTION()        { return "FetchDirection"; }
-const sal_Char* getPROPERTY_FETCHSIZE()             { return "FetchSize"; }
-const sal_Char* getPROPERTY_ESCAPEPROCESSING()      { return "EscapeProcessing"; }
-const sal_Char* getPROPERTY_USEBOOKMARKS()          { return "UseBookmarks"; }
-
-const sal_Char* getPROPERTY_NAME()                  { return "Name"; }
-const sal_Char* getPROPERTY_TYPE()                  { return "Type"; }
-const sal_Char* getPROPERTY_TYPENAME()              { return "TypeName"; }
-const sal_Char* getPROPERTY_PRECISION()             { return "Precision"; }
-const sal_Char* getPROPERTY_SCALE()                 { return "Scale"; }
-const sal_Char* getPROPERTY_ISNULLABLE()            { return "IsNullable"; }
-const sal_Char* getPROPERTY_ISAUTOINCREMENT()       { return "IsAutoIncrement"; }
-const sal_Char* getPROPERTY_ISROWVERSION()          { return "IsRowVersion"; }
-const sal_Char* getPROPERTY_DESCRIPTION()           { return "Description"; }
-const sal_Char* getPROPERTY_DEFAULTVALUE()          { return "DefaultValue"; }
-
-const sal_Char* getPROPERTY_REFERENCEDTABLE()       { return "ReferencedTable"; }
-const sal_Char* getPROPERTY_UPDATERULE()            { return "UpdateRule"; }
-const sal_Char* getPROPERTY_DELETERULE()            { return "DeleteRule"; }
-const sal_Char* getPROPERTY_CATALOG()               { return "Catalog"; }
-const sal_Char* getPROPERTY_ISUNIQUE()              { return "IsUnique"; }
-const sal_Char* getPROPERTY_ISPRIMARYKEYINDEX()     { return "IsPrimaryKeyIndex"; }
-const sal_Char* getPROPERTY_ISCLUSTERED()           { return "IsClustered"; }
-const sal_Char* getPROPERTY_ISASCENDING()           { return "IsAscending"; }
-const sal_Char* getPROPERTY_SCHEMANAME()            { return "SchemaName"; }
-const sal_Char* getPROPERTY_CATALOGNAME()           { return "CatalogName"; }
-const sal_Char* getPROPERTY_COMMAND()               { return "Command"; }
-const sal_Char* getPROPERTY_CHECKOPTION()           { return "CheckOption"; }
-const sal_Char* getPROPERTY_PASSWORD()              { return "Password"; }
-const sal_Char* getPROPERTY_RELATEDCOLUMN()         { return "RelatedColumn"; }
-
-const sal_Char* getSTAT_INVALID_INDEX()             { return "Invalid descriptor index"; }
-
-const sal_Char* getPROPERTY_FUNCTION()              { return "Function"; }
-const sal_Char* getPROPERTY_TABLENAME()             { return "TableName"; }
-const sal_Char* getPROPERTY_REALNAME()              { return "RealName"; }
-const sal_Char* getPROPERTY_DBASEPRECISIONCHANGED() { return "DbasePrecisionChanged"; }
-const sal_Char* getPROPERTY_ISCURRENCY()            { return "IsCurrency"; }
-const sal_Char* getPROPERTY_ISBOOKMARKABLE()        { return "IsBookmarkable"; }
-
-const sal_Char* getPROPERTY_FORMATKEY()             { return "FormatKey"; }
-const sal_Char* getPROPERTY_LOCALE()                { return "Locale"; }
-
-const sal_Char* getPROPERTY_AUTOINCREMENTCREATION() { return "AutoIncrementCreation"; }
-const sal_Char* getPROPERTY_PRIVILEGES()            { return "Privileges"; }
+const sal_Char* getPROPERTY_QUERYTIMEOUT()			{ return "QueryTimeOut"; }
+const sal_Char* getPROPERTY_MAXFIELDSIZE()			{ return "MaxFieldSize"; }
+const sal_Char* getPROPERTY_MAXROWS()				{ return "MaxRows"; }
+const sal_Char* getPROPERTY_CURSORNAME()			{ return "CursorName"; }
+const sal_Char* getPROPERTY_RESULTSETCONCURRENCY()	{ return "ResultSetConcurrency"; }
+const sal_Char* getPROPERTY_RESULTSETTYPE()			{ return "ResultSetType"; }
+const sal_Char* getPROPERTY_FETCHDIRECTION()		{ return "FetchDirection"; }
+const sal_Char* getPROPERTY_FETCHSIZE()				{ return "FetchSize"; }
+const sal_Char* getPROPERTY_ESCAPEPROCESSING()		{ return "EscapeProcessing"; }
+const sal_Char* getPROPERTY_USEBOOKMARKS()			{ return "UseBookmarks"; }
+
+const sal_Char* getPROPERTY_NAME()					{ return "Name"; }
+const sal_Char* getPROPERTY_TYPE()					{ return "Type"; }
+const sal_Char* getPROPERTY_TYPENAME()				{ return "TypeName"; }
+const sal_Char* getPROPERTY_PRECISION()				{ return "Precision"; }
+const sal_Char* getPROPERTY_SCALE()					{ return "Scale"; }
+const sal_Char* getPROPERTY_ISNULLABLE()			{ return "IsNullable"; }
+const sal_Char* getPROPERTY_ISAUTOINCREMENT()		{ return "IsAutoIncrement"; }
+const sal_Char* getPROPERTY_ISROWVERSION()			{ return "IsRowVersion"; }
+const sal_Char* getPROPERTY_DESCRIPTION()			{ return "Description"; }
+const sal_Char* getPROPERTY_DEFAULTVALUE()			{ return "DefaultValue"; }
+
+const sal_Char* getPROPERTY_REFERENCEDTABLE()		{ return "ReferencedTable"; }
+const sal_Char* getPROPERTY_UPDATERULE()			{ return "UpdateRule"; }
+const sal_Char* getPROPERTY_DELETERULE()			{ return "DeleteRule"; }
+const sal_Char* getPROPERTY_CATALOG()				{ return "Catalog"; }
+const sal_Char* getPROPERTY_ISUNIQUE()				{ return "IsUnique"; }
+const sal_Char* getPROPERTY_ISPRIMARYKEYINDEX()		{ return "IsPrimaryKeyIndex"; }
+const sal_Char* getPROPERTY_ISCLUSTERED()			{ return "IsClustered"; }
+const sal_Char* getPROPERTY_ISASCENDING()			{ return "IsAscending"; }
+const sal_Char* getPROPERTY_SCHEMANAME()			{ return "SchemaName"; }
+const sal_Char* getPROPERTY_CATALOGNAME()			{ return "CatalogName"; }
+const sal_Char* getPROPERTY_COMMAND()				{ return "Command"; }
+const sal_Char* getPROPERTY_CHECKOPTION()			{ return "CheckOption"; }
+const sal_Char* getPROPERTY_PASSWORD()				{ return "Password"; }
+const sal_Char* getPROPERTY_RELATEDCOLUMN()			{ return "RelatedColumn"; }
+
+const sal_Char* getSTAT_INVALID_INDEX()				{ return "Invalid descriptor index"; }
+
+const sal_Char* getPROPERTY_FUNCTION()				{ return "Function"; }
+const sal_Char* getPROPERTY_TABLENAME()				{ return "TableName"; }
+const sal_Char* getPROPERTY_REALNAME()				{ return "RealName"; }
+const sal_Char* getPROPERTY_DBASEPRECISIONCHANGED()	{ return "DbasePrecisionChanged"; }
+const sal_Char* getPROPERTY_ISCURRENCY()			{ return "IsCurrency"; }
+const sal_Char* getPROPERTY_ISBOOKMARKABLE()		{ return "IsBookmarkable"; }
+
+const sal_Char* getPROPERTY_FORMATKEY()				{ return "FormatKey"; }
+const sal_Char* getPROPERTY_LOCALE()				{ return "Locale"; }
+
+const sal_Char* getPROPERTY_AUTOINCREMENTCREATION()	{ return "AutoIncrementCreation"; }
+const sal_Char* getPROPERTY_PRIVILEGES()			{ return "Privileges"; }
     //============================================================
     //= error messages
     //============================================================
-const sal_Char* getERRORMSG_SEQUENCE()              { return "Function sequence error"; }
-const sal_Char* getSQLSTATE_SEQUENCE()              { return "HY010"; }
-const sal_Char* getSQLSTATE_GENERAL()               { return "HY0000"; }
-const sal_Char* getSTR_DELIMITER()                  { return "/"; }
+const sal_Char* getERRORMSG_SEQUENCE()				{ return "Function sequence error"; }
+const sal_Char* getSQLSTATE_SEQUENCE()				{ return "HY010"; }
+const sal_Char* getSQLSTATE_GENERAL()				{ return "HY0000"; }
+const sal_Char* getSTR_DELIMITER()					{ return "/"; }
 
 
 
diff --git a/mysqlc/source/mysqlc_propertyids.hxx b/mysqlc/source/mysqlc_propertyids.hxx
index 294ed509ee23..9fc802efdae4 100644
--- a/mysqlc/source/mysqlc_propertyids.hxx
+++ b/mysqlc/source/mysqlc_propertyids.hxx
@@ -18,7 +18,7 @@ namespace mysqlc
 {
     class OPropertyMap
     {
-        ::std::map<sal_Int32 , rtl_uString*> m_aPropertyMap;
+        ::std::map<sal_Int32 , rtl_uString*> m_aPropertyMap; 
 
         ::rtl::OUString fillValue(sal_Int32 _nIndex);
     public:
@@ -40,10 +40,10 @@ namespace mysqlc
 
     struct UStringDescription
     {
-        const sal_Char* pZeroTerminatedName;
+        const sal_Char*	pZeroTerminatedName;
         sal_Int32 nLength;
 
-        UStringDescription(PVFN _fCharFkt);
+        UStringDescription(PVFN _fCharFkt); 
         operator ::rtl::OUString() const { return ::rtl::OUString(pZeroTerminatedName,nLength,RTL_TEXTENCODING_ASCII_US); }
         ~UStringDescription();
     private:
@@ -121,13 +121,13 @@ enum
 #define DECL_PROP1IMPL(varname, type) \
 pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type*>(NULL)),
 //------------------------------------------------------------------------------
-#define DECL_PROP0(varname, type)   \
+#define DECL_PROP0(varname, type)	\
     DECL_PROP1IMPL(varname, type) 0)
 //------------------------------------------------------------------------------
 #define DECL_BOOL_PROP1IMPL(varname) \
         pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getBooleanCppuType(),
 //------------------------------------------------------------------------------
-#define DECL_BOOL_PROP0(varname)    \
+#define DECL_BOOL_PROP0(varname)	\
     DECL_BOOL_PROP1IMPL(varname) 0)
 
 
diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx
index c55744baa956..2898d12cf02e 100644
--- a/mysqlc/source/mysqlc_resultset.cxx
+++ b/mysqlc/source/mysqlc_resultset.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -61,7 +61,7 @@ using ::rtl::OUString;
 #include <stdio.h>
 
 
-//  IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
+//	IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
 /* {{{ OResultSet::getImplementationName() -I- */
 OUString SAL_CALL OResultSet::getImplementationName()
     throw (RuntimeException)
@@ -101,7 +101,7 @@ sal_Bool SAL_CALL OResultSet::supportsService(const OUString& _rServiceName)
 
 
 /* {{{ OResultSet::OResultSet() -I- */
-OResultSet::OResultSet(OCommonStatement * pStmt, sql::ResultSet * result, rtl_TextEncoding _encoding )
+OResultSet::OResultSet(OCommonStatement * pStmt, sql::ResultSet * result, rtl_TextEncoding _encoding ) 
     : OResultSet_BASE(m_aMutex)
     ,OPropertySetHelper(OResultSet_BASE::rBHelper)
     ,m_aStatement((OWeakObject*)pStmt)
@@ -162,7 +162,7 @@ Sequence< Type > SAL_CALL OResultSet::getTypes()
     throw(RuntimeException)
 {
     OSL_TRACE("OResultSet::getTypes");
-    OTypeCollection aTypes( ::getCppuType((const  Reference< XMultiPropertySet > *) NULL),
+    OTypeCollection aTypes(	::getCppuType((const  Reference< XMultiPropertySet > *) NULL),
                                                 ::getCppuType((const Reference< XFastPropertySet > *) NULL),
                                                 ::getCppuType((const Reference< XPropertySet > *) NULL));
 
@@ -269,7 +269,7 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes(sal_Int32 column)
     throw(SQLException, RuntimeException)
 {
     OSL_TRACE("OResultSet::getBytes");
-
+    
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     MutexGuard aGuard(m_aMutex);
 
@@ -861,7 +861,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted()
 /* {{{ OResultSet::rowInserted() -I- */
 sal_Bool SAL_CALL OResultSet::rowInserted()
     throw(SQLException, RuntimeException)
-{
+{	
     OSL_TRACE("OResultSet::rowInserted");
     MutexGuard aGuard(m_aMutex);
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1366,11 +1366,11 @@ IPropertyArrayHelper * OResultSet::createArrayHelper() const
     Sequence< Property > aProps(5);
     Property* pProperties = aProps.getArray();
     sal_Int32 nPos = 0;
-    DECL_PROP0(FETCHDIRECTION,          sal_Int32);
-    DECL_PROP0(FETCHSIZE,               sal_Int32);
+    DECL_PROP0(FETCHDIRECTION,			sal_Int32);
+    DECL_PROP0(FETCHSIZE,				sal_Int32);
     DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY);
     DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) PropertyAttribute::READONLY);
-    DECL_PROP1IMPL(RESULTSETTYPE,       sal_Int32) PropertyAttribute::READONLY);
+    DECL_PROP1IMPL(RESULTSETTYPE,		sal_Int32) PropertyAttribute::READONLY);
 
     return new OPropertyArrayHelper(aProps);
 }
diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx
index 87cd76979ec0..981d0bd7b97a 100644
--- a/mysqlc/source/mysqlc_resultset.hxx
+++ b/mysqlc/source/mysqlc_resultset.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -62,9 +62,9 @@ namespace connectivity
         typedef my_XNameAccessRef my_XNameAccessRef;
 
         /*
-        **  OResultSet
+        **	OResultSet
         */
-        typedef ::cppu::WeakComponentImplHelper12<  ::com::sun::star::sdbc::XResultSet,
+        typedef ::cppu::WeakComponentImplHelper12<	::com::sun::star::sdbc::XResultSet,
                                                     ::com::sun::star::sdbc::XRow,
                                                     ::com::sun::star::sdbc::XResultSetMetaDataSupplier,
                                                     ::com::sun::star::util::XCancellable,
@@ -77,16 +77,16 @@ namespace connectivity
                                                     ::com::sun::star::sdbc::XColumnLocate,
                                                     ::com::sun::star::lang::XServiceInfo> OResultSet_BASE;
 
-        class OResultSet :  public  OBase_Mutex,
-                            public  OResultSet_BASE,
-                            public  ::cppu::OPropertySetHelper,
-                            public  OPropertyArrayUsageHelper<OResultSet>
+        class OResultSet :	public	OBase_Mutex,
+                            public	OResultSet_BASE,
+                            public	::cppu::OPropertySetHelper,
+                            public	OPropertyArrayUsageHelper<OResultSet>
         {
         protected:
-            ::com::sun::star::uno::WeakReferenceHelper  m_aStatement;
+            ::com::sun::star::uno::WeakReferenceHelper	m_aStatement;
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData;
-            sql::ResultSet      *m_result;
-            unsigned int        fieldCount;
+            sql::ResultSet		*m_result;
+            unsigned int		fieldCount;
             rtl_TextEncoding    m_encoding;
             // OPropertyArrayUsageHelper
             ::cppu::IPropertyArrayHelper* createArrayHelper() const;
@@ -106,7 +106,7 @@ namespace connectivity
 
         public:
             DECLARE_SERVICE_INFO();
-
+            
             OResultSet( OCommonStatement* pStmt, sql::ResultSet *result, rtl_TextEncoding _encoding );
 
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *()
@@ -121,9 +121,9 @@ namespace connectivity
             Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType)
                                                                         throw(RuntimeException);
 
-            void SAL_CALL acquire()                                     throw();
+            void SAL_CALL acquire()										throw();
 
-            void SAL_CALL release()                                     throw();
+            void SAL_CALL release()										throw();
 
             //XTypeProvider
             ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
@@ -134,60 +134,60 @@ namespace connectivity
                                                                         throw(RuntimeException);
 
             // XResultSet
-            sal_Bool SAL_CALL next()                                    throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL next()									throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL isBeforeFirst()                           throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL isBeforeFirst()							throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL isAfterLast()                             throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL isAfterLast()								throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL isFirst()                                 throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL isFirst()									throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL isLast()                                  throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL isLast()									throw(SQLException, RuntimeException);
 
-            void SAL_CALL beforeFirst()                                 throw(SQLException, RuntimeException);
+            void SAL_CALL beforeFirst()									throw(SQLException, RuntimeException);
 
-            void SAL_CALL afterLast()                                   throw(SQLException, RuntimeException);
+            void SAL_CALL afterLast()									throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL first()                                   throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL first()									throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL last()                                    throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL last()									throw(SQLException, RuntimeException);
 
-            sal_Int32 SAL_CALL getRow()                                 throw(SQLException, RuntimeException);
+            sal_Int32 SAL_CALL getRow()									throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL absolute(sal_Int32 row)                   throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL absolute(sal_Int32 row)					throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL relative(sal_Int32 rows)                  throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL relative(sal_Int32 rows)					throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL previous()                                throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL previous()								throw(SQLException, RuntimeException);
 
-            void SAL_CALL refreshRow()                                  throw(SQLException, RuntimeException);
+            void SAL_CALL refreshRow()									throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL rowUpdated()                              throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL rowUpdated()								throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL rowInserted()                             throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL rowInserted()								throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL rowDeleted()                              throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL rowDeleted()								throw(SQLException, RuntimeException);
 
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement()
                                                                         throw(SQLException, RuntimeException);
             // XRow
             sal_Bool SAL_CALL wasNull() throw(SQLException, RuntimeException);
 
-            OUString SAL_CALL getString(sal_Int32 column)       throw(SQLException, RuntimeException);
+            OUString SAL_CALL getString(sal_Int32 column)		throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL getBoolean(sal_Int32 column)              throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL getBoolean(sal_Int32 column)				throw(SQLException, RuntimeException);
 
-            sal_Int8 SAL_CALL getByte(sal_Int32 column)                 throw(SQLException, RuntimeException);
+            sal_Int8 SAL_CALL getByte(sal_Int32 column)					throw(SQLException, RuntimeException);
 
-            sal_Int16 SAL_CALL getShort(sal_Int32 column)               throw(SQLException, RuntimeException);
+            sal_Int16 SAL_CALL getShort(sal_Int32 column)				throw(SQLException, RuntimeException);
 
-            sal_Int32 SAL_CALL getInt(sal_Int32 column)                 throw(SQLException, RuntimeException);
+            sal_Int32 SAL_CALL getInt(sal_Int32 column)					throw(SQLException, RuntimeException);
 
-            sal_Int64 SAL_CALL getLong(sal_Int32 column)                throw(SQLException, RuntimeException);
+            sal_Int64 SAL_CALL getLong(sal_Int32 column)				throw(SQLException, RuntimeException);
 
-            float SAL_CALL getFloat(sal_Int32 column)                   throw(SQLException, RuntimeException);
+            float SAL_CALL getFloat(sal_Int32 column)					throw(SQLException, RuntimeException);
 
-            double SAL_CALL getDouble(sal_Int32 column)                 throw(SQLException, RuntimeException);
+            double SAL_CALL getDouble(sal_Int32 column)					throw(SQLException, RuntimeException);
 
             ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int32 column)
                                                                         throw(SQLException, RuntimeException);
@@ -227,45 +227,45 @@ namespace connectivity
                                                                         throw(SQLException, RuntimeException);
 
             // XCancellable
-            void SAL_CALL cancel()                                      throw(RuntimeException);
+            void SAL_CALL cancel()										throw(RuntimeException);
 
             // XCloseable
-            void SAL_CALL close()                                       throw(SQLException, RuntimeException);
+            void SAL_CALL close()										throw(SQLException, RuntimeException);
 
             // XWarningsSupplier
-            Any SAL_CALL getWarnings()                                  throw(SQLException, RuntimeException);
+            Any SAL_CALL getWarnings()									throw(SQLException, RuntimeException);
 
-            void SAL_CALL clearWarnings()                               throw(SQLException, RuntimeException);
+            void SAL_CALL clearWarnings()								throw(SQLException, RuntimeException);
 
             // XResultSetUpdate
-            void SAL_CALL insertRow()                                   throw(SQLException, RuntimeException);
+            void SAL_CALL insertRow()									throw(SQLException, RuntimeException);
 
-            void SAL_CALL updateRow()                                   throw(SQLException, RuntimeException);
+            void SAL_CALL updateRow()									throw(SQLException, RuntimeException);
 
-            void SAL_CALL deleteRow()                                   throw(SQLException, RuntimeException);
+            void SAL_CALL deleteRow()									throw(SQLException, RuntimeException);
 
-            void SAL_CALL cancelRowUpdates()                            throw(SQLException, RuntimeException);
+            void SAL_CALL cancelRowUpdates()							throw(SQLException, RuntimeException);
 
-            void SAL_CALL moveToInsertRow()                             throw(SQLException, RuntimeException);
+            void SAL_CALL moveToInsertRow()								throw(SQLException, RuntimeException);
 
-            void SAL_CALL moveToCurrentRow()                            throw(SQLException, RuntimeException);
+            void SAL_CALL moveToCurrentRow()							throw(SQLException, RuntimeException);
 
             // XRowUpdate
-            void SAL_CALL updateNull(sal_Int32 column)                  throw(SQLException, RuntimeException);
+            void SAL_CALL updateNull(sal_Int32 column)					throw(SQLException, RuntimeException);
 
-            void SAL_CALL updateBoolean(sal_Int32 column, sal_Bool x)   throw(SQLException, RuntimeException);
+            void SAL_CALL updateBoolean(sal_Int32 column, sal_Bool x)	throw(SQLException, RuntimeException);
 
-            void SAL_CALL updateByte(sal_Int32 column, sal_Int8 x)      throw(SQLException, RuntimeException);
+            void SAL_CALL updateByte(sal_Int32 column, sal_Int8 x)		throw(SQLException, RuntimeException);
 
-            void SAL_CALL updateShort(sal_Int32 column, sal_Int16 x)    throw(SQLException, RuntimeException);
+            void SAL_CALL updateShort(sal_Int32 column, sal_Int16 x)	throw(SQLException, RuntimeException);
 
-            void SAL_CALL updateInt(sal_Int32 column, sal_Int32 x)      throw(SQLException, RuntimeException);
+            void SAL_CALL updateInt(sal_Int32 column, sal_Int32 x)		throw(SQLException, RuntimeException);
 
-            void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x)     throw(SQLException, RuntimeException);
+            void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x)		throw(SQLException, RuntimeException);
 
-            void SAL_CALL updateFloat(sal_Int32 column, float x)        throw(SQLException, RuntimeException);
+            void SAL_CALL updateFloat(sal_Int32 column, float x)		throw(SQLException, RuntimeException);
 
-            void SAL_CALL updateDouble(sal_Int32 column, double x)      throw(SQLException, RuntimeException);
+            void SAL_CALL updateDouble(sal_Int32 column, double x)		throw(SQLException, RuntimeException);
 
             void SAL_CALL updateString(sal_Int32 column, const OUString& x)
                                                                         throw(SQLException, RuntimeException);
@@ -299,7 +299,7 @@ namespace connectivity
                                                                         throw(SQLException, RuntimeException);
 
             // XRowLocate
-            Any SAL_CALL getBookmark()                                  throw(SQLException, RuntimeException);
+            Any SAL_CALL getBookmark()									throw(SQLException, RuntimeException);
 
             sal_Bool SAL_CALL moveToBookmark(const Any& bookmark)
                                                                         throw(SQLException, RuntimeException);
@@ -310,7 +310,7 @@ namespace connectivity
             sal_Int32 SAL_CALL compareBookmarks(const Any& first, const Any& second)
                                                                         throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL hasOrderedBookmarks()                     throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL hasOrderedBookmarks()						throw(SQLException, RuntimeException);
 
             sal_Int32 SAL_CALL hashBookmark(const Any& bookmark)
                                                                         throw(SQLException, RuntimeException);
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.cxx b/mysqlc/source/mysqlc_resultsetmetadata.cxx
index 933bc7d57e98..7078033da440 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.cxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -86,7 +86,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column)
 /*
   XXX: This method doesn't throw exceptions at all.
   Should it declare that it throws ?? What if throw() is removed?
-  Does it change the API, the open-close principle?
+  Does it change the API, the open-close principle?  
 */
 /* {{{ OResultSetMetaData::getColumnCount() -I- */
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount()
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx
index 93bc107fd455..e9bad5ffd6ea 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.hxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -74,49 +74,49 @@ namespace connectivity
             inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw()
             { return this; }
 
-            sal_Int32 SAL_CALL getColumnCount()                     throw(SQLException, RuntimeException);
+            sal_Int32 SAL_CALL getColumnCount()						throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column)     throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column)		throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column)     throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column)		throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL isSearchable(sal_Int32 column)        throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL isSearchable(sal_Int32 column)		throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL isCurrency(sal_Int32 column)          throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL isCurrency(sal_Int32 column)			throw(SQLException, RuntimeException);
 
-            sal_Int32 SAL_CALL isNullable(sal_Int32 column)         throw(SQLException, RuntimeException);
+            sal_Int32 SAL_CALL isNullable(sal_Int32 column)			throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL isSigned(sal_Int32 column)            throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL isSigned(sal_Int32 column)			throw(SQLException, RuntimeException);
 
             sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column)throw(SQLException, RuntimeException);
 
-            OUString SAL_CALL getColumnLabel(sal_Int32 column)      throw(SQLException, RuntimeException);
+            OUString SAL_CALL getColumnLabel(sal_Int32 column)		throw(SQLException, RuntimeException);
 
-            OUString SAL_CALL getColumnName(sal_Int32 column)       throw(SQLException, RuntimeException);
+            OUString SAL_CALL getColumnName(sal_Int32 column)		throw(SQLException, RuntimeException);
 
-            OUString SAL_CALL getSchemaName(sal_Int32 column)       throw(SQLException, RuntimeException);
+            OUString SAL_CALL getSchemaName(sal_Int32 column)		throw(SQLException, RuntimeException);
 
-            sal_Int32 SAL_CALL getPrecision(sal_Int32 column)       throw(SQLException, RuntimeException);
+            sal_Int32 SAL_CALL getPrecision(sal_Int32 column)		throw(SQLException, RuntimeException);
 
-            sal_Int32 SAL_CALL getScale(sal_Int32 column)           throw(SQLException, RuntimeException);
+            sal_Int32 SAL_CALL getScale(sal_Int32 column)			throw(SQLException, RuntimeException);
 
-            OUString SAL_CALL getTableName(sal_Int32 column)        throw(SQLException, RuntimeException);
+            OUString SAL_CALL getTableName(sal_Int32 column)		throw(SQLException, RuntimeException);
 
-            OUString SAL_CALL getCatalogName(sal_Int32 column)      throw(SQLException, RuntimeException);
+            OUString SAL_CALL getCatalogName(sal_Int32 column)		throw(SQLException, RuntimeException);
 
-            sal_Int32 SAL_CALL getColumnType(sal_Int32 column)      throw(SQLException, RuntimeException);
+            sal_Int32 SAL_CALL getColumnType(sal_Int32 column)		throw(SQLException, RuntimeException);
 
-            OUString SAL_CALL getColumnTypeName(sal_Int32 column)   throw(SQLException, RuntimeException);
+            OUString SAL_CALL getColumnTypeName(sal_Int32 column) 	throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL isReadOnly(sal_Int32 column)          throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL isReadOnly(sal_Int32 column)			throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL isWritable(sal_Int32 column)          throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL isWritable(sal_Int32 column)			throw(SQLException, RuntimeException);
 
             sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column)throw(SQLException, RuntimeException);
 
             OUString SAL_CALL getColumnServiceName(sal_Int32 column)throw(SQLException, RuntimeException);
 
-            void checkColumnIndex(sal_Int32 columnIndex)            throw (SQLException, RuntimeException);
+            void checkColumnIndex(sal_Int32 columnIndex)			throw (SQLException, RuntimeException);
         };
     }
 }
diff --git a/mysqlc/source/mysqlc_services.cxx b/mysqlc/source/mysqlc_services.cxx
index 4111870f874c..fea6bd1c446f 100644
--- a/mysqlc/source/mysqlc_services.cxx
+++ b/mysqlc/source/mysqlc_services.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@ using ::com::sun::star::lang::XMultiServiceFactory;
 typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
         (
             const Reference< XMultiServiceFactory > & rServiceManager,
-            const OUString & rComponentName,
+            const OUString & rComponentName, 
             ::cppu::ComponentInstantiation pCreateFunction,
             const Sequence< OUString > & rServiceNames,
             rtl_ModuleCount* _pTemp
@@ -59,8 +59,8 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
 
 //---------------------------------------------------------------------------------------
 void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
+        const OUString& aServiceImplName, 
+        const Sequence< OUString>& Services, 
         const Reference< XRegistryKey > & xKey)
 {
     ::rtl::OUStringBuffer aMainKeyName;
@@ -94,7 +94,7 @@ struct ProviderRequest
 
     /* {{{ CREATE_PROVIDER -I- */
     inline sal_Bool CREATE_PROVIDER(
-                const OUString& Implname,
+                const OUString& Implname, 
                 const Sequence< OUString > & Services,
                 ::cppu::ComponentInstantiation Factory,
                 createFactoryFunc creator
@@ -116,8 +116,8 @@ struct ProviderRequest
 
 /* {{{ component_getImplementationEnvironment -I- */
 extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char  **ppEnvTypeName,
-                uno_Environment ** /* ppEnv */
+                const sal_Char	**ppEnvTypeName,
+                uno_Environment	** /* ppEnv */
             )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -129,11 +129,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
 extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void * /* pServiceManager */, void * pRegistryKey)
 {
     if (pRegistryKey) {
-        try {
+        try	{
             Reference< XRegistryKey > xKey(reinterpret_cast< XRegistryKey*>(pRegistryKey));
 
             REGISTER_PROVIDER(
-                MysqlCDriver::getImplementationName_Static(),
+                MysqlCDriver::getImplementationName_Static(), 
                 MysqlCDriver::getSupportedServiceNames_Static(), xKey);
 
             return sal_True;
diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx
index 64a06e6fde34..902edc10b0d8 100644
--- a/mysqlc/source/mysqlc_statement.cxx
+++ b/mysqlc/source/mysqlc_statement.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -64,7 +64,7 @@ using ::rtl::OUString;
 #include <stdio.h>
 
 /* {{{ OConnection::OCommonStatement() -I- */
-OCommonStatement::OCommonStatement(OConnection* _pConnection, sql::Statement *_cppStatement)
+OCommonStatement::OCommonStatement(OConnection* _pConnection, sql::Statement *_cppStatement) 
     :OCommonStatement_IBase(m_aMutex)
     ,OPropertySetHelper(OCommonStatement_IBase::rBHelper)
     ,OStatement_CBase( (::cppu::OWeakObject*)_pConnection, this )
@@ -136,7 +136,7 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes()
     throw(RuntimeException)
 {
     OSL_TRACE("OCommonStatement::getTypes");
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
+    ::cppu::OTypeCollection aTypes(	::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
                                     ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
                                     ::getCppuType( (const Reference< XPropertySet > *)0 ));
 
@@ -163,7 +163,7 @@ void SAL_CALL OCommonStatement::close()
 {
     OSL_TRACE("OCommonStatement::close");
     /*
-      We need a block for the checkDisposed call.
+      We need a block for the checkDisposed call. 
       After the check we can call dispose() as we are not under lock ??
     */
     {
@@ -342,7 +342,7 @@ sal_Bool SAL_CALL OCommonStatement::getMoreResults()
     MutexGuard aGuard(m_aMutex);
     checkDisposed(rBHelper.bDisposed);
 
-    // if your driver supports more than only one resultset
+    // if your driver supports more than only one resultset 
     // and has one more at this moment return(true
     return (sal_False);
 }
@@ -384,12 +384,12 @@ void SAL_CALL OCommonStatement::clearWarnings()
     Sequence< Property > aProps(10);
     Property* pProperties = aProps.getArray();
     sal_Int32 nPos = 0;
-    DECL_PROP0(CURSORNAME,  OUString);
+    DECL_PROP0(CURSORNAME,	OUString);
     DECL_BOOL_PROP0(ESCAPEPROCESSING);
     DECL_PROP0(FETCHDIRECTION,sal_Int32);
-    DECL_PROP0(FETCHSIZE,   sal_Int32);
+    DECL_PROP0(FETCHSIZE,	sal_Int32);
     DECL_PROP0(MAXFIELDSIZE,sal_Int32);
-    DECL_PROP0(MAXROWS,     sal_Int32);
+    DECL_PROP0(MAXROWS,		sal_Int32);
     DECL_PROP0(QUERYTIMEOUT,sal_Int32);
     DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32);
     DECL_PROP0(RESULTSETTYPE,sal_Int32);
@@ -451,7 +451,7 @@ void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const
 void OCommonStatement::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) const
 {
     OSL_TRACE("OCommonStatement::getFastPropertyValue");
-    switch (nHandle)    {
+    switch (nHandle)	{
         case PROPERTY_ID_QUERYTIMEOUT:
         case PROPERTY_ID_MAXFIELDSIZE:
         case PROPERTY_ID_MAXROWS:
diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx
index 8a7fb500a0a8..2e0aea26321c 100644
--- a/mysqlc/source/mysqlc_statement.hxx
+++ b/mysqlc/source/mysqlc_statement.hxx
@@ -30,7 +30,7 @@ namespace connectivity
         using ::com::sun::star::uno::RuntimeException;
         using ::rtl::OUString;
 
-        typedef ::cppu::WeakComponentImplHelper5<   ::com::sun::star::sdbc::XStatement,
+        typedef ::cppu::WeakComponentImplHelper5<	::com::sun::star::sdbc::XStatement,
                                                     ::com::sun::star::sdbc::XWarningsSupplier,
                                                     ::com::sun::star::util::XCancellable,
                                                     ::com::sun::star::sdbc::XCloseable,
@@ -56,11 +56,11 @@ namespace connectivity
             SQLWarning m_aLastWarning;
 
         protected:
-            ::std::list< OUString>  m_aBatchList;
+            ::std::list< OUString>	m_aBatchList;
 
-            OConnection*            m_pConnection;  // The owning Connection object
+            OConnection*			m_pConnection;	// The owning Connection object
 
-            sql::Statement          *cppStatement;
+            sql::Statement			*cppStatement;
 
         protected:
             void disposeResultSet();
@@ -91,9 +91,9 @@ namespace connectivity
             void SAL_CALL disposing(void);
 
             // XInterface
-            void SAL_CALL release()             throw();
+            void SAL_CALL release() 			throw();
 
-            void SAL_CALL acquire()             throw();
+            void SAL_CALL acquire() 			throw();
 
             // XInterface
             Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType)
@@ -121,15 +121,15 @@ namespace connectivity
                                                 throw(SQLException, RuntimeException);
 
             // XWarningsSupplier
-            Any SAL_CALL getWarnings()      throw(SQLException, RuntimeException);
+            Any SAL_CALL getWarnings() 		throw(SQLException, RuntimeException);
 
-            void SAL_CALL clearWarnings()       throw(SQLException, RuntimeException);
+            void SAL_CALL clearWarnings() 		throw(SQLException, RuntimeException);
 
             // XCancellable
-            void SAL_CALL cancel()              throw(RuntimeException);
+            void SAL_CALL cancel() 				throw(RuntimeException);
 
             // XCloseable
-            void SAL_CALL close()               throw(SQLException, RuntimeException);
+            void SAL_CALL close() 				throw(SQLException, RuntimeException);
 
             // XMultipleResults
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet()
@@ -137,7 +137,7 @@ namespace connectivity
 
             sal_Int32 SAL_CALL getUpdateCount() throw(SQLException, RuntimeException);
 
-            sal_Bool SAL_CALL getMoreResults()  throw(SQLException, RuntimeException);
+            sal_Bool SAL_CALL getMoreResults()	throw(SQLException, RuntimeException);
 
             // other methods
             OConnection* getOwnConnection() const { return m_pConnection;}
@@ -147,7 +147,7 @@ namespace connectivity
         };
 
 
-        class OStatement :  public OCommonStatement,
+        class OStatement :	public OCommonStatement,
                             public ::com::sun::star::sdbc::XBatchExecution,
                             public ::com::sun::star::lang::XServiceInfo
 
@@ -163,14 +163,14 @@ namespace connectivity
             Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType )
                                                 throw(RuntimeException);
 
-            void SAL_CALL acquire()             throw();
-            void SAL_CALL release()             throw();
+            void SAL_CALL acquire() 			throw();
+            void SAL_CALL release() 			throw();
 
             // XBatchExecution
             void SAL_CALL addBatch(const OUString& sql)
                                                 throw(SQLException, RuntimeException);
 
-            void SAL_CALL clearBatch()          throw(SQLException, RuntimeException);
+            void SAL_CALL clearBatch()			throw(SQLException, RuntimeException);
 
             ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch()
                                                 throw(SQLException, RuntimeException);
diff --git a/mysqlc/source/mysqlc_subcomponent.hxx b/mysqlc/source/mysqlc_subcomponent.hxx
index 8cf2f2b8b7e1..853091aa53d8 100644
--- a/mysqlc/source/mysqlc_subcomponent.hxx
+++ b/mysqlc/source/mysqlc_subcomponent.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -74,7 +74,7 @@ namespace connectivity
         protected:
             // the parent must support the tunnel implementation
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent;
-            SELF*   m_pDerivedImplementation;
+            SELF*	m_pDerivedImplementation;
 
         public:
             OSubComponent(
@@ -107,14 +107,14 @@ namespace connectivity
         class OPropertyArrayUsageHelper
         {
         protected:
-            static sal_Int32                        s_nRefCount;
-            static ::cppu::IPropertyArrayHelper*    s_pProps;
-            static ::osl::Mutex                     s_aMutex;
+            static sal_Int32						s_nRefCount;
+            static ::cppu::IPropertyArrayHelper*	s_pProps;
+            static ::osl::Mutex						s_aMutex;
 
         public:
             OPropertyArrayUsageHelper();
             virtual ~OPropertyArrayUsageHelper()
-            {   // ARGHHHHHHH ..... would like to implement this in proparrhlp_impl.hxx (as we do with all other methods)
+            {	// ARGHHHHHHH ..... would like to implement this in proparrhlp_impl.hxx (as we do with all other methods)
                 // but SUNPRO 5 compiler (linker) doesn't like this
                 ::osl::MutexGuard aGuard(s_aMutex);
                 OSL_ENSURE(s_nRefCount > 0, "OPropertyArrayUsageHelper::~OPropertyArrayUsageHelper : suspicious call : have a refcount of 0 !");
@@ -128,7 +128,7 @@ namespace connectivity
             /** call this in the getInfoHelper method of your derived class. The method returns the array helper of the
                 class, which is created if neccessary.
             */
-            ::cppu::IPropertyArrayHelper*   getArrayHelper();
+            ::cppu::IPropertyArrayHelper*	getArrayHelper();
 
         protected:
             /** used to implement the creation of the array helper which is shared amongst all instances of the class.
@@ -138,19 +138,19 @@ namespace connectivity
                 <BR>
                 as long as IPropertyArrayHelper has no virtual destructor, the implementation of ~OPropertyArrayUsageHelper
                 assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps.
-                @return                         an pointer to the newly created array helper. Must not be NULL.
+                @return							an pointer to the newly created array helper. Must not be NULL.
             */
             virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const = 0;
         };
 
-        template<class TYPE>
-        sal_Int32                       OPropertyArrayUsageHelper< TYPE >::s_nRefCount  = 0;
+        template<class TYPE> 
+        sal_Int32						OPropertyArrayUsageHelper< TYPE >::s_nRefCount	= 0;
 
-        template<class TYPE>
-        ::cppu::IPropertyArrayHelper*   OPropertyArrayUsageHelper< TYPE >::s_pProps = NULL;
+        template<class TYPE> 
+        ::cppu::IPropertyArrayHelper*	OPropertyArrayUsageHelper< TYPE >::s_pProps	= NULL;
 
-        template<class TYPE>
-        ::osl::Mutex                    OPropertyArrayUsageHelper< TYPE >::s_aMutex;
+        template<class TYPE> 
+        ::osl::Mutex					OPropertyArrayUsageHelper< TYPE >::s_aMutex;
 
         //------------------------------------------------------------------
         template <class TYPE>
@@ -211,31 +211,31 @@ namespace connectivity
         }
 
 
-#define DECLARE_SERVICE_INFO()  \
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);   \
-    virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException);   \
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)   \
-
-#define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname)  \
-    ::rtl::OUString SAL_CALL classname::getImplementationName() throw (::com::sun::star::uno::RuntimeException) \
-    {   \
-        return ::rtl::OUString::createFromAscii(implasciiname); \
-    }   \
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)    \
-    {   \
-        ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);   \
-        aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \
-        return aSupported;  \
-    }   \
-    sal_Bool SAL_CALL classname::supportsService(const ::rtl::OUString& _rServiceName) throw(::com::sun::star::uno::RuntimeException)   \
-    {   \
-        Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());             \
-        const ::rtl::OUString* pSupported = aSupported.getConstArray();                 \
-        const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();              \
-        for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)   \
-            ;                                                                           \
-        return pSupported != pEnd;                                                      \
-    }   \
+#define DECLARE_SERVICE_INFO()	\
+    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);	\
+    virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException);	\
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)	\
+
+#define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname)	\
+    ::rtl::OUString SAL_CALL classname::getImplementationName() throw (::com::sun::star::uno::RuntimeException)	\
+    {	\
+        return ::rtl::OUString::createFromAscii(implasciiname);	\
+    }	\
+    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)	\
+    {	\
+        ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);	\
+        aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname);	\
+        return aSupported;	\
+    }	\
+    sal_Bool SAL_CALL classname::supportsService(const ::rtl::OUString& _rServiceName) throw(::com::sun::star::uno::RuntimeException)	\
+    {	\
+        Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());				\
+        const ::rtl::OUString* pSupported = aSupported.getConstArray();					\
+        const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();				\
+        for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)	\
+            ;																			\
+        return pSupported != pEnd;														\
+    }	\
 
 
     }
diff --git a/mysqlc/source/mysqlc_types.cxx b/mysqlc/source/mysqlc_types.cxx
index c363143d901d..24d40efdc194 100644
--- a/mysqlc/source/mysqlc_types.cxx
+++ b/mysqlc/source/mysqlc_types.cxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
diff --git a/mysqlc/source/mysqlc_types.hxx b/mysqlc/source/mysqlc_types.hxx
index 4d5d844ac480..2ddd2ee251d4 100644
--- a/mysqlc/source/mysqlc_types.hxx
+++ b/mysqlc/source/mysqlc_types.hxx
@@ -1,7 +1,7 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+* 
 * Copyright 2008 by Sun Microsystems, Inc.
 *
 * OpenOffice.org - a multi-platform office productivity suite
@@ -47,8 +47,8 @@ struct TypeInfoDef {
     const char *localTypeName;
     sal_Int32 minScale;
     sal_Int32 maxScale;
-    sal_Int32 sqlDataType;
-    sal_Int32 sqlDateTimeSub;
+    sal_Int32 sqlDataType; 
+    sal_Int32 sqlDateTimeSub; 
     sal_Int32 numPrecRadix;
 };
 
diff --git a/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu b/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu
index 3c076a4a3a7a..b9f239ebc03c 100644
--- a/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -2,7 +2,7 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/nlpsolver/locale/NLPSolverCommon_bg.properties b/nlpsolver/locale/NLPSolverCommon_bg.properties
new file mode 100644
index 000000000000..830440ebb6f9
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverCommon_bg.properties
@@ -0,0 +1,22 @@
+# x-no-translate
+#BaseNLPSolver
+NLPSolverCommon.Properties.AssumeNonNegative=\u041F\u0440\u0438\u0435\u043C\u0430\u043D\u0435 \u043D\u0430 \u043F\u0440\u043E\u043C\u0435\u043D\u043B\u0438\u0432\u0438\u0442\u0435 \u0437\u0430 \u043D\u0435\u043E\u0442\u0440\u0438\u0446\u0430\u0442\u0435\u043B\u043D\u0438
+#BaseEvolutionarySolver
+NLPSolverCommon.Properties.SwarmSize=\u0420\u0430\u0437\u043C\u0435\u0440 \u043D\u0430 \u0440\u043E\u044F
+NLPSolverCommon.Properties.LibrarySize=\u0420\u0430\u0437\u043C\u0435\u0440 \u043D\u0430 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430\u0442\u0430
+NLPSolverCommon.Properties.LearningCycles=\u041E\u0431\u0443\u0447\u0430\u0432\u0430\u0449\u0438 \u0446\u0438\u043A\u043B\u0438
+NLPSolverCommon.Properties.GuessVariableRange=\u041E\u0446\u0435\u043D\u043A\u0430 \u043D\u0430 \u0433\u0440\u0430\u043D\u0438\u0446\u0438\u0442\u0435 \u043D\u0430 \u043F\u0440\u043E\u043C\u0435\u043D\u043B\u0438\u0432\u0438\u0442\u0435
+NLPSolverCommon.Properties.VariableRangeThreshold=\u041F\u0440\u0430\u0433 \u0437\u0430 \u0433\u0440\u0430\u043D\u0438\u0446\u0438\u0442\u0435 \u043D\u0430 \u043F\u0440\u043E\u043C\u0435\u043D\u043B\u0438\u0432\u0438\u0442\u0435 (\u043F\u0440\u0438 \u043E\u0446\u0435\u043D\u044F\u0432\u0430\u043D\u0435)
+NLPSolverCommon.Properties.UseACRComparator=\u0421\u0440\u0430\u0432\u043D\u044F\u0432\u0430\u043D\u0435 \u0447\u0440\u0435\u0437 ACR (\u0432\u043C\u0435\u0441\u0442\u043E BCH)
+NLPSolverCommon.Properties.UseRandomStartingPoint=\u0418\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u0441\u043B\u0443\u0447\u0430\u0439\u043D\u0430 \u043D\u0430\u0447\u0430\u043B\u043D\u0430 \u0442\u043E\u0447\u043A\u0430
+NLPSolverCommon.Properties.StagnationLimit=\u0413\u0440\u0430\u043D\u0438\u0446\u0430 \u043D\u0430 \u0441\u0442\u0430\u0433\u043D\u0430\u0446\u0438\u044F
+NLPSolverCommon.Properties.Tolerance=\u0422\u043E\u043B\u0435\u0440\u0430\u043D\u0441 \u043D\u0430 \u0441\u0442\u0430\u0433\u043D\u0430\u0446\u0438\u044F
+NLPSolverCommon.Properties.EnhancedSolverStatus=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u0440\u0430\u0437\u0448\u0438\u0440\u0435\u043D\u043E \u0441\u044A\u0441\u0442\u043E\u044F\u043D\u0438\u0435
+#DEPS
+NLPSolverCommon.Properties.AgentSwitchRate=\u041D\u0438\u0432\u043E \u043D\u0430 \u043F\u0440\u0435\u0432\u043A\u043B\u044E\u0447\u0432\u0430\u043D\u0435 \u043D\u0430 \u0430\u0433\u0435\u043D\u0442\u0430 (\u0432\u0435\u0440\u043E\u044F\u0442\u043D\u043E\u0441\u0442 \u043D\u0430 \u0414\u0415)
+NLPSolverCommon.Properties.DEFactor=\u0414\u0415: \u043A\u043E\u0435\u0444\u0438\u0446\u0438\u0435\u043D\u0442 \u043D\u0430 \u043C\u0430\u0449\u0430\u0431\u0438\u0440\u0430\u043D\u0435 (0\u20131,2)
+NLPSolverCommon.Properties.DECR=\u0414\u0415: \u0432\u0435\u0440\u043E\u044F\u0442\u043D\u043E\u0441\u0442 \u0437\u0430 \u043A\u0440\u044A\u0441\u0442\u043E\u0441\u0432\u0430\u043D\u0435 (0\u20131)
+NLPSolverCommon.Properties.PSC1=\u0420\u0427: \u043A\u043E\u0433\u043D\u0438\u0442\u0438\u0432\u043D\u0430 \u043A\u043E\u043D\u0441\u0442\u0430\u043D\u0442\u0430
+NLPSolverCommon.Properties.PSC2=\u0420\u0427: \u0441\u043E\u0446\u0438\u0430\u043B\u043D\u0430 \u043A\u043E\u043D\u0441\u0442\u0430\u043D\u0442\u0430
+NLPSolverCommon.Properties.PSWeight=\u0420\u0427: \u043A\u043E\u0435\u0444\u0438\u0446\u0438\u0435\u043D\u0442 \u043D\u0430 \u0441\u0432\u0438\u0432\u0430\u043D\u0435
+NLPSolverCommon.Properties.PSCL=\u0420\u0427: \u0432\u0435\u0440\u043E\u044F\u0442\u043D\u043E\u0441\u0442 \u0437\u0430 \u043C\u0443\u0442\u0430\u0446\u0438\u044F (0\u20130,005)
diff --git a/nlpsolver/locale/NLPSolverCommon_et.properties b/nlpsolver/locale/NLPSolverCommon_et.properties
new file mode 100644
index 000000000000..49a4bdfd5440
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverCommon_et.properties
@@ -0,0 +1,22 @@
+# x-no-translate
+#BaseNLPSolver
+NLPSolverCommon.Properties.AssumeNonNegative=Mittenegatiivsete muutujate eeldamine
+#BaseEvolutionarySolver
+NLPSolverCommon.Properties.SwarmSize=S\u00FClemi suurus
+NLPSolverCommon.Properties.LibrarySize=Teegi suurus
+NLPSolverCommon.Properties.LearningCycles=\u00D5ppimists\u00FCklite arv
+NLPSolverCommon.Properties.GuessVariableRange=Muutujapiiride oletamine
+NLPSolverCommon.Properties.VariableRangeThreshold=Muutujapiiride l\u00E4vi (oletamisel)
+NLPSolverCommon.Properties.UseACRComparator=ACR komparaatori kasutamine (BCH asemel)
+NLPSolverCommon.Properties.UseRandomStartingPoint=Juhusliku alguspunkti kasutamine
+NLPSolverCommon.Properties.StagnationLimit=Seisakuraja
+NLPSolverCommon.Properties.Tolerance=Seisakutolerants
+NLPSolverCommon.Properties.EnhancedSolverStatus=Lahendaja t\u00E4iendatud oleku kuvamine
+#DEPS
+NLPSolverCommon.Properties.AgentSwitchRate=Agent Switch Rate (DE t\u00F5en\u00E4osus)
+NLPSolverCommon.Properties.DEFactor=DE: skaleerimistegur (0-1,2)
+NLPSolverCommon.Properties.DECR=DE: ristumist\u00F5en\u00E4osus (0-1)
+NLPSolverCommon.Properties.PSC1=PS: kognitiivsuskonstant
+NLPSolverCommon.Properties.PSC2=PS: sotsiaalkonstant
+NLPSolverCommon.Properties.PSWeight=PS: ahenemiskoefitsient
+NLPSolverCommon.Properties.PSCL=PS: mutatsioonit\u00F5en\u00E4osus (0-0,005)
diff --git a/nlpsolver/locale/NLPSolverCommon_nb.properties b/nlpsolver/locale/NLPSolverCommon_nb.properties
index 3b88d95b50f8..477fea9c0f99 100644
--- a/nlpsolver/locale/NLPSolverCommon_nb.properties
+++ b/nlpsolver/locale/NLPSolverCommon_nb.properties
@@ -1,6 +1,6 @@
 # x-no-translate
 #BaseNLPSolver
-NLPSolverCommon.Properties.AssumeNonNegative=Assume Non-Negative Variables
+NLPSolverCommon.Properties.AssumeNonNegative=Anta positive variabler
 #BaseEvolutionarySolver
 NLPSolverCommon.Properties.SwarmSize=Size of Swarm
 NLPSolverCommon.Properties.LibrarySize=Bibliotekst\u00F8rrelse
diff --git a/nlpsolver/locale/NLPSolverCommon_tr.properties b/nlpsolver/locale/NLPSolverCommon_tr.properties
new file mode 100644
index 000000000000..87d2929d4f0f
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverCommon_tr.properties
@@ -0,0 +1,22 @@
+# x-no-translate
+#BaseNLPSolver
+NLPSolverCommon.Properties.AssumeNonNegative=Negatif olmayan De\u011Fi\u015Fkenleri Varsay
+#BaseEvolutionarySolver
+NLPSolverCommon.Properties.SwarmSize=Y\u0131\u011F\u0131n\u0131n Boyutu
+NLPSolverCommon.Properties.LibrarySize=K\u00FCt\u00FCphanenin Boyutu
+NLPSolverCommon.Properties.LearningCycles=\u00D6\u011Frenme Evreleri
+NLPSolverCommon.Properties.GuessVariableRange=De\u011Fi\u015Fken \u00D6l\u00E7\u00FCs\u00FC Tahmini
+NLPSolverCommon.Properties.VariableRangeThreshold=De\u011Fi\u015Fken \u00D6l\u00E7\u00FCs\u00FC S\u0131n\u0131r\u0131 (tahmin ediyorken)
+NLPSolverCommon.Properties.UseACRComparator=ACR Kar\u015F\u0131la\u015Ft\u0131r\u0131c\u0131s\u0131n\u0131 kullan (BCH'nin yerine)
+NLPSolverCommon.Properties.UseRandomStartingPoint=Rasgele ba\u015Flama noktas\u0131 kullan
+NLPSolverCommon.Properties.StagnationLimit=Durgunluk S\u0131n\u0131r\u0131
+NLPSolverCommon.Properties.Tolerance=Durgunluk Tolerans\u0131
+NLPSolverCommon.Properties.EnhancedSolverStatus=Geli\u015Ftirilmi\u015F \u00E7\u00F6z\u00FCc\u00FC durumunu g\u00F6ster
+#DEPS
+NLPSolverCommon.Properties.AgentSwitchRate=Arac\u0131 Ge\u00E7i\u015F Oran\u0131 (DE Olas\u0131l\u0131\u011F\u0131)
+NLPSolverCommon.Properties.DEFactor=DE: \u00D6l\u00E7\u00FCleme Fakt\u00F6r\u00FC (0-1.2)
+NLPSolverCommon.Properties.DECR=DE: A\u015Fma Olas\u0131l\u0131\u011F\u0131 (0-1)
+NLPSolverCommon.Properties.PSC1=PS: Bili\u015Fsel Sabit
+NLPSolverCommon.Properties.PSC2=PS: Sosyal Sabit
+NLPSolverCommon.Properties.PSWeight=PS: \u0130n\u015Fa Fakt\u00F6r\u00FC
+NLPSolverCommon.Properties.PSCL=PS: T\u00FCrde\u011Fi\u015Fim Olas\u0131l\u0131\u011F\u0131 (0-0.005)
diff --git a/nlpsolver/locale/NLPSolverStatusDialog_bg.properties b/nlpsolver/locale/NLPSolverStatusDialog_bg.properties
new file mode 100644
index 000000000000..791513f3236c
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverStatusDialog_bg.properties
@@ -0,0 +1,28 @@
+# x-no-translate
+#Dialog
+NLPSolverStatusDialog.Dialog.Caption=\u0421\u044A\u0441\u0442\u043E\u044F\u043D\u0438\u0435
+#Controls
+NLPSolverStatusDialog.Controls.lblSolution=\u0422\u0435\u043A\u0443\u0449\u043E \u0440\u0435\u0448\u0435\u043D\u0438\u0435:
+NLPSolverStatusDialog.Controls.lblIteration=\u0418\u0442\u0435\u0440\u0430\u0446\u0438\u044F:
+NLPSolverStatusDialog.Controls.lblStagnation=\u0421\u0442\u0430\u0433\u043D\u0430\u0446\u0438\u044F:
+NLPSolverStatusDialog.Controls.lblRuntime=\u0412\u0440\u0435\u043C\u0435 \u043D\u0430 \u0438\u0437\u043F\u044A\u043B\u043D\u0435\u043D\u0438\u0435:
+NLPSolverStatusDialog.Controls.btnStop=\u0421\u043F\u0438\u0440\u0430\u043D\u0435
+NLPSolverStatusDialog.Controls.btnOK=OK
+NLPSolverStatusDialog.Controls.btnContinue=\u041F\u0440\u043E\u0434\u044A\u043B\u0436\u0430\u0432\u0430\u043D\u0435
+#Messages
+NLPSolverStatusDialog.Message.StopIteration=\u0414\u043E\u0441\u0442\u0438\u0433\u043D\u0430\u0442 \u0435 \u043C\u0430\u043A\u0441\u0438\u043C\u0443\u043C\u044A\u0442 \u043D\u0430 \u0438\u0442\u0435\u0440\u0430\u0446\u0438\u0438\u0442\u0435.
+NLPSolverStatusDialog.Message.StopStagnation=\u041F\u0440\u043E\u0446\u0435\u0441\u044A\u0442 \u0435 \u0441\u043F\u0440\u044F\u043D \u043F\u043E\u0440\u0430\u0434\u0438 \u0441\u0442\u0430\u0433\u043D\u0430\u0446\u0438\u044F.
+NLPSolverStatusDialog.Message.StopUser=\u041F\u0440\u043E\u0446\u0435\u0441\u044A\u0442 \u0435 \u043F\u0440\u0435\u043A\u044A\u0441\u043D\u0430\u0442 \u043E\u0442 \u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u044F.
+NLPSolverStatusDialog.Message.CurrentIteration=\u041F\u0440\u043E\u0446\u0435\u0441\u044A\u0442 \u0435 \u0441\u043F\u0440\u044F\u043D \u043D\u0430 \u0438\u0442\u0435\u0440\u0430\u0446\u0438\u044F %d \u043E\u0442 %d.
+#Time formatting
+NLPSolverStatusDialog.Time.Nanoseconds=\u043D\u0430\u043D\u043E\u0441\u0435\u043A\u0443\u043D\u0434\u0438
+NLPSolverStatusDialog.Time.Microseconds=\u043C\u0438\u043A\u0440\u043E\u0441\u0435\u043A\u0443\u043D\u0434\u0438
+NLPSolverStatusDialog.Time.Milliseconds=\u043C\u0438\u043B\u0438\u0441\u0435\u043A\u0443\u043D\u0434\u0438
+NLPSolverStatusDialog.Time.Second=\u0441\u0435\u043A\u0443\u043D\u0434\u0430
+NLPSolverStatusDialog.Time.Seconds=\u0441\u0435\u043A\u0443\u043D\u0434\u0438
+NLPSolverStatusDialog.Time.Minute=\u043C\u0438\u043D\u0443\u0442\u0430
+NLPSolverStatusDialog.Time.Minutes=\u043C\u0438\u043D\u0443\u0442\u0438
+NLPSolverStatusDialog.Time.Hour=\u0447\u0430\u0441
+NLPSolverStatusDialog.Time.Hours=\u0447\u0430\u0441\u0430
+NLPSolverStatusDialog.Time.Day=\u0434\u0435\u043D
+NLPSolverStatusDialog.Time.Days=\u0434\u043D\u0438
diff --git a/nlpsolver/locale/NLPSolverStatusDialog_et.properties b/nlpsolver/locale/NLPSolverStatusDialog_et.properties
new file mode 100644
index 000000000000..ffc1e7a1abb3
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverStatusDialog_et.properties
@@ -0,0 +1,28 @@
+# x-no-translate
+#Dialog
+NLPSolverStatusDialog.Dialog.Caption=Lahendaja olek
+#Controls
+NLPSolverStatusDialog.Controls.lblSolution=Praegune lahendus:
+NLPSolverStatusDialog.Controls.lblIteration=Iteratsioon:
+NLPSolverStatusDialog.Controls.lblStagnation=Seisak:
+NLPSolverStatusDialog.Controls.lblRuntime=T\u00F6\u00F6 kestus:
+NLPSolverStatusDialog.Controls.btnStop=Peata
+NLPSolverStatusDialog.Controls.btnOK=Sobib
+NLPSolverStatusDialog.Controls.btnContinue=J\u00E4tka
+#Messages
+NLPSolverStatusDialog.Message.StopIteration=Saavutati iteratsioonide maksimaalne arv.
+NLPSolverStatusDialog.Message.StopStagnation=Protsess peatati seisaku t\u00F5ttu.
+NLPSolverStatusDialog.Message.StopUser=Kasutaja katkestas protsessi.
+NLPSolverStatusDialog.Message.CurrentIteration=Protsess peatati %d. iteratsioonil %d-st.
+#Time formatting
+NLPSolverStatusDialog.Time.Nanoseconds=nanosekundit
+NLPSolverStatusDialog.Time.Microseconds=mikrosekundit
+NLPSolverStatusDialog.Time.Milliseconds=millisekundit
+NLPSolverStatusDialog.Time.Second=sekund
+NLPSolverStatusDialog.Time.Seconds=sekundit
+NLPSolverStatusDialog.Time.Minute=minut
+NLPSolverStatusDialog.Time.Minutes=minutit
+NLPSolverStatusDialog.Time.Hour=tund
+NLPSolverStatusDialog.Time.Hours=tundi
+NLPSolverStatusDialog.Time.Day=p\u00E4ev
+NLPSolverStatusDialog.Time.Days=p\u00E4eva
diff --git a/nlpsolver/locale/NLPSolverStatusDialog_fr.properties b/nlpsolver/locale/NLPSolverStatusDialog_fr.properties
index de6c1a9de7a9..bdd7028fbb3b 100644
--- a/nlpsolver/locale/NLPSolverStatusDialog_fr.properties
+++ b/nlpsolver/locale/NLPSolverStatusDialog_fr.properties
@@ -2,7 +2,7 @@
 #Dialog
 NLPSolverStatusDialog.Dialog.Caption=\u00C9tat du solveur
 #Controls
-NLPSolverStatusDialog.Controls.lblSolution=Solution actuelle : 
+NLPSolverStatusDialog.Controls.lblSolution=Solution actuelle :
 NLPSolverStatusDialog.Controls.lblIteration=It\u00E9ration :
 NLPSolverStatusDialog.Controls.lblStagnation=Stagnation :
 NLPSolverStatusDialog.Controls.lblRuntime=Dur\u00E9e d'ex\u00E9cution :
@@ -17,7 +17,7 @@ NLPSolverStatusDialog.Message.CurrentIteration=Processus arr\u00EAt\u00E9 \u00E0
 #Time formatting
 NLPSolverStatusDialog.Time.Nanoseconds=Nanosecondes
 NLPSolverStatusDialog.Time.Microseconds=Microsecondes
-NLPSolverStatusDialog.Time.Milliseconds=Millisecondes 
+NLPSolverStatusDialog.Time.Milliseconds=Millisecondes
 NLPSolverStatusDialog.Time.Second=Seconde
 NLPSolverStatusDialog.Time.Seconds=Secondes
 NLPSolverStatusDialog.Time.Minute=Minute
diff --git a/nlpsolver/locale/NLPSolverStatusDialog_tr.properties b/nlpsolver/locale/NLPSolverStatusDialog_tr.properties
new file mode 100644
index 000000000000..1570c061abff
--- /dev/null
+++ b/nlpsolver/locale/NLPSolverStatusDialog_tr.properties
@@ -0,0 +1,28 @@
+# x-no-translate
+#Dialog
+NLPSolverStatusDialog.Dialog.Caption=\u00C7\u00F6z\u00FCmleyici Durumu
+#Controls
+NLPSolverStatusDialog.Controls.lblSolution=Ge\u00E7erli \u00C7\u00F6z\u00FCm:
+NLPSolverStatusDialog.Controls.lblIteration=Tekrarlama:
+NLPSolverStatusDialog.Controls.lblStagnation=Durgunluk:
+NLPSolverStatusDialog.Controls.lblRuntime=\u00C7al\u0131\u015Fma zaman\u0131
+NLPSolverStatusDialog.Controls.btnStop=Dur
+NLPSolverStatusDialog.Controls.btnOK=Tamam
+NLPSolverStatusDialog.Controls.btnContinue=Devam Et
+#Messages
+NLPSolverStatusDialog.Message.StopIteration=En fazla yinelemeye ula\u015F\u0131ld\u0131.
+NLPSolverStatusDialog.Message.StopStagnation=Durgunluk nedeniyle i\u015Flem durduruldu.
+NLPSolverStatusDialog.Message.StopUser=Kullan\u0131c\u0131 m\u00FCdahalesi nedeniyle i\u015Flem durduruldu.
+NLPSolverStatusDialog.Message.CurrentIteration=\u0130\u015Flem %d %d yinelemede durduruldu
+#Time formatting
+NLPSolverStatusDialog.Time.Nanoseconds=Nanosaniye
+NLPSolverStatusDialog.Time.Microseconds=Mikrosaniyeler
+NLPSolverStatusDialog.Time.Milliseconds=Milisaniye
+NLPSolverStatusDialog.Time.Second=Saniye
+NLPSolverStatusDialog.Time.Seconds=Saniyeler
+NLPSolverStatusDialog.Time.Minute=Dakika
+NLPSolverStatusDialog.Time.Minutes=Dakika
+NLPSolverStatusDialog.Time.Hour=Saat
+NLPSolverStatusDialog.Time.Hours=Saat
+NLPSolverStatusDialog.Time.Day=G\u00FCn
+NLPSolverStatusDialog.Time.Days=G\u00FCn
diff --git a/reportbuilder/java/com/sun/star/report/DataRow.java b/reportbuilder/java/com/sun/star/report/DataRow.java
index 8d255a516217..0bbb5132d1f7 100644
--- a/reportbuilder/java/com/sun/star/report/DataRow.java
+++ b/reportbuilder/java/com/sun/star/report/DataRow.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/DataSource.java b/reportbuilder/java/com/sun/star/report/DataSource.java
index c786b8b6d5c4..83b5b537bbb1 100644
--- a/reportbuilder/java/com/sun/star/report/DataSource.java
+++ b/reportbuilder/java/com/sun/star/report/DataSource.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/DataSourceException.java b/reportbuilder/java/com/sun/star/report/DataSourceException.java
index c513dd9344b5..019c76eda183 100644
--- a/reportbuilder/java/com/sun/star/report/DataSourceException.java
+++ b/reportbuilder/java/com/sun/star/report/DataSourceException.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/DataSourceFactory.java b/reportbuilder/java/com/sun/star/report/DataSourceFactory.java
index 36b794a3599a..290b5ddb599d 100644
--- a/reportbuilder/java/com/sun/star/report/DataSourceFactory.java
+++ b/reportbuilder/java/com/sun/star/report/DataSourceFactory.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/ImageService.java b/reportbuilder/java/com/sun/star/report/ImageService.java
index d7224ed792eb..4eaf95383150 100644
--- a/reportbuilder/java/com/sun/star/report/ImageService.java
+++ b/reportbuilder/java/com/sun/star/report/ImageService.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/InputRepository.java b/reportbuilder/java/com/sun/star/report/InputRepository.java
index 2e02abf591b7..38dd89bc4826 100644
--- a/reportbuilder/java/com/sun/star/report/InputRepository.java
+++ b/reportbuilder/java/com/sun/star/report/InputRepository.java
@@ -1,7 +1,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
@@ -56,7 +56,7 @@ public interface InputRepository
     InputStream createInputStream(final String name) throws IOException;
 
     /** allows to acces sub repositories inside this repository
-     *
+     * 
      * @param name describes the path to the sub repository
      * @return the sub repository
      * @throws java.io.IOException when the sub repository doesn't exist.
diff --git a/reportbuilder/java/com/sun/star/report/JobDefinitionException.java b/reportbuilder/java/com/sun/star/report/JobDefinitionException.java
index 5623caf3d1a1..4a888c0633e0 100644
--- a/reportbuilder/java/com/sun/star/report/JobDefinitionException.java
+++ b/reportbuilder/java/com/sun/star/report/JobDefinitionException.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/JobProgressIndicator.java b/reportbuilder/java/com/sun/star/report/JobProgressIndicator.java
index 06066a2ab757..c324e9f89afd 100644
--- a/reportbuilder/java/com/sun/star/report/JobProgressIndicator.java
+++ b/reportbuilder/java/com/sun/star/report/JobProgressIndicator.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/JobProperties.java b/reportbuilder/java/com/sun/star/report/JobProperties.java
index c934451dfbac..897301e56980 100644
--- a/reportbuilder/java/com/sun/star/report/JobProperties.java
+++ b/reportbuilder/java/com/sun/star/report/JobProperties.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/OfficeToken.java b/reportbuilder/java/com/sun/star/report/OfficeToken.java
index 2c25942f3762..667146970ec3 100644
--- a/reportbuilder/java/com/sun/star/report/OfficeToken.java
+++ b/reportbuilder/java/com/sun/star/report/OfficeToken.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/OutputRepository.java b/reportbuilder/java/com/sun/star/report/OutputRepository.java
index c5283b9c1325..7d2f0b53c4a6 100644
--- a/reportbuilder/java/com/sun/star/report/OutputRepository.java
+++ b/reportbuilder/java/com/sun/star/report/OutputRepository.java
@@ -1,7 +1,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
@@ -53,7 +53,7 @@ public interface OutputRepository
     OutputStream createOutputStream(final String name, final String mimeType) throws IOException;
 
     /** allows to acces sub repositories inside this repository
-     *
+     * 
      * @param name describes the path to the sub repository
      * @param mimeType
      * @return the sub repository
diff --git a/reportbuilder/java/com/sun/star/report/ParameterMap.java b/reportbuilder/java/com/sun/star/report/ParameterMap.java
index 0a5dfce9317b..1169e8c1fc86 100644
--- a/reportbuilder/java/com/sun/star/report/ParameterMap.java
+++ b/reportbuilder/java/com/sun/star/report/ParameterMap.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/ReportAddIn.java b/reportbuilder/java/com/sun/star/report/ReportAddIn.java
index 620955c98db7..190f550007b8 100644
--- a/reportbuilder/java/com/sun/star/report/ReportAddIn.java
+++ b/reportbuilder/java/com/sun/star/report/ReportAddIn.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/ReportEngine.java b/reportbuilder/java/com/sun/star/report/ReportEngine.java
index 2518cb1742f0..65fbb1197b9f 100644
--- a/reportbuilder/java/com/sun/star/report/ReportEngine.java
+++ b/reportbuilder/java/com/sun/star/report/ReportEngine.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java b/reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java
index 25d39b732448..e26f367cca7d 100644
--- a/reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java
+++ b/reportbuilder/java/com/sun/star/report/ReportEngineMetaData.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java b/reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java
index 2796537f758a..adc74b9ef961 100644
--- a/reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java
+++ b/reportbuilder/java/com/sun/star/report/ReportEngineParameterNames.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/ReportExecutionException.java b/reportbuilder/java/com/sun/star/report/ReportExecutionException.java
index 6fc8fb1ac29f..d8a3edac376a 100644
--- a/reportbuilder/java/com/sun/star/report/ReportExecutionException.java
+++ b/reportbuilder/java/com/sun/star/report/ReportExecutionException.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/ReportExpression.java b/reportbuilder/java/com/sun/star/report/ReportExpression.java
index a828ee6ddba4..2daa4da1584b 100644
--- a/reportbuilder/java/com/sun/star/report/ReportExpression.java
+++ b/reportbuilder/java/com/sun/star/report/ReportExpression.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java b/reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java
index 3223044d2270..67957471e42f 100644
--- a/reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java
+++ b/reportbuilder/java/com/sun/star/report/ReportExpressionMetaData.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/ReportFunction.java b/reportbuilder/java/com/sun/star/report/ReportFunction.java
index 24be767c1a71..3b5d31a730db 100644
--- a/reportbuilder/java/com/sun/star/report/ReportFunction.java
+++ b/reportbuilder/java/com/sun/star/report/ReportFunction.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/ReportJob.java b/reportbuilder/java/com/sun/star/report/ReportJob.java
index 9bda7926f7d4..c9f31638a1e4 100644
--- a/reportbuilder/java/com/sun/star/report/ReportJob.java
+++ b/reportbuilder/java/com/sun/star/report/ReportJob.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/ReportJobDefinition.java b/reportbuilder/java/com/sun/star/report/ReportJobDefinition.java
index 89724ec20fe5..615e9a918ee7 100644
--- a/reportbuilder/java/com/sun/star/report/ReportJobDefinition.java
+++ b/reportbuilder/java/com/sun/star/report/ReportJobDefinition.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/ReportJobFactory.java b/reportbuilder/java/com/sun/star/report/ReportJobFactory.java
index 1771f0bedb22..68eafdeb36a7 100644
--- a/reportbuilder/java/com/sun/star/report/ReportJobFactory.java
+++ b/reportbuilder/java/com/sun/star/report/ReportJobFactory.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportData.java b/reportbuilder/java/com/sun/star/report/SDBCReportData.java
index 769657aa6bf5..21e1ab22ff22 100644
--- a/reportbuilder/java/com/sun/star/report/SDBCReportData.java
+++ b/reportbuilder/java/com/sun/star/report/SDBCReportData.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java b/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
index 78ac17a7ba08..d3f701712f2d 100644
--- a/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java
@@ -1,7 +1,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
@@ -348,7 +348,7 @@ public class SDBCReportDataFactory implements DataSourceFactory
             // should not happen
             // assert False
         }
-
+        
         return null;
     }
 
diff --git a/reportbuilder/java/com/sun/star/report/SOImageService.java b/reportbuilder/java/com/sun/star/report/SOImageService.java
index 6d67ebabc0d1..67412f4b4b3f 100644
--- a/reportbuilder/java/com/sun/star/report/SOImageService.java
+++ b/reportbuilder/java/com/sun/star/report/SOImageService.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/StorageRepository.java b/reportbuilder/java/com/sun/star/report/StorageRepository.java
index 9bf610b70606..8ecbb380e154 100644
--- a/reportbuilder/java/com/sun/star/report/StorageRepository.java
+++ b/reportbuilder/java/com/sun/star/report/StorageRepository.java
@@ -1,7 +1,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
@@ -66,9 +66,9 @@ public class StorageRepository implements InputRepository, OutputRepository
     private final String rootURL;
 
     /**
-     *
-     * @param input
-     * @param output
+     * 
+     * @param input 
+     * @param output 
      * @param rootURL
      * @throws java.io.IOException
      */
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java b/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java
index 11eb9e038a60..84d771d5a9ec 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunction.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java b/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java
index f8c1032bfb16..9275abc70d58 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/AuthorFunctionDescription.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory.java b/reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory.java
index 8fa0e5d80ac5..4cb767e870e3 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory.java
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/MetaDataFunctionCategory.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java b/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java
index 55c3d6ff381c..89d5ad9ddd4c 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunction.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java b/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java
index 7ed8a61bd06a..572521f33857 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/TitleFunctionDescription.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java b/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java
index 620ddcee98eb..8d6ecfa7b603 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/DefaultNameGenerator.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java b/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java
index 823bf6540f47..ddb5f88e2161 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java
index c68424de99c9..85a89b56ebfb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoFormulaContext.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn.java
index a4222fdaa3b3..61e551ffcbf7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportAddIn.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java
index 8ee9d8547363..fc0ed6506adb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngine.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java
index c32f490c9b73..e8017403ef70 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
index a30a97a1e7e1..b420850a9d0b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java
index f5d6d654aa0e..22982222db67 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaOpCodeMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
index 4dbf435f28ec..d3a6593adddb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java b/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java
index 7a7c1e159bf7..f5c53dae739a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOFunctionManager.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java
index b02c2010a14d..ab87cb381e73 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOReportJobFactory.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java b/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java
index 7825a2b34c4a..0c7eb7af03a8 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionCategory.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java b/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java
index f0debc672118..80f508124ea5 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarFunctionDescription.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java b/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java
index b53271cb78d1..6546b0c13825 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarReportData.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java
index 3f5beae7e6be..9eae60f3121a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarReportDataFactory.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java b/reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java
index b3497fc51377..8152a5e12f8b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/StarReportModule.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java b/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java
index c86b2186d08e..84f43eccf644 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpression.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java b/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java
index 21f8f4c4471b..8d05446f585c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/expressions/SumExpressionMetaData.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
index 85f841a11338..b11862fe3e59 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java
index 6ac7b7551bec..3e3993c9003f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
index fc1baaa8c9a3..57e858517d47 100755
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
index 5a6b8f948372..e5ebde9caac7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java
index 9a2def45d32c..14acf7b24ff2 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementContext.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java
index 78f504107348..017110241254 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java
index 1fcb1b67ec81..b5bd376ab547 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
index b5f77d2a2971..4409a3a25884 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
index 9055c2a5bdd1..55fa47370bd8 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
index 21086d6584d9..c455528b147a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupSectionLayoutController.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java
index 790d18527f14..b50e1f8f619b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeRepeatingStructureLayoutController.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
index 2ad88388b347..cbf7412e6dbe 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java
index 9ce1be656b53..b537520ea677 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableLayoutController.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
index 6c6f997d84aa..5bf05ecda555 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
index f3c5ef383057..3ce77c6d14b4 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java
index a0ca9d8c98b6..1d2d82faf872 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesCollection.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java
index ba54e200f652..5a78a25b84c1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/VariablesDeclarationLayoutController.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
index f8e2b4294feb..124b4cd00332 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java
index 4341c386113e..23e952c4aac2 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryResourceData.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java
index b9491fc3dec6..b9b5e05e4615 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputResourceKey.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java b/reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java
index 8e2f62c81a32..7ec9ac86e378 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/DataStyle.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java
index 124fc5e13827..3a1d18df4828 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FixedTextElement.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java
index 0f1a9330e82d..fb6b41e201de 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java
index cbd29672a305..03bd5282e28d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceElement.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java b/reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java
index 471c383466a9..a19506d47dd7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FormatCondition.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java
index 182f6a998681..8e425771a469 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FormattedTextElement.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java
index 176500134191..3c6222fbe7fd 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/ImageElement.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java
index 84f41523c79a..63de51e74c95 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java
index 14614b2548e0..7f528efab6fb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDetailSection.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java
index f17c1d0d65c0..03540e755178 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeDocument.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java
index 92e6964ea622..21e8fab4c473 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroup.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java
index 262d95782572..93c0c9bf2318 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeGroupSection.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java
index 68d508a4b2bd..fd5a99d478fe 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterPage.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java
index 562f369b9087..abdbaf39c21e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport.java
index cf873b9452d5..ba3fbddc1d57 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeReport.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java
index 3968df62dcd9..ae7f544248fa 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyle.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java
index 0af1062505c7..690d496eb3b7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java
index b2fdf3e43f57..4d6e7eaaf2fd 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStylesCollection.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection.java
index 9df11ff0156c..fca244fd8d47 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeTableSection.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java b/reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java
index 47030c3fe638..3c59c7011c40 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/PageLayout.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java
index ae4aa55a3d9d..49bb0787a69d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/PageSection.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/RawText.java b/reportbuilder/java/com/sun/star/report/pentaho/model/RawText.java
index 47b275a0a5b7..6b286e85e263 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/RawText.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/RawText.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java
index 5821351d2d9e..8de4adf0ce1c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement.java
index bbe2c7dadf78..db5801287690 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/TableCellElement.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection.java
index d50935f837fb..e8c072a7935c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/model/VariablesDeclarationSection.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java b/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java
index b3d6485d9195..31b1ac6b6be2 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
index b41252a17089..68bf32352af3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java b/reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java
index ef9296707af3..b457f175eafc 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/OleProducer.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java b/reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java
index 939583be8365..82bfc743f529 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/StyleUtilities.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
index 54b7d0d0159c..5ab27b4e7dca 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor.java b/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor.java
index 72d799e1a204..eab8ba125eeb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportProcessor.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java
index f76d43bb807a..3b1061a92912 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/chart/ChartRawReportTarget.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java b/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java
index 6876ea5be028..bc711fc3cda3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
index d2c4ebd96e3c..f163029a7970 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java
index ff680e14657a..b8cd54d3b027 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageBreakDefinition.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageBreakDefinition.java
index 4632d81b8970..8bfb02563370 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageBreakDefinition.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageBreakDefinition.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java
index 8aa0bb09a1f1..a306ce4be7c0 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/PageContext.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java
index 00d4aff11de9..79832e8e9188 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
index 9f3746086b87..a780e0a9455f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/TextRawReportTarget.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java b/reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java
index b79d18b56a0b..74fecc92d411 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/output/text/VariablesDeclarations.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification.java
index 98a47a23aae7..c7d72c7d4933 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/AttributeSpecification.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java
index c90f6425d971..d85761ee3665 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/ElementReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java
index 4177a75f81be..cb815162bae3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeDocumentXmlResourceFactory.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java
index 5272a987957f..4b0c6c008046 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeParserUtil.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java
index 28d646eb8a23..a94187ba4eb9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/OfficeStylesXmlResourceFactory.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java
index baa6531fbd08..9851ebc834d7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/StarStyleXmlFactoryModule.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java
index ce16d222eaba..23c6555f6f58 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/StarXmlFactoryModule.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper.java
index aaae0b7795b5..d14b31f48a0e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/StyleMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java
index 9f899389b27b..e8538e3d56b9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/chart/ChartReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler.java
index e2effde8dfc3..d58f53a02a66 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/data/DataStyleReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java
index e5d38f2d364a..5f27c0b64485 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/draw/ObjectOleReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java
index b77c0e80e321..18b10dc31240 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/BodyReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java
index 1f57c7c61205..780a286d2d49 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentContentReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java
index c8bf1268ab3c..a0d484861d51 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/DocumentStylesReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java
index bfd0e99e170d..ece7a250d78a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/FontFaceDeclsReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java
index 61263a216dca..55b7325d2e8b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/office/MasterStylesReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java
index 02d23aec10bd..005c177308db 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ConditionalPrintExpressionReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/DetailRootTableReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/DetailRootTableReadHandler.java
index a8252667ff1f..68a4871e2a00 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/DetailRootTableReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/DetailRootTableReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java
index e414a1bbe16c..69f119c896e2 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FixedContentReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler.java
index 581dd79f418e..58d1334e437e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormatConditionReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java
index 4c94cb910d79..5d71ed9c4442 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java
index 233e0692dd07..f846e70dbf9d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FunctionReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java
index 3516f6e047ad..f4ff094f57b9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupSectionReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupSectionReadHandler.java
index 99a34abc1d42..3ab79122cc55 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupSectionReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/GroupSectionReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java
index 1695eac68fe0..8e0be61371d5 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ImageReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java
index 59671bfbbe60..5bb4555a8290 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/MasterDetailReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java
index 4359581da3a6..55909f50b3d5 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java
index f6db6905da13..4331f882d156 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java
index 70075f96b017..573dcd96a26f 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/RootTableReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java
index 081e8bf2020e..567aaf82db55 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/SubDocumentReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java
index fb20e3783123..cb9a5688b137 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/FontFaceReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java
index d662e8028ab6..3a6f8b41cf2b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/MasterPageReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java
index 2433a7dfa2c1..5287bda0ad06 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java
index d679c1c0f412..6480048861ff 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java
index d781a05305f7..8db9e7dfd3bb 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java
index 5dcd52d04782..909fea32caae 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java
index 2832007d5ec0..d96f70b897ac 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/OneOfConstantsMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java
index eb3217022f97..7d3ac8087331 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/draw/TextAreaVerticalAlignMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java
index f5f680ce295e..532d848cb30c 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BackgroundColorMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java
index c4769b9f2708..d5a973ad0ac8 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/BorderRightMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper.java
index 6ab7454dbc59..36622b8b5548 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/ColorMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java
index a28c293feef3..a0e6a01461af 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontSizeMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java
index e33a3c437c46..1610bbfc7715 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontStyleMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java
index c611b09cc444..a16e4679fb8a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/FontWeightMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java
index 2820dc3d83f7..8f459efd22cd 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/fo/TextAlignMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java
index c3159f54e1a3..82d156c63084 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyGenericMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java
index 808c57523361..70fe95e5f756 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontFamilyMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java
index 8cc6721cffc3..24caf8d9a58a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontNameMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java
index c7f10d61cb00..e4fabb1446e0 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontPitchMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java
index 6d4f90c3beda..dbfc023e89ab 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/FontReliefMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java
index 1ba4c480d58d..d6d10c8d6027 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextEmphasizeMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java
index f247f2c171fc..62f66284c2e9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineColorMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java
index bfb1f64a8035..c8c4a9ae63ed 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineStyleMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java
index 63628b9ed60d..30a98deac48d 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWidthMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java
index 9cc2a62c157e..7b681be849b7 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/TextUnderlineWordMode.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java
index 9994a1413b4f..5eacfb8415e1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/style/VerticalAlignMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java
index 89c5769f15a6..95ba9b6c1742 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/ColumnWidthMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java
index 5d94f4101059..351a5c8c2ca5 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/stylemapper/table/RowHeightMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler.java
index 34158230c3c1..46047b51a3ed 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/CoveredCellReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableCellReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableCellReadHandler.java
index 9d963fd46326..792b0f05c9b3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableCellReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableCellReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java
index 4b8bc8498d91..fdfebaa75be4 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java
index d1c23bb63957..29a732bb0bd1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableColumnsReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java
index 2eb20bdc96ac..bb302ab94ff9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java
index d86410140103..a18f7598a755 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java
index 00a61ffb8573..e73fe308b5bd 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/table/TableRowsReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java
index ae0c29f13d3c..172438b8d2c0 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/text/TextContentReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler.java
index 54a6cae8eaaa..c77e543b1b3a 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/xlink/XLinkReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator.java
index 0665066f2a9f..e9033db374c9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/LengthCalculator.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java
index cee02bae0430..a015e48e4804 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapper.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java
index 447a0b958fd8..46c3b9e847a1 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperKey.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.java
index 95f8322de730..263abf29737e 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlFactoryModule.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java
index 3fecbbfc882e..bc54f18079e9 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMapperXmlResourceFactory.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java
index b0acf047df7f..144e05c7b080 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingDocumentReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java
index 1ec2dc111cb0..42484e184c05 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingReadHandler.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule.java b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule.java
index 9698e73ce67b..42695eb04489 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/StyleMappingRule.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml b/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml
index 11ca5fcd8ae4..112f55979cc3 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml
+++ b/reportbuilder/java/com/sun/star/report/pentaho/styles/stylemapper.xml
@@ -2,23 +2,23 @@
 
 <!--
   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
-
+ 
   This file is part of OpenOffice.org.
-
+ 
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
-
+ 
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
-
+ 
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
diff --git a/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java b/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java
index 050ad47615cd..41752e935e13 100644
--- a/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java
+++ b/reportbuilder/java/com/sun/star/report/util/DefaultJobProperties.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java b/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java
index 0fdda8f21d61..5d50fb13558a 100644
--- a/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java
+++ b/reportbuilder/java/com/sun/star/report/util/DefaultParameterMap.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java b/reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java
index dbd943bb0ea1..5115128da6a8 100644
--- a/reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java
+++ b/reportbuilder/java/com/sun/star/report/util/DefaultReportJobDefinition.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java b/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java
index f1b6f7a56ab3..03e30c33b24d 100644
--- a/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java
+++ b/reportbuilder/java/com/sun/star/report/util/ManifestWriter.java
@@ -1,7 +1,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
diff --git a/reportbuilder/java/com/sun/star/report/util/ReportUtil.java b/reportbuilder/java/com/sun/star/report/util/ReportUtil.java
index 464f0e9901b7..82fbb2f5be34 100644
--- a/reportbuilder/java/com/sun/star/report/util/ReportUtil.java
+++ b/reportbuilder/java/com/sun/star/report/util/ReportUtil.java
@@ -1,7 +1,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
diff --git a/reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu b/reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu
index ebb6ac365443..8ee03947ff62 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -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
@@ -142,14 +142,14 @@
             <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
           </prop>
         </node>
-
+        
         <node oor:name="ADD" oor:op="replace">
           <prop oor:name="Command">
             <value xml:lang="en-US">.uno:ExpandSection</value>
             <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
           </prop>
         </node>
-
+        
       </node>
     </node>
   </node>
diff --git a/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu b/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu
index e40b13f257bb..0126b505e58a 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu
@@ -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
diff --git a/reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu b/reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu
index 521166e1d4c8..6d64a5e693e5 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu
@@ -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
diff --git a/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu b/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
index e17460345a61..255eeffd601e 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
@@ -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
diff --git a/reportbuilder/registry/data/org/openoffice/Office/Paths.xcu b/reportbuilder/registry/data/org/openoffice/Office/Paths.xcu
index cba53df0ffce..8d67fdf03645 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/Paths.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/Paths.xcu
@@ -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
diff --git a/reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu b/reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu
index 0a9c957a52bb..1d29ed5f4413 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu
@@ -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
diff --git a/reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu b/reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu
index c45a2e27a1bb..2a1c46c96f7c 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -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
diff --git a/reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu b/reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
index 229502286ccb..879db0790ea8 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
@@ -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
diff --git a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu b/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
index ed78f4b13608..31bfd76fd1a0 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
@@ -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
diff --git a/reportbuilder/registry/data/org/openoffice/Setup.xcu b/reportbuilder/registry/data/org/openoffice/Setup.xcu
index 55ff435f718e..2f51d595e96d 100644
--- a/reportbuilder/registry/data/org/openoffice/Setup.xcu
+++ b/reportbuilder/registry/data/org/openoffice/Setup.xcu
@@ -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
diff --git a/reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu b/reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu
index 3760b439fbc4..d0475c369b36 100644
--- a/reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu
+++ b/reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu
@@ -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
diff --git a/reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu b/reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu
index c36b31fbe2aa..f728dfb4e0e1 100644
--- a/reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu
+++ b/reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu
@@ -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
diff --git a/reportbuilder/template/pre.xml b/reportbuilder/template/pre.xml
index a1426ca2fb4e..e36e2ecc7643 100644
--- a/reportbuilder/template/pre.xml
+++ b/reportbuilder/template/pre.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <description xmlns="http://openoffice.org/extensions/description/2006"
-    xmlns:d="http://openoffice.org/extensions/description/2006"
+    xmlns:d="http://openoffice.org/extensions/description/2006" 
     xmlns:xlink="http://www.w3.org/1999/xlink">
   <registration>
     <simple-license accept-by="admin" default-license-id="en-US" >
diff --git a/reportbuilder/template/registry/data/org/openoffice/Office/Paths.xcu b/reportbuilder/template/registry/data/org/openoffice/Office/Paths.xcu
index 65ee5a1b4dbb..b46d8a6b20ef 100644
--- a/reportbuilder/template/registry/data/org/openoffice/Office/Paths.xcu
+++ b/reportbuilder/template/registry/data/org/openoffice/Office/Paths.xcu
@@ -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
diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml
index 4b0372d53de9..367f59b35344 100755
--- a/reportbuilder/util/description.xml
+++ b/reportbuilder/util/description.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <description xmlns="http://openoffice.org/extensions/description/2006"
-    xmlns:d="http://openoffice.org/extensions/description/2006"
+    xmlns:d="http://openoffice.org/extensions/description/2006" 
     xmlns:xlink="http://www.w3.org/1999/xlink">
   <display-name>
     <name lang="en-US">Report Builder</name>
diff --git a/reportbuilder/util/hidother.src b/reportbuilder/util/hidother.src
index a06b9d89a4ec..f85a8c8ff625 100644
--- a/reportbuilder/util/hidother.src
+++ b/reportbuilder/util/hidother.src
@@ -1,7 +1,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
@@ -32,42 +32,42 @@
 #include <svx/svxids.hrc>
 #endif
 
-hidspecial UID_RPT_RPT_APP_VIEW                                 { HelpId = UID_RPT_RPT_APP_VIEW     ; };
-hidspecial UID_RPT_SCROLLWINDOW                                 { HelpId = UID_RPT_SCROLLWINDOW ; };
-hidspecial UID_RPT_REPORTWINDOW                                 { HelpId = UID_RPT_REPORTWINDOW ; };
-hidspecial HID_RPT_HORZ_RULER                                   { HelpId = HID_RPT_HORZ_RULER       ; };
-hidspecial UID_RPT_SECTIONSWINDOW                               { HelpId = UID_RPT_SECTIONSWINDOW   ; };
-hidspecial UID_RPT_VIEWSWINDOW                                  { HelpId = UID_RPT_VIEWSWINDOW      ; };
-hidspecial HID_RPT_ENDMARKER                                    { HelpId = HID_RPT_ENDMARKER        ; };
-hidspecial HID_RPT_SPLITTER                                     { HelpId = HID_RPT_SPLITTER     ; };
-hidspecial HID_REPORTSECTION                                { HelpId = HID_REPORTSECTION    ; };
-hidspecial HID_RPT_HORZ_SCROLLBAR                               { HelpId = HID_RPT_HORZ_SCROLLBAR   ; };
-hidspecial HID_RPT_VERT_SCROLLBAR                               { HelpId = HID_RPT_VERT_SCROLLBAR   ; };
-hidspecial HID_RPT_STARTMARKER                                  { HelpId = HID_RPT_STARTMARKER      ; };
+hidspecial UID_RPT_RPT_APP_VIEW									{ HelpId = UID_RPT_RPT_APP_VIEW		; };
+hidspecial UID_RPT_SCROLLWINDOW									{ HelpId = UID_RPT_SCROLLWINDOW	; };
+hidspecial UID_RPT_REPORTWINDOW									{ HelpId = UID_RPT_REPORTWINDOW	; };
+hidspecial HID_RPT_HORZ_RULER									{ HelpId = HID_RPT_HORZ_RULER		; };
+hidspecial UID_RPT_SECTIONSWINDOW								{ HelpId = UID_RPT_SECTIONSWINDOW	; };
+hidspecial UID_RPT_VIEWSWINDOW									{ HelpId = UID_RPT_VIEWSWINDOW		; };
+hidspecial HID_RPT_ENDMARKER									{ HelpId = HID_RPT_ENDMARKER		; };
+hidspecial HID_RPT_SPLITTER										{ HelpId = HID_RPT_SPLITTER		; };
+hidspecial HID_REPORTSECTION								{ HelpId = HID_REPORTSECTION	; };
+hidspecial HID_RPT_HORZ_SCROLLBAR								{ HelpId = HID_RPT_HORZ_SCROLLBAR	; };
+hidspecial HID_RPT_VERT_SCROLLBAR								{ HelpId = HID_RPT_VERT_SCROLLBAR	; };
+hidspecial HID_RPT_STARTMARKER									{ HelpId = HID_RPT_STARTMARKER		; };
 
-hidspecial SID_RPT_SHOWREPORTEXPLORER                       { HelpId = SID_RPT_SHOWREPORTEXPLORER   ; };
-hidspecial SID_PAGEHEADERFOOTER                             { HelpId = SID_PAGEHEADERFOOTER         ; };
-hidspecial SID_REPORTHEADERFOOTER                           { HelpId = SID_REPORTHEADERFOOTER       ; };
-hidspecial SID_SORTINGANDGROUPING                           { HelpId = SID_SORTINGANDGROUPING       ; };
-hidspecial SID_INSERT_FLD_PGNUMBER                          { HelpId = SID_INSERT_FLD_PGNUMBER      ; };
-hidspecial SID_CONDITIONALFORMATTING                        { HelpId = SID_CONDITIONALFORMATTING    ; };
-hidspecial SID_PAGEDIALOG                                   { HelpId = SID_PAGEDIALOG               ; };
-hidspecial SID_SETCONTROLDEFAULTS                           { HelpId = SID_SETCONTROLDEFAULTS       ; };
-hidspecial SID_INSERTBREAK                                  { HelpId = SID_INSERTBREAK              ; };
-hidspecial HID_RPT_FIELDEXPRESSION                              { HelpId = HID_RPT_FIELDEXPRESSION          ; };
-hidspecial HID_RPT_SORTORDER                                    { HelpId = HID_RPT_SORTORDER                ; };
-hidspecial HID_RPT_GROUPSBRW                                    { HelpId = HID_RPT_GROUPSBRW                ; };
-hidspecial HID_RPT_GROUPSSORTING_DLG                            { HelpId = HID_RPT_GROUPSSORTING_DLG        ; };
-hidspecial HID_RPT_PAGENUMBERS_DLG                              { HelpId = HID_RPT_PAGENUMBERS_DLG          ; };
-hidspecial HID_RPT_DATETIME_DLG                                 { HelpId = HID_RPT_DATETIME_DLG             ; };
-hidspecial HID_RPT_CONDFORMAT_DLG                               { HelpId = HID_RPT_CONDFORMAT_DLG           ; };
-hidspecial HID_RPT_CRTL_FORMAT_PREVIEW                          { HelpId = HID_RPT_CRTL_FORMAT_PREVIEW      ; };
-hidspecial HID_RPT_COND_DLG                                     { HelpId = HID_RPT_COND_DLG                 ; };
+hidspecial SID_RPT_SHOWREPORTEXPLORER						{ HelpId = SID_RPT_SHOWREPORTEXPLORER	; };
+hidspecial SID_PAGEHEADERFOOTER								{ HelpId = SID_PAGEHEADERFOOTER			; };
+hidspecial SID_REPORTHEADERFOOTER							{ HelpId = SID_REPORTHEADERFOOTER		; };
+hidspecial SID_SORTINGANDGROUPING							{ HelpId = SID_SORTINGANDGROUPING		; };
+hidspecial SID_INSERT_FLD_PGNUMBER							{ HelpId = SID_INSERT_FLD_PGNUMBER		; };
+hidspecial SID_CONDITIONALFORMATTING						{ HelpId = SID_CONDITIONALFORMATTING	; };
+hidspecial SID_PAGEDIALOG									{ HelpId = SID_PAGEDIALOG				; };
+hidspecial SID_SETCONTROLDEFAULTS							{ HelpId = SID_SETCONTROLDEFAULTS		; };
+hidspecial SID_INSERTBREAK									{ HelpId = SID_INSERTBREAK				; };
+hidspecial HID_RPT_FIELDEXPRESSION								{ HelpId = HID_RPT_FIELDEXPRESSION			; };
+hidspecial HID_RPT_SORTORDER									{ HelpId = HID_RPT_SORTORDER				; };
+hidspecial HID_RPT_GROUPSBRW									{ HelpId = HID_RPT_GROUPSBRW				; };
+hidspecial HID_RPT_GROUPSSORTING_DLG							{ HelpId = HID_RPT_GROUPSSORTING_DLG		; };
+hidspecial HID_RPT_PAGENUMBERS_DLG								{ HelpId = HID_RPT_PAGENUMBERS_DLG			; };
+hidspecial HID_RPT_DATETIME_DLG									{ HelpId = HID_RPT_DATETIME_DLG				; };
+hidspecial HID_RPT_CONDFORMAT_DLG								{ HelpId = HID_RPT_CONDFORMAT_DLG			; };
+hidspecial HID_RPT_CRTL_FORMAT_PREVIEW							{ HelpId = HID_RPT_CRTL_FORMAT_PREVIEW		; };
+hidspecial HID_RPT_COND_DLG										{ HelpId = HID_RPT_COND_DLG					; };
 hidspecial HID_RPT_POPUP_COLOR_CTRL                         { HelpId = HID_RPT_POPUP_COLOR_CTRL     ; };
 hidspecial HID_RPT_POPUP_COLOR                              { HelpId = HID_RPT_POPUP_COLOR          ; };
-hidspecial SID_ESCAPE                                       { HelpId = SID_ESCAPE                   ; };
-hidspecial HID_RPT_PROPDLG_TAB_GENERAL                          { HelpId = HID_RPT_PROPDLG_TAB_GENERAL      ; };
-hidspecial HID_RPT_PROPDLG_TAB_DATA                             { HelpId = HID_RPT_PROPDLG_TAB_DATA         ; };
+hidspecial SID_ESCAPE										{ HelpId = SID_ESCAPE					; };
+hidspecial HID_RPT_PROPDLG_TAB_GENERAL							{ HelpId = HID_RPT_PROPDLG_TAB_GENERAL		; };
+hidspecial HID_RPT_PROPDLG_TAB_DATA								{ HelpId = HID_RPT_PROPDLG_TAB_DATA			; };
 
 hidspecial HID_RPT_PROP_FORCENEWPAGE { HelpId = HID_RPT_PROP_FORCENEWPAGE; };
 hidspecial HID_RPT_PROP_NEWROWORCOL { HelpId = HID_RPT_PROP_NEWROWORCOL; };
@@ -120,14 +120,14 @@ hidspecial HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT    { HelpId = HID_RPT_PROP_
 
 hidspecial SID_ARRANGEMENU    { HelpId = SID_ARRANGEMENU; };
 hidspecial SID_SELECTALL_IN_SECTION    { HelpId = SID_SELECTALL_IN_SECTION; };
-hidspecial SID_SECTION_ALIGN { HelpId = SID_SECTION_ALIGN; };
-hidspecial SID_SECTION_ALIGN_LEFT { HelpId = SID_SECTION_ALIGN_LEFT; };
-hidspecial SID_SECTION_ALIGN_CENTER { HelpId = SID_SECTION_ALIGN_CENTER; };
-hidspecial SID_SECTION_ALIGN_RIGHT { HelpId = SID_SECTION_ALIGN_RIGHT; };
-hidspecial SID_SECTION_ALIGN_UP { HelpId = SID_SECTION_ALIGN_UP; };
-hidspecial SID_SECTION_ALIGN_MIDDLE { HelpId = SID_SECTION_ALIGN_MIDDLE; };
-hidspecial SID_SECTION_ALIGN_DOWN { HelpId = SID_SECTION_ALIGN_DOWN; };
-hidspecial SID_NEXT_MARK { HelpId = SID_NEXT_MARK; };
+hidspecial SID_SECTION_ALIGN { HelpId = SID_SECTION_ALIGN; };         
+hidspecial SID_SECTION_ALIGN_LEFT { HelpId = SID_SECTION_ALIGN_LEFT; };    
+hidspecial SID_SECTION_ALIGN_CENTER { HelpId = SID_SECTION_ALIGN_CENTER; };  
+hidspecial SID_SECTION_ALIGN_RIGHT { HelpId = SID_SECTION_ALIGN_RIGHT; };   
+hidspecial SID_SECTION_ALIGN_UP { HelpId = SID_SECTION_ALIGN_UP; };      
+hidspecial SID_SECTION_ALIGN_MIDDLE { HelpId = SID_SECTION_ALIGN_MIDDLE; };  
+hidspecial SID_SECTION_ALIGN_DOWN { HelpId = SID_SECTION_ALIGN_DOWN; };    
+hidspecial SID_NEXT_MARK { HelpId = SID_NEXT_MARK; };    
 hidspecial SID_PREV_MARK { HelpId = SID_PREV_MARK; };
 
 hidspecial UID_RPT_PROP_CHARTTYPE_DLG { HelpId = UID_RPT_PROP_CHARTTYPE_DLG; };
diff --git a/sdext/inc/pch/precompiled_sdext.cxx b/sdext/inc/pch/precompiled_sdext.cxx
index 071aae824858..4fb89ae1585a 100644
--- a/sdext/inc/pch/precompiled_sdext.cxx
+++ b/sdext/inc/pch/precompiled_sdext.cxx
@@ -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
diff --git a/sdext/inc/pch/precompiled_sdext.hxx b/sdext/inc/pch/precompiled_sdext.hxx
index ea496150e83e..46ba80cdc77e 100644
--- a/sdext/inc/pch/precompiled_sdext.hxx
+++ b/sdext/inc/pch/precompiled_sdext.hxx
@@ -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
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index 7e89eecbcd36..83187bc5b15e 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -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
@@ -70,21 +70,21 @@ void OptimizerSettings::LoadSettingsFromConfiguration( const Reference< XNameAcc
                 Any aValue( rSettings->getByName( aPropertyName ) );
                 switch( TKGet( aPropertyName ) )
                 {
-                    case TK_Name :                      aValue >>= maName; break;
-                    case TK_JPEGCompression :           aValue >>= mbJPEGCompression; break;
-                    case TK_JPEGQuality :               aValue >>= mnJPEGQuality; break;
-                    case TK_RemoveCropArea :            aValue >>= mbRemoveCropArea; break;
-                    case TK_ImageResolution :           aValue >>= mnImageResolution; break;
-                    case TK_EmbedLinkedGraphics :       aValue >>= mbEmbedLinkedGraphics; break;
-                    case TK_OLEOptimization :           aValue >>= mbOLEOptimization; break;
-                    case TK_OLEOptimizationType :       aValue >>= mnOLEOptimizationType; break;
-                    case TK_DeleteUnusedMasterPages :   aValue >>= mbDeleteUnusedMasterPages; break;
-                    case TK_DeleteHiddenSlides :        aValue >>= mbDeleteHiddenSlides; break;
-                    case TK_DeleteNotesPages :          aValue >>= mbDeleteNotesPages ;break;
-                    case TK_SaveAs :                    aValue >>= mbSaveAs; break;
-//                  case TK_SaveAsURL :                 aValue >>= maSaveAsURL; break;      // URL is not saved to configuration
-//                  case TK_FilterName :                aValue >>= maFilterName; break;     // URL is not saved to configuration
-                    case TK_OpenNewDocument :           aValue >>= mbOpenNewDocument; break;
+                    case TK_Name :						aValue >>= maName; break;
+                    case TK_JPEGCompression :			aValue >>= mbJPEGCompression; break;
+                    case TK_JPEGQuality :				aValue >>= mnJPEGQuality; break;
+                    case TK_RemoveCropArea :			aValue >>= mbRemoveCropArea; break;
+                    case TK_ImageResolution :			aValue >>= mnImageResolution; break;
+                    case TK_EmbedLinkedGraphics :		aValue >>= mbEmbedLinkedGraphics; break;
+                    case TK_OLEOptimization :			aValue >>= mbOLEOptimization; break;
+                    case TK_OLEOptimizationType :		aValue >>= mnOLEOptimizationType; break;
+                    case TK_DeleteUnusedMasterPages :	aValue >>= mbDeleteUnusedMasterPages; break;
+                    case TK_DeleteHiddenSlides :		aValue >>= mbDeleteHiddenSlides; break;
+                    case TK_DeleteNotesPages :			aValue >>= mbDeleteNotesPages ;break;
+                    case TK_SaveAs :					aValue >>= mbSaveAs; break;
+//					case TK_SaveAsURL :					aValue >>= maSaveAsURL; break;		// URL is not saved to configuration
+//					case TK_FilterName :				aValue >>= maFilterName; break;		// URL is not saved to configuration
+                    case TK_OpenNewDocument :			aValue >>= mbOpenNewDocument; break;
                     default: break;
                 }
             }
@@ -112,11 +112,11 @@ void OptimizerSettings::SaveSettingsToConfiguration( const Reference< XNameRepla
             TKGet( TK_DeleteHiddenSlides ),
             TKGet( TK_DeleteNotesPages ),
             TKGet( TK_SaveAs ),
-//          TKGet( TK_SaveAsURL ),
-//          TKGet( TK_FilterName ),
-            TKGet( TK_OpenNewDocument ) };
+//			TKGet( TK_SaveAsURL ),
+//			TKGet( TK_FilterName ),
+            TKGet( TK_OpenNewDocument )	};
 
-        Any pValues[] = {
+        Any	pValues[] = {
             Any( maName ),
             Any( mbJPEGCompression ),
             Any( mnJPEGQuality ),
@@ -129,8 +129,8 @@ void OptimizerSettings::SaveSettingsToConfiguration( const Reference< XNameRepla
             Any( mbDeleteHiddenSlides ),
             Any( mbDeleteNotesPages ),
             Any( mbSaveAs ),
-//          Any( maSaveAsURL ),
-//          Any( maFilterName ),
+//			Any( maSaveAsURL ),
+//			Any( maFilterName ),
             Any( mbOpenNewDocument ) };
 
         sal_Int32 i, nCount = sizeof( pNames ) / sizeof( OUString );
@@ -160,7 +160,7 @@ sal_Bool OptimizerSettings::operator==( const OptimizerSettings& rOptimizerSetti
         && ( rOptimizerSettings.mbDeleteUnusedMasterPages == mbDeleteUnusedMasterPages )
         && ( rOptimizerSettings.mbDeleteHiddenSlides == mbDeleteHiddenSlides )
         && ( rOptimizerSettings.mbDeleteNotesPages == mbDeleteNotesPages );
-//      && ( rOptimizerSettings.mbOpenNewDocument == mbOpenNewDocument );
+//		&& ( rOptimizerSettings.mbOpenNewDocument == mbOpenNewDocument );
 }
 
 
@@ -234,7 +234,7 @@ void ConfigurationAccess::LoadStrings()
                     }
                     catch( Exception& )
                     {
-                    }
+                    }			
                 }
             }
         }
@@ -344,8 +344,8 @@ Reference< XInterface > ConfigurationAccess::OpenConfiguration( bool bReadOnly )
         {
             Sequence< Any > aCreationArguments( 2 );
             aCreationArguments[0] = makeAny( PropertyValue(
-                OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ), 0,
-                makeAny( GetPathToConfigurationRoot() ),
+                OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ), 0, 
+                makeAny( GetPathToConfigurationRoot() ), 
                 PropertyState_DIRECT_VALUE ) );
             aCreationArguments[1] = makeAny(beans::PropertyValue(
                 OUString( RTL_CONSTASCII_USTRINGPARAM( "lazywrite" ) ), 0, makeAny( true ),
@@ -369,7 +369,7 @@ Reference< XInterface > ConfigurationAccess::OpenConfiguration( bool bReadOnly )
 }
 
 Reference< XInterface > ConfigurationAccess::GetConfigurationNode(
-    const Reference< XInterface >& xRoot,
+    const Reference< XInterface >& xRoot, 
     const OUString& sPathToNode )
 {
     Reference< XInterface > xNode;
@@ -405,22 +405,22 @@ com::sun::star::uno::Any ConfigurationAccess::GetConfigProperty( const PPPOptimi
     {
         switch( ePropertyToken )
         {
-            case TK_Name :                      aRetValue <<= rSettings.maName; break;
-            case TK_JPEGCompression :           aRetValue <<= rSettings.mbJPEGCompression; break;
-            case TK_JPEGQuality :               aRetValue <<= rSettings.mnJPEGQuality; break;
-            case TK_RemoveCropArea :            aRetValue <<= rSettings.mbRemoveCropArea; break;
-            case TK_ImageResolution :           aRetValue <<= rSettings.mnImageResolution; break;
-            case TK_EmbedLinkedGraphics :       aRetValue <<= rSettings.mbEmbedLinkedGraphics; break;
-            case TK_OLEOptimization :           aRetValue <<= rSettings.mbOLEOptimization; break;
-            case TK_OLEOptimizationType :       aRetValue <<= rSettings.mnOLEOptimizationType; break;
-            case TK_DeleteUnusedMasterPages :   aRetValue <<= rSettings.mbDeleteUnusedMasterPages; break;
-            case TK_DeleteHiddenSlides :        aRetValue <<= rSettings.mbDeleteHiddenSlides; break;
-            case TK_DeleteNotesPages :          aRetValue <<= rSettings.mbDeleteNotesPages; break;
-            case TK_SaveAs :                    aRetValue <<= rSettings.mbSaveAs; break;
-            case TK_SaveAsURL :                 aRetValue <<= rSettings.maSaveAsURL; break;
-            case TK_FilterName :                aRetValue <<= rSettings.maFilterName; break;
-            case TK_OpenNewDocument :           aRetValue <<= rSettings.mbOpenNewDocument; break;
-            case TK_EstimatedFileSize :         aRetValue <<= rSettings.mnEstimatedFileSize; break;
+            case TK_Name :						aRetValue <<= rSettings.maName; break;
+            case TK_JPEGCompression :			aRetValue <<= rSettings.mbJPEGCompression; break;
+            case TK_JPEGQuality :				aRetValue <<= rSettings.mnJPEGQuality; break;
+            case TK_RemoveCropArea :			aRetValue <<= rSettings.mbRemoveCropArea; break;
+            case TK_ImageResolution :			aRetValue <<= rSettings.mnImageResolution; break;
+            case TK_EmbedLinkedGraphics :		aRetValue <<= rSettings.mbEmbedLinkedGraphics; break;
+            case TK_OLEOptimization :			aRetValue <<= rSettings.mbOLEOptimization; break;
+            case TK_OLEOptimizationType :		aRetValue <<= rSettings.mnOLEOptimizationType; break;
+            case TK_DeleteUnusedMasterPages :	aRetValue <<= rSettings.mbDeleteUnusedMasterPages; break;
+            case TK_DeleteHiddenSlides :		aRetValue <<= rSettings.mbDeleteHiddenSlides; break;
+            case TK_DeleteNotesPages :			aRetValue <<= rSettings.mbDeleteNotesPages; break;
+            case TK_SaveAs :					aRetValue <<= rSettings.mbSaveAs; break;
+            case TK_SaveAsURL :					aRetValue <<= rSettings.maSaveAsURL; break;
+            case TK_FilterName :				aRetValue <<= rSettings.maFilterName; break;
+            case TK_OpenNewDocument :			aRetValue <<= rSettings.mbOpenNewDocument; break;
+            case TK_EstimatedFileSize :			aRetValue <<= rSettings.mnEstimatedFileSize; break;
             default:
                 break;
         }
@@ -438,23 +438,23 @@ void ConfigurationAccess::SetConfigProperty( const PPPOptimizerTokenEnum eProper
     {
         switch( ePropertyToken )
         {
-            case TK_Name :                      rValue >>= rSettings.maName; break;
-            case TK_JPEGCompression :           rValue >>= rSettings.mbJPEGCompression; break;
-            case TK_JPEGQuality :               rValue >>= rSettings.mnJPEGQuality; break;
-            case TK_RemoveCropArea :            rValue >>= rSettings.mbRemoveCropArea; break;
-            case TK_ImageResolution :           rValue >>= rSettings.mnImageResolution; break;
-            case TK_EmbedLinkedGraphics :       rValue >>= rSettings.mbEmbedLinkedGraphics; break;
-            case TK_OLEOptimization :           rValue >>= rSettings.mbOLEOptimization; break;
-            case TK_OLEOptimizationType :       rValue >>= rSettings.mnOLEOptimizationType; break;
-            case TK_DeleteUnusedMasterPages :   rValue >>= rSettings.mbDeleteUnusedMasterPages; break;
-            case TK_DeleteHiddenSlides :        rValue >>= rSettings.mbDeleteHiddenSlides; break;
-            case TK_DeleteNotesPages :          rValue >>= rSettings.mbDeleteNotesPages; break;
-            case TK_CustomShowName :            rValue >>= rSettings.maCustomShowName; break;
-            case TK_SaveAs :                    rValue >>= rSettings.mbSaveAs; break;
-            case TK_SaveAsURL :                 rValue >>= rSettings.maSaveAsURL; break;
-            case TK_FilterName :                rValue >>= rSettings.maFilterName; break;
-            case TK_OpenNewDocument :           rValue >>= rSettings.mbOpenNewDocument; break;
-            case TK_EstimatedFileSize :         rValue >>= rSettings.mnEstimatedFileSize; break;
+            case TK_Name :						rValue >>= rSettings.maName; break;
+            case TK_JPEGCompression :			rValue >>= rSettings.mbJPEGCompression; break;
+            case TK_JPEGQuality :				rValue >>= rSettings.mnJPEGQuality; break;
+            case TK_RemoveCropArea :			rValue >>= rSettings.mbRemoveCropArea; break;
+            case TK_ImageResolution :			rValue >>= rSettings.mnImageResolution; break;
+            case TK_EmbedLinkedGraphics :		rValue >>= rSettings.mbEmbedLinkedGraphics; break;
+            case TK_OLEOptimization :			rValue >>= rSettings.mbOLEOptimization; break;
+            case TK_OLEOptimizationType :		rValue >>= rSettings.mnOLEOptimizationType; break;
+            case TK_DeleteUnusedMasterPages :	rValue >>= rSettings.mbDeleteUnusedMasterPages; break;
+            case TK_DeleteHiddenSlides :		rValue >>= rSettings.mbDeleteHiddenSlides; break;
+            case TK_DeleteNotesPages :			rValue >>= rSettings.mbDeleteNotesPages; break;
+            case TK_CustomShowName :			rValue >>= rSettings.maCustomShowName; break;
+            case TK_SaveAs :					rValue >>= rSettings.mbSaveAs; break;
+            case TK_SaveAsURL :					rValue >>= rSettings.maSaveAsURL; break;
+            case TK_FilterName :				rValue >>= rSettings.maFilterName; break;
+            case TK_OpenNewDocument :			rValue >>= rSettings.mbOpenNewDocument; break;
+            case TK_EstimatedFileSize :			rValue >>= rSettings.mnEstimatedFileSize; break;
             default:
                 break;
         }
diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx
index 436ae90fe071..2ccc8ece8428 100644
--- a/sdext/source/minimizer/configurationaccess.hxx
+++ b/sdext/source/minimizer/configurationaccess.hxx
@@ -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
@@ -47,24 +47,24 @@
 
 struct OptimizerSettings
 {
-    rtl::OUString   maName;
-    sal_Bool        mbJPEGCompression;
-    sal_Int32       mnJPEGQuality;
-    sal_Bool        mbRemoveCropArea;
-    sal_Int32       mnImageResolution;
-    sal_Bool        mbEmbedLinkedGraphics;
-    sal_Bool        mbOLEOptimization;
-    sal_Int16       mnOLEOptimizationType;
-    sal_Bool        mbDeleteUnusedMasterPages;
-    sal_Bool        mbDeleteHiddenSlides;
-    sal_Bool        mbDeleteNotesPages;
-    rtl::OUString   maCustomShowName;
-    sal_Bool        mbSaveAs;
-    rtl::OUString   maSaveAsURL;
-    rtl::OUString   maFilterName;
-    sal_Bool        mbOpenNewDocument;
-    sal_Int64       mnEstimatedFileSize;
-
+    rtl::OUString	maName;
+    sal_Bool		mbJPEGCompression;
+    sal_Int32		mnJPEGQuality;
+    sal_Bool		mbRemoveCropArea;
+    sal_Int32		mnImageResolution;
+    sal_Bool		mbEmbedLinkedGraphics;
+    sal_Bool		mbOLEOptimization;
+    sal_Int16		mnOLEOptimizationType;
+    sal_Bool		mbDeleteUnusedMasterPages;
+    sal_Bool		mbDeleteHiddenSlides;
+    sal_Bool		mbDeleteNotesPages;
+    rtl::OUString	maCustomShowName;
+    sal_Bool		mbSaveAs;
+    rtl::OUString	maSaveAsURL;
+    rtl::OUString	maFilterName;
+    sal_Bool		mbOpenNewDocument;
+    sal_Int64		mnEstimatedFileSize;
+    
     OptimizerSettings() :
         mbJPEGCompression( sal_False ),
         mnJPEGQuality( 90 ),
@@ -80,13 +80,13 @@ struct OptimizerSettings
         mbOpenNewDocument( sal_True ),
         mnEstimatedFileSize( 0 ){};
         ~OptimizerSettings(){};
-
+    
         void LoadSettingsFromConfiguration( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& rSettings );
         void SaveSettingsToConfiguration( const com::sun::star::uno::Reference< com::sun::star::container::XNameReplace >& rSettings );
 
         sal_Bool operator==( const OptimizerSettings& rOptimizerSettings ) const;
 
-};
+}; 
 class ConfigurationAccess
 {
     public :
@@ -108,7 +108,7 @@ class ConfigurationAccess
         sal_Int32 GetConfigProperty( const PPPOptimizerTokenEnum, const sal_Int32 nDefault ) const;
 
         com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > GetConfigurationSequence();
-
+        
         // getting access to the OptimizerSettings list
         std::vector< OptimizerSettings >& GetOptimizerSettings() { return maSettings; };
         std::vector< OptimizerSettings >::iterator GetOptimizerSettingsByName( const rtl::OUString& rName );
@@ -136,6 +136,6 @@ class ConfigurationAccess
             const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& xRoot, const rtl::OUString& sPathToNode );
 };
 
-#endif  // _CONFIGURATION_ACCESS_HXX_
+#endif	// _CONFIGURATION_ACCESS_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx
index 6091e34cf614..ef5cd430ca36 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -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
@@ -71,7 +71,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxMSF ) :
     mxMSF( rxMSF )
 {
     Sequence< Any > aInitPropSeq( 1 );
-    aInitPropSeq[ 0 ] <<= (sal_Int16)TemplateDescription::FILESAVE_AUTOEXTENSION;   // TemplateDescription.FILEOPEN_SIMPLE
+    aInitPropSeq[ 0 ] <<= (sal_Int16)TemplateDescription::FILESAVE_AUTOEXTENSION;	// TemplateDescription.FILEOPEN_SIMPLE
 
     mxFilePicker = Reference < XFilePicker >( mxMSF->getServiceManager()->createInstanceWithArgumentsAndContext(
         OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ), aInitPropSeq, rxMSF ),UNO_QUERY_THROW );
@@ -117,10 +117,10 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxMSF ) :
                                 j = aFilterProperties.getLength();
                         }
                         break;
-                        case TK_Name :      rProperty.Value >>= aFilterEntry.maName; break;
-                        case TK_UIName :    rProperty.Value >>= aFilterEntry.maUIName; break;
-                        case TK_Type :      rProperty.Value >>= aFilterEntry.maType; break;
-                        case TK_Flags :     rProperty.Value >>= aFilterEntry.maFlags; break;
+                        case TK_Name :		rProperty.Value >>= aFilterEntry.maName; break;
+                        case TK_UIName :	rProperty.Value >>= aFilterEntry.maUIName; break;
+                        case TK_Type :		rProperty.Value >>= aFilterEntry.maType; break;
+                        case TK_Flags :		rProperty.Value >>= aFilterEntry.maFlags; break;
                         default : break;
                     }
                 }
@@ -139,7 +139,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxMSF ) :
         OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ) ), rxMSF ), UNO_QUERY_THROW );
     Sequence< OUString > aTypeList( xFilters->getElementNames() );
 
-//  mxFilePicker->setDefaultName( );
+//	mxFilePicker->setDefaultName( );
 
     Reference< XFilterManager > xFilterManager( mxFilePicker, UNO_QUERY_THROW );
     std::vector< FilterEntry >::iterator aIter( aFilterEntryList.begin() );
@@ -184,12 +184,12 @@ void FileOpenDialog::setDefaultName( const rtl::OUString& rDefaultName )
 {
     mxFilePicker->setDefaultName( rDefaultName );
 }
-::rtl::OUString FileOpenDialog::getURL() const
+::rtl::OUString	FileOpenDialog::getURL() const
 {
     Sequence< OUString > aFileSeq( mxFilePicker->getFiles() );
     return aFileSeq.getLength() ? aFileSeq[ 0 ] : OUString();
 };
-::rtl::OUString FileOpenDialog::getFilterName() const
+::rtl::OUString	FileOpenDialog::getFilterName() const
 {
     rtl::OUString aFilterName;
     Reference< XFilterManager > xFilterManager( mxFilePicker, UNO_QUERY_THROW );
diff --git a/sdext/source/minimizer/fileopendialog.hxx b/sdext/source/minimizer/fileopendialog.hxx
index 8ddbba752113..6cb2d615f145 100644
--- a/sdext/source/minimizer/fileopendialog.hxx
+++ b/sdext/source/minimizer/fileopendialog.hxx
@@ -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
@@ -63,12 +63,12 @@ public :
         sal_Int16 execute();
 
         void setDefaultName( const rtl::OUString& );
-//      void setDefaultDirectory( const rtl::OUString& );
+//		void setDefaultDirectory( const rtl::OUString& );
 
-        ::rtl::OUString getURL() const;
+        ::rtl::OUString	getURL() const;
         ::rtl::OUString getFilterName() const;
 };
 
-#endif  // _FILEOPEN_DIALOG_HXX_
+#endif	// _FILEOPEN_DIALOG_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx
index d4258e66953c..66b33b690a03 100644
--- a/sdext/source/minimizer/graphiccollector.cxx
+++ b/sdext/source/minimizer/graphiccollector.cxx
@@ -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
@@ -218,7 +218,7 @@ void ImpCollectBackgroundGraphic( const Reference< XComponentContext >& rxMSF, c
         Reference< XPropertySet > xPropertySet( rxDrawPage, UNO_QUERY_THROW );
         xPropertySet->getPropertyValue( TKGet( TK_Width ) ) >>= aLogicalSize.Width;
         xPropertySet->getPropertyValue( TKGet( TK_Height ) ) >>= aLogicalSize.Height;
-
+        
         Reference< XPropertySet > xBackgroundPropSet;
         if ( xPropertySet->getPropertyValue( TKGet( TK_Background ) ) >>= xBackgroundPropSet )
             ImpAddFillBitmapEntity( rxMSF, xBackgroundPropSet, aLogicalSize, rGraphicEntities, rGraphicSettings, xPropertySet );
@@ -267,7 +267,7 @@ awt::Size GraphicCollector::GetOriginalSize( const Reference< XComponentContext
     if ( xGraphicPropertySet->getPropertyValue( TKGet( TK_Size100thMM ) ) >>= aSize100thMM )
     {
         if ( !aSize100thMM.Width && !aSize100thMM.Height )
-        {   // MAPMODE_PIXEL USED :-(
+        {	// MAPMODE_PIXEL USED :-(
             awt::Size aSourceSizePixel( 0, 0 );
             if ( xGraphicPropertySet->getPropertyValue( TKGet( TK_SizePixel ) ) >>= aSourceSizePixel )
             {
@@ -404,7 +404,7 @@ void ImpCountBackgroundGraphic( const Reference< XComponentContext >& /* rxMSF *
         Reference< XPropertySet > xPropertySet( rxDrawPage, UNO_QUERY_THROW );
         xPropertySet->getPropertyValue( TKGet( TK_Width ) ) >>= aLogicalSize.Width;
         xPropertySet->getPropertyValue( TKGet( TK_Height ) ) >>= aLogicalSize.Height;
-
+        
         Reference< XPropertySet > xBackgroundPropSet;
         if ( xPropertySet->getPropertyValue( TKGet( TK_Background ) ) >>= xBackgroundPropSet )
         {
diff --git a/sdext/source/minimizer/graphiccollector.hxx b/sdext/source/minimizer/graphiccollector.hxx
index f67e06058cfa..392a632ba334 100644
--- a/sdext/source/minimizer/graphiccollector.hxx
+++ b/sdext/source/minimizer/graphiccollector.hxx
@@ -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
@@ -42,11 +42,11 @@
 
 struct GraphicSettings
 {
-    sal_Bool    mbJPEGCompression;
-    sal_Int32   mnJPEGQuality;
-    sal_Bool    mbRemoveCropArea;
-    sal_Int32   mnImageResolution;
-    sal_Bool    mbEmbedLinkedGraphics;
+    sal_Bool	mbJPEGCompression;
+    sal_Int32	mnJPEGQuality;
+    sal_Bool	mbRemoveCropArea;
+    sal_Int32	mnImageResolution;
+    sal_Bool	mbEmbedLinkedGraphics;
 
     GraphicSettings( sal_Bool bJPEGCompression, sal_Int32 nJPEGQuality, sal_Bool bRemoveCropArea,
                         sal_Int32 nImageResolution, sal_Bool bEmbedLinkedGraphics )
@@ -63,25 +63,25 @@ class GraphicCollector
 
     struct GraphicUser
     {
-        com::sun::star::uno::Reference< com::sun::star::drawing::XShape >       mxShape;            // if mbFillBitmap is false the xShape has
-        com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >   mxPropertySet;      // to be used otherwise the PropertySet
-        com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >   mxPagePropertySet;
-        rtl::OUString                       maGraphicURL;
-        rtl::OUString                       maGraphicStreamURL;
-        com::sun::star::text::GraphicCrop   maGraphicCropLogic;
-        com::sun::star::awt::Size           maLogicalSize;
-        sal_Bool                            mbFillBitmap;
+        com::sun::star::uno::Reference< com::sun::star::drawing::XShape >		mxShape;			// if mbFillBitmap is false the xShape has
+        com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >	mxPropertySet;		// to be used otherwise the PropertySet
+        com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >	mxPagePropertySet;
+        rtl::OUString						maGraphicURL;
+        rtl::OUString						maGraphicStreamURL;
+        com::sun::star::text::GraphicCrop	maGraphicCropLogic;
+        com::sun::star::awt::Size			maLogicalSize;
+        sal_Bool							mbFillBitmap;
 
         GraphicUser() : mxShape(), maGraphicCropLogic( 0, 0, 0, 0 ), mbFillBitmap( sal_False ) {};
     };
 
     struct GraphicEntity
     {
-        com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic > mxGraphic;          // the corresponding XGraphic of the Shape
-        com::sun::star::awt::Size                       maLogicalSize;                          // the biggest logical size the graphic will be displayed
-        sal_Bool                                        mbRemoveCropArea;                       //
-        com::sun::star::text::GraphicCrop               maGraphicCropLogic;
-        std::vector< GraphicUser >                      maUser;
+        com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic >	mxGraphic;			// the corresponding XGraphic of the Shape
+        com::sun::star::awt::Size						maLogicalSize;							// the biggest logical size the graphic will be displayed
+        sal_Bool										mbRemoveCropArea;						//
+        com::sun::star::text::GraphicCrop				maGraphicCropLogic;
+        std::vector< GraphicUser >						maUser;				
 
         GraphicEntity( const com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic >& xGraphic, const GraphicUser& rUser )
             : mxGraphic( xGraphic ), maLogicalSize( rUser.maLogicalSize ), mbRemoveCropArea( sal_False ), maGraphicCropLogic( 0, 0, 0, 0 ) { maUser.push_back( rUser ); };
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index d2e00fb94f26..9d4e49e5f951 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -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
@@ -236,13 +236,13 @@ void ImpCompressGraphic( Reference< XGraphicProvider >& rxGraphicProvider, const
             Sequence< PropertyValue > aFilterData( 8 );
             aFilterData[ 0 ].Name = TKGet( TK_ImageResolution );
             aFilterData[ 0 ].Value <<= nImageResolution;
-            aFilterData[ 1 ].Name = TKGet( TK_ColorMode );      // todo: jpeg color mode (0->true color, 1->greyscale)
+            aFilterData[ 1 ].Name = TKGet( TK_ColorMode );		// todo: jpeg color mode (0->true color, 1->greyscale)
             aFilterData[ 1 ].Value <<= (sal_Int32)0;
-            aFilterData[ 2 ].Name = TKGet( TK_Quality );        // quality that is used if we export to jpeg
+            aFilterData[ 2 ].Name = TKGet( TK_Quality );		// quality that is used if we export to jpeg
             aFilterData[ 2 ].Value <<= nJPEGQuality;
-            aFilterData[ 3 ].Name = TKGet( TK_Compression );    // compression that is used if we export to png
+            aFilterData[ 3 ].Name = TKGet( TK_Compression );	// compression that is used if we export to png
             aFilterData[ 3 ].Value <<= (sal_Int32)6;
-            aFilterData[ 4 ].Name = TKGet( TK_Interlaced );     // interlaced is turned off if we export to png
+            aFilterData[ 4 ].Name = TKGet( TK_Interlaced );		// interlaced is turned off if we export to png
             aFilterData[ 4 ].Value <<= (sal_Int32)0;
             aFilterData[ 5 ].Name = TKGet( TK_LogicalSize );
             aFilterData[ 5 ].Value <<= rLogicalSize;
@@ -250,9 +250,9 @@ void ImpCompressGraphic( Reference< XGraphicProvider >& rxGraphicProvider, const
             aFilterData[ 6 ].Value <<= bRemoveCropping;
             aFilterData[ 7 ].Name = TKGet( TK_GraphicCropLogic );
             aFilterData[ 7 ].Value <<= rGraphicCropLogic;
-
+            
             Sequence< PropertyValue > aArgs( 3 );
-            aArgs[ 0 ].Name = TKGet( TK_MimeType );             // the GraphicProvider is using "MimeType", the GraphicExporter "MediaType"...
+            aArgs[ 0 ].Name = TKGet( TK_MimeType );				// the GraphicProvider is using "MimeType", the GraphicExporter "MediaType"...
             aArgs[ 0 ].Value <<= rDestMimeType;
             aArgs[ 1 ].Name = TKGet( TK_OutputStream );
             aArgs[ 1 ].Value <<= rxOutputStream;
@@ -282,8 +282,8 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
             if ( nGraphicType == com::sun::star::graphic::GraphicType::PIXEL )
             {
                 sal_Bool bTransparent = sal_False;
-                sal_Bool bAlpha       = sal_False;
-                sal_Bool bAnimated    = sal_False;
+                sal_Bool bAlpha		  = sal_False;
+                sal_Bool bAnimated	  = sal_False;
 
                 awt::Size aSourceSizePixel( 0, 0 );
                 text::GraphicCrop aGraphicCropPixel( 0, 0, 0, 0 );
@@ -295,7 +295,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
                 {
                     awt::Size aDestSizePixel( aSourceSizePixel );
                     if ( !bAnimated )
-                    {
+                    {					
                         sal_Bool bNeedsOptimizing = sal_False;
                         sal_Bool bRemoveCropArea( rGraphicSettings.mbRemoveCropArea );
 
@@ -329,7 +329,7 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
                             if ( rGraphicSettings.mbJPEGCompression && !bTransparent && !bAlpha && !bAnimated )
                             {
                                 aDestMimeType = OUString( RTL_CONSTASCII_USTRINGPARAM( "image/jpeg" ) );
-//                                      if( aSourceMimeType != aDestMimeType )
+//										if( aSourceMimeType != aDestMimeType )
                                 bNeedsOptimizing = sal_True;
                             }
                             if ( bRemoveCropArea )
@@ -427,7 +427,7 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
 
                         if ( aGraphicUserIter->maGraphicCropLogic.Left || aGraphicUserIter->maGraphicCropLogic.Top
                         || aGraphicUserIter->maGraphicCropLogic.Right || aGraphicUserIter->maGraphicCropLogic.Bottom )
-                        {   // removing crop area was not possible or should't been applied
+                        {	// removing crop area was not possible or should't been applied
                             text::GraphicCrop aGraphicCropLogic( 0, 0, 0, 0 );
                             if ( !aGraphicSettings.mbRemoveCropArea )
                             {
@@ -481,19 +481,19 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
 // ----------------
 
 ImpOptimizer::ImpOptimizer( const Reference< XComponentContext >& rxMSF, const Reference< XModel >& rxModel ) :
-    mxMSF                       ( rxMSF ),
-    mxModel                     ( rxModel ),
-    mbJPEGCompression           ( sal_False ),
-    mnJPEGQuality               ( 90 ),
-    mbRemoveCropArea            ( sal_False ),
-    mnImageResolution           ( 0 ),
-    mbEmbedLinkedGraphics       ( sal_True ),
-    mbOLEOptimization           ( sal_False ),
-    mnOLEOptimizationType       ( 0 ),
-    mbDeleteUnusedMasterPages   ( sal_False ),
-    mbDeleteHiddenSlides        ( sal_False ),
-    mbDeleteNotesPages          ( sal_False ),
-    mbOpenNewDocument           ( sal_True )
+    mxMSF						( rxMSF ),
+    mxModel						( rxModel ),
+    mbJPEGCompression			( sal_False ),
+    mnJPEGQuality				( 90 ),
+    mbRemoveCropArea			( sal_False ),
+    mnImageResolution			( 0 ),
+    mbEmbedLinkedGraphics		( sal_True ),
+    mbOLEOptimization			( sal_False ),
+    mnOLEOptimizationType		( 0 ),
+    mbDeleteUnusedMasterPages	( sal_False ),
+    mbDeleteHiddenSlides		( sal_False ),
+    mbDeleteNotesPages			( sal_False ),
+    mbOpenNewDocument			( sal_True )
 {
 }
 
@@ -619,21 +619,21 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
                     {
                         switch( TKGet( aSettings[ j ].Name ) )
                         {
-                            case TK_JPEGCompression         : aSettings[ j ].Value >>= mbJPEGCompression; break;
-                            case TK_JPEGQuality             : aSettings[ j ].Value >>= mnJPEGQuality; break;
-                            case TK_RemoveCropArea          : aSettings[ j ].Value >>= mbRemoveCropArea; break;
-                            case TK_ImageResolution         : aSettings[ j ].Value >>= mnImageResolution; break;
-                            case TK_EmbedLinkedGraphics     : aSettings[ j ].Value >>= mbEmbedLinkedGraphics; break;
-                            case TK_OLEOptimization         : aSettings[ j ].Value >>= mbOLEOptimization; break;
-                            case TK_OLEOptimizationType     : aSettings[ j ].Value >>= mnOLEOptimizationType; break;
-                            case TK_CustomShowName          : aSettings[ j ].Value >>= maCustomShowName; break;
+                            case TK_JPEGCompression			: aSettings[ j ].Value >>= mbJPEGCompression; break;
+                            case TK_JPEGQuality				: aSettings[ j ].Value >>= mnJPEGQuality; break;
+                            case TK_RemoveCropArea			: aSettings[ j ].Value >>= mbRemoveCropArea; break;
+                            case TK_ImageResolution			: aSettings[ j ].Value >>= mnImageResolution; break;
+                            case TK_EmbedLinkedGraphics		: aSettings[ j ].Value >>= mbEmbedLinkedGraphics; break;
+                            case TK_OLEOptimization			: aSettings[ j ].Value >>= mbOLEOptimization; break;
+                            case TK_OLEOptimizationType		: aSettings[ j ].Value >>= mnOLEOptimizationType; break;
+                            case TK_CustomShowName			: aSettings[ j ].Value >>= maCustomShowName; break;
                             case TK_DeleteUnusedMasterPages : aSettings[ j ].Value >>= mbDeleteUnusedMasterPages; break;
-                            case TK_DeleteHiddenSlides      : aSettings[ j ].Value >>= mbDeleteHiddenSlides; break;
-                            case TK_DeleteNotesPages        : aSettings[ j ].Value >>= mbDeleteNotesPages; break;
-                            case TK_SaveAsURL               : aSettings[ j ].Value >>= maSaveAsURL; break;
-                            case TK_FilterName              : aSettings[ j ].Value >>= maFilterName; break;
-                            case TK_OpenNewDocument         : aSettings[ j ].Value >>= mbOpenNewDocument; break;
-                            case TK_EstimatedFileSize       : aSettings[ j ].Value >>= nEstimatedFileSize; break;
+                            case TK_DeleteHiddenSlides		: aSettings[ j ].Value >>= mbDeleteHiddenSlides; break;
+                            case TK_DeleteNotesPages		: aSettings[ j ].Value >>= mbDeleteNotesPages; break;
+                            case TK_SaveAsURL				: aSettings[ j ].Value >>= maSaveAsURL; break;
+                            case TK_FilterName				: aSettings[ j ].Value >>= maFilterName; break;
+                            case TK_OpenNewDocument			: aSettings[ j ].Value >>= mbOpenNewDocument; break;
+                            case TK_EstimatedFileSize		: aSettings[ j ].Value >>= nEstimatedFileSize; break;
                             default: break;
                         }
                     }
@@ -649,7 +649,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
         Reference< XFrame > xSelf;
         if ( maSaveAsURL.getLength() )
         {
-
+    
             SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 10 ) ) );
             SetStatusValue( TK_Status, Any( TKGet( STR_DUPLICATING_PRESENTATION ) ) );
             DispatchStatus();
@@ -697,7 +697,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
             mxModel->lockControllers();
             bRet = Optimize();
             mxModel->unlockControllers();
-
+    
             // clearing undo stack:
             Reference< XFrame > xFrame( xSelf.is() ? xSelf : mxInformationDialog );
             if ( xFrame.is() )
@@ -723,7 +723,7 @@ sal_Bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
             SetStatusValue( TK_OpenNewDocument, Any( mbOpenNewDocument ) );
             DispatchStatus();
         }
-
+    
         if ( maSaveAsURL.getLength() )
         {
             if ( mbOpenNewDocument && xSelf.is() )
diff --git a/sdext/source/minimizer/impoptimizer.hxx b/sdext/source/minimizer/impoptimizer.hxx
index ac3b4e8c36e4..9112cbd1bd61 100644
--- a/sdext/source/minimizer/impoptimizer.hxx
+++ b/sdext/source/minimizer/impoptimizer.hxx
@@ -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
@@ -50,27 +50,27 @@ class ImpOptimizer : public OptimizationStats
 {
 private:
 
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >    mxMSF;
-    com::sun::star::uno::Reference< com::sun::star::frame::XModel >             mxModel;
-    com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >          mxStatusDispatcher;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >	mxMSF;
+    com::sun::star::uno::Reference< com::sun::star::frame::XModel >				mxModel;
+    com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >			mxStatusDispatcher;
 
-    sal_Bool        mbJPEGCompression;
-    sal_Int32       mnJPEGQuality;
-    sal_Bool        mbRemoveCropArea;
-    sal_Int32       mnImageResolution;
-    sal_Bool        mbEmbedLinkedGraphics;
-    sal_Bool        mbOLEOptimization;
-    sal_Int32       mnOLEOptimizationType;
-    rtl::OUString   maCustomShowName;
-    sal_Bool        mbDeleteUnusedMasterPages;
-    sal_Bool        mbDeleteHiddenSlides;
-    sal_Bool        mbDeleteNotesPages;
-    rtl::OUString   maSaveAsURL;
-    rtl::OUString   maFilterName;
-    sal_Bool        mbOpenNewDocument;
+    sal_Bool		mbJPEGCompression;
+    sal_Int32		mnJPEGQuality;
+    sal_Bool		mbRemoveCropArea;
+    sal_Int32		mnImageResolution;
+    sal_Bool		mbEmbedLinkedGraphics;
+    sal_Bool		mbOLEOptimization;
+    sal_Int32		mnOLEOptimizationType;
+    rtl::OUString	maCustomShowName;
+    sal_Bool		mbDeleteUnusedMasterPages;
+    sal_Bool		mbDeleteHiddenSlides;
+    sal_Bool		mbDeleteNotesPages;
+    rtl::OUString	maSaveAsURL;
+    rtl::OUString	maFilterName;
+    sal_Bool		mbOpenNewDocument;
 
     com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxInformationDialog;
-
+    
     sal_Bool Optimize();
 
 public:
@@ -80,7 +80,7 @@ public:
         ~ImpOptimizer();
 
         sal_Bool Optimize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rArguments );
-        void     DispatchStatus();
+        void	 DispatchStatus();
 };
 
 #endif
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 17f900ccc6b6..de6bd58aeb04 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -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
@@ -38,10 +38,10 @@
 #include "com/sun/star/util/URL.hpp"
 #include "com/sun/star/util/XURLTransformer.hpp"
 
-#define DIALOG_WIDTH    240
-#define DIALOG_HEIGHT   80
-#define PAGE_POS_X      35
-#define PAGE_WIDTH      ( DIALOG_WIDTH - PAGE_POS_X ) - 6
+#define DIALOG_WIDTH	240
+#define DIALOG_HEIGHT	80
+#define PAGE_POS_X		35
+#define PAGE_WIDTH		( DIALOG_WIDTH - PAGE_POS_X ) - 6
 
 
 // ---------------------
@@ -78,7 +78,7 @@ rtl::OUString InsertFixedText( InformationDialog& rInformationDialog, const rtl:
         TKGet( TK_TabIndex ),
         TKGet( TK_Width ) };
 
-    Any pValues[] = {
+    Any	pValues[] = {
         Any( nHeight ),
         Any( rLabel ),
         Any( bMultiLine ),
@@ -90,8 +90,8 @@ rtl::OUString InsertFixedText( InformationDialog& rInformationDialog, const rtl:
 
     sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
 
-    Sequence< rtl::OUString >   aNames( pNames, nCount );
-    Sequence< Any >             aValues( pValues, nCount );
+    Sequence< rtl::OUString >	aNames( pNames, nCount );
+    Sequence< Any >				aValues( pValues, nCount );
 
     rInformationDialog.insertFixedText( rControlName, aNames, aValues );
     return rControlName;
@@ -109,7 +109,7 @@ rtl::OUString InsertImage( InformationDialog& rInformationDialog, const OUString
         TKGet( TK_ScaleImage ),
         TKGet( TK_Width ) };
 
-    Any pValues[] = {
+    Any	pValues[] = {
         Any( sal_Int16( 0 ) ),
         Any( nHeight ),
         Any( rURL ),
@@ -119,8 +119,8 @@ rtl::OUString InsertImage( InformationDialog& rInformationDialog, const OUString
         Any( nWidth ) };
     sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
 
-    Sequence< rtl::OUString >   aNames( pNames, nCount );
-    Sequence< Any >             aValues( pValues, nCount );
+    Sequence< rtl::OUString >	aNames( pNames, nCount );
+    Sequence< Any >				aValues( pValues, nCount );
 
     rInformationDialog.insertImage( rControlName, aNames, aValues );
     return rControlName;
@@ -140,7 +140,7 @@ rtl::OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUStr
         TKGet( TK_TabIndex ),
         TKGet( TK_Width ) };
 
-    Any pValues[] = {
+    Any	pValues[] = {
         Any( sal_True ),
         Any( nHeight ),
         Any( rLabel ),
@@ -152,8 +152,8 @@ rtl::OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUStr
 
     sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
 
-    Sequence< rtl::OUString >   aNames( pNames, nCount );
-    Sequence< Any >             aValues( pValues, nCount );
+    Sequence< rtl::OUString >	aNames( pNames, nCount );
+    Sequence< Any >				aValues( pValues, nCount );
 
     Reference< XCheckBox > xCheckBox( rInformationDialog.insertCheckBox( rControlName, aNames, aValues ) );
     if ( xItemListener.is() )
@@ -175,7 +175,7 @@ rtl::OUString InsertButton( InformationDialog& rInformationDialog, const OUStrin
         TKGet( TK_TabIndex ),
         TKGet( TK_Width ) };
 
-    Any pValues[] = {
+    Any	pValues[] = {
         Any( sal_True ),
         Any( nHeight ),
         Any( rInformationDialog.getString( nResID ) ),
@@ -189,8 +189,8 @@ rtl::OUString InsertButton( InformationDialog& rInformationDialog, const OUStrin
 
     sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
 
-    Sequence< rtl::OUString >   aNames( pNames, nCount );
-    Sequence< Any >             aValues( pValues, nCount );
+    Sequence< rtl::OUString >	aNames( pNames, nCount );
+    Sequence< Any >				aValues( pValues, nCount );
 
     rInformationDialog.insertButton( rControlName, xActionListener, aNames, aValues );
     return rControlName;
@@ -229,7 +229,7 @@ OUString InformationDialog::ImpGetStandardImage( const OUString& sPrivateURL )
             {
                 OUString aDestMimeType( RTL_CONSTASCII_USTRINGPARAM( "image/png" ) );
                 Sequence< PropertyValue > aArgs2( 2 );
-                aArgs2[ 0 ].Name = TKGet( TK_MimeType );                // the GraphicProvider is using "MimeType", the GraphicExporter "MediaType"...
+                aArgs2[ 0 ].Name = TKGet( TK_MimeType );				// the GraphicProvider is using "MimeType", the GraphicExporter "MediaType"...
                 aArgs2[ 0 ].Value <<= aDestMimeType;
                 aArgs2[ 1 ].Name = TKGet( TK_OutputStream );
                 aArgs2[ 1 ].Value <<= xOutputStream;
@@ -260,7 +260,7 @@ void InformationDialog::InitDialog()
         TKGet( TK_Title ),
         TKGet( TK_Width ) };
 
-    Any pValues[] = {
+    Any	pValues[] = {
         Any( sal_True ),
         Any( nDialogHeight ),
         Any( sal_True ),
@@ -268,13 +268,13 @@ void InformationDialog::InitDialog()
         Any( sal_Int32( 115 ) ),
         Any( getString( STR_SUN_OPTIMIZATION_WIZARD2 ) ),
         Any( sal_Int32( DIALOG_WIDTH ) ) };
-
+    
     sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
 
-    Sequence< rtl::OUString >   aNames( pNames, nCount );
-    Sequence< Any >             aValues( pValues, nCount );
+    Sequence< rtl::OUString >	aNames( pNames, nCount );
+    Sequence< Any >				aValues( pValues, nCount );
 
-    mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues );
+    mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues ); 
 
     sal_Int64 nSource = mnSourceSize;
     sal_Int64 nDest   = mnDestSize;
@@ -335,7 +335,7 @@ void InformationDialog::InitDialog()
     if ( k >= 0 )
         aInfoString = aInfoString.replaceAt( k, aTitlePlaceholder.getLength(), aTitle );
 
-    com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > xItemListener;
+    com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > xItemListener; 
     InsertImage( *this, rtl::OUString( rtl::OUString::createFromAscii( "aboutimage" ) ), ImpGetStandardImage( rtl::OUString::createFromAscii( "private:standardimage/query" ) ), 5, 5, 25, 25 );
     InsertFixedText( *this, rtl::OUString( rtl::OUString::createFromAscii( "fixedtext" ) ), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 );
     if ( maSaveAsURL.getLength() )
@@ -363,7 +363,7 @@ InformationDialog::InformationDialog( const Reference< XComponentContext > &rxMS
     Reference< XFrame > xFrame( mxController->getFrame() );
     Reference< XWindow > xContainerWindow( xFrame->getContainerWindow() );
     Reference< XWindowPeer > xWindowPeer( xContainerWindow, UNO_QUERY_THROW );
-    createWindowPeer( xWindowPeer );
+    createWindowPeer( xWindowPeer );		
 
     InitDialog();
 }
diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx
index 44d2d4c035be..0b38f57eb177 100644
--- a/sdext/source/minimizer/informationdialog.hxx
+++ b/sdext/source/minimizer/informationdialog.hxx
@@ -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
@@ -60,19 +60,19 @@ public :
                 sal_Bool& bOpenNewDocument, const sal_Int64& nSourceSize, const sal_Int64& nDestSize, const sal_Int64& nApproxDest );
     ~InformationDialog();
 
-    sal_Bool                execute();
+    sal_Bool				execute();
 
 private :
 
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >mxMSF;
-    com::sun::star::uno::Reference< com::sun::star::frame::XFrame >         mxFrame;
-    com::sun::star::uno::Reference< com::sun::star::io::XStream >           mxTempFile;
+    com::sun::star::uno::Reference< com::sun::star::frame::XFrame >			mxFrame;
+    com::sun::star::uno::Reference< com::sun::star::io::XStream >			mxTempFile;
 
-    com::sun::star::uno::Reference< com::sun::star::awt::XActionListener >  mxActionListener;
+    com::sun::star::uno::Reference< com::sun::star::awt::XActionListener >	mxActionListener;
 
     rtl::OUString ImpGetStandardImage( const rtl::OUString& rPrivateURL );
     void InitDialog();
-
+    
     sal_Int64 mnSourceSize;
     sal_Int64 mnDestSize;
     sal_Int64 mnApproxSize;
@@ -93,7 +93,7 @@ public:
     virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException);
 private:
-
+    
     InformationDialog& mrInformationDialog;
 };
 
diff --git a/sdext/source/minimizer/optimizationstats.cxx b/sdext/source/minimizer/optimizationstats.cxx
index 8f6eaeeb7f1c..a1e22ea08548 100644
--- a/sdext/source/minimizer/optimizationstats.cxx
+++ b/sdext/source/minimizer/optimizationstats.cxx
@@ -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
diff --git a/sdext/source/minimizer/optimizationstats.hxx b/sdext/source/minimizer/optimizationstats.hxx
index 3359b5888627..5a45de99f62e 100644
--- a/sdext/source/minimizer/optimizationstats.hxx
+++ b/sdext/source/minimizer/optimizationstats.hxx
@@ -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
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index 17fd2b1cdde5..32bac3134ef5 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -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
@@ -71,7 +71,7 @@ void OptimizerDialog::InitDialog()
         TKGet( TK_Title ),
         TKGet( TK_Width ) };
 
-    Any pValues[] = {
+    Any	pValues[] = {
         Any( sal_True ),
         Any( sal_Int32( DIALOG_HEIGHT ) ),
         Any( sal_True ),
@@ -79,13 +79,13 @@ void OptimizerDialog::InitDialog()
         Any( sal_Int32( 52 ) ),
         Any( getString( STR_SUN_OPTIMIZATION_WIZARD2 ) ),
         Any( sal_Int32( OD_DIALOG_WIDTH ) ) };
-
+    
     sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
 
-    Sequence< rtl::OUString >   aNames( pNames, nCount );
-    Sequence< Any >             aValues( pValues, nCount );
+    Sequence< rtl::OUString >	aNames( pNames, nCount );
+    Sequence< Any >				aValues( pValues, nCount );
 
-    mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues );
+    mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues ); 
 }
 
 // -----------------------------------------------------------------------------
@@ -102,7 +102,7 @@ void OptimizerDialog::InitRoadmap()
             TKGet( TK_TabIndex ),
             TKGet( TK_Width ) };
 
-        Any pValues[] = {
+        Any	pValues[] = {
             Any( sal_Int32( DIALOG_HEIGHT - 26 ) ),
             Any( sal_Int32( 0 ) ),
             Any( sal_Int32( 0 ) ),
@@ -112,11 +112,11 @@ void OptimizerDialog::InitRoadmap()
 
         sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
 
-        Sequence< rtl::OUString >   aNames( pNames, nCount );
-        Sequence< Any >             aValues( pValues, nCount );
+        Sequence< rtl::OUString >	aNames( pNames, nCount );
+        Sequence< Any >				aValues( pValues, nCount );
 
         mxRoadmapControlModel = insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlRoadmapModel" ) ),
-                                                              TKGet( TK_rdmNavi ), aNames, aValues  );
+                                                              TKGet( TK_rdmNavi ), aNames, aValues	);
 
         Reference< XPropertySet > xPropertySet( mxRoadmapControlModel, UNO_QUERY_THROW );
         xPropertySet->setPropertyValue( TKGet( TK_Name ), Any( TKGet( TK_rdmNavi ) ) );
@@ -168,13 +168,13 @@ void OptimizerDialog::InsertRoadmapItem( const sal_Int32 nIndex, const sal_Bool
 
 void OptimizerDialog::UpdateConfiguration()
 {
-    sal_Int16   nInt16 = 0;
-    OUString    aString;
-    Any         aAny;
+    sal_Int16	nInt16 = 0;
+    OUString	aString;
+    Any			aAny;
 
     Sequence< sal_Int16 > aSelectedItems;
     Sequence< OUString > aStringItemList;
-
+        
     // page0
     aAny = getControlProperty( TKGet( TK_ListBox0Pg0 ), TKGet( TK_SelectedItems ) );
     if ( aAny >>= aSelectedItems )
@@ -266,7 +266,7 @@ sal_Bool OptimizerDialog::execute()
     Reference< XItemEventBroadcaster > maRoadmapBroadcaster( mxRoadmapControl, UNO_QUERY_THROW );
     maRoadmapBroadcaster->addItemListener( mxItemListener );
     UnoDialog::execute();
-    UpdateConfiguration();          // taking actual control settings for the configuration
+    UpdateConfiguration();			// taking actual control settings for the configuration
     maRoadmapBroadcaster->removeItemListener( mxItemListener );
     return mbStatus;
 }
@@ -282,14 +282,14 @@ void OptimizerDialog::SwitchPage( sal_Int16 nNewStep )
             disableControl( TKGet( TK_btnNavBack ) );
         else if ( nOldStep == 0 )
             enableControl( TKGet( TK_btnNavBack ) );
-
+        
         if ( nNewStep == MAX_STEP )
             disableControl( TKGet( TK_btnNavNext ) );
         else if ( nOldStep == MAX_STEP )
             enableControl( TKGet( TK_btnNavNext ) );
 
         setControlProperty( TKGet( TK_rdmNavi ), TKGet( TK_CurrentItemID ), Any( nNewStep ) );
-
+        
         DeactivatePage( nOldStep );
         UpdateControlStates( nNewStep );
 
@@ -547,7 +547,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
                     Reference< XLayoutManager > xLayoutManager;
                     if ( xPropSet->getPropertyValue( OUString::createFromAscii( "LayoutManager" ) ) >>= xLayoutManager )
                     {
-                        xLayoutManager->setVisible( sal_False );
+                        xLayoutManager->setVisible( sal_False );                    
                         xLayoutManager->hideElement( OUString::createFromAscii( "private:resource/menubar/menubar" ) );
                         xLayoutManager->destroyElement( OUString::createFromAscii( "private:resource/statusbar/statusbar" ) );
                     }
@@ -559,8 +559,8 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
             }
         }
         break;
-        case TK_btnNavBack :    mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep - 1 ); break;
-        case TK_btnNavNext :    mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep + 1 ); break;
+        case TK_btnNavBack :	mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep - 1 ); break;
+        case TK_btnNavNext :	mrOptimizerDialog.SwitchPage( mrOptimizerDialog.mnCurrentStep + 1 ); break;	
         case TK_btnNavFinish :
         {
             mrOptimizerDialog.UpdateConfiguration();
@@ -574,9 +574,9 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
             mrOptimizerDialog.setControlProperty( TKGet( TK_btnNavCancel ), TKGet( TK_Enabled ), Any( sal_False ) );
             mrOptimizerDialog.setControlProperty( TKGet( TK_FixedText0Pg4 ), TKGet( TK_Enabled ), Any( sal_True ) );
 
-            // check if we have to open the FileDialog
-            sal_Bool    bSuccessfullyExecuted = sal_True;
-            sal_Int16   nInt16 = 0;
+            // check if we have to open the FileDialog 
+            sal_Bool	bSuccessfullyExecuted = sal_True;
+            sal_Int16	nInt16 = 0;
             mrOptimizerDialog.getControlProperty( TKGet( TK_RadioButton1Pg4 ), TKGet( TK_State ) ) >>= nInt16;
             if ( nInt16 )
             {
@@ -629,7 +629,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
                 }
             }
             if ( bSuccessfullyExecuted )
-            {   // now check if we have to store a session template
+            {	// now check if we have to store a session template
                 nInt16 = 0;
                 OUString aSettingsName;
                 mrOptimizerDialog.getControlProperty( TKGet( TK_CheckBox1Pg4 ), TKGet( TK_State ) ) >>= nInt16;
@@ -682,8 +682,8 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
             }
         }
         break;
-        case TK_btnNavCancel :  mrOptimizerDialog.endExecute( sal_False ); break;
-        case TK_Button0Pg0 :    // delete configuration
+        case TK_btnNavCancel :	mrOptimizerDialog.endExecute( sal_False ); break;
+        case TK_Button0Pg0 :	// delete configuration
         {
             OUString aSelectedItem( mrOptimizerDialog.GetSelectedString( TK_ListBox0Pg0 ) );
             if ( aSelectedItem.getLength() )
@@ -781,7 +781,7 @@ void SpinListenerFormattedField0Pg1::up( const SpinEvent& /* rEvent */ )
         fDouble += 9;
         if ( fDouble > 100 )
             fDouble = 100;
-        mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) );
+        mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) );	
         mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)fDouble ) );
     }
 }
@@ -795,20 +795,20 @@ void SpinListenerFormattedField0Pg1::down( const SpinEvent& /* rEvent */ )
         fDouble -= 9;
         if ( fDouble < 0 )
             fDouble = 0;
-        mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) );
+        mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( fDouble ) );	
         mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)fDouble ) );
     }
 }
 void SpinListenerFormattedField0Pg1::first( const SpinEvent& /* rEvent */ )
     throw ( com::sun::star::uno::RuntimeException )
 {
-    mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( static_cast< double >( 0 ) ) );
+    mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( static_cast< double >( 0 ) ) );	
     mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)0 ) );
 }
 void SpinListenerFormattedField0Pg1::last( const SpinEvent& /* rEvent */ )
     throw ( com::sun::star::uno::RuntimeException )
 {
-    mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( static_cast< double >( 100 ) ) );
+    mrOptimizerDialog.setControlProperty( TKGet( TK_FormattedField0Pg1 ), TKGet( TK_EffectiveValue ), Any( static_cast< double >( 100 ) ) );	
     mrOptimizerDialog.SetConfigProperty( TK_JPEGQuality, Any( (sal_Int32)100 ) );
 }
 void SpinListenerFormattedField0Pg1::disposing( const ::com::sun::star::lang::EventObject& /* Source */ )
diff --git a/sdext/source/minimizer/optimizerdialog.hrc b/sdext/source/minimizer/optimizerdialog.hrc
index bc3fd49a277f..9bf81f9d612a 100644
--- a/sdext/source/minimizer/optimizerdialog.hrc
+++ b/sdext/source/minimizer/optimizerdialog.hrc
@@ -1,7 +1,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,10 +27,10 @@
 #ifndef _OPTIMIZERDIALOG_HRC
 #define _OPTIMIZERDIALOG_HRC
 
-#define ITEM_ID_INTRODUCTION            0
-#define ITEM_ID_SLIDES                  1
-#define ITEM_ID_GRAPHIC_OPTIMIZATION    2
-#define ITEM_ID_OLE_OPTIMIZATION        3
-#define ITEM_ID_SUMMARY                 4
+#define	ITEM_ID_INTRODUCTION			0
+#define ITEM_ID_SLIDES					1
+#define ITEM_ID_GRAPHIC_OPTIMIZATION	2
+#define ITEM_ID_OLE_OPTIMIZATION		3
+#define ITEM_ID_SUMMARY					4
 
 #endif
diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx
index 08036c056069..af661121dbcb 100644
--- a/sdext/source/minimizer/optimizerdialog.hxx
+++ b/sdext/source/minimizer/optimizerdialog.hxx
@@ -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
@@ -53,16 +53,16 @@
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/awt/PushButtonType.hpp>
 
-#define MAX_STEP        4
-#define OD_DIALOG_WIDTH 330
-#define DIALOG_HEIGHT   210
-#define BUTTON_WIDTH    50
-#define BUTTON_HEIGHT   14
-#define BUTTON_POS_Y    DIALOG_HEIGHT - BUTTON_HEIGHT - 6
+#define MAX_STEP		4
+#define OD_DIALOG_WIDTH	330
+#define DIALOG_HEIGHT	210
+#define BUTTON_WIDTH	50
+#define BUTTON_HEIGHT	14
+#define BUTTON_POS_Y	DIALOG_HEIGHT - BUTTON_HEIGHT - 6
 
-#define PAGE_POS_X      91
-#define PAGE_POS_Y      8
-#define PAGE_WIDTH      OD_DIALOG_WIDTH - PAGE_POS_X
+#define PAGE_POS_X		91
+#define PAGE_POS_Y		8
+#define PAGE_WIDTH		OD_DIALOG_WIDTH - PAGE_POS_X
 
 // -------------------
 // - OPTIMIZERDIALOG -
@@ -75,26 +75,26 @@ public :
         com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > rxStatusDispatcher );
     ~OptimizerDialog();
 
-    sal_Bool                execute();
+    sal_Bool				execute();
 
-    sal_Int16               mnCurrentStep;
-    sal_Int16               mnTabIndex;
-    sal_Bool                mbIsReadonly;
+    sal_Int16				mnCurrentStep;
+    sal_Int16				mnTabIndex;
+    sal_Bool				mbIsReadonly;
 
 private :
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >mxMSF;
-    com::sun::star::uno::Reference< com::sun::star::frame::XFrame >         mxFrame;
+    com::sun::star::uno::Reference< com::sun::star::frame::XFrame >			mxFrame;
 
-    com::sun::star::uno::Reference< com::sun::star::uno::XInterface >       mxRoadmapControl;
-    com::sun::star::uno::Reference< com::sun::star::uno::XInterface >       mxRoadmapControlModel;
+    com::sun::star::uno::Reference< com::sun::star::uno::XInterface >		mxRoadmapControl;
+    com::sun::star::uno::Reference< com::sun::star::uno::XInterface >		mxRoadmapControlModel;
 
-    com::sun::star::uno::Reference< com::sun::star::awt::XItemListener >    mxItemListener;
-    com::sun::star::uno::Reference< com::sun::star::awt::XActionListener >  mxActionListener;
-    com::sun::star::uno::Reference< com::sun::star::awt::XActionListener >  mxActionListenerListBox0Pg0;
-    com::sun::star::uno::Reference< com::sun::star::awt::XTextListener >    mxTextListenerFormattedField0Pg1;
-    com::sun::star::uno::Reference< com::sun::star::awt::XTextListener >    mxTextListenerComboBox0Pg1;
-    com::sun::star::uno::Reference< com::sun::star::awt::XSpinListener >    mxSpinListenerFormattedField0Pg1;
-    com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >      mxStatusDispatcher;
+    com::sun::star::uno::Reference< com::sun::star::awt::XItemListener >	mxItemListener;
+    com::sun::star::uno::Reference< com::sun::star::awt::XActionListener >	mxActionListener;
+    com::sun::star::uno::Reference< com::sun::star::awt::XActionListener >	mxActionListenerListBox0Pg0;
+    com::sun::star::uno::Reference< com::sun::star::awt::XTextListener >	mxTextListenerFormattedField0Pg1;
+    com::sun::star::uno::Reference< com::sun::star::awt::XTextListener >	mxTextListenerComboBox0Pg1;
+    com::sun::star::uno::Reference< com::sun::star::awt::XSpinListener >	mxSpinListenerFormattedField0Pg1;
+    com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >		mxStatusDispatcher;
 
     std::vector< std::vector< rtl::OUString > > maControlPages;
 
@@ -161,7 +161,7 @@ public:
     virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException);
 private:
-
+    
     OptimizerDialog& mrOptimizerDialog;
 };
 
@@ -175,7 +175,7 @@ public:
     virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException);
 private:
-
+    
     OptimizerDialog& mrOptimizerDialog;
 };
 
@@ -189,7 +189,7 @@ public:
     virtual void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& Event ) throw ( com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException);
 private:
-
+    
     OptimizerDialog& mrOptimizerDialog;
 };
 
@@ -203,7 +203,7 @@ public:
     virtual void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& Event ) throw ( com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException);
 private:
-
+    
     OptimizerDialog& mrOptimizerDialog;
 };
 
@@ -220,7 +220,7 @@ public:
     virtual void SAL_CALL last( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException );
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException);
 private:
-
+    
     OptimizerDialog& mrOptimizerDialog;
 };
 
@@ -238,7 +238,7 @@ public:
     virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException) ;
 
 private:
-
+    
     com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& mrXFrame;
 };
 
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index bdd3cf0e80c1..a72ec1482d48 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -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
@@ -81,7 +81,7 @@ rtl::OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString
         TKGet( TK_Step ),
         TKGet( TK_Width ) };
 
-    Any pValues[] = {
+    Any	pValues[] = {
         Any( nHeight ),
         Any( nOrientation ),
         Any( nPosX ),
@@ -91,8 +91,8 @@ rtl::OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString
 
     sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
 
-    Sequence< rtl::OUString >   aNames( pNames, nCount );
-    Sequence< Any >             aValues( pValues, nCount );
+    Sequence< rtl::OUString >	aNames( pNames, nCount );
+    Sequence< Any >				aValues( pValues, nCount );
 
     rOptimizerDialog.insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFixedLineModel" ) ),
         rControlName, aNames, aValues );
@@ -115,7 +115,7 @@ rtl::OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& r
         TKGet( TK_TabIndex ),
         TKGet( TK_Width ) };
 
-    Any pValues[] = {
+    Any	pValues[] = {
         Any( bEnabled  ),
         Any( nHeight ),
         Any( rOptimizerDialog.getString( nResID ) ),
@@ -129,8 +129,8 @@ rtl::OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& r
 
     sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
 
-    Sequence< rtl::OUString >   aNames( pNames, nCount );
-    Sequence< Any >             aValues( pValues, nCount );
+    Sequence< rtl::OUString >	aNames( pNames, nCount );
+    Sequence< Any >				aValues( pValues, nCount );
 
     rOptimizerDialog.insertButton( rControlName, xActionListener, aNames, aValues );
     return rControlName;
@@ -151,7 +151,7 @@ rtl::OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const rtl::OUS
         TKGet( TK_TabIndex ),
         TKGet( TK_Width ) };
 
-    Any pValues[] = {
+    Any	pValues[] = {
         Any( nHeight ),
         Any( rLabel ),
         Any( bMultiLine ),
@@ -163,8 +163,8 @@ rtl::OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const rtl::OUS
 
     sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
 
-    Sequence< rtl::OUString >   aNames( pNames, nCount );
-    Sequence< Any >             aValues( pValues, nCount );
+    Sequence< rtl::OUString >	aNames( pNames, nCount );
+    Sequence< Any >				aValues( pValues, nCount );
 
     rOptimizerDialog.insertFixedText( rControlName, aNames, aValues );
     if ( bBold )
@@ -188,7 +188,7 @@ rtl::OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString&
         TKGet( TK_TabIndex ),
         TKGet( TK_Width ) };
 
-    Any pValues[] = {
+    Any	pValues[] = {
         Any( sal_True ),
         Any( nHeight ),
         Any( rLabel ),
@@ -200,8 +200,8 @@ rtl::OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString&
 
     sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
 
-    Sequence< rtl::OUString >   aNames( pNames, nCount );
-    Sequence< Any >             aValues( pValues, nCount );
+    Sequence< rtl::OUString >	aNames( pNames, nCount );
+    Sequence< Any >				aValues( pValues, nCount );
 
     Reference< XCheckBox > xCheckBox( rOptimizerDialog.insertCheckBox( rControlName, aNames, aValues ) );
     if ( xItemListener.is() )
@@ -228,7 +228,7 @@ rtl::OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUS
         TKGet( TK_TabIndex ),
         TKGet( TK_Width ) };
 
-    Any pValues[] = {
+    Any	pValues[] = {
         Any( fEffectiveMax ),
         Any( fEffectiveMin ),
         Any( sal_True ),
@@ -243,8 +243,8 @@ rtl::OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUS
 
     sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
 
-    Sequence< rtl::OUString >   aNames( pNames, nCount );
-    Sequence< Any >             aValues( pValues, nCount );
+    Sequence< rtl::OUString >	aNames( pNames, nCount );
+    Sequence< Any >				aValues( pValues, nCount );
 
     Reference< XTextComponent > xTextComponent( rOptimizerDialog.insertFormattedField( rControlName, aNames, aValues ), UNO_QUERY_THROW );
     if ( xTextListener.is() )
@@ -275,7 +275,7 @@ rtl::OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString&
         TKGet( TK_TabIndex ),
         TKGet( TK_Width ) };
 
-    Any pValues[] = {
+    Any	pValues[] = {
         Any( sal_True ),
         Any( bEnabled ),
         Any( nHeight ),
@@ -289,8 +289,8 @@ rtl::OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString&
 
     sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
 
-    Sequence< rtl::OUString >   aNames( pNames, nCount );
-    Sequence< Any >             aValues( pValues, nCount );
+    Sequence< rtl::OUString >	aNames( pNames, nCount );
+    Sequence< Any >				aValues( pValues, nCount );
 
     Reference< XTextComponent > xTextComponent( rOptimizerDialog.insertComboBox( rControlName, aNames, aValues ), UNO_QUERY_THROW );
     if ( xTextListener.is() )
@@ -313,7 +313,7 @@ rtl::OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const rtl::O
         TKGet( TK_TabIndex ),
         TKGet( TK_Width ) };
 
-    Any pValues[] = {
+    Any	pValues[] = {
         Any( nHeight ),
         Any( rLabel ),
         Any( bMultiLine ),
@@ -325,8 +325,8 @@ rtl::OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const rtl::O
 
     sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
 
-    Sequence< rtl::OUString >   aNames( pNames, nCount );
-    Sequence< Any >             aValues( pValues, nCount );
+    Sequence< rtl::OUString >	aNames( pNames, nCount );
+    Sequence< Any >				aValues( pValues, nCount );
 
     Reference< XRadioButton > xRadioButton( rOptimizerDialog.insertRadioButton( rControlName, aNames, aValues ) );
     if ( xItemListener.is() )
@@ -353,7 +353,7 @@ rtl::OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString&
         TKGet( TK_TabIndex ),
         TKGet( TK_Width ) };
 
-    Any pValues[] = {
+    Any	pValues[] = {
         Any( sal_True ),
         Any( bEnabled ),
         Any( nHeight ),
@@ -368,8 +368,8 @@ rtl::OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString&
 
     sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
 
-    Sequence< rtl::OUString >   aNames( pNames, nCount );
-    Sequence< Any >             aValues( pValues, nCount );
+    Sequence< rtl::OUString >	aNames( pNames, nCount );
+    Sequence< Any >				aValues( pValues, nCount );
 
     Reference< XListBox > xListBox( rOptimizerDialog.insertListBox( rControlName, aNames, aValues ) );
     if ( xListBox.is() )
@@ -381,10 +381,10 @@ rtl::OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString&
 
 void OptimizerDialog::InitNavigationBar()
 {
-    sal_Int32   nCancelPosX = OD_DIALOG_WIDTH - BUTTON_WIDTH - 6;
-    sal_Int32   nFinishPosX = nCancelPosX - 6 - BUTTON_WIDTH;
-    sal_Int32   nNextPosX = nFinishPosX - 6 - BUTTON_WIDTH;
-    sal_Int32   nBackPosX = nNextPosX - 3 - BUTTON_WIDTH;
+    sal_Int32	nCancelPosX = OD_DIALOG_WIDTH - BUTTON_WIDTH - 6;
+    sal_Int32	nFinishPosX = nCancelPosX - 6 - BUTTON_WIDTH;
+    sal_Int32	nNextPosX = nFinishPosX - 6 - BUTTON_WIDTH;
+    sal_Int32	nBackPosX = nNextPosX - 3 - BUTTON_WIDTH;
 
     InsertSeparator( *this, TKGet( TK_lnNavSep1 ), 0, 0, DIALOG_HEIGHT - 26, OD_DIALOG_WIDTH, 1 );
     InsertSeparator( *this, TKGet( TK_lnNavSep2 ), 1, 85, 0, 1, BUTTON_POS_Y - 6 );
@@ -406,7 +406,7 @@ void OptimizerDialog::UpdateControlStatesPage0()
     short nSelectedItem = -1;
     Sequence< OUString > aItemList;
     const std::vector< OptimizerSettings >& rList( GetOptimizerSettings() );
-    if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one
+    if ( rList.size() > 1 )	// the first session in the list is the actual one -> skipping first one
     {
         aItemList.realloc( rList.size() - 1 );
         for ( i = 1; i < rList.size(); i++ )
@@ -425,7 +425,7 @@ void OptimizerDialog::UpdateControlStatesPage0()
     {
         aSelectedItems.realloc( 1 );
         aSelectedItems[ 0 ] = nSelectedItem;
-        if ( nSelectedItem > 2 )    // only allowing to delete custom themes, the first can|t be deleted
+        if ( nSelectedItem > 2 )	// only allowing to delete custom themes, the first can|t be deleted
             bRemoveButtonEnabled = sal_True;
     }
     setControlProperty( TKGet( TK_ListBox0Pg0 ), TKGet( TK_StringItemList ), Any( aItemList ) );
@@ -630,7 +630,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
     sal_uInt32 w;
     Sequence< OUString > aItemList;
     const std::vector< OptimizerSettings >& rList( GetOptimizerSettings() );
-    if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one
+    if ( rList.size() > 1 )	// the first session in the list is the actual one -> skipping first one
     {
         aItemList.realloc( rList.size() - 1 );
         for ( w = 1; w < rList.size(); w++ )
@@ -640,7 +640,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
 
     // now check if it is sensible to enable the combo box
     sal_Bool bSaveSettingsEnabled = sal_True;
-    if ( rList.size() > 1 ) // the first session in the list is the actual one -> skipping first one
+    if ( rList.size() > 1 )	// the first session in the list is the actual one -> skipping first one
     {
         for ( w = 1; w < rList.size(); w++ )
         {
@@ -769,7 +769,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
         sal_Int32 i = aStr.indexOf( aImagePlaceholder, 0 );
         if ( i >= 0 )
             aStr = aStr.replaceAt( i, aImagePlaceholder.getLength(), OUString::valueOf( nGraphics ) );
-
+        
         sal_Int32 j = aStr.indexOf( aQualityPlaceholder, 0 );
         if ( j >= 0 )
             aStr = aStr.replaceAt( j, aQualityPlaceholder.getLength(), OUString::valueOf( nJPEGQuality ) );
@@ -846,7 +846,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
 
 void OptimizerDialog::InitPage4()
 {
-    {   // creating progress bar:
+    {	// creating progress bar:
         OUString pNames[] = {
             TKGet( TK_Height ),
             TKGet( TK_Name ),
@@ -857,7 +857,7 @@ void OptimizerDialog::InitPage4()
             TKGet( TK_ProgressValueMin ),
             TKGet( TK_Width ) };
 
-        Any pValues[] = {
+        Any	pValues[] = {
             Any( (sal_Int32)12 ),
             Any( TKGet( STR_SAVE_AS ) ),
             Any( (sal_Int32)( PAGE_POS_X + 6 ) ),
@@ -869,8 +869,8 @@ void OptimizerDialog::InitPage4()
 
         sal_Int32 nCount = sizeof( pNames ) / sizeof( OUString );
 
-        Sequence< rtl::OUString >   aNames( pNames, nCount );
-        Sequence< Any >             aValues( pValues, nCount );
+        Sequence< rtl::OUString >	aNames( pNames, nCount );
+        Sequence< Any >				aValues( pValues, nCount );
 
         Reference< XMultiPropertySet > xMultiPropertySet( insertControlModel( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlProgressBarModel" ) ),
             TKGet( TK_Progress ), aNames, aValues ), UNO_QUERY );
@@ -879,7 +879,7 @@ void OptimizerDialog::InitPage4()
     Sequence< OUString > aItemList;
     std::vector< rtl::OUString > aControlList;
     aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText0Pg4 ), getString( STR_SUMMARY_TITLE ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, sal_False, sal_True, mnTabIndex++ ) );
-//  aControlList.push_back( InsertSeparator( *this, TKGet( TK_Separator0Pg4 ), 0, PAGE_POS_X + 6, PAGE_POS_Y + 90, PAGE_WIDTH - 12, 1 ) );
+//	aControlList.push_back( InsertSeparator( *this, TKGet( TK_Separator0Pg4 ), 0, PAGE_POS_X + 6, PAGE_POS_Y + 90, PAGE_WIDTH - 12, 1 ) );
 
     aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText4Pg4 ), OUString(), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, sal_False, sal_False, mnTabIndex++ ) );
     aControlList.push_back( InsertFixedText( *this, TKGet( TK_FixedText5Pg4 ), OUString(), PAGE_POS_X + 6, PAGE_POS_Y + 22, PAGE_WIDTH - 12, 8, sal_False, sal_False, mnTabIndex++ ) );
diff --git a/sdext/source/minimizer/pagecollector.cxx b/sdext/source/minimizer/pagecollector.cxx
index e9f733533475..33522109549c 100644
--- a/sdext/source/minimizer/pagecollector.cxx
+++ b/sdext/source/minimizer/pagecollector.cxx
@@ -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
diff --git a/sdext/source/minimizer/pagecollector.hxx b/sdext/source/minimizer/pagecollector.hxx
index 3387dd92213f..60c0292ee111 100644
--- a/sdext/source/minimizer/pagecollector.hxx
+++ b/sdext/source/minimizer/pagecollector.hxx
@@ -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
diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx
index 4fac633ca4dc..9fbd5233a5f9 100644
--- a/sdext/source/minimizer/pppoptimizer.cxx
+++ b/sdext/source/minimizer/pppoptimizer.cxx
@@ -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
@@ -107,7 +107,7 @@ Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizer::queryDispat
     Reference < XDispatch > xRet;
     if ( aURL.Protocol.compareToAscii( "vnd.com.sun.star.comp.PPPOptimizer:" ) == 0 )
     {
-//      if ( aURL.Path.compareToAscii( "Function1" ) == 0 )
+//		if ( aURL.Path.compareToAscii( "Function1" ) == 0 )
         xRet = this;
     }
     return xRet;
diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx
index eaa4502e8d5f..871e8c886cd9 100644
--- a/sdext/source/minimizer/pppoptimizer.hxx
+++ b/sdext/source/minimizer/pppoptimizer.hxx
@@ -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
@@ -54,7 +54,7 @@ class PPPOptimizer : public cppu::WeakImplHelper4<
 public:
 
                 PPPOptimizer( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF );
-    virtual     ~PPPOptimizer();
+    virtual		~PPPOptimizer();
 
     // XInitialization
     void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 5729eda5c4dc..776c2d9d32e6 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -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
@@ -29,8 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sdext.hxx"
 
-#include "pppoptimizerdialog.hxx"
-#include "optimizerdialog.hxx"
+#include "pppoptimizerdialog.hxx" 
+#include "optimizerdialog.hxx" 
 
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
@@ -65,7 +65,7 @@ PPPOptimizerDialog::~PPPOptimizerDialog()
 void SAL_CALL PPPOptimizerDialog::initialize( const Sequence< Any >& aArguments )
     throw ( Exception, RuntimeException )
 {
-    if( aArguments.getLength() != 1 )
+    if( aArguments.getLength() != 1 ) 
         throw IllegalArgumentException();
 
     aArguments[ 0 ] >>= mxFrame;
@@ -83,13 +83,13 @@ OUString SAL_CALL PPPOptimizerDialog::getImplementationName()
     return PPPOptimizerDialog_getImplementationName();
 }
 
-sal_Bool SAL_CALL PPPOptimizerDialog::supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL PPPOptimizerDialog::supportsService( const OUString& ServiceName ) 
     throw ( RuntimeException )
 {
     return ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SERVICE_NAME ) );
 }
 
-Sequence< OUString > SAL_CALL PPPOptimizerDialog::getSupportedServiceNames()
+Sequence< OUString > SAL_CALL PPPOptimizerDialog::getSupportedServiceNames() 
     throw (RuntimeException)
 {
     return PPPOptimizerDialog_getSupportedServiceNames();
@@ -161,7 +161,7 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL,
                     sBuf.append( rtl::OUString::valueOf( nFileSizeDest >> 10 ) );
                     sBuf.append( rtl::OUString::createFromAscii( "KB." ) );
                     OUString sResult( sBuf.makeStringAndClear() );
-//                  mpOptimizerDialog->showMessageBox( sResult, sResult, sal_False );
+//					mpOptimizerDialog->showMessageBox( sResult, sResult, sal_False );
                 }
                 delete mpOptimizerDialog, mpOptimizerDialog = NULL;
             }
@@ -201,7 +201,7 @@ OUString PPPOptimizerDialog_getImplementationName()
     return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.SunPresentationMinimizerImp" ) );
 }
 
-Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames()
+Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames() 
 {
     Sequence < OUString > aRet(1);
     OUString* pArray = aRet.getArray();
@@ -209,7 +209,7 @@ Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames()
     return aRet;
 }
 
-Reference< XInterface > PPPOptimizerDialog_createInstance( const Reference< XComponentContext > & rSMgr)
+Reference< XInterface > PPPOptimizerDialog_createInstance( const Reference< XComponentContext > & rSMgr) 
     throw( Exception )
 {
     return (cppu::OWeakObject*) new PPPOptimizerDialog( rSMgr );
diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx
index 712db18cb7ee..76fad42b6a9d 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.hxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.hxx
@@ -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
@@ -48,7 +48,7 @@
 // ----------------------
 
 class OptimizerDialog;
-class PPPOptimizerDialog : public   ::cppu::WeakImplHelper4<
+class PPPOptimizerDialog : public	::cppu::WeakImplHelper4<
                                     com::sun::star::lang::XInitialization,
                                     com::sun::star::lang::XServiceInfo,
                                     com::sun::star::frame::XDispatchProvider,
@@ -58,12 +58,12 @@ class PPPOptimizerDialog : public   ::cppu::WeakImplHelper4<
     com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxFrame;
     com::sun::star::uno::Reference< com::sun::star::frame::XController > mxController;
 
-    OptimizerDialog*    mpOptimizerDialog;
+    OptimizerDialog*	mpOptimizerDialog;
 
 public:
 
     PPPOptimizerDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF );
-    virtual ~PPPOptimizerDialog();
+    virtual	~PPPOptimizerDialog();
 
     // XInitialization
     void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx
index ef80a02798ab..e213a065d489 100644
--- a/sdext/source/minimizer/pppoptimizertoken.cxx
+++ b/sdext/source/minimizer/pppoptimizertoken.cxx
@@ -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
@@ -51,261 +51,261 @@ static ::osl::Mutex& getHashMapMutex()
 
 struct TokenTable
 {
-    const char*                         pS;
-    PPPOptimizerTokenEnum               pE;
+    const char*						    pS;
+    PPPOptimizerTokenEnum				pE;
 };
-
-static const TokenTable pTokenTableArray[] =
+                                                                                                                                                                                                                    
+static const TokenTable pTokenTableArray[] = 
 {
-    { "rdmNavi",            TK_rdmNavi },
-    { "lnNavSep1",          TK_lnNavSep1 },
-    { "lnNavSep2",          TK_lnNavSep2 },
-    { "btnNavHelp",         TK_btnNavHelp },
-    { "btnNavBack",         TK_btnNavBack },
-    { "btnNavNext",         TK_btnNavNext },
-    { "btnNavFinish",       TK_btnNavFinish },
-    { "btnNavCancel",       TK_btnNavCancel },
+    { "rdmNavi",			TK_rdmNavi },
+    { "lnNavSep1",			TK_lnNavSep1 },
+    { "lnNavSep2",			TK_lnNavSep2 },
+    { "btnNavHelp",			TK_btnNavHelp },
+    { "btnNavBack",			TK_btnNavBack },
+    { "btnNavNext",			TK_btnNavNext },
+    { "btnNavFinish",		TK_btnNavFinish },
+    { "btnNavCancel",		TK_btnNavCancel },
 
-    { "FixedText0Pg0",      TK_FixedText0Pg0 },
-    { "FixedText1Pg0",      TK_FixedText1Pg0 },
-    { "Separator1Pg0",      TK_Separator1Pg0 },
-    { "FixedText2Pg0",      TK_FixedText2Pg0 },
-    { "ListBox0Pg0",        TK_ListBox0Pg0 },
-    { "Button0Pg0",         TK_Button0Pg0 },
-    { "RadioButton0Pg1",    TK_RadioButton0Pg1 },
-    { "RadioButton1Pg1",    TK_RadioButton1Pg1 },
-    { "FixedText0Pg1",      TK_FixedText0Pg1 },
-    { "CheckBox1Pg1",       TK_CheckBox1Pg1 },
-    { "FixedText1Pg1",      TK_FixedText1Pg1 },
-    { "FixedText2Pg1",      TK_FixedText2Pg1 },
-    { "FormattedField0Pg1", TK_FormattedField0Pg1 },
-    { "ComboBox0Pg1",       TK_ComboBox0Pg1 },
-    { "CheckBox2Pg1",       TK_CheckBox2Pg1 },
-    { "FixedText0Pg2",      TK_FixedText0Pg2 },
-    { "FixedText1Pg2",      TK_FixedText1Pg2 },
-    { "CheckBox0Pg2",       TK_CheckBox0Pg2 },
-    { "RadioButton0Pg2",    TK_RadioButton0Pg2 },
-    { "RadioButton1Pg2",    TK_RadioButton1Pg2 },
-    { "FixedText0Pg3",      TK_FixedText0Pg3 },
-    { "CheckBox0Pg3",       TK_CheckBox0Pg3 },
-    { "FixedText1Pg3",      TK_FixedText1Pg3 },
-    { "CheckBox1Pg3",       TK_CheckBox1Pg3 },
-    { "FixedText2Pg3",      TK_FixedText2Pg3 },
-    { "CheckBox2Pg3",       TK_CheckBox2Pg3 },
-    { "CheckBox3Pg3",       TK_CheckBox3Pg3 },
-    { "ListBox0Pg3",        TK_ListBox0Pg3 },
-    { "Separator0Pg4",      TK_Separator0Pg4 },
-    { "RadioButton0Pg4",    TK_RadioButton0Pg4 },
-    { "RadioButton1Pg4",    TK_RadioButton1Pg4 },
-    { "Separator1Pg4",      TK_Separator1Pg4 },
-    { "FixedText0Pg4",      TK_FixedText0Pg4 },
-    { "FixedText1Pg4",      TK_FixedText1Pg4 },
-    { "FixedText2Pg4",      TK_FixedText2Pg4 },
-    { "FixedText3Pg4",      TK_FixedText3Pg4 },
-    { "FixedText4Pg4",      TK_FixedText4Pg4 },
-    { "FixedText5Pg4",      TK_FixedText5Pg4 },
-    { "FixedText6Pg4",      TK_FixedText6Pg4 },
-    { "FixedText7Pg4",      TK_FixedText7Pg4 },
-    { "FixedText8Pg4",      TK_FixedText8Pg4 },
-    { "CheckBox1Pg4",       TK_CheckBox1Pg4 },
-    { "ComboBox0Pg4",       TK_ComboBox0Pg4 },
+    { "FixedText0Pg0",		TK_FixedText0Pg0 },
+    { "FixedText1Pg0",		TK_FixedText1Pg0 },
+    { "Separator1Pg0",		TK_Separator1Pg0 },
+    { "FixedText2Pg0",		TK_FixedText2Pg0 },
+    { "ListBox0Pg0",		TK_ListBox0Pg0 },
+    { "Button0Pg0",			TK_Button0Pg0 },
+    { "RadioButton0Pg1",	TK_RadioButton0Pg1 },
+    { "RadioButton1Pg1",	TK_RadioButton1Pg1 },
+    { "FixedText0Pg1",		TK_FixedText0Pg1 },
+    { "CheckBox1Pg1",		TK_CheckBox1Pg1 },
+    { "FixedText1Pg1",		TK_FixedText1Pg1 },
+    { "FixedText2Pg1",		TK_FixedText2Pg1 },
+    { "FormattedField0Pg1",	TK_FormattedField0Pg1 },
+    { "ComboBox0Pg1",		TK_ComboBox0Pg1 },
+    { "CheckBox2Pg1",		TK_CheckBox2Pg1 },
+    { "FixedText0Pg2",		TK_FixedText0Pg2 },
+    { "FixedText1Pg2",		TK_FixedText1Pg2 },
+    { "CheckBox0Pg2",		TK_CheckBox0Pg2 },
+    { "RadioButton0Pg2",	TK_RadioButton0Pg2 },
+    { "RadioButton1Pg2",	TK_RadioButton1Pg2 },
+    { "FixedText0Pg3",		TK_FixedText0Pg3 },
+    { "CheckBox0Pg3",		TK_CheckBox0Pg3 },
+    { "FixedText1Pg3",		TK_FixedText1Pg3 },
+    { "CheckBox1Pg3",		TK_CheckBox1Pg3 },
+    { "FixedText2Pg3",		TK_FixedText2Pg3 },
+    { "CheckBox2Pg3",		TK_CheckBox2Pg3 },
+    { "CheckBox3Pg3",		TK_CheckBox3Pg3 },
+    { "ListBox0Pg3",		TK_ListBox0Pg3 },
+    { "Separator0Pg4",		TK_Separator0Pg4 },
+    { "RadioButton0Pg4",	TK_RadioButton0Pg4 },
+    { "RadioButton1Pg4",	TK_RadioButton1Pg4 },
+    { "Separator1Pg4",		TK_Separator1Pg4 },
+    { "FixedText0Pg4",		TK_FixedText0Pg4 },
+    { "FixedText1Pg4",		TK_FixedText1Pg4 },
+    { "FixedText2Pg4",		TK_FixedText2Pg4 },
+    { "FixedText3Pg4",		TK_FixedText3Pg4 },
+    { "FixedText4Pg4",		TK_FixedText4Pg4 },
+    { "FixedText5Pg4",		TK_FixedText5Pg4 },
+    { "FixedText6Pg4",		TK_FixedText6Pg4 },
+    { "FixedText7Pg4",		TK_FixedText7Pg4 },
+    { "FixedText8Pg4",		TK_FixedText8Pg4 },
+    { "CheckBox1Pg4",		TK_CheckBox1Pg4 },
+    { "ComboBox0Pg4",		TK_ComboBox0Pg4 },
 
-    { "_blank",             TK__blank },
-    { "_self",              TK__self },
-    { "Activated",          TK_Activated },
-    { "Align",              TK_Align },
-    { "Alpha",              TK_Alpha },
-    { "Animated",           TK_Animated },
-    { "Background",         TK_Background },
-    { "BitmapPath",         TK_BitmapPath },
-    { "Border",             TK_Border },
-    { "Closeable",          TK_Closeable },
-    { "ColorMode",          TK_ColorMode },
-    { "Complete",           TK_Complete },
-    { "Compression",        TK_Compression },
-    { "CurrentItemID",      TK_CurrentItemID },
-    { "DefaultButton",      TK_DefaultButton },
-    { "DocumentService",    TK_DocumentService },
-    { "Dropdown",           TK_Dropdown },
-    { "EffectiveValue",     TK_EffectiveValue },
-    { "EffectiveMin",       TK_EffectiveMin },
-    { "EffectiveMax",       TK_EffectiveMax },
-    { "Enabled",            TK_Enabled },
-    { "Extensions",         TK_Extensions },
+    { "_blank",				TK__blank },
+    { "_self",				TK__self },
+    { "Activated",			TK_Activated },
+    { "Align",				TK_Align },
+    { "Alpha",				TK_Alpha },
+    { "Animated",			TK_Animated },
+    { "Background",			TK_Background },
+    { "BitmapPath",			TK_BitmapPath },
+    { "Border",				TK_Border },
+    { "Closeable",			TK_Closeable },
+    { "ColorMode",			TK_ColorMode },
+    { "Complete",			TK_Complete },
+    { "Compression",		TK_Compression },
+    { "CurrentItemID",		TK_CurrentItemID },
+    { "DefaultButton",		TK_DefaultButton },
+    { "DocumentService",	TK_DocumentService },
+    { "Dropdown",			TK_Dropdown },
+    { "EffectiveValue",		TK_EffectiveValue },
+    { "EffectiveMin",		TK_EffectiveMin },
+    { "EffectiveMax",		TK_EffectiveMax },
+    { "Enabled",			TK_Enabled },
+    { "Extensions",			TK_Extensions },
     { "FileSizeDestination",TK_FileSizeDestination },
-    { "FileSizeSource",     TK_FileSizeSource },
-    { "FillBitmap",         TK_FillBitmap },
+    { "FileSizeSource",		TK_FileSizeSource },
+    { "FillBitmap",			TK_FillBitmap },
     { "FillBitmapLogicalSize",TK_FillBitmapLogicalSize },
-    { "FillBitmapMode",     TK_FillBitmapMode },
-    { "FillBitmapSizeX",    TK_FillBitmapSizeX },
-    { "FillBitmapSizeY",    TK_FillBitmapSizeY },
-    { "FillBitmapURL",      TK_FillBitmapURL },
-    { "FillStyle",          TK_FillStyle },
-    { "FilterData",         TK_FilterData },
-    { "FilterName",         TK_FilterName },
-    { "Flags",              TK_Flags },
-    { "FontDescriptor",     TK_FontDescriptor },
-    { "Graphic",            TK_Graphic },
-    { "GraphicCrop",        TK_GraphicCrop },
-    { "GraphicCropLogic",   TK_GraphicCropLogic },
-    { "GraphicURL",         TK_GraphicURL },
-    { "GraphicStreamURL",   TK_GraphicStreamURL },
-    { "Height",             TK_Height },
-    { "HelpFile",           TK_HelpFile },
-    { "Hidden",             TK_Hidden },
-    { "ID",                 TK_ID },
-    { "ImageURL",           TK_ImageURL },
-    { "InformationDialog",  TK_InformationDialog },
-    { "InputStream",        TK_InputStream },
-    { "Interlaced",         TK_Interlaced },
-    { "IsInternal",         TK_IsInternal },
-    { "Label",              TK_Label },
-    { "LineCount",          TK_LineCount },
-    { "LogicalHeight",      TK_LogicalHeight },
-    { "LogicalWidth",       TK_LogicalWidth },
-    { "LogicalSize",        TK_LogicalSize },
-    { "MimeType",           TK_MimeType },
-    { "Moveable",           TK_Moveable },
-    { "MultiLine",          TK_MultiLine },
-    { "MultiSelection",     TK_MultiSelection },
-    { "Name",               TK_Name },
-    { "Orientation",        TK_Orientation },
-    { "OutputStream",       TK_OutputStream },
-    { "PixelHeight",        TK_PixelHeight },
-    { "PixelWidth",         TK_PixelWidth },
-    { "PositionX",          TK_PositionX },
-    { "PositionY",          TK_PositionY },
-    { "Progress",           TK_Progress },
-    { "ProgressValue",      TK_ProgressValue },
-    { "ProgressValueMax",   TK_ProgressValueMax },
-    { "ProgressValueMin",   TK_ProgressValueMin },
-    { "PushButtonType",     TK_PushButtonType },
-    { "Quality",            TK_Quality },
-    { "ReadOnly",           TK_ReadOnly },
-    { "Repeat",             TK_Repeat },
-    { "ScaleImage",         TK_ScaleImage },
-    { "SelectedItems",      TK_SelectedItems },
-    { "Settings",           TK_Settings },
-    { "Size100thMM",        TK_Size100thMM },
-    { "SizePixel",          TK_SizePixel },
-    { "Spin",               TK_Spin },
-    { "Step",               TK_Step },
-    { "State",              TK_State },
-    { "StatusDispatcher",   TK_StatusDispatcher },
-    { "StringItemList",     TK_StringItemList },
-    { "Strings",            TK_Strings },
-    { "TabIndex",           TK_TabIndex },
-    { "Template",           TK_Template },
-    { "Text",               TK_Text },
-    { "Title",              TK_Title },
-    { "Transparent",        TK_Transparent },
-    { "Type",               TK_Type },
-    { "UIName",             TK_UIName },
-    { "Value",              TK_Value },
-    { "Width",              TK_Width },
-    { "ZOrder",             TK_ZOrder },
+    { "FillBitmapMode",		TK_FillBitmapMode },
+    { "FillBitmapSizeX",	TK_FillBitmapSizeX },
+    { "FillBitmapSizeY",	TK_FillBitmapSizeY },
+    { "FillBitmapURL",		TK_FillBitmapURL },
+    { "FillStyle",			TK_FillStyle },
+    { "FilterData",			TK_FilterData },
+    { "FilterName",			TK_FilterName },
+    { "Flags",				TK_Flags },
+    { "FontDescriptor",		TK_FontDescriptor },
+    { "Graphic",			TK_Graphic },
+    { "GraphicCrop",		TK_GraphicCrop },
+    { "GraphicCropLogic",	TK_GraphicCropLogic },
+    { "GraphicURL",			TK_GraphicURL },
+    { "GraphicStreamURL",	TK_GraphicStreamURL },
+    { "Height",				TK_Height },
+    { "HelpFile",			TK_HelpFile },
+    { "Hidden",				TK_Hidden },
+    { "ID",					TK_ID },
+    { "ImageURL",			TK_ImageURL },
+    { "InformationDialog",	TK_InformationDialog },
+    { "InputStream",		TK_InputStream },
+    { "Interlaced",			TK_Interlaced },
+    { "IsInternal",			TK_IsInternal },
+    { "Label",				TK_Label },
+    { "LineCount",			TK_LineCount },
+    { "LogicalHeight",		TK_LogicalHeight },
+    { "LogicalWidth",		TK_LogicalWidth },
+    { "LogicalSize",		TK_LogicalSize },
+    { "MimeType",			TK_MimeType },
+    { "Moveable",			TK_Moveable },
+    { "MultiLine",			TK_MultiLine },
+    { "MultiSelection",		TK_MultiSelection },
+    { "Name",				TK_Name },
+    { "Orientation",		TK_Orientation },
+    { "OutputStream",		TK_OutputStream },
+    { "PixelHeight",		TK_PixelHeight },
+    { "PixelWidth",			TK_PixelWidth },
+    { "PositionX",			TK_PositionX },
+    { "PositionY",			TK_PositionY },
+    { "Progress",			TK_Progress },
+    { "ProgressValue",		TK_ProgressValue },
+    { "ProgressValueMax",	TK_ProgressValueMax },
+    { "ProgressValueMin",	TK_ProgressValueMin },
+    { "PushButtonType",		TK_PushButtonType },
+    { "Quality",			TK_Quality },
+    { "ReadOnly",			TK_ReadOnly },
+    { "Repeat",				TK_Repeat },
+    { "ScaleImage",			TK_ScaleImage },
+    { "SelectedItems",		TK_SelectedItems },
+    { "Settings",			TK_Settings },
+    { "Size100thMM",		TK_Size100thMM },
+    { "SizePixel",			TK_SizePixel },
+    { "Spin",				TK_Spin },
+    { "Step",				TK_Step },
+    { "State",				TK_State },
+    { "StatusDispatcher",	TK_StatusDispatcher },
+    { "StringItemList",		TK_StringItemList },
+    { "Strings",			TK_Strings },
+    { "TabIndex",			TK_TabIndex },
+    { "Template",			TK_Template },
+    { "Text",				TK_Text },
+    { "Title",				TK_Title },
+    { "Transparent",		TK_Transparent },
+    { "Type",				TK_Type },
+    { "UIName",				TK_UIName },
+    { "Value",				TK_Value },
+    { "Width",				TK_Width },
+    { "ZOrder",				TK_ZOrder },
 
-    { "LastUsedSettings",   TK_LastUsedSettings },
-    { "Settings/Templates", TK_Settings_Templates },
+    { "LastUsedSettings",	TK_LastUsedSettings },
+    { "Settings/Templates",	TK_Settings_Templates },
     { "Settings/Templates/",TK_Settings_Templates_ },
-    { "JPEGCompression",    TK_JPEGCompression },
-    { "JPEGQuality",        TK_JPEGQuality },
-    { "RemoveCropArea",     TK_RemoveCropArea },
-    { "ImageResolution",    TK_ImageResolution },
+    { "JPEGCompression",	TK_JPEGCompression },
+    { "JPEGQuality",		TK_JPEGQuality },
+    { "RemoveCropArea",		TK_RemoveCropArea },
+    { "ImageResolution",	TK_ImageResolution },
     { "EmbedLinkedGraphics",TK_EmbedLinkedGraphics },
-    { "OLEOptimization",    TK_OLEOptimization },
+    { "OLEOptimization",	TK_OLEOptimization },
     { "OLEOptimizationType",TK_OLEOptimizationType },
     { "DeleteUnusedMasterPages", TK_DeleteUnusedMasterPages },
     { "DeleteHiddenSlides", TK_DeleteHiddenSlides },
-    { "DeleteNotesPages",   TK_DeleteNotesPages },
-    { "CustomShowName",     TK_CustomShowName },
-    { "SaveAs",             TK_SaveAs },
-    { "SaveAsURL",          TK_SaveAsURL },
-    { "OpenNewDocument",    TK_OpenNewDocument },
-    { "EstimatedFileSize",  TK_EstimatedFileSize },
+    { "DeleteNotesPages",	TK_DeleteNotesPages },
+    { "CustomShowName",		TK_CustomShowName },
+    { "SaveAs",				TK_SaveAs },
+    { "SaveAsURL",			TK_SaveAsURL },
+    { "OpenNewDocument",	TK_OpenNewDocument },
+    { "EstimatedFileSize",	TK_EstimatedFileSize },
 
-    { "Status",             TK_Status },
-    { "Pages",              TK_Pages },
-    { "CurrentPage",        TK_CurrentPage },
-    { "GraphicObjects",     TK_GraphicObjects },
+    { "Status",				TK_Status },
+    { "Pages",				TK_Pages },
+    { "CurrentPage",		TK_CurrentPage },
+    { "GraphicObjects",		TK_GraphicObjects },
     { "CurrentGraphicObject",TK_CurrentGraphicObject },
-    { "OLEObjects",         TK_OLEObjects },
-    { "CurrentOLEObject",   TK_CurrentOLEObject },
+    { "OLEObjects",			TK_OLEObjects },
+    { "CurrentOLEObject",	TK_CurrentOLEObject },
 
     { "STR_SUN_OPTIMIZATION_WIZARD2",STR_SUN_OPTIMIZATION_WIZARD2 },
-    { "STR_STEPS",                  STR_STEPS },
-    { "STR_HELP",                   STR_HELP },
-    { "STR_BACK",                   STR_BACK },
-    { "STR_NEXT",                   STR_NEXT },
-    { "STR_FINISH",                 STR_FINISH },
-    { "STR_CANCEL",                 STR_CANCEL },
-    { "STR_INTRODUCTION",           STR_INTRODUCTION },
-    { "STR_INTRODUCTION_T",         STR_INTRODUCTION_T },
-    { "STR_CHOSE_SETTINGS",         STR_CHOSE_SETTINGS },
-    { "STR_REMOVE",                 STR_REMOVE },
-    { "STR_GRAPHIC_OPTIMIZATION",   STR_GRAPHIC_OPTIMIZATION },
-    { "STR_IMAGE_OPTIMIZATION",     STR_IMAGE_OPTIMIZATION },
-    { "STR_LOSSLESS_COMPRESSION",   STR_LOSSLESS_COMPRESSION },
-    { "STR_JPEG_COMPRESSION",       STR_JPEG_COMPRESSION },
-    { "STR_QUALITY",                STR_QUALITY },
-    { "STR_REMOVE_CROP_AREA",       STR_REMOVE_CROP_AREA },
-    { "STR_IMAGE_RESOLUTION",       STR_IMAGE_RESOLUTION },
-    { "STR_IMAGE_RESOLUTION_0",     STR_IMAGE_RESOLUTION_0 },
-    { "STR_IMAGE_RESOLUTION_1",     STR_IMAGE_RESOLUTION_1 },
-    { "STR_IMAGE_RESOLUTION_2",     STR_IMAGE_RESOLUTION_2 },
-    { "STR_IMAGE_RESOLUTION_3",     STR_IMAGE_RESOLUTION_3 },
-    { "STR_EMBED_LINKED_GRAPHICS",  STR_EMBED_LINKED_GRAPHICS },
-    { "STR_OLE_OBJECTS",            STR_OLE_OBJECTS },
-    { "STR_OLE_OPTIMIZATION",       STR_OLE_OPTIMIZATION },
-    { "STR_OLE_REPLACE",            STR_OLE_REPLACE },
-    { "STR_ALL_OLE_OBJECTS",        STR_ALL_OLE_OBJECTS },
-    { "STR_ALIEN_OLE_OBJECTS_ONLY", STR_ALIEN_OLE_OBJECTS_ONLY },
-    { "STR__OLE_OBJECTS_DESC",      STR_OLE_OBJECTS_DESC },
-    { "STR_NO_OLE_OBJECTS_DESC",    STR_NO_OLE_OBJECTS_DESC },
-    { "STR_SLIDES",                 STR_SLIDES },
-    { "STR_CHOOSE_SLIDES",          STR_CHOOSE_SLIDES },
-    { "STR_MASTER_PAGES",           STR_MASTER_PAGES },
-    { "STR_DELETE_MASTER_PAGES",    STR_DELETE_MASTER_PAGES },
-    { "STR_DELETE_NOTES_PAGES",     STR_DELETE_NOTES_PAGES },
-    { "STR_DELETE_HIDDEN_SLIDES",   STR_DELETE_HIDDEN_SLIDES },
-    { "STR_CUSTOM_SHOW",            STR_CUSTOM_SHOW },
-    { "STR_SUMMARY",                STR_SUMMARY },
-    { "STR_SUMMARY_TITLE",          STR_SUMMARY_TITLE },
-    { "STR_PROGRESS",               STR_PROGRESS },
-    { "STR_OBJECTS_OPTIMIZED",      STR_OBJECTS_OPTIMIZED },
-    { "STR_APPLY_TO_CURRENT",       STR_APPLY_TO_CURRENT },
-    { "STR_AUTOMATICALLY_OPEN",     STR_AUTOMATICALLY_OPEN },
-    { "STR_SAVE_SETTINGS",          STR_SAVE_SETTINGS },
-    { "STR_SAVE_AS",                STR_SAVE_AS },
-    { "STR_DELETE_SLIDES",          STR_DELETE_SLIDES },
-    { "STR_OPTIMIZE_IMAGES",        STR_OPTIMIZE_IMAGES },
-    { "STR_CREATE_REPLACEMENT",     STR_CREATE_REPLACEMENT },
-    { "STR_CURRENT_FILESIZE",       STR_CURRENT_FILESIZE },
-    { "STR_ESTIMATED_FILESIZE",     STR_ESTIMATED_FILESIZE },
-    { "STR_MB",                     STR_MB },
-    { "MY_SETTINGS",                STR_MY_SETTINGS },
-    { "STR_DEFAULT_SESSION",        STR_DEFAULT_SESSION },
-    { "STR_MODIFY_WARNING",         STR_MODIFY_WARNING },
-    { "STR_YES",                    STR_YES },
-    { "STR_OK",                     STR_OK },
-    { "STR_INFO_1",                 STR_INFO_1 },
-    { "STR_INFO_2",                 STR_INFO_2 },
-    { "STR_INFO_3",                 STR_INFO_3 },
-    { "STR_INFO_4",                 STR_INFO_4 },
+    { "STR_STEPS",					STR_STEPS },
+    { "STR_HELP",					STR_HELP },
+    { "STR_BACK",					STR_BACK },
+    { "STR_NEXT",					STR_NEXT },
+    { "STR_FINISH",					STR_FINISH },
+    { "STR_CANCEL",					STR_CANCEL },
+    { "STR_INTRODUCTION",			STR_INTRODUCTION },
+    { "STR_INTRODUCTION_T",			STR_INTRODUCTION_T },
+    { "STR_CHOSE_SETTINGS",			STR_CHOSE_SETTINGS },
+    { "STR_REMOVE",					STR_REMOVE },
+    { "STR_GRAPHIC_OPTIMIZATION",	STR_GRAPHIC_OPTIMIZATION },
+    { "STR_IMAGE_OPTIMIZATION",		STR_IMAGE_OPTIMIZATION },
+    { "STR_LOSSLESS_COMPRESSION",	STR_LOSSLESS_COMPRESSION },
+    { "STR_JPEG_COMPRESSION",		STR_JPEG_COMPRESSION },
+    { "STR_QUALITY",				STR_QUALITY },
+    { "STR_REMOVE_CROP_AREA",		STR_REMOVE_CROP_AREA },
+    { "STR_IMAGE_RESOLUTION",		STR_IMAGE_RESOLUTION },
+    { "STR_IMAGE_RESOLUTION_0",		STR_IMAGE_RESOLUTION_0 },
+    { "STR_IMAGE_RESOLUTION_1",		STR_IMAGE_RESOLUTION_1 },
+    { "STR_IMAGE_RESOLUTION_2",		STR_IMAGE_RESOLUTION_2 },
+    { "STR_IMAGE_RESOLUTION_3",		STR_IMAGE_RESOLUTION_3 },
+    { "STR_EMBED_LINKED_GRAPHICS",	STR_EMBED_LINKED_GRAPHICS },
+    { "STR_OLE_OBJECTS",			STR_OLE_OBJECTS },
+    { "STR_OLE_OPTIMIZATION",		STR_OLE_OPTIMIZATION },
+    { "STR_OLE_REPLACE",			STR_OLE_REPLACE },
+    { "STR_ALL_OLE_OBJECTS",		STR_ALL_OLE_OBJECTS },
+    { "STR_ALIEN_OLE_OBJECTS_ONLY",	STR_ALIEN_OLE_OBJECTS_ONLY },
+    { "STR__OLE_OBJECTS_DESC",		STR_OLE_OBJECTS_DESC },
+    { "STR_NO_OLE_OBJECTS_DESC",	STR_NO_OLE_OBJECTS_DESC },
+    { "STR_SLIDES",					STR_SLIDES },
+    { "STR_CHOOSE_SLIDES",			STR_CHOOSE_SLIDES },
+    { "STR_MASTER_PAGES",			STR_MASTER_PAGES },
+    { "STR_DELETE_MASTER_PAGES",	STR_DELETE_MASTER_PAGES },
+    { "STR_DELETE_NOTES_PAGES",		STR_DELETE_NOTES_PAGES },
+    { "STR_DELETE_HIDDEN_SLIDES",	STR_DELETE_HIDDEN_SLIDES },
+    { "STR_CUSTOM_SHOW",			STR_CUSTOM_SHOW },
+    { "STR_SUMMARY",				STR_SUMMARY },
+    { "STR_SUMMARY_TITLE",			STR_SUMMARY_TITLE },
+    { "STR_PROGRESS",				STR_PROGRESS },
+    { "STR_OBJECTS_OPTIMIZED",		STR_OBJECTS_OPTIMIZED },
+    { "STR_APPLY_TO_CURRENT",		STR_APPLY_TO_CURRENT },
+    { "STR_AUTOMATICALLY_OPEN",		STR_AUTOMATICALLY_OPEN },
+    { "STR_SAVE_SETTINGS",			STR_SAVE_SETTINGS },
+    { "STR_SAVE_AS",				STR_SAVE_AS },
+    { "STR_DELETE_SLIDES",			STR_DELETE_SLIDES },
+    { "STR_OPTIMIZE_IMAGES",		STR_OPTIMIZE_IMAGES },
+    { "STR_CREATE_REPLACEMENT",		STR_CREATE_REPLACEMENT },
+    { "STR_CURRENT_FILESIZE",		STR_CURRENT_FILESIZE },
+    { "STR_ESTIMATED_FILESIZE",		STR_ESTIMATED_FILESIZE },
+    { "STR_MB",						STR_MB },
+    { "MY_SETTINGS",				STR_MY_SETTINGS },
+    { "STR_DEFAULT_SESSION",		STR_DEFAULT_SESSION },
+    { "STR_MODIFY_WARNING",			STR_MODIFY_WARNING },
+    { "STR_YES",					STR_YES },
+    { "STR_OK",						STR_OK },
+    { "STR_INFO_1",					STR_INFO_1 },
+    { "STR_INFO_2",					STR_INFO_2 },
+    { "STR_INFO_3",					STR_INFO_3 },
+    { "STR_INFO_4",					STR_INFO_4 },
     { "STR_DUPLICATING_PRESENTATION",STR_DUPLICATING_PRESENTATION },
-    { "STR_DELETING_SLIDES",        STR_DELETING_SLIDES },
-    { "STR_OPTIMIZING_GRAPHICS",    STR_OPTIMIZING_GRAPHICS },
+    { "STR_DELETING_SLIDES",		STR_DELETING_SLIDES },
+    { "STR_OPTIMIZING_GRAPHICS",	STR_OPTIMIZING_GRAPHICS },
     { "STR_CREATING_OLE_REPLACEMENTS",STR_CREATING_OLE_REPLACEMENTS },
-    { "STR_FileSizeSeparator",      STR_FILESIZESEPARATOR },
-
-    { "Last",               TK_Last },
-    { "NotFound",           TK_NotFound }
+    { "STR_FileSizeSeparator",		STR_FILESIZESEPARATOR },
+    
+    { "Last",				TK_Last }, 
+    { "NotFound",			TK_NotFound }
 };
 
 PPPOptimizerTokenEnum TKGet( const rtl::OUString& rToken )
 {
     if ( !pHashMap )
-    {   // init hash map
+    {	// init hash map
         ::osl::MutexGuard aGuard( getHashMapMutex() );
         if ( !pHashMap )
         {
diff --git a/sdext/source/minimizer/pppoptimizertoken.hxx b/sdext/source/minimizer/pppoptimizertoken.hxx
index 19ae973c7572..3a4cf2f93637 100644
--- a/sdext/source/minimizer/pppoptimizertoken.hxx
+++ b/sdext/source/minimizer/pppoptimizertoken.hxx
@@ -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
@@ -274,7 +274,7 @@ enum PPPOptimizerTokenEnum
     STR_CREATING_OLE_REPLACEMENTS,
     STR_FILESIZESEPARATOR,
 
-    TK_Last,
+    TK_Last, 
     TK_NotFound
 };
 
diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx
index 1bb4d182bb2b..a905ccb037d9 100644
--- a/sdext/source/minimizer/pppoptimizeruno.cxx
+++ b/sdext/source/minimizer/pppoptimizeruno.cxx
@@ -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
@@ -51,7 +51,7 @@ extern "C"
     }
 
     // -------------------------------------------------------------------------
-
+    
     sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey )
     {
         if (pRegistryKey)
@@ -68,7 +68,7 @@ extern "C"
                 for ( nPos = rSNL1.getLength(); nPos--; )
                     xNewKey->createKey( pArray1[nPos] );
 
-                xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PPPOptimizerDialog_getImplementationName() );
+                xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PPPOptimizerDialog_getImplementationName() ); 
                 xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
                 const Sequence< OUString > & rSNL2 = PPPOptimizerDialog_getSupportedServiceNames();
                 const OUString * pArray2 = rSNL2.getConstArray();
@@ -99,7 +99,7 @@ extern "C"
             {
                 xFactory = createSingleComponentFactory(
                         PPPOptimizer_createInstance,
-                        OUString::createFromAscii( pImplName ),
+                        OUString::createFromAscii( pImplName ), 
                         PPPOptimizer_getSupportedServiceNames() );
 
             }
diff --git a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
index 08324953d32c..0cf414778f8a 100644
--- a/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
+++ b/sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu
@@ -53,7 +53,7 @@
         </prop>
         <prop oor:name="STR_LOSSLESS_COMPRESSION">
             <value xml:lang="en-US">~Lossless compression</value>
-        </prop>
+        </prop>	
         <prop oor:name="STR_JPEG_COMPRESSION">
             <value xml:lang="en-US">~JPEG compression</value>
         </prop>
@@ -80,7 +80,7 @@
         </prop>
         <prop oor:name="STR_EMBED_LINKED_GRAPHICS">
             <value xml:lang="en-US">~Break links to external graphics</value>
-        </prop>
+        </prop>	
         <prop oor:name="STR_OLE_OBJECTS">
             <value xml:lang="en-US">OLE Objects</value>
         </prop>
@@ -105,7 +105,7 @@ The current presentation contains OLE objects.</value>
             <value xml:lang="en-US">Object Linking and Embedding (OLE) is a technology that allows embedding and linking to documents and other objects.
 
 The current presentation contains no OLE objects.</value>
-        </prop>
+        </prop>	
         <prop oor:name="STR_SLIDES">
             <value xml:lang="en-US">Slides</value>
         </prop>
@@ -180,13 +180,13 @@ The current presentation contains no OLE objects.</value>
         </prop>
         <prop oor:name="STR_YES">
             <value xml:lang="en-US">~Yes</value>
-        </prop>
+        </prop>			
         <prop oor:name="STR_OK">
             <value xml:lang="en-US">OK</value>
-        </prop>
+        </prop>		
         <prop oor:name="STR_INFO_1">
             <value xml:lang="en-US">The @MINIMIZEREXTENSIONPRODUCTNAME@ has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to %NEWFILESIZE MB.</value>
-        </prop>
+        </prop>		
         <prop oor:name="STR_INFO_2">
             <value xml:lang="en-US">The @MINIMIZEREXTENSIONPRODUCTNAME@ has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to approximated %NEWFILESIZE MB.</value>
         </prop>
@@ -230,7 +230,7 @@ The current presentation contains no OLE objects.</value>
         </prop>
         <prop oor:name="EmbedLinkedGraphics">
             <value>true</value>
-        </prop>
+        </prop>			
         <prop oor:name="OLEOptimization">
             <value>true</value>
         </prop>
@@ -251,11 +251,11 @@ The current presentation contains no OLE objects.</value>
         </prop>
         <prop oor:name="OpenNewDocument">
             <value>true</value>
-        </prop>
+        </prop>	
     </node>
     <node oor:name="Settings">
         <node oor:name="Templates">
-            <node oor:name="template1" oor:op="replace">
+            <node oor:name="template1" oor:op="replace">		
                 <prop oor:name="Name">
                     <value xml:lang="en-US">Screen optimized (smallest file size)</value>
                 </prop>
@@ -294,7 +294,7 @@ The current presentation contains no OLE objects.</value>
                 </prop>
                 <prop oor:name="OpenNewDocument">
                     <value>true</value>
-                </prop>
+                </prop>	
             </node>
             <node oor:name="template2" oor:op="replace">
                 <prop oor:name="Name">
@@ -314,7 +314,7 @@ The current presentation contains no OLE objects.</value>
                 </prop>
                 <prop oor:name="EmbedLinkedGraphics">
                     <value>true</value>
-                </prop>
+                </prop>			
                 <prop oor:name="OLEOptimization">
                     <value>true</value>
                 </prop>
@@ -335,7 +335,7 @@ The current presentation contains no OLE objects.</value>
                 </prop>
                 <prop oor:name="OpenNewDocument">
                     <value>true</value>
-                </prop>
+                </prop>	
             </node>
             <node oor:name="template3" oor:op="replace">
                 <prop oor:name="Name">
@@ -355,7 +355,7 @@ The current presentation contains no OLE objects.</value>
                 </prop>
                 <prop oor:name="EmbedLinkedGraphics">
                     <value>true</value>
-                </prop>
+                </prop>			
                 <prop oor:name="OLEOptimization">
                     <value>true</value>
                 </prop>
@@ -376,8 +376,8 @@ The current presentation contains no OLE objects.</value>
                 </prop>
                 <prop oor:name="OpenNewDocument">
                     <value>true</value>
-                </prop>
-            </node>
+                </prop>	
+            </node>			
         </node>
     </node>
 </oor:component-data>
diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx
index e5f6fdceeed3..554a3537710c 100644
--- a/sdext/source/minimizer/unodialog.cxx
+++ b/sdext/source/minimizer/unodialog.cxx
@@ -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
@@ -77,7 +77,7 @@ UnoDialog::UnoDialog( const Reference< XComponentContext > &rxMSF, Reference< XF
     Reference< XFrame > xFrame( mxController->getFrame() );
     Reference< XWindow > xContainerWindow( xFrame->getContainerWindow() );
     mxWindowPeer = Reference< XWindowPeer >( xContainerWindow, UNO_QUERY_THROW );
-    createWindowPeer( mxWindowPeer );
+    createWindowPeer( mxWindowPeer );		
 }
 
 // -----------------------------------------------------------------------------
@@ -113,7 +113,7 @@ Reference< XWindowPeer > UnoDialog::createWindowPeer( Reference< XWindowPeer > x
         xParentPeer = xToolkit->getDesktopWindow();
     mxReschedule = Reference< XReschedule >( xToolkit, UNO_QUERY );
     mxControl->createPeer( xToolkit, xParentPeer );
-//  xWindowPeer = xControl.getPeer();
+//	xWindowPeer = xControl.getPeer();
     return mxControl->getPeer();
 }
 
diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx
index 78e3fd0f409c..39c366474301 100644
--- a/sdext/source/minimizer/unodialog.hxx
+++ b/sdext/source/minimizer/unodialog.hxx
@@ -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
@@ -119,28 +119,28 @@ public :
     void enableControl( const rtl::OUString& rControlName );
     void disableControl( const rtl::OUString& rControlName );
 
-    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >        mxMSF;
-    com::sun::star::uno::Reference< com::sun::star::frame::XController >            mxController;
-    com::sun::star::uno::Reference< com::sun::star::awt::XReschedule >              mxReschedule;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >		mxMSF;
+    com::sun::star::uno::Reference< com::sun::star::frame::XController >			mxController;
+    com::sun::star::uno::Reference< com::sun::star::awt::XReschedule >				mxReschedule;
 
-    com::sun::star::uno::Reference< com::sun::star::uno::XInterface >               mxDialogModel;
-    com::sun::star::uno::Reference< com::sun::star::beans::XMultiPropertySet >      mxDialogModelMultiPropertySet;
-    com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >           mxDialogModelPropertySet;
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >    mxDialogModelMSF;
-    com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >     mxDialogModelNameContainer;
-    com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >        mxDialogModelNameAccess;
+    com::sun::star::uno::Reference< com::sun::star::uno::XInterface >				mxDialogModel;
+    com::sun::star::uno::Reference< com::sun::star::beans::XMultiPropertySet >		mxDialogModelMultiPropertySet;
+    com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >			mxDialogModelPropertySet;
+    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >	mxDialogModelMSF;
+    com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >		mxDialogModelNameContainer;
+    com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >		mxDialogModelNameAccess;
 
-    com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >            mxControlModel;
+    com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >			mxControlModel;
 
-    com::sun::star::uno::Reference< com::sun::star::awt::XDialog >                  mxDialog;
-    com::sun::star::uno::Reference< com::sun::star::awt::XControl >                 mxControl;
-    com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer >              mxWindowPeer;
+    com::sun::star::uno::Reference< com::sun::star::awt::XDialog >					mxDialog;
+    com::sun::star::uno::Reference< com::sun::star::awt::XControl >					mxControl;
+    com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer >				mxWindowPeer;
 
-    com::sun::star::uno::Reference< com::sun::star::awt::XControlContainer >        mxDialogControlContainer;
-    com::sun::star::uno::Reference< com::sun::star::lang::XComponent >              mxDialogComponent;
-    com::sun::star::uno::Reference< com::sun::star::awt::XWindow >                  mxDialogWindow;
+    com::sun::star::uno::Reference< com::sun::star::awt::XControlContainer >		mxDialogControlContainer;
+    com::sun::star::uno::Reference< com::sun::star::lang::XComponent >				mxDialogComponent;
+    com::sun::star::uno::Reference< com::sun::star::awt::XWindow >					mxDialogWindow;
 
-    sal_Bool                                                                        mbStatus;
+    sal_Bool																		mbStatus;
 };
 
 #endif // UNODIALOG_HXX
diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml
index 0b4031a5a63f..b7340a1f27b5 100755
--- a/sdext/source/pdfimport/config/description.xml
+++ b/sdext/source/pdfimport/config/description.xml
@@ -21,7 +21,7 @@
     <display-name>
         <name lang="en-US">PDF Import</name>
     </display-name>
-
+    
     <icon>
       <default xlink:href="images/extension_32.png" />
       <high-contrast xlink:href="images/extension_32_h.png" />
diff --git a/sdext/source/pdfimport/config/pdf_import_filter.xcu b/sdext/source/pdfimport/config/pdf_import_filter.xcu
index 89ad84b7a6cf..f10a0022fa82 100644
--- a/sdext/source/pdfimport/config/pdf_import_filter.xcu
+++ b/sdext/source/pdfimport/config/pdf_import_filter.xcu
@@ -9,7 +9,7 @@
     <value>0</value>
    </prop>
    <prop oor:name="FilterService" oor:type="xs:string">
-    <!-- stacks filters for XML import. see UserData below.
+    <!-- stacks filters for XML import. see UserData below. 
          the _Writer_ in the impl name is a misnomer -->
     <value>com.sun.star.comp.Writer.XmlFilterAdaptor</value>
    </prop>
@@ -38,7 +38,7 @@
     <value>0</value>
    </prop>
    <prop oor:name="FilterService" oor:type="xs:string">
-    <!-- stacks filters for XML import. see UserData below.
+    <!-- stacks filters for XML import. see UserData below. 
          the _Writer_ in the impl name is a misnomer -->
     <value>com.sun.star.comp.Writer.XmlFilterAdaptor</value>
    </prop>
@@ -67,7 +67,7 @@
     <value>0</value>
    </prop>
    <prop oor:name="FilterService" oor:type="xs:string">
-    <!-- stacks filters for XML import. see UserData below.
+    <!-- stacks filters for XML import. see UserData below. 
          the _Writer_ in the impl name is a misnomer -->
     <value>com.sun.star.comp.Writer.XmlFilterAdaptor</value>
    </prop>
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx
index bfd237d85570..265ccbcad0e1 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -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
@@ -104,7 +104,7 @@ namespace {
         {}
 
         void initControls( const uno::Reference<awt::XControlContainer>& xControls,
-                           const rtl::OUString&                          rFilename )
+                           const rtl::OUString&							 rFilename )
         {
             m_xListbox.set(xControls->getControl(
                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBox" ))),
@@ -710,7 +710,7 @@ uno::Reference< io::XStream > getAdditionalStream( const rtl::OUString&
                                         xEmbed.clear();
                                         break;
                                     }
-
+                                    
                                     rtl::OUString aDocName( rInPDFFileURL.copy( rInPDFFileURL.lastIndexOf( sal_Unicode('/') )+1 ) );
 
                                     bool bEntered = false;
diff --git a/sdext/source/pdfimport/filterdet.hxx b/sdext/source/pdfimport/filterdet.hxx
index 3532b0180333..2ca62d139ed2 100644
--- a/sdext/source/pdfimport/filterdet.hxx
+++ b/sdext/source/pdfimport/filterdet.hxx
@@ -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
@@ -42,22 +42,22 @@
 namespace pdfi
 {
 
-typedef ::cppu::WeakComponentImplHelper1<
+typedef ::cppu::WeakComponentImplHelper1< 
     com::sun::star::document::XExtendedFilterDetection > PDFDetectorBase;
 
 class PDFDetector : private cppu::BaseMutex,
                     public PDFDetectorBase
 {
 private:
-    com::sun::star::uno::Reference<
+    com::sun::star::uno::Reference< 
         com::sun::star::uno::XComponentContext > m_xContext;
 
 public:
-    explicit PDFDetector( const ::com::sun::star::uno::Reference<
-                                ::com::sun::star::uno::XComponentContext >& xContext );
+    explicit PDFDetector( const ::com::sun::star::uno::Reference< 
+                                ::com::sun::star::uno::XComponentContext >& xContext );    
 
     // XExtendedFilterDetection
-    virtual rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence<
+    virtual rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence< 
                                                com::sun::star::beans::PropertyValue >& io_rDescriptor )
         throw (com::sun::star::uno::RuntimeException);
 };
diff --git a/sdext/source/pdfimport/inc/contentsink.hxx b/sdext/source/pdfimport/inc/contentsink.hxx
index 204eb7499a50..5919028e1858 100644
--- a/sdext/source/pdfimport/inc/contentsink.hxx
+++ b/sdext/source/pdfimport/inc/contentsink.hxx
@@ -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
@@ -35,7 +35,7 @@
 #include <boost/shared_ptr.hpp>
 
 namespace rtl { class OUString; }
-namespace com { namespace sun { namespace star {
+namespace com { namespace sun { namespace star { 
 namespace rendering
 {
     class  XPolyPolygon2D;
@@ -47,7 +47,7 @@ namespace geometry
     struct RealRectangle2D;
     struct RealPoint2D;
     struct RealSize2D;
-}
+} 
 namespace beans
 {
     struct PropertyValue;
@@ -86,7 +86,7 @@ namespace pdfi
         bool                isUnderline;
         bool                isOutline;
         double              size; // device pixel
-
+            
         bool operator==(const FontAttributes& rFont) const
         {
             return familyName == rFont.familyName &&
@@ -106,18 +106,18 @@ namespace pdfi
     struct ContentSink
     {
         virtual ~ContentSink() {}
-
+        
         /// Total number of pages for upcoming document
         virtual void setPageNum( sal_Int32 nNumPages ) = 0;
         virtual void startPage( const ::com::sun::star::geometry::RealSize2D& rSize ) = 0;
         virtual void endPage() = 0;
-
+        
         virtual void hyperLink( const ::com::sun::star::geometry::RealRectangle2D& rBounds,
                                 const ::rtl::OUString&                             rURI ) = 0;
-
+        
         virtual void pushState() = 0;
         virtual void popState() = 0;
-
+        
         virtual void setFlatness( double ) = 0;
         virtual void setTransformation( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix ) = 0;
         virtual void setLineDash( const ::com::sun::star::uno::Sequence<double>& dashes,
@@ -131,27 +131,27 @@ namespace pdfi
         virtual void setBlendMode( sal_Int8 blendMode ) = 0;
         virtual void setFont( const FontAttributes& rFont ) = 0;
         virtual void setTextRenderMode( sal_Int32 ) = 0;
+        
 
-
-        virtual void strokePath( const ::com::sun::star::uno::Reference<
+        virtual void strokePath( const ::com::sun::star::uno::Reference< 
                                        ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) = 0;
-        virtual void fillPath( const ::com::sun::star::uno::Reference<
+        virtual void fillPath( const ::com::sun::star::uno::Reference< 
                                      ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) = 0;
-        virtual void eoFillPath( const ::com::sun::star::uno::Reference<
+        virtual void eoFillPath( const ::com::sun::star::uno::Reference< 
                                        ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) = 0;
-
-        virtual void intersectClip(const ::com::sun::star::uno::Reference<
+        
+        virtual void intersectClip(const ::com::sun::star::uno::Reference< 
                                          ::com::sun::star::rendering::XPolyPolygon2D >& rPath) = 0;
-        virtual void intersectEoClip(const ::com::sun::star::uno::Reference<
+        virtual void intersectEoClip(const ::com::sun::star::uno::Reference< 
                                            ::com::sun::star::rendering::XPolyPolygon2D >& rPath) = 0;
-
+        
         virtual void drawGlyphs( const rtl::OUString&                               rGlyphs,
                                  const ::com::sun::star::geometry::RealRectangle2D& rRect,
                                  const ::com::sun::star::geometry::Matrix2D&        rFontMatrix ) = 0;
 
         /// issued when a sequence of associated glyphs is drawn
         virtual void endText() = 0;
-
+        
         /// draws given bitmap as a mask (using current fill color)
         virtual void drawMask(const ::com::sun::star::uno::Sequence<
                                     ::com::sun::star::beans::PropertyValue>& xBitmap,
@@ -159,13 +159,13 @@ namespace pdfi
         /// Given image must already be color-mapped and normalized to sRGB.
         virtual void drawImage(const ::com::sun::star::uno::Sequence<
                                      ::com::sun::star::beans::PropertyValue>& xBitmap ) = 0;
-        /** Given image must already be color-mapped and normalized to sRGB.
+        /** Given image must already be color-mapped and normalized to sRGB. 
 
             maskColors must contain two sequences of color components
          */
         virtual void drawColorMaskedImage(const ::com::sun::star::uno::Sequence<
                                                 ::com::sun::star::beans::PropertyValue>& xBitmap,
-                                          const ::com::sun::star::uno::Sequence<
+                                          const ::com::sun::star::uno::Sequence< 
                                                 ::com::sun::star::uno::Any>&             xMaskColors ) = 0;
         virtual void drawMaskedImage(const ::com::sun::star::uno::Sequence<
                                            ::com::sun::star::beans::PropertyValue>& xBitmap,
diff --git a/sdext/source/pdfimport/inc/odfemitter.hxx b/sdext/source/pdfimport/inc/odfemitter.hxx
index d7e1c27097b7..f8c958e31c5e 100644
--- a/sdext/source/pdfimport/inc/odfemitter.hxx
+++ b/sdext/source/pdfimport/inc/odfemitter.hxx
@@ -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
@@ -32,14 +32,14 @@
 #include "xmlemitter.hxx"
 #include <com/sun/star/uno/Reference.hxx>
 
-namespace com { namespace sun { namespace star { namespace io
+namespace com { namespace sun { namespace star { namespace io 
 {
     class XOutputStream;
 } } } }
 
 namespace pdfi
 {
-    XmlEmitterSharedPtr createOdfEmitter( const com::sun::star::uno::Reference<
+    XmlEmitterSharedPtr createOdfEmitter( const com::sun::star::uno::Reference< 
                                                 com::sun::star::io::XOutputStream>& xOut );
 }
 
diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx
index 50e982557d01..ce0ddf50c7ad 100644
--- a/sdext/source/pdfimport/inc/pdfihelper.hxx
+++ b/sdext/source/pdfimport/inc/pdfihelper.hxx
@@ -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
@@ -49,8 +49,8 @@ namespace com { namespace sun { namespace star { namespace task
 
 namespace pdfi
 {
-    typedef std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > PropertyMap;
-    typedef sal_Int32 ImageId;
+    typedef std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash > PropertyMap; 
+    typedef sal_Int32 ImageId;    
 
     /// What to do with a polygon. values can be ORed together
     enum PolygonAction { PATH_STROKE=1, PATH_FILL=2, PATH_EOFILL=4 };
@@ -64,14 +64,14 @@ namespace pdfi
         fPix *= px2mm;
         return fPix;
     }
-
+    
     inline double convmm2Px( double fMM )
     {
         const double mm2px = PDFI_OUTDEV_RESOLUTION/25.4;
         fMM *= mm2px;
         return fMM;
     }
-
+    
     inline double convPx2mmPrec2( double fPix )
     {
         return rtl_math_round( convPx2mm( fPix ), 2, rtl_math_RoundingMode_Floor );
@@ -148,12 +148,12 @@ namespace pdfi
                 Transformation == rRight.Transformation &&
                 Clip == rRight.Clip;
         }
-
+            
         bool isRotatedOrSkewed() const
         { return Transformation.get( 0, 1 ) != 0.0 ||
                 Transformation.get( 1, 0 ) != 0.0; }
     };
-
+        
     struct GraphicsContextHash
     {
         size_t operator()(const GraphicsContext& rGC ) const
@@ -188,7 +188,7 @@ namespace pdfi
 
     /** retrieve password from user
      */
-    bool getPassword( const ::com::sun::star::uno::Reference<
+    bool getPassword( const ::com::sun::star::uno::Reference< 
                             ::com::sun::star::task::XInteractionHandler >& xHandler,
                       rtl::OUString&                                       rOutPwd,
                       bool                                                 bFirstTry,
diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx
index 6dae97c309b7..76db849b6b30 100644
--- a/sdext/source/pdfimport/inc/pdfparse.hxx
+++ b/sdext/source/pdfimport/inc/pdfparse.hxx
@@ -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
@@ -48,15 +48,15 @@ class EmitContext
     virtual unsigned int getCurPos() = 0;
     virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) = 0;
     virtual unsigned int readOrigBytes( unsigned int nOrigOffset, unsigned int nLen, void* pBuf ) = 0;
-
+    
     EmitContext( const PDFContainer* pTop = NULL );
     virtual ~EmitContext();
-
+    
     // set this to deflate contained streams
     bool m_bDeflate;
     // set this to decrypt the PDF file
     bool m_bDecrypt;
-
+    
     private:
     friend struct PDFEntry;
     EmitImplData* m_pImplData;
@@ -66,10 +66,10 @@ struct PDFEntry
 {
     PDFEntry() {}
     virtual ~PDFEntry();
-
+    
     virtual bool emit( EmitContext& rWriteContext ) const = 0;
     virtual PDFEntry* clone() const = 0;
-
+    
     protected:
     EmitImplData* getEmitData( EmitContext& rContext ) const;
     void setEmitData( EmitContext& rContext, EmitImplData* pNewEmitData ) const;
@@ -102,7 +102,7 @@ struct PDFName : public PDFValue
     virtual ~PDFName();
     virtual bool emit( EmitContext& rWriteContext ) const;
     virtual PDFEntry* clone() const;
-
+    
     rtl::OUString getFilteredName() const;
 };
 
@@ -115,7 +115,7 @@ struct PDFString : public PDFValue
     virtual ~PDFString();
     virtual bool emit( EmitContext& rWriteContext ) const;
     virtual PDFEntry* clone() const;
-
+    
     rtl::OString getFilteredString() const;
 };
 
@@ -145,7 +145,7 @@ struct PDFObjectRef : public PDFValue
 {
     unsigned int    m_nNumber;
     unsigned int    m_nGeneration;
-
+    
     PDFObjectRef( unsigned int nNr, unsigned int nGen )
     : PDFValue(), m_nNumber( nNr ), m_nGeneration( nGen ) {}
     virtual ~PDFObjectRef();
@@ -173,7 +173,7 @@ struct PDFContainer : public PDFEntry
     virtual ~PDFContainer();
     virtual bool emitSubElements( EmitContext& rWriteContext ) const;
     virtual void cloneSubElements( std::vector<PDFEntry*>& rNewSubElements ) const;
-
+    
     PDFObject* findObject( unsigned int nNumber, unsigned int nGeneration ) const;
     PDFObject* findObject( PDFObjectRef* pRef ) const
     { return findObject( pRef->m_nNumber, pRef->m_nGeneration ); }
@@ -191,12 +191,12 @@ struct PDFDict : public PDFContainer
 {
     typedef std::hash_map<rtl::OString,PDFEntry*,rtl::OStringHash> Map;
     Map m_aMap;
-
+    
     PDFDict() {}
     virtual ~PDFDict();
     virtual bool emit( EmitContext& rWriteContext ) const;
     virtual PDFEntry* clone() const;
-
+    
     // inserting a value of NULL will remove rName and the previous value
     // from the dictionary
     void insertValue( const rtl::OString& rName, PDFEntry* pValue );
@@ -212,20 +212,20 @@ struct PDFStream : public PDFEntry
     unsigned int    m_nBeginOffset;
     unsigned int    m_nEndOffset; // offset of the byte after the stream
     PDFDict*        m_pDict;
-
+    
     PDFStream( unsigned int nBegin, unsigned int nEnd, PDFDict* pStreamDict )
     : PDFEntry(), m_nBeginOffset( nBegin ), m_nEndOffset( nEnd ), m_pDict( pStreamDict ) {}
     virtual ~PDFStream();
     virtual bool emit( EmitContext& rWriteContext ) const;
     virtual PDFEntry* clone() const;
-
+    
     unsigned int getDictLength( const PDFContainer* pObjectContainer = NULL ) const; // get contents of the "Length" entry of the dict
 };
 
 struct PDFTrailer : public PDFContainer
 {
     PDFDict*        m_pDict;
-
+    
     PDFTrailer() : PDFContainer(), m_pDict( NULL ) {}
     virtual ~PDFTrailer();
     virtual bool emit( EmitContext& rWriteContext ) const;
@@ -241,23 +241,23 @@ struct PDFFile : public PDFContainer
     public:
     unsigned int        m_nMajor;           // PDF major
     unsigned int        m_nMinor;           // PDF minor
-
+    
     PDFFile()
     : PDFContainer(),
       m_pData( NULL ),
       m_nMajor( 0 ), m_nMinor( 0 )
     {}
     virtual ~PDFFile();
-
+    
     virtual bool emit( EmitContext& rWriteContext ) const;
     virtual PDFEntry* clone() const;
-
+    
     bool isEncrypted() const;
     // this method checks whether rPwd is compatible with
     // either user or owner password and sets up decrypt data in that case
     // returns true if decryption can be done
     bool setupDecryptionData( const rtl::OString& rPwd ) const;
-
+    
     bool decrypt( const sal_uInt8* pInBuffer, sal_uInt32 nLen,
                   sal_uInt8* pOutBuffer,
                   unsigned int nObject, unsigned int nGeneration ) const;
@@ -269,16 +269,16 @@ struct PDFObject : public PDFContainer
     PDFStream*      m_pStream;
     unsigned int    m_nNumber;
     unsigned int    m_nGeneration;
-
+    
     PDFObject( unsigned int nNr, unsigned int nGen )
     : m_pObject( NULL ), m_pStream( NULL ), m_nNumber( nNr ), m_nGeneration( nGen ) {}
     virtual ~PDFObject();
     virtual bool emit( EmitContext& rWriteContext ) const;
     virtual PDFEntry* clone() const;
-
+    
     // writes only the contained stream, deflated if necessary
     bool writeStream( EmitContext& rContext, const PDFFile* pPDFFile ) const;
-
+    
     private:
     // returns true if stream is deflated
     // fills *ppStream and *pBytes with start of stream and count of bytes
@@ -300,7 +300,7 @@ class PDFReader
     public:
     PDFReader() {}
     ~PDFReader() {}
-
+    
     PDFEntry* read( const char* pFileName );
     PDFEntry* read( const char* pBuffer, unsigned int nLen );
 };
diff --git a/sdext/source/pdfimport/inc/saxemitter.hxx b/sdext/source/pdfimport/inc/saxemitter.hxx
index c8a394ab746e..c2871f8124cc 100644
--- a/sdext/source/pdfimport/inc/saxemitter.hxx
+++ b/sdext/source/pdfimport/inc/saxemitter.hxx
@@ -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 @@ namespace sax
 
 namespace pdfi
 {
-    XmlEmitterSharedPtr createSaxEmitter( const com::sun::star::uno::Reference<
+    XmlEmitterSharedPtr createSaxEmitter( const com::sun::star::uno::Reference< 
                                                 com::sun::star::xml::sax::XDocumentHandler >& xDocHdl );
 }
 
diff --git a/sdext/source/pdfimport/inc/treevisitorfactory.hxx b/sdext/source/pdfimport/inc/treevisitorfactory.hxx
index 064b23864043..fd9ad74fc5f4 100644
--- a/sdext/source/pdfimport/inc/treevisitorfactory.hxx
+++ b/sdext/source/pdfimport/inc/treevisitorfactory.hxx
@@ -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
diff --git a/sdext/source/pdfimport/inc/wrapper.hxx b/sdext/source/pdfimport/inc/wrapper.hxx
index a7ca18574a39..119510c6c22a 100644
--- a/sdext/source/pdfimport/inc/wrapper.hxx
+++ b/sdext/source/pdfimport/inc/wrapper.hxx
@@ -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
@@ -33,7 +33,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 
 namespace rtl { class OUString; }
-namespace com { namespace sun { namespace star {
+namespace com { namespace sun { namespace star { 
     namespace uno {
         class XComponentContext;
     }
@@ -49,15 +49,15 @@ namespace pdfi
                               const com::sun::star::uno::Reference<
                                     com::sun::star::task::XInteractionHandler >& xIHdl,
                               const rtl::OUString&                               rPwd,
-                              const com::sun::star::uno::Reference<
+                              const com::sun::star::uno::Reference< 
                                     com::sun::star::uno::XComponentContext >&    xContext );
-    bool xpdf_ImportFromStream( const com::sun::star::uno::Reference<
+    bool xpdf_ImportFromStream( const com::sun::star::uno::Reference< 
                                       com::sun::star::io::XInputStream >&          xInput,
                                 const ContentSinkSharedPtr&                        rSink,
                                 const com::sun::star::uno::Reference<
                                       com::sun::star::task::XInteractionHandler >& xIHdl,
                                 const rtl::OUString&                               rPwd,
-                                const com::sun::star::uno::Reference<
+                                const com::sun::star::uno::Reference< 
                                       com::sun::star::uno::XComponentContext >&    xContext );
 }
 
diff --git a/sdext/source/pdfimport/inc/xmlemitter.hxx b/sdext/source/pdfimport/inc/xmlemitter.hxx
index 3700e67b8006..66a43d609656 100644
--- a/sdext/source/pdfimport/inc/xmlemitter.hxx
+++ b/sdext/source/pdfimport/inc/xmlemitter.hxx
@@ -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
@@ -42,7 +42,7 @@ namespace pdfi
     {
     public:
         virtual ~XmlEmitter() {}
-
+        
         /** Open up a tag with the given properties
          */
         virtual void beginTag( const char* pTag, const PropertyMap& rProperties ) = 0;
diff --git a/sdext/source/pdfimport/misc/pdfihelper.cxx b/sdext/source/pdfimport/misc/pdfihelper.cxx
index 1c888e1e6d1f..8209346b478a 100644
--- a/sdext/source/pdfimport/misc/pdfihelper.cxx
+++ b/sdext/source/pdfimport/misc/pdfihelper.cxx
@@ -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
@@ -65,7 +65,7 @@ rtl::OUString pdfi::unitMMString( double fMM )
     rtl::OUStringBuffer aBuf( 32 );
     aBuf.append( rtl_math_round( fMM, 2, rtl_math_RoundingMode_Floor ) );
     aBuf.appendAscii( "mm" );
-
+    
     return aBuf.makeStringAndClear();
 }
 
@@ -74,7 +74,7 @@ rtl::OUString pdfi::convertPixelToUnitString( double fPix )
     rtl::OUStringBuffer aBuf( 32 );
     aBuf.append( rtl_math_round( convPx2mm( fPix ), 2, rtl_math_RoundingMode_Floor ) );
     aBuf.appendAscii( "mm" );
-
+    
     return aBuf.makeStringAndClear();
 }
 
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index 6ef2a17c2875..3280beafe3d7 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -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
diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx
index c2d30ac16304..665d351e6dd7 100644
--- a/sdext/source/pdfimport/odf/odfemitter.cxx
+++ b/sdext/source/pdfimport/odf/odfemitter.cxx
@@ -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
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index 3b800f242396..f40e35480c5a 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -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
@@ -168,7 +168,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
             catch(uno::Exception& e)
             {
                 (void)e;
-                OSL_TRACE( "subfilter exception: %s\n",
+                OSL_TRACE( "subfilter exception: %s\n", 
                            OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
             }
 
@@ -182,7 +182,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
                     {
                         nPwPos = aFilterData.getLength();
                         aFilterData.realloc( nPwPos+1 );
-                        aFilterData[nPwPos].Name = rtl::OUString(
+                        aFilterData[nPwPos].Name = rtl::OUString( 
                             RTL_CONSTASCII_USTRINGPARAM( "Password" ) );
                     }
                     aFilterData[nPwPos].Value <<= aPwd;
@@ -201,7 +201,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert
     else
         OSL_TRACE( "PDFIAdaptor::filter: no model set\n" );
     #endif
-
+    
     return bRet;
 }
 
@@ -238,12 +238,12 @@ bool PDFIRawAdaptor::parse( const uno::Reference<io::XInputStream>&       xInput
                             const uno::Reference<task::XInteractionHandler>& xIHdl,
                             const rtl::OUString&                          rPwd,
                             const uno::Reference<task::XStatusIndicator>& xStatus,
-                            const XmlEmitterSharedPtr&                    rEmitter,
+                            const XmlEmitterSharedPtr&                    rEmitter, 
                             const rtl::OUString&                          rURL )
 {
     // container for metaformat
     boost::shared_ptr<PDFIProcessor> pSink(
-        new PDFIProcessor(xStatus, m_xContext));
+        new PDFIProcessor(xStatus, m_xContext)); 
 
     // TEMP! TEMP!
     if( m_bEnableToplevelText )
@@ -274,7 +274,7 @@ bool PDFIRawAdaptor::odfConvert( const rtl::OUString&                          r
 
     // tell input stream that it is no longer needed
     xOutput->closeOutput();
-
+    
     return bSuccess;
 }
 
@@ -313,8 +313,8 @@ sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::Property
 
     // tell input stream that it is no longer needed
     xInput->closeInput();
-    xInput.clear();
-
+    xInput.clear();    
+    
     return bSuccess;
 }
 
diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx
index d9d6d71356f7..2b0b0b915be1 100644
--- a/sdext/source/pdfimport/pdfiadaptor.hxx
+++ b/sdext/source/pdfimport/pdfiadaptor.hxx
@@ -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
@@ -48,7 +48,7 @@
 
 namespace pdfi
 {
-    typedef ::cppu::WeakComponentImplHelper2<
+    typedef ::cppu::WeakComponentImplHelper2< 
         com::sun::star::document::XFilter,
         com::sun::star::document::XImporter > PDFIHybridAdaptorBase;
 
@@ -56,13 +56,13 @@ namespace pdfi
                               public PDFIHybridAdaptorBase
     {
     private:
-        com::sun::star::uno::Reference<
+        com::sun::star::uno::Reference< 
             com::sun::star::uno::XComponentContext >  m_xContext;
-        com::sun::star::uno::Reference<
+        com::sun::star::uno::Reference< 
             com::sun::star::frame::XModel >           m_xModel;
 
     public:
-        explicit PDFIHybridAdaptor( const ::com::sun::star::uno::Reference<
+        explicit PDFIHybridAdaptor( const ::com::sun::star::uno::Reference< 
                                           ::com::sun::star::uno::XComponentContext >& xContext );
 
         // XFilter
@@ -75,7 +75,7 @@ namespace pdfi
 
     };
 
-    typedef ::cppu::WeakComponentImplHelper2<
+    typedef ::cppu::WeakComponentImplHelper2< 
         com::sun::star::xml::XImportFilter,
         com::sun::star::document::XImporter > PDFIAdaptorBase;
 
@@ -85,9 +85,9 @@ namespace pdfi
                            public PDFIAdaptorBase
     {
     private:
-        com::sun::star::uno::Reference<
+        com::sun::star::uno::Reference< 
             com::sun::star::uno::XComponentContext >  m_xContext;
-        com::sun::star::uno::Reference<
+        com::sun::star::uno::Reference< 
             com::sun::star::frame::XModel >           m_xModel;
         TreeVisitorFactorySharedPtr                   m_pVisitorFactory;
         bool                                          m_bEnableToplevelText;
@@ -96,11 +96,11 @@ namespace pdfi
                     const com::sun::star::uno::Reference<com::sun::star::task::XInteractionHandler>& xIHdl,
                     const rtl::OUString&                                                          rPwd,
                     const com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator>& xStatus,
-                    const XmlEmitterSharedPtr&                                                    rEmitter,
+                    const XmlEmitterSharedPtr&                                                    rEmitter, 
                     const rtl::OUString&                                                          rURL );
-
+    
     public:
-        explicit PDFIRawAdaptor( const ::com::sun::star::uno::Reference<
+        explicit PDFIRawAdaptor( const ::com::sun::star::uno::Reference< 
                                        ::com::sun::star::uno::XComponentContext >& xContext );
 
         /** Set factory object used to create the tree visitors
@@ -114,7 +114,7 @@ namespace pdfi
         void enableToplevelText() { m_bEnableToplevelText=true; }
 
         /** Export pdf document to ODG
-
+            
             @param xOutput
             Stream to write the flat xml file to
 
@@ -128,7 +128,7 @@ namespace pdfi
         // XImportFilter
         virtual sal_Bool SAL_CALL importer( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rSourceData,
                                             const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& rHdl,
-                                            const com::sun::star::uno::Sequence< rtl::OUString >& rUserData ) throw( com::sun::star::uno::RuntimeException );
+                                            const com::sun::star::uno::Sequence< rtl::OUString >& rUserData ) throw( com::sun::star::uno::RuntimeException );    
 
         // XImporter
         virtual void SAL_CALL setTargetDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDocument )
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index c41e3acfb902..51bf6a1b7348 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -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
@@ -60,7 +60,7 @@ struct EmitImplData
     XRefTable m_aXRefTable;
     // container of all indirect objects (usually a PDFFile*)
     const PDFContainer* m_pObjectContainer;
-
+    
     // returns true if the xref table was updated
     bool insertXref( unsigned int nObject, unsigned int nGeneration, unsigned int nOffset )
     {
@@ -79,7 +79,7 @@ struct EmitImplData
         }
         return false;
     }
-
+    
     EmitImplData( const PDFContainer* pTopContainer ) :
         m_pObjectContainer( pTopContainer )
     {}
@@ -212,7 +212,7 @@ OString PDFString::getFilteredString() const
 {
     int nLen = m_aString.getLength();
     OStringBuffer aBuf( nLen );
-
+    
     const sal_Char* pStr = m_aString.getStr();
     if( *pStr == '(' )
     {
@@ -296,7 +296,7 @@ OString PDFString::getFilteredString() const
             aBuf.append( rResult );
         }
     }
-
+    
     return aBuf.makeStringAndClear();
 }
 
@@ -308,7 +308,7 @@ bool PDFNumber::emit( EmitContext& rWriteContext ) const
 {
     rtl::OStringBuffer aBuf( 32 );
     aBuf.append( ' ' );
-
+    
     double fValue = m_fValue;
     bool bNeg = false;
     int nPrecision = 5;
@@ -348,7 +348,7 @@ bool PDFNumber::emit( EmitContext& rWriteContext ) const
             nBound /= 10;
         }
     }
-
+    
     return rWriteContext.write( aBuf.getStr(), aBuf.getLength() );
 }
 
@@ -485,7 +485,7 @@ void PDFDict::insertValue( const OString& rName, PDFEntry* pValue )
 {
     if( ! pValue )
         eraseValue( rName );
-
+    
     std::hash_map<OString,PDFEntry*,OStringHash>::iterator it = m_aMap.find( rName );
     if( it == m_aMap.end() )
     {
@@ -648,7 +648,7 @@ bool PDFObject::getDeflatedStream( char** ppStream, unsigned int* pBytes, const
                     pFilter = dynamic_cast<PDFName*>(pArray->m_aSubElements.front());
                 }
             }
-
+            
             // is the (first) filter FlateDecode ?
             if( pFilter && pFilter->m_aName.equals( "FlateDecode" ) )
             {
@@ -692,7 +692,7 @@ static void unzipToBuffer( const char* pBegin, unsigned int nLen,
     aZStr.zfree         = ( free_func )0;
     aZStr.opaque        = ( voidpf )0;
     inflateInit(&aZStr);
-
+    
     const unsigned int buf_increment_size = 16384;
 
     *pOutBuf = (sal_uInt8*)rtl_reallocateMemory( *pOutBuf, buf_increment_size );
@@ -755,11 +755,11 @@ bool PDFObject::emit( EmitContext& rWriteContext ) const
 {
     if( ! rWriteContext.write( "\n", 1 ) )
         return false;
-
+    
     EmitImplData* pEData = getEmitData( rWriteContext );
     if( pEData )
         pEData->insertXref( m_nNumber, m_nGeneration, rWriteContext.getCurPos() );
-
+    
     OStringBuffer aBuf( 32 );
     aBuf.append( sal_Int32( m_nNumber ) );
     aBuf.append( ' ' );
@@ -767,7 +767,7 @@ bool PDFObject::emit( EmitContext& rWriteContext ) const
     aBuf.append( " obj\n" );
     if( ! rWriteContext.write( aBuf.getStr(), aBuf.getLength() ) )
         return false;
-
+    
     if( rWriteContext.m_bDeflate && pEData )
     {
         char* pStream = NULL;
@@ -944,9 +944,9 @@ struct PDFFileImplData
     OString     m_aDocID;
     rtlCipher   m_aCipher;
     rtlDigest   m_aDigest;
-
+    
     sal_uInt8   m_aDecryptionKey[ENCRYPTION_KEY_LEN+5]; // maximum handled key length
-
+    
     PDFFileImplData() :
         m_bIsEncrypted( false ),
         m_bStandardHandler( false ),
@@ -961,7 +961,7 @@ struct PDFFileImplData
         rtl_zeroMemory( m_aUEntry, sizeof( m_aUEntry ) );
         rtl_zeroMemory( m_aDecryptionKey, sizeof( m_aDecryptionKey ) );
     }
-
+    
     ~PDFFileImplData()
     {
         if( m_aCipher )
@@ -988,10 +988,10 @@ bool PDFFile::decrypt( const sal_uInt8* pInBuffer, sal_uInt32 nLen, sal_uInt8* p
 {
     if( ! isEncrypted() )
         return false;
-
+    
     if( ! m_pData->m_aCipher )
         m_pData->m_aCipher = rtl_cipher_createARCFOUR( rtl_Cipher_ModeStream );
-
+    
     // modify encryption key
     sal_uInt32 i = m_pData->m_nKeyLength;
     m_pData->m_aDecryptionKey[i++] = sal_uInt8(nObject&0xff);
@@ -999,11 +999,11 @@ bool PDFFile::decrypt( const sal_uInt8* pInBuffer, sal_uInt32 nLen, sal_uInt8* p
     m_pData->m_aDecryptionKey[i++] = sal_uInt8((nObject>>16)&0xff);
     m_pData->m_aDecryptionKey[i++] = sal_uInt8(nGeneration&0xff);
     m_pData->m_aDecryptionKey[i++] = sal_uInt8((nGeneration>>8)&0xff);
-
+    
     sal_uInt8 aSum[ENCRYPTION_KEY_LEN];
     rtl_digest_updateMD5( m_pData->m_aDigest, m_pData->m_aDecryptionKey, i );
     rtl_digest_getMD5( m_pData->m_aDigest, aSum, sizeof( aSum ) );
-
+    
     if( i > 16 )
         i = 16;
 
@@ -1086,12 +1086,12 @@ static bool check_user_password( const OString& rPwd, PDFFileImplData* pData )
     {
         // see PDF reference 1.4 Algorithm 3.4
         // encrypt pad string
-        rtl_cipher_initARCFOUR( pData->m_aCipher, rtl_Cipher_DirectionEncode,
+        rtl_cipher_initARCFOUR( pData->m_aCipher, rtl_Cipher_DirectionEncode, 
                                 aKey, nKeyLen,
                                 NULL, 0 );
         rtl_cipher_encodeARCFOUR( pData->m_aCipher, nPadString, sizeof( nPadString ),
                                   nEncryptedEntry, sizeof( nEncryptedEntry ) );
-        bValid = (rtl_compareMemory( nEncryptedEntry, pData->m_aUEntry, 32 ) == 0);
+        bValid = (rtl_compareMemory( nEncryptedEntry, pData->m_aUEntry, 32 ) == 0); 
     }
     else if( pData->m_nStandardRevision == 3 )
     {
@@ -1099,7 +1099,7 @@ static bool check_user_password( const OString& rPwd, PDFFileImplData* pData )
         rtl_digest_updateMD5( pData->m_aDigest, nPadString, sizeof( nPadString ) );
         rtl_digest_updateMD5( pData->m_aDigest, pData->m_aDocID.getStr(), pData->m_aDocID.getLength() );
         rtl_digest_getMD5( pData->m_aDigest, nEncryptedEntry, sizeof(nEncryptedEntry) );
-        rtl_cipher_initARCFOUR( pData->m_aCipher, rtl_Cipher_DirectionEncode,
+        rtl_cipher_initARCFOUR( pData->m_aCipher, rtl_Cipher_DirectionEncode, 
                                 aKey, sizeof(aKey), NULL, 0 );
         rtl_cipher_encodeARCFOUR( pData->m_aCipher,
                                   nEncryptedEntry, 16,
@@ -1109,14 +1109,14 @@ static bool check_user_password( const OString& rPwd, PDFFileImplData* pData )
             sal_uInt8 aTempKey[ENCRYPTION_KEY_LEN];
             for( sal_uInt32 j = 0; j < sizeof(aTempKey); j++ )
                 aTempKey[j] = static_cast<sal_uInt8>( aKey[j] ^ i );
-
-            rtl_cipher_initARCFOUR( pData->m_aCipher, rtl_Cipher_DirectionEncode,
+            
+            rtl_cipher_initARCFOUR( pData->m_aCipher, rtl_Cipher_DirectionEncode, 
                                     aTempKey, sizeof(aTempKey), NULL, 0 );
             rtl_cipher_encodeARCFOUR( pData->m_aCipher,
                                       nEncryptedEntry, 16,
                                       nEncryptedEntry, 16 ); // encrypt in place
         }
-        bValid = (rtl_compareMemory( nEncryptedEntry, pData->m_aUEntry, 16 ) == 0);
+        bValid = (rtl_compareMemory( nEncryptedEntry, pData->m_aUEntry, 16 ) == 0); 
     }
     return bValid;
 }
@@ -1125,7 +1125,7 @@ bool PDFFile::setupDecryptionData( const OString& rPwd ) const
 {
     if( !impl_getData()->m_bIsEncrypted )
         return rPwd.getLength() == 0;
-
+    
     // check if we can handle this encryption at all
     if( ! m_pData->m_bStandardHandler ||
         m_pData->m_nAlgoVersion < 1 ||
@@ -1133,15 +1133,15 @@ bool PDFFile::setupDecryptionData( const OString& rPwd ) const
         m_pData->m_nStandardRevision < 2 ||
         m_pData->m_nStandardRevision > 3 )
         return false;
-
+    
     if( ! m_pData->m_aCipher )
         m_pData->m_aCipher = rtl_cipher_createARCFOUR(rtl_Cipher_ModeStream);
     if( ! m_pData->m_aDigest )
         m_pData->m_aDigest = rtl_digest_createMD5();
-
+    
     // first try user password
     bool bValid = check_user_password( rPwd, m_pData );
-
+    
     if( ! bValid )
     {
         // try owner password
@@ -1152,7 +1152,7 @@ bool PDFFile::setupDecryptionData( const OString& rPwd ) const
         sal_uInt32 nKeyLen = password_to_key( rPwd, aKey, m_pData, true );
         if( m_pData->m_nStandardRevision == 2 )
         {
-            rtl_cipher_initARCFOUR( m_pData->m_aCipher, rtl_Cipher_DirectionDecode,
+            rtl_cipher_initARCFOUR( m_pData->m_aCipher, rtl_Cipher_DirectionDecode, 
                                     aKey, nKeyLen, NULL, 0 );
             rtl_cipher_decodeARCFOUR( m_pData->m_aCipher,
                                       m_pData->m_aOEntry, 32,
@@ -1166,7 +1166,7 @@ bool PDFFile::setupDecryptionData( const OString& rPwd ) const
                 sal_uInt8 nTempKey[ENCRYPTION_KEY_LEN];
                 for( unsigned int j = 0; j < sizeof(nTempKey); j++ )
                     nTempKey[j] = sal_uInt8(aKey[j] ^ i);
-                rtl_cipher_initARCFOUR( m_pData->m_aCipher, rtl_Cipher_DirectionDecode,
+                rtl_cipher_initARCFOUR( m_pData->m_aCipher, rtl_Cipher_DirectionDecode, 
                                         nTempKey, nKeyLen, NULL, 0 );
                 rtl_cipher_decodeARCFOUR( m_pData->m_aCipher,
                                           nPwd, 32,
@@ -1316,17 +1316,17 @@ PDFFileImplData* PDFFile::impl_getData() const
                         break;
                     }
                 }
-            }
+            }   
         }
     }
-
+    
     return m_pData;
 }
 
 bool PDFFile::emit( EmitContext& rWriteContext ) const
 {
     setEmitData(  rWriteContext, new EmitImplData( this ) );
-
+    
     OStringBuffer aBuf( 32 );
     aBuf.append( "%PDF-" );
     aBuf.append( sal_Int32( m_nMajor ) );
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index b278021df6f8..5105ac5e2413 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -85,7 +85,7 @@ class StringEmitContext : public EmitContext
         }
         return 0;
     }
-
+    
     OString getString() { return m_aBuf.makeStringAndClear(); }
 };
 
@@ -107,7 +107,7 @@ public:
     std::vector< PDFEntry* >    m_aObjectStack;
     rtl::OString                m_aErrorString;
     iteratorT                   m_aGlobalBegin;
-
+    
 public:
     struct pdf_string_parser
     {
@@ -117,7 +117,7 @@ public:
         operator()(ScannerT const& scan, result_t&) const
         {
             std::ptrdiff_t len = 0;
-
+            
             int nBraceLevel = 0;
             while( ! scan.at_end() )
             {
@@ -150,11 +150,11 @@ public:
         definition( const PDFGrammar<iteratorT>& rSelf )
         {
             PDFGrammar<iteratorT>* pSelf = const_cast< PDFGrammar<iteratorT>* >( &rSelf );
-
+            
             // workaround workshop compiler: comment_p doesn't work
             // comment     = comment_p("%")[boost::bind(&PDFGrammar::pushComment, pSelf, _1, _2 )];
             comment     = lexeme_d[ (ch_p('%') >> *(~ch_p('\r') & ~ch_p('\n')) >> eol_p)[boost::bind(&PDFGrammar::pushComment, pSelf, _1, _2 )] ];
-
+            
             boolean     = (str_p("true") | str_p("false"))[boost::bind(&PDFGrammar::pushBool, pSelf, _1, _2)];
 
             // workaround workshop compiler: confix_p doesn't work
@@ -170,13 +170,13 @@ public:
             //stringtype  = ( confix_p("(",*anychar_p, ")") |
             //                confix_p("<",*xdigit_p,  ">") )
             //              [boost::bind(&PDFGrammar::pushString,pSelf, _1, _2)];
-
+            
             stringtype  = ( ( ch_p('(') >> functor_parser<pdf_string_parser>() >> ch_p(')') ) |
                             ( ch_p('<') >> *xdigit_p >> ch_p('>') ) )
                           [boost::bind(&PDFGrammar::pushString,pSelf, _1, _2)];
 
             null_object = str_p( "null" )[boost::bind(&PDFGrammar::pushNull, pSelf, _1, _2)];
-
+                          
             #ifdef USE_ASSIGN_ACTOR
             objectref   = ( uint_p[push_back_a(pSelf->m_aUIntStack)]
                             >> uint_p[push_back_a(pSelf->m_aUIntStack)]
@@ -202,10 +202,10 @@ public:
                           [boost::bind(&PDFGrammar::pushDouble, pSelf, _1, _2)]
                           | stringtype | boolean | null_object;
             #endif
-
+            
             dict_begin  = str_p( "<<" )[boost::bind(&PDFGrammar::beginDict, pSelf, _1, _2)];
             dict_end    = str_p( ">>" )[boost::bind(&PDFGrammar::endDict, pSelf, _1, _2)];
-
+            
             array_begin = str_p("[")[boost::bind(&PDFGrammar::beginArray,pSelf, _1, _2)];
             array_end   = str_p("]")[boost::bind(&PDFGrammar::endArray,pSelf, _1, _2)];
 
@@ -219,7 +219,7 @@ public:
                           >> str_p("obj" )[boost::bind(&PDFGrammar::beginObject, pSelf, _1, _2)];
             #endif
             object_end  = str_p( "endobj" )[boost::bind(&PDFGrammar::endObject, pSelf, _1, _2)];
-
+            
             xref        = str_p( "xref" ) >> uint_p >> uint_p
                           >> lexeme_d[
                                 +( repeat_p(10)[digit_p]
@@ -229,21 +229,21 @@ public:
                                    >> ( ch_p('n') | ch_p('f') )
                                    >> repeat_p(2)[space_p]
                                  ) ];
-
+                                
             dict_element= dict_begin | comment | simple_type
                           | array_begin | array_end | dict_end;
-
+                          
             object      = object_begin
                           >> *dict_element
                           >> !stream
                           >> object_end;
-
+            
             trailer     = str_p( "trailer" )[boost::bind(&PDFGrammar::beginTrailer,pSelf,_1,_2)]
                           >> *dict_element
                           >> str_p("startxref")
                           >> uint_p
                           >> str_p("%%EOF")[boost::bind(&PDFGrammar::endTrailer,pSelf,_1,_2)];
-
+            
             #ifdef USE_ASSIGN_ACTOR
             pdfrule     = ! (lexeme_d[
                                 str_p( "%PDF-" )
@@ -270,10 +270,10 @@ public:
                          objectref, array, value, dict_element, dict_begin, dict_end,
                          array_begin, array_end, object, object_begin, object_end,
                          xref, trailer, pdfrule;
-
+        
         const rule< ScannerT >& start() const { return pdfrule; }
     };
-
+    
     #ifndef USE_ASSIGN_ACTOR
     void push_back_action_uint( unsigned int i )
     {
@@ -284,12 +284,12 @@ public:
         m_fDouble = d;
     }
     #endif
-
+    
     void parseError( const char* pMessage, iteratorT pLocation )
     {
         throw_( pLocation, pMessage );
     }
-
+    
     rtl::OString iteratorToString( iteratorT first, iteratorT last ) const
     {
         rtl::OStringBuffer aStr( 32 );
@@ -300,7 +300,7 @@ public:
         }
         return aStr.makeStringAndClear();
     }
-
+    
     void haveFile( iteratorT pBegin, iteratorT /*pEnd*/ )
     {
         if( m_aObjectStack.empty() )
@@ -308,14 +308,14 @@ public:
             PDFFile* pFile = new PDFFile();
             pFile->m_nMinor = m_aUIntStack.back();
             m_aUIntStack.pop_back();
-            pFile->m_nMajor = m_aUIntStack.back();
+            pFile->m_nMajor = m_aUIntStack.back();            
             m_aUIntStack.pop_back();
             m_aObjectStack.push_back( pFile );
         }
         else
             parseError( "found file header in unusual place", pBegin );
     }
-
+    
     void pushComment( iteratorT first, iteratorT last )
     {
         // add a comment to the current stack element
@@ -328,7 +328,7 @@ public:
             parseError( "comment without container", first );
         pContainer->m_aSubElements.push_back( pComment );
     }
-
+    
     void insertNewValue( PDFEntry* pNewValue, iteratorT pPos )
     {
         PDFContainer* pContainer = NULL;
@@ -382,7 +382,7 @@ public:
             parseError( pMsg, pPos );
         }
     }
-
+    
     void pushName( iteratorT first, iteratorT last )
     {
         insertNewValue( new PDFName(iteratorToString(first,last)), first );
@@ -408,7 +408,7 @@ public:
         insertNewValue( new PDFNull(), first );
     }
 
-
+    
     void beginObject( iteratorT first, iteratorT /*last*/ )
     {
         if( m_aObjectStack.empty() )
@@ -418,12 +418,12 @@ public:
         m_aUIntStack.pop_back();
         unsigned int nObject = m_aUIntStack.back();
         m_aUIntStack.pop_back();
-
+        
         PDFObject* pObj = new PDFObject( nObject, nGeneration );
         pObj->m_nOffset = first - m_aGlobalBegin;
 
         PDFContainer* pContainer = dynamic_cast<PDFContainer*>(m_aObjectStack.back());
-        if( pContainer &&
+        if( pContainer && 
             ( dynamic_cast<PDFFile*>(pContainer) ||
               dynamic_cast<PDFPart*>(pContainer) ) )
         {
@@ -433,7 +433,7 @@ public:
         else
             parseError( "object in wrong place", first );
     }
-
+    
     void endObject( iteratorT first, iteratorT )
     {
         if( m_aObjectStack.empty() )
@@ -443,7 +443,7 @@ public:
         else
             m_aObjectStack.pop_back();
     }
-
+    
     void pushObjectRef( iteratorT first, iteratorT )
     {
         unsigned int nGeneration = m_aUIntStack.back();
@@ -452,7 +452,7 @@ public:
         m_aUIntStack.pop_back();
         insertNewValue( new PDFObjectRef(nObject,nGeneration), first );
     }
-
+    
     void beginDict( iteratorT first, iteratorT )
     {
         PDFDict* pDict = new PDFDict();
@@ -471,7 +471,7 @@ public:
             parseError( "spurious dictionary end", first );
         else
             m_aObjectStack.pop_back();
-
+        
         PDFEntry* pOffender = pDict->buildMap();
         if( pOffender )
         {
@@ -487,7 +487,7 @@ public:
     {
         PDFArray* pArray = new PDFArray();
         pArray->m_nOffset = first - m_aGlobalBegin;
-
+        
         insertNewValue( pArray, first );
         // will not come here if insertion fails (exception)
         m_aObjectStack.push_back( pArray );
@@ -502,7 +502,7 @@ public:
         else
             m_aObjectStack.pop_back();
     }
-
+    
     void emitStream( iteratorT first, iteratorT last )
     {
         if( m_aObjectStack.empty() )
@@ -512,7 +512,7 @@ public:
         {
             if( pObj->m_pStream )
                 parseError( "multiple streams in object", first );
-
+            
             PDFDict* pDict = dynamic_cast<PDFDict*>(pObj->m_pObject);
             if( pDict )
             {
@@ -535,7 +535,7 @@ public:
         pTrailer->m_nOffset = first - m_aGlobalBegin;
 
         PDFContainer* pContainer = dynamic_cast<PDFContainer*>(m_aObjectStack.back());
-        if( pContainer &&
+        if( pContainer && 
             ( dynamic_cast<PDFFile*>(pContainer) ||
               dynamic_cast<PDFPart*>(pContainer) ) )
         {
@@ -560,7 +560,7 @@ public:
 PDFEntry* PDFReader::read( const char* pBuffer, unsigned int nLen )
 {
     PDFGrammar<const char*> aGrammar( pBuffer );
-
+    
     try
     {
         boost::spirit::parse_info<const char*> aInfo =
@@ -588,7 +588,7 @@ PDFEntry* PDFReader::read( const char* pBuffer, unsigned int nLen )
         }
         #endif
     }
-
+    
     PDFEntry* pRet = NULL;
     unsigned int nEntries = aGrammar.m_aObjectStack.size();
     if( nEntries == 1 )
@@ -600,7 +600,7 @@ PDFEntry* PDFReader::read( const char* pBuffer, unsigned int nLen )
     else if( nEntries > 1 )
         fprintf( stderr, "error got %u stack objects in parse\n", nEntries );
     #endif
-
+             
     return pRet;
 }
 
@@ -611,7 +611,7 @@ PDFEntry* PDFReader::read( const char* pFileName )
        since converting to boost 1.39 file_iterator does not work anymore on all Windows systems
        C++ stdlib istream_iterator does not allow "-" apparently
        using spirit 2.0 doesn't work in our environment with the MSC
-
+       
        So for the time being bite the bullet and read the whole file.
        FIXME: give Spirit 2.x another try when we upgrade boost again.
     */
@@ -638,7 +638,7 @@ PDFEntry* PDFReader::read( const char* pFileName )
         return NULL;
     file_iterator<> file_end = file_start.make_end();
     PDFGrammar< file_iterator<> > aGrammar( file_start );
-
+    
     try
     {
         boost::spirit::parse_info< file_iterator<> > aInfo =
@@ -666,7 +666,7 @@ PDFEntry* PDFReader::read( const char* pFileName )
         }
         #endif
     }
-
+    
     PDFEntry* pRet = NULL;
     unsigned int nEntries = aGrammar.m_aObjectStack.size();
     if( nEntries == 1 )
@@ -697,7 +697,7 @@ PDFEntry* PDFReader::read( const char* pFileName )
 #pragma enable_warn
 #elif defined _MSC_VER
 #pragma warning(pop)
-#endif
+#endif 
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx
index 19d439060883..21de11382aa1 100644
--- a/sdext/source/pdfimport/sax/emitcontext.cxx
+++ b/sdext/source/pdfimport/sax/emitcontext.cxx
@@ -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
diff --git a/sdext/source/pdfimport/sax/emitcontext.hxx b/sdext/source/pdfimport/sax/emitcontext.hxx
index e617763636f3..c67615a7456b 100644
--- a/sdext/source/pdfimport/sax/emitcontext.hxx
+++ b/sdext/source/pdfimport/sax/emitcontext.hxx
@@ -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
@@ -30,7 +30,7 @@
 #define INCLUDED_PDFI_EMITCONTEXT_HXX
 
 #include "xmlemitter.hxx"
-
+ 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 
 #include <rtl/ustring.hxx>
@@ -43,14 +43,14 @@ namespace pdfi
     class SaxEmitter : public XmlEmitter
     {
     private:
-        com::sun::star::uno::Reference<
+        com::sun::star::uno::Reference< 
             com::sun::star::xml::sax::XDocumentHandler > m_xDocHdl;
-
+        
     public:
-        explicit SaxEmitter( const com::sun::star::uno::Reference<
+        explicit SaxEmitter( const com::sun::star::uno::Reference< 
                                     com::sun::star::xml::sax::XDocumentHandler >& xDocHdl );
         ~SaxEmitter();
-
+        
         virtual void beginTag( const char* pTag, const PropertyMap& rProperties );
         virtual void write( const rtl::OUString& rString );
         virtual void endTag( const char* pTag );
diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx b/sdext/source/pdfimport/sax/saxattrlist.cxx
index 2059e836bfae..dbfe2d3aad1f 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.cxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.cxx
@@ -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
@@ -65,7 +65,7 @@ namespace {
         return aStr;
     }
 }
-
+    
 sal_Int16 SAL_CALL SaxAttrList::getLength() throw()
 {
     return sal_Int16(m_aAttributes.size());
@@ -95,7 +95,7 @@ rtl::OUString SAL_CALL SaxAttrList::getValueByName(const ::rtl::OUString& i_rNam
     std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it = m_aIndexMap.find( i_rName );
     return (it != m_aIndexMap.end()) ? m_aAttributes[it->second].m_aValue : rtl::OUString();
 }
-
+    
 com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL SaxAttrList::createClone() throw()
 {
     return new SaxAttrList( *this );
diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx
index 5e01ef18896a..5ca6b56cf9f1 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.hxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.hxx
@@ -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
@@ -48,19 +48,19 @@ namespace pdfi
         {
             rtl::OUString m_aName;
             rtl::OUString m_aValue;
-
+            
             AttrEntry( const rtl::OUString& i_rName, const rtl::OUString& i_rValue )
             : m_aName( i_rName ), m_aValue( i_rValue ) {}
         };
         std::vector< AttrEntry >                                    m_aAttributes;
         std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >   m_aIndexMap;
-
+    
     public:
         SaxAttrList() {}
         SaxAttrList( const std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >& );
         SaxAttrList( const SaxAttrList& );
         virtual ~SaxAttrList();
-
+    
         // ::com::sun::star::xml::sax::XAttributeList
         virtual sal_Int16 SAL_CALL getLength() throw();
         virtual rtl::OUString SAL_CALL getNameByIndex(sal_Int16 i) throw();
@@ -68,7 +68,7 @@ namespace pdfi
         virtual rtl::OUString SAL_CALL getTypeByName(const ::rtl::OUString& aName) throw();
         virtual rtl::OUString SAL_CALL getValueByIndex(sal_Int16 i) throw();
         virtual rtl::OUString SAL_CALL getValueByName(const ::rtl::OUString& aName) throw();
-
+    
         // ::com::sun::star::util::XCloneable
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw();
     };
diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx
index a7c61f1a2577..c4860ebe1170 100644
--- a/sdext/source/pdfimport/services.cxx
+++ b/sdext/source/pdfimport/services.cxx
@@ -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
@@ -95,7 +95,7 @@ namespace
 
     struct ComponentDescription
     {
-        const sal_Char*     pAsciiServiceName;
+        const sal_Char*	    pAsciiServiceName;
         const sal_Char*     pAsciiImplementationName;
         ComponentFactory    pFactory;
 
diff --git a/sdext/source/pdfimport/test/export.map b/sdext/source/pdfimport/test/export.map
index 7321bbca16ad..f313c44bd7ad 100755
--- a/sdext/source/pdfimport/test/export.map
+++ b/sdext/source/pdfimport/test/export.map
@@ -1,7 +1,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
diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx
index 148ee739e7d7..5da34d5f9f80 100644
--- a/sdext/source/pdfimport/test/outputwrap.hxx
+++ b/sdext/source/pdfimport/test/outputwrap.hxx
@@ -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
@@ -38,7 +38,7 @@
 namespace pdfi
 {
 
-typedef ::cppu::WeakComponentImplHelper1<
+typedef ::cppu::WeakComponentImplHelper1< 
         com::sun::star::io::XOutputStream > OutputWrapBase;
 
     class OutputWrap : private cppu::BaseMutex, public OutputWrapBase
@@ -47,7 +47,7 @@ typedef ::cppu::WeakComponentImplHelper1<
 
     public:
 
-        explicit OutputWrap( const rtl::OUString& rURL ) : OutputWrapBase(m_aMutex), maFile(rURL)
+        explicit OutputWrap( const rtl::OUString& rURL ) : OutputWrapBase(m_aMutex), maFile(rURL) 
         {
             maFile.open(osl_File_OpenFlag_Create|OpenFlag_Write);
         }
@@ -70,6 +70,6 @@ typedef ::cppu::WeakComponentImplHelper1<
     };
 }
 #endif
-
+ 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/pdfimport/test/pdf2xml.cxx b/sdext/source/pdfimport/test/pdf2xml.cxx
index a8278ccf2267..2bf0ecbb6b1c 100644
--- a/sdext/source/pdfimport/test/pdf2xml.cxx
+++ b/sdext/source/pdfimport/test/pdf2xml.cxx
@@ -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
diff --git a/sdext/source/pdfimport/test/pdfunzip.cxx b/sdext/source/pdfimport/test/pdfunzip.cxx
index e871e36809d2..606b91295888 100644
--- a/sdext/source/pdfimport/test/pdfunzip.cxx
+++ b/sdext/source/pdfimport/test/pdfunzip.cxx
@@ -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
@@ -68,13 +68,13 @@ class FileEmitContext : public EmitContext
     oslFileHandle m_aHandle;
     oslFileHandle m_aReadHandle;
     unsigned int  m_nReadLen;
-
+    
     void openReadFile( const char* pOrigName );
-
+    
     public:
     FileEmitContext( const char* pFileName, const char* pOrigName, const PDFContainer* pTop );
     virtual ~FileEmitContext();
-
+    
     virtual bool write( const void* pBuf, unsigned int nLen ) throw();
     virtual unsigned int getCurPos() throw();
     virtual bool copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen ) throw();
@@ -94,7 +94,7 @@ FileEmitContext::FileEmitContext( const char* pFileName, const char* pOrigName,
         fprintf( stderr, "filename conversion \"%s\" failed\n", pFileName );
         return;
     }
-
+    
     if( osl_openFile( aURL.pData, &m_aHandle, osl_File_OpenFlag_Write ) == osl_File_E_None )
     {
         if( osl_setFileSize( m_aHandle, 0 ) != osl_File_E_None )
@@ -111,7 +111,7 @@ FileEmitContext::FileEmitContext( const char* pFileName, const char* pOrigName,
         return;
     }
     m_bDeflate = true;
-
+    
     openReadFile( pOrigName );
 }
 
@@ -132,20 +132,20 @@ void FileEmitContext::openReadFile( const char* pInFile )
         fprintf( stderr, "filename conversion \"%s\" failed\n", pInFile );
         return;
     }
-
+    
     if( osl_openFile( aURL.pData, &m_aReadHandle, osl_File_OpenFlag_Read ) != osl_File_E_None )
     {
         fprintf( stderr, "could not open %s\n", pInFile );
         return;
     }
-
+                                                       
     if( osl_setFilePos( m_aReadHandle, osl_Pos_End, 0 ) != osl_File_E_None )
     {
         fprintf( stderr, "could not seek to end of %s\n", pInFile );
         osl_closeFile( m_aReadHandle );
         return;
     }
-
+    
     sal_uInt64 nFileSize = 0;
     if( osl_getFilePos( m_aReadHandle, &nFileSize ) != osl_File_E_None )
     {
@@ -153,7 +153,7 @@ void FileEmitContext::openReadFile( const char* pInFile )
         osl_closeFile( m_aReadHandle );
         return;
     }
-
+    
     m_nReadLen = static_cast<unsigned int>(nFileSize);
 }
 
@@ -161,7 +161,7 @@ bool FileEmitContext::write( const void* pBuf, unsigned int nLen ) throw()
 {
     if( ! m_aHandle )
         return false;
-
+    
     sal_uInt64 nWrite = static_cast<sal_uInt64>(nLen);
     sal_uInt64 nWritten = 0;
     return (osl_writeFile( m_aHandle, pBuf, nWrite, &nWritten ) == osl_File_E_None)
@@ -183,7 +183,7 @@ bool FileEmitContext::copyOrigBytes( unsigned int nOrigOffset, unsigned int nLen
 {
     if( nOrigOffset + nLen > m_nReadLen )
         return false;
-
+    
     if( osl_setFilePos( m_aReadHandle, osl_Pos_Absolut, nOrigOffset ) != osl_File_E_None )
     {
         fprintf( stderr, "could not seek to offset %u\n", nOrigOffset );
@@ -209,7 +209,7 @@ unsigned int FileEmitContext::readOrigBytes( unsigned int nOrigOffset, unsigned
 {
     if( nOrigOffset + nLen > m_nReadLen )
         return 0;
-
+    
     if( osl_setFilePos( m_aReadHandle, osl_Pos_Absolut, nOrigOffset ) != osl_File_E_None )
     {
         fprintf( stderr, "could not seek to offset %u\n", nOrigOffset );
@@ -225,7 +225,7 @@ typedef int(*PDFFileHdl)(const char*, const char*, PDFFile*);
 
 int handleFile( const char* pInFile, const char* pOutFile, const char* pPassword, PDFFileHdl pHdl )
 {
-
+    
     PDFReader aParser;
     int nRet = 0;
     PDFEntry* pEntry = aParser.read( pInFile );
@@ -333,18 +333,18 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF
         PDFDict* pDict = dynamic_cast<PDFDict*>(pObj->m_pObject);
         if( ! pDict )
             continue;
-
+        
         std::hash_map<rtl::OString,PDFEntry*,rtl::OStringHash>::iterator map_it =
                 pDict->m_aMap.find( "Type" );
         if( map_it == pDict->m_aMap.end() )
             continue;
-
+        
         PDFName* pName = dynamic_cast<PDFName*>(map_it->second);
         if( ! pName )
             continue;
         if( ! pName->m_aName.equals( "FontDescriptor" ) )
             continue;
-
+        
         // the font name will be helpful, also there must be one in
         // a font descriptor
         map_it = pDict->m_aMap.find( "FontName" );
@@ -352,9 +352,9 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF
             continue;
         pName = dynamic_cast<PDFName*>(map_it->second);
         if( ! pName )
-            continue;
+            continue;        
         rtl::OString aFontName( pName->m_aName );
-
+        
         PDFObjectRef* pStreamRef = 0;
         const char* pFileType = NULL;
         // we have a font descriptor, try for a type 1 font
@@ -377,14 +377,14 @@ int write_fonts( const char* i_pInFile, const char* i_pOutFile, PDFFile* i_pPDFF
                     pFileType = "ttf";
             }
         }
-
+        
         if( ! pStreamRef )
             continue;
-
+        
         PDFObject* pStream = i_pPDFFile->findObject( pStreamRef );
         if( ! pStream )
             continue;
-
+        
         rtl::OStringBuffer aOutStream( i_pOutFile );
         aOutStream.append( "_font_" );
         aOutStream.append( sal_Int32(pStreamRef->m_nNumber) );
@@ -440,7 +440,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
     const char* pPassword = NULL;
     OStringBuffer aOutFile( 256 );
     PDFFileHdl aHdl = write_unzipFile;
-
+    
     for( int nArg = 1; nArg < argc; nArg++ )
     {
         if( argv[nArg][0] == '-' )
@@ -493,7 +493,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
                         s_aEmitObjects.push_back( std::pair<sal_Int32,sal_Int32>(nObject,nGeneration) );
                     }
                 }
-            }
+            }            
             else
             {
                 fprintf( stderr, "unrecognized option \"%s\"\n",
@@ -533,7 +533,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
             return 11;
         }
     }
-
+    
     return handleFile( pInFile, pOutFile, pPassword, aHdl );
 }
 
diff --git a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_draw.xml b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_draw.xml
index f864c4dfb01a..8c3704cb0b4e 100644
--- a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_draw.xml
+++ b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_draw.xml
@@ -43,73 +43,73 @@ UDYKMTAwIDQwCjI1NQr/////////////////////////////////////////////////////////////
 <text:span text:style-name="text7" >
 H
 e
-
+ 
 h
 e
 a
 r
 d
-
+ 
 q
 u
 i
 e
 t
-
+ 
 s
 t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
 .
-
+ 
 T
 h
 a
 t
-
+ 
 d
 i
 d
 n
 '
 t
-
+ 
 b
 o
 d
 e
-
+ 
 w
 e
 l
 l
 .
-
+ 
 W
 h
 o
-
+ 
 c
 o
 u
 l
 d
-
+ 
 b
 e
-
+ 
 f
 o
 l
@@ -119,24 +119,24 @@ w
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 t
 h
 i
 s
-
+ 
 l
 a
 t
 e
-
+ 
 a
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -150,19 +150,19 @@ i
 g
 h
 t
-
+ 
 a
 n
 d
-
+ 
 i
 n
-
+ 
 t
 h
 i
 s
-
+ 
 d
 e
 a
@@ -171,33 +171,33 @@ b
 e
 a
 t
-
+ 
 p
 a
 r
 t
-
+ 
 o
 f
-
+ 
 t
 o
 w
 n
 ?
-
+ 
 A
 n
 d
-
+ 
 a
 t
-
+ 
 t
 h
 i
 s
-
+ 
 p
 a
 r
@@ -208,7 +208,7 @@ u
 l
 a
 r
-
+ 
 m
 o
 m
@@ -216,36 +216,36 @@ e
 n
 t
 ,
-
+ 
 j
 u
 s
 t
-
+ 
 a
 f
 t
 e
 r
-
+ 
 h
 e
-
+ 
 p
 u
 l
 l
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -257,40 +257,40 @@ e
 b
 i
 g
-
+ 
 t
 i
 m
 e
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 m
 a
 k
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 w
 i
 t
 h
-
+ 
 t
 h
 e
-
+ 
 g
 r
 e
@@ -302,17 +302,17 @@ c
 k
 s
 .
-
+ 
 W
 a
 s
-
+ 
 t
 h
 e
 r
 e
-
+ 
 a
 n
 o
@@ -320,32 +320,32 @@ t
 h
 e
 r
-
+ 
 c
 r
 o
 o
 k
-
+ 
 w
 h
 o
 '
 d
-
+ 
 h
 a
 d
-
+ 
 t
 h
 e
-
+ 
 s
 a
 m
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -359,19 +359,19 @@ d
 e
 a
 ,
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 n
 o
 w
-
+ 
 w
 a
 t
@@ -380,15 +380,15 @@ h
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 w
 a
 i
@@ -396,63 +396,63 @@ t
 i
 n
 g
-
+ 
 f
 o
 r
-
+ 
 a
-
+ 
 c
 h
 a
 n
 c
 e
-
+ 
 t
 o
-
+ 
 g
 r
 a
 b
-
+ 
 t
 h
 e
-
+ 
 f
 r
 u
 i
 t
-
+ 
 o
 f
-
+ 
 h
 i
 s
-
+ 
 l
 a
 b
 o
 r
 ?
-
+ 
 O
 r
-
+ 
 d
 i
 d
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -466,44 +466,44 @@ t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
-
+ 
 m
 e
 a
 n
-
+ 
 t
 h
 a
 t
-
+ 
 o
 n
 e
-
+ 
 o
 f
-
+ 
 m
 a
 n
 y
-
+ 
 l
 a
 w
-
+ 
 o
 f
 f
@@ -512,38 +512,38 @@ c
 e
 r
 s
-
+ 
 i
 n
-
+ 
 t
 o
 w
 n
-
+ 
 w
 a
 s
-
+ 
 o
 n
-
+ 
 t
 o
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 j
 u
 s
 t
-
+ 
 w
 a
 i
@@ -551,10 +551,10 @@ t
 i
 n
 g
-
+ 
 t
 o
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -569,35 +569,35 @@ u
 n
 c
 e
-
+ 
 a
 n
 d
-
+ 
 s
 n
 a
 p
-
+ 
 t
 h
 o
 s
 e
-
+ 
 c
 u
 f
 f
 s
-
+ 
 o
 n
-
+ 
 h
 i
 s
-
+ 
 w
 r
 i
@@ -605,10 +605,10 @@ s
 t
 s
 ?
-
+ 
 H
 e
-
+ 
 n
 e
 r
@@ -618,18 +618,18 @@ u
 s
 l
 y
-
+ 
 l
 o
 o
 k
 e
 d
-
+ 
 a
 l
 l
-
+ 
 a
 r
 o
@@ -637,7 +637,7 @@ u
 n
 d
 .
-
+ 
 S
 u
 d
@@ -646,18 +646,18 @@ e
 n
 l
 y
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -672,12 +672,12 @@ l
 e
 y
 .
-
+ 
 L
 i
 k
 e
-
+ 
 l
 i
 g
@@ -687,37 +687,37 @@ n
 i
 n
 g
-
+ 
 h
 e
-
+ 
 d
 a
 r
 t
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 o
-
+ 
 t
 h
 e
-
+ 
 l
 e
 f
 t
-
+ 
 a
 n
 d
-
+ 
 d
 i
 s
@@ -729,7 +729,7 @@ a
 r
 e
 d
-
+ 
 b
 e
 t
@@ -737,15 +737,15 @@ w
 e
 e
 n
-
+ 
 t
 h
 e
-
+ 
 t
 w
 o
-
+ 
 w
 a
 r
@@ -756,14 +756,14 @@ u
 s
 e
 s
-
+ 
 a
 l
 m
 o
 s
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -779,53 +779,53 @@ l
 i
 n
 g
-
+ 
 o
 v
 e
 r
-
+ 
 t
 h
 e
-
+ 
 t
 r
 a
 s
 h
-
+ 
 c
 a
 n
-
+ 
 l
 y
 i
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 m
 i
 d
 d
 l
 e
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 s
 i
 d
@@ -835,19 +835,19 @@ a
 l
 k
 .
-
+ 
 H
 e
-
+ 
 t
 r
 i
 e
 d
-
+ 
 t
 o
-
+ 
 n
 e
 r
@@ -857,19 +857,19 @@ u
 s
 l
 y
-
+ 
 t
 a
 p
-
+ 
 h
 i
 s
-
+ 
 w
 a
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -883,19 +883,19 @@ l
 o
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 i
 n
 k
 y
-
+ 
 d
 a
 r
@@ -904,11 +904,11 @@ n
 e
 s
 s
-
+ 
 a
 n
 d
-
+ 
 s
 u
 d
@@ -917,7 +917,7 @@ e
 n
 l
 y
-
+ 
 s
 t
 i
@@ -928,16 +928,16 @@ n
 e
 d
 :
-
+ 
 i
 t
-
+ 
 w
 a
 s
-
+ 
 a
-
+ 
 d
 e
 a
@@ -947,36 +947,36 @@ e
 n
 d
 ,
-
+ 
 h
 e
-
+ 
 w
 o
 u
 l
 d
-
+ 
 h
 a
 v
 e
-
+ 
 t
 o
-
+ 
 g
 o
-
+ 
 b
 a
 c
 k
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -988,45 +988,45 @@ e
 w
 a
 y
-
+ 
 h
 e
-
+ 
 h
 a
 d
-
+ 
 c
 o
 m
 e
 .
-
+ 
 T
 h
 e
-
+ 
 s
 t
 e
 p
 s
-
+ 
 g
 o
 t
-
+ 
 l
 o
 u
 d
 e
 r
-
+ 
 a
 n
 d
-
+ 
 l
 o
 u
@@ -1034,24 +1034,24 @@ d
 e
 r
 ,
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 b
 l
 a
 c
 k
-
+ 
 o
 u
 t
@@ -1059,26 +1059,26 @@ l
 i
 n
 e
-
+ 
 o
 f
-
+ 
 a
-
+ 
 f
 i
 g
 u
 r
 e
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1093,11 +1093,11 @@ o
 u
 n
 d
-
+ 
 t
 h
 e
-
+ 
 c
 o
 r
@@ -1105,39 +1105,39 @@ n
 e
 r
 .
-
+ 
 I
 s
-
+ 
 t
 h
 i
 s
-
+ 
 t
 h
 e
-
+ 
 e
 n
 d
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 l
 i
 n
 e
 ?
-
+ 
 h
 e
-
+ 
 t
 h
 o
@@ -1145,7 +1145,7 @@ u
 g
 h
 t
-
+ 
 p
 r
 e
@@ -1154,7 +1154,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -1162,12 +1162,12 @@ s
 e
 l
 f
-
+ 
 b
 a
 c
 k
-
+ 
 a
 g
 a
@@ -1175,16 +1175,16 @@ i
 n
 s
 t
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1199,15 +1199,15 @@ y
 i
 n
 g
-
+ 
 t
 o
-
+ 
 m
 a
 k
 e
-
+ 
 h
 i
 m
@@ -1215,7 +1215,7 @@ s
 e
 l
 f
-
+ 
 i
 n
 v
@@ -1225,33 +1225,33 @@ i
 b
 l
 e
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 w
 a
 s
-
+ 
 a
 l
 l
-
+ 
 t
 h
 a
 t
-
+ 
 p
 l
 a
@@ -1260,18 +1260,18 @@ n
 i
 n
 g
-
+ 
 a
 n
 d
-
+ 
 e
 n
 e
 r
 g
 y
-
+ 
 w
 a
 s
@@ -1279,14 +1279,14 @@ t
 e
 d
 ?
-
+ 
 H
 e
-
+ 
 w
 a
 s
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1303,76 +1303,76 @@ p
 i
 n
 g
-
+ 
 w
 i
 t
 h
-
+ 
 s
 w
 e
 a
 t
-
+ 
 n
 o
 w
 ,
-
+ 
 c
 o
 l
 d
-
+ 
 a
 n
 d
-
+ 
 w
 e
 t
 ,
-
+ 
 h
 e
-
+ 
 c
 o
 u
 l
 d
-
+ 
 s
 m
 e
 l
 l
-
+ 
 t
 h
 e
-
+ 
 f
 e
 a
 r
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 h
 i
 s
-
+ 
 c
 l
 o
@@ -1381,7 +1381,7 @@ h
 e
 s
 .
-
+ 
 S
 u
 d
@@ -1390,7 +1390,7 @@ e
 n
 l
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1403,29 +1403,29 @@ n
 e
 x
 t
-
+ 
 t
 o
-
+ 
 h
 i
 m
 ,
-
+ 
 w
 i
 t
 h
-
+ 
 a
-
+ 
 b
 a
 r
 e
 l
 y
-
+ 
 n
 o
 t
@@ -1436,7 +1436,7 @@ a
 b
 l
 e
-
+ 
 s
 q
 u
@@ -1444,20 +1444,20 @@ e
 a
 k
 ,
-
+ 
 a
-
+ 
 d
 o
 o
 r
-
+ 
 s
 w
 u
 n
 g
-
+ 
 q
 u
 i
@@ -1465,25 +1465,25 @@ e
 t
 l
 y
-
+ 
 t
 o
-
+ 
 a
 n
 d
-
+ 
 f
 r
 o
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 n
 i
 g
@@ -1491,7 +1491,7 @@ h
 t
 '
 s
-
+ 
 b
 r
 e
@@ -1499,7 +1499,7 @@ e
 z
 e
 .
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1513,74 +1513,74 @@ o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 b
 e
-
+ 
 t
 h
 e
-
+ 
 h
 a
 v
 e
 n
-
+ 
 h
 e
 '
 d
-
+ 
 p
 r
 a
 y
 e
 d
-
+ 
 f
 o
 r
 ?
-
+ 
 S
 l
 o
 w
 l
 y
-
+ 
 h
 e
-
+ 
 s
 l
 i
 d
-
+ 
 t
 o
 w
 a
 r
 d
-
+ 
 t
 h
 e
-
+ 
 d
 o
 o
 r
 ,
-
+ 
 p
 r
 e
@@ -1589,7 +1589,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -1597,16 +1597,16 @@ s
 e
 l
 f
-
+ 
 m
 o
 r
 e
-
+ 
 a
 n
 d
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1619,83 +1619,83 @@ m
 o
 r
 e
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
 ,
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 a
 w
 a
 y
-
+ 
 f
 r
 o
 m
-
+ 
 h
 i
 s
-
+ 
 e
 n
 e
 m
 y
 .
-
+ 
 W
 o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 d
 o
 o
 r
-
+ 
 s
 a
 v
 e
-
+ 
 h
 i
 s
-
+ 
 h
 i
 d
@@ -1711,73 +1711,73 @@ e
 <text:span text:style-name="text7" >
 H
 e
-
+ 
 h
 e
 a
 r
 d
-
+ 
 q
 u
 i
 e
 t
-
+ 
 s
 t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
 .
-
+ 
 T
 h
 a
 t
-
+ 
 d
 i
 d
 n
 '
 t
-
+ 
 b
 o
 d
 e
-
+ 
 w
 e
 l
 l
 .
-
+ 
 W
 h
 o
-
+ 
 c
 o
 u
 l
 d
-
+ 
 b
 e
-
+ 
 f
 o
 l
@@ -1787,24 +1787,24 @@ w
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 t
 h
 i
 s
-
+ 
 l
 a
 t
 e
-
+ 
 a
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1818,19 +1818,19 @@ i
 g
 h
 t
-
+ 
 a
 n
 d
-
+ 
 i
 n
-
+ 
 t
 h
 i
 s
-
+ 
 d
 e
 a
@@ -1839,33 +1839,33 @@ b
 e
 a
 t
-
+ 
 p
 a
 r
 t
-
+ 
 o
 f
-
+ 
 t
 o
 w
 n
 ?
-
+ 
 A
 n
 d
-
+ 
 a
 t
-
+ 
 t
 h
 i
 s
-
+ 
 p
 a
 r
@@ -1876,7 +1876,7 @@ u
 l
 a
 r
-
+ 
 m
 o
 m
@@ -1884,36 +1884,36 @@ e
 n
 t
 ,
-
+ 
 j
 u
 s
 t
-
+ 
 a
 f
 t
 e
 r
-
+ 
 h
 e
-
+ 
 p
 u
 l
 l
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1925,40 +1925,40 @@ e
 b
 i
 g
-
+ 
 t
 i
 m
 e
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 m
 a
 k
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 w
 i
 t
 h
-
+ 
 t
 h
 e
-
+ 
 g
 r
 e
@@ -1970,17 +1970,17 @@ c
 k
 s
 .
-
+ 
 W
 a
 s
-
+ 
 t
 h
 e
 r
 e
-
+ 
 a
 n
 o
@@ -1988,32 +1988,32 @@ t
 h
 e
 r
-
+ 
 c
 r
 o
 o
 k
-
+ 
 w
 h
 o
 '
 d
-
+ 
 h
 a
 d
-
+ 
 t
 h
 e
-
+ 
 s
 a
 m
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2027,19 +2027,19 @@ d
 e
 a
 ,
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 n
 o
 w
-
+ 
 w
 a
 t
@@ -2048,15 +2048,15 @@ h
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 w
 a
 i
@@ -2064,63 +2064,63 @@ t
 i
 n
 g
-
+ 
 f
 o
 r
-
+ 
 a
-
+ 
 c
 h
 a
 n
 c
 e
-
+ 
 t
 o
-
+ 
 g
 r
 a
 b
-
+ 
 t
 h
 e
-
+ 
 f
 r
 u
 i
 t
-
+ 
 o
 f
-
+ 
 h
 i
 s
-
+ 
 l
 a
 b
 o
 r
 ?
-
+ 
 O
 r
-
+ 
 d
 i
 d
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2134,44 +2134,44 @@ t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
-
+ 
 m
 e
 a
 n
-
+ 
 t
 h
 a
 t
-
+ 
 o
 n
 e
-
+ 
 o
 f
-
+ 
 m
 a
 n
 y
-
+ 
 l
 a
 w
-
+ 
 o
 f
 f
@@ -2180,38 +2180,38 @@ c
 e
 r
 s
-
+ 
 i
 n
-
+ 
 t
 o
 w
 n
-
+ 
 w
 a
 s
-
+ 
 o
 n
-
+ 
 t
 o
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 j
 u
 s
 t
-
+ 
 w
 a
 i
@@ -2219,10 +2219,10 @@ t
 i
 n
 g
-
+ 
 t
 o
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2237,35 +2237,35 @@ u
 n
 c
 e
-
+ 
 a
 n
 d
-
+ 
 s
 n
 a
 p
-
+ 
 t
 h
 o
 s
 e
-
+ 
 c
 u
 f
 f
 s
-
+ 
 o
 n
-
+ 
 h
 i
 s
-
+ 
 w
 r
 i
@@ -2273,10 +2273,10 @@ s
 t
 s
 ?
-
+ 
 H
 e
-
+ 
 n
 e
 r
@@ -2286,18 +2286,18 @@ u
 s
 l
 y
-
+ 
 l
 o
 o
 k
 e
 d
-
+ 
 a
 l
 l
-
+ 
 a
 r
 o
@@ -2305,7 +2305,7 @@ u
 n
 d
 .
-
+ 
 S
 u
 d
@@ -2314,18 +2314,18 @@ e
 n
 l
 y
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2340,12 +2340,12 @@ l
 e
 y
 .
-
+ 
 L
 i
 k
 e
-
+ 
 l
 i
 g
@@ -2355,37 +2355,37 @@ n
 i
 n
 g
-
+ 
 h
 e
-
+ 
 d
 a
 r
 t
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 o
-
+ 
 t
 h
 e
-
+ 
 l
 e
 f
 t
-
+ 
 a
 n
 d
-
+ 
 d
 i
 s
@@ -2397,7 +2397,7 @@ a
 r
 e
 d
-
+ 
 b
 e
 t
@@ -2405,15 +2405,15 @@ w
 e
 e
 n
-
+ 
 t
 h
 e
-
+ 
 t
 w
 o
-
+ 
 w
 a
 r
@@ -2424,14 +2424,14 @@ u
 s
 e
 s
-
+ 
 a
 l
 m
 o
 s
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2447,53 +2447,53 @@ l
 i
 n
 g
-
+ 
 o
 v
 e
 r
-
+ 
 t
 h
 e
-
+ 
 t
 r
 a
 s
 h
-
+ 
 c
 a
 n
-
+ 
 l
 y
 i
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 m
 i
 d
 d
 l
 e
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 s
 i
 d
@@ -2503,19 +2503,19 @@ a
 l
 k
 .
-
+ 
 H
 e
-
+ 
 t
 r
 i
 e
 d
-
+ 
 t
 o
-
+ 
 n
 e
 r
@@ -2525,19 +2525,19 @@ u
 s
 l
 y
-
+ 
 t
 a
 p
-
+ 
 h
 i
 s
-
+ 
 w
 a
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2551,19 +2551,19 @@ l
 o
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 i
 n
 k
 y
-
+ 
 d
 a
 r
@@ -2572,11 +2572,11 @@ n
 e
 s
 s
-
+ 
 a
 n
 d
-
+ 
 s
 u
 d
@@ -2585,7 +2585,7 @@ e
 n
 l
 y
-
+ 
 s
 t
 i
@@ -2596,16 +2596,16 @@ n
 e
 d
 :
-
+ 
 i
 t
-
+ 
 w
 a
 s
-
+ 
 a
-
+ 
 d
 e
 a
@@ -2615,36 +2615,36 @@ e
 n
 d
 ,
-
+ 
 h
 e
-
+ 
 w
 o
 u
 l
 d
-
+ 
 h
 a
 v
 e
-
+ 
 t
 o
-
+ 
 g
 o
-
+ 
 b
 a
 c
 k
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2656,45 +2656,45 @@ e
 w
 a
 y
-
+ 
 h
 e
-
+ 
 h
 a
 d
-
+ 
 c
 o
 m
 e
 .
-
+ 
 T
 h
 e
-
+ 
 s
 t
 e
 p
 s
-
+ 
 g
 o
 t
-
+ 
 l
 o
 u
 d
 e
 r
-
+ 
 a
 n
 d
-
+ 
 l
 o
 u
@@ -2702,24 +2702,24 @@ d
 e
 r
 ,
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 b
 l
 a
 c
 k
-
+ 
 o
 u
 t
@@ -2727,26 +2727,26 @@ l
 i
 n
 e
-
+ 
 o
 f
-
+ 
 a
-
+ 
 f
 i
 g
 u
 r
 e
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2761,11 +2761,11 @@ o
 u
 n
 d
-
+ 
 t
 h
 e
-
+ 
 c
 o
 r
@@ -2773,39 +2773,39 @@ n
 e
 r
 .
-
+ 
 I
 s
-
+ 
 t
 h
 i
 s
-
+ 
 t
 h
 e
-
+ 
 e
 n
 d
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 l
 i
 n
 e
 ?
-
+ 
 h
 e
-
+ 
 t
 h
 o
@@ -2813,7 +2813,7 @@ u
 g
 h
 t
-
+ 
 p
 r
 e
@@ -2822,7 +2822,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -2830,12 +2830,12 @@ s
 e
 l
 f
-
+ 
 b
 a
 c
 k
-
+ 
 a
 g
 a
@@ -2843,16 +2843,16 @@ i
 n
 s
 t
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2867,15 +2867,15 @@ y
 i
 n
 g
-
+ 
 t
 o
-
+ 
 m
 a
 k
 e
-
+ 
 h
 i
 m
@@ -2883,7 +2883,7 @@ s
 e
 l
 f
-
+ 
 i
 n
 v
@@ -2893,33 +2893,33 @@ i
 b
 l
 e
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 w
 a
 s
-
+ 
 a
 l
 l
-
+ 
 t
 h
 a
 t
-
+ 
 p
 l
 a
@@ -2928,18 +2928,18 @@ n
 i
 n
 g
-
+ 
 a
 n
 d
-
+ 
 e
 n
 e
 r
 g
 y
-
+ 
 w
 a
 s
@@ -2947,14 +2947,14 @@ t
 e
 d
 ?
-
+ 
 H
 e
-
+ 
 w
 a
 s
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2971,76 +2971,76 @@ p
 i
 n
 g
-
+ 
 w
 i
 t
 h
-
+ 
 s
 w
 e
 a
 t
-
+ 
 n
 o
 w
 ,
-
+ 
 c
 o
 l
 d
-
+ 
 a
 n
 d
-
+ 
 w
 e
 t
 ,
-
+ 
 h
 e
-
+ 
 c
 o
 u
 l
 d
-
+ 
 s
 m
 e
 l
 l
-
+ 
 t
 h
 e
-
+ 
 f
 e
 a
 r
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 h
 i
 s
-
+ 
 c
 l
 o
@@ -3049,7 +3049,7 @@ h
 e
 s
 .
-
+ 
 S
 u
 d
@@ -3058,7 +3058,7 @@ e
 n
 l
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3071,29 +3071,29 @@ n
 e
 x
 t
-
+ 
 t
 o
-
+ 
 h
 i
 m
 ,
-
+ 
 w
 i
 t
 h
-
+ 
 a
-
+ 
 b
 a
 r
 e
 l
 y
-
+ 
 n
 o
 t
@@ -3104,7 +3104,7 @@ a
 b
 l
 e
-
+ 
 s
 q
 u
@@ -3112,20 +3112,20 @@ e
 a
 k
 ,
-
+ 
 a
-
+ 
 d
 o
 o
 r
-
+ 
 s
 w
 u
 n
 g
-
+ 
 q
 u
 i
@@ -3133,25 +3133,25 @@ e
 t
 l
 y
-
+ 
 t
 o
-
+ 
 a
 n
 d
-
+ 
 f
 r
 o
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 n
 i
 g
@@ -3159,7 +3159,7 @@ h
 t
 '
 s
-
+ 
 b
 r
 e
@@ -3167,7 +3167,7 @@ e
 z
 e
 .
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3181,74 +3181,74 @@ o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 b
 e
-
+ 
 t
 h
 e
-
+ 
 h
 a
 v
 e
 n
-
+ 
 h
 e
 '
 d
-
+ 
 p
 r
 a
 y
 e
 d
-
+ 
 f
 o
 r
 ?
-
+ 
 S
 l
 o
 w
 l
 y
-
+ 
 h
 e
-
+ 
 s
 l
 i
 d
-
+ 
 t
 o
 w
 a
 r
 d
-
+ 
 t
 h
 e
-
+ 
 d
 o
 o
 r
 ,
-
+ 
 p
 r
 e
@@ -3257,7 +3257,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -3265,16 +3265,16 @@ s
 e
 l
 f
-
+ 
 m
 o
 r
 e
-
+ 
 a
 n
 d
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3287,83 +3287,83 @@ m
 o
 r
 e
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
 ,
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 a
 w
 a
 y
-
+ 
 f
 r
 o
 m
-
+ 
 h
 i
 s
-
+ 
 e
 n
 e
 m
 y
 .
-
+ 
 W
 o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 d
 o
 o
 r
-
+ 
 s
 a
 v
 e
-
+ 
 h
 i
 s
-
+ 
 h
 i
 d
diff --git a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_impress.xml b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_impress.xml
index 6d777866ee33..68ab55f1fb65 100644
--- a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_impress.xml
+++ b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_impress.xml
@@ -43,73 +43,73 @@ UDYKMTAwIDQwCjI1NQr/////////////////////////////////////////////////////////////
 <text:span text:style-name="text7" >
 H
 e
-
+ 
 h
 e
 a
 r
 d
-
+ 
 q
 u
 i
 e
 t
-
+ 
 s
 t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
 .
-
+ 
 T
 h
 a
 t
-
+ 
 d
 i
 d
 n
 '
 t
-
+ 
 b
 o
 d
 e
-
+ 
 w
 e
 l
 l
 .
-
+ 
 W
 h
 o
-
+ 
 c
 o
 u
 l
 d
-
+ 
 b
 e
-
+ 
 f
 o
 l
@@ -119,24 +119,24 @@ w
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 t
 h
 i
 s
-
+ 
 l
 a
 t
 e
-
+ 
 a
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -150,19 +150,19 @@ i
 g
 h
 t
-
+ 
 a
 n
 d
-
+ 
 i
 n
-
+ 
 t
 h
 i
 s
-
+ 
 d
 e
 a
@@ -171,33 +171,33 @@ b
 e
 a
 t
-
+ 
 p
 a
 r
 t
-
+ 
 o
 f
-
+ 
 t
 o
 w
 n
 ?
-
+ 
 A
 n
 d
-
+ 
 a
 t
-
+ 
 t
 h
 i
 s
-
+ 
 p
 a
 r
@@ -208,7 +208,7 @@ u
 l
 a
 r
-
+ 
 m
 o
 m
@@ -216,36 +216,36 @@ e
 n
 t
 ,
-
+ 
 j
 u
 s
 t
-
+ 
 a
 f
 t
 e
 r
-
+ 
 h
 e
-
+ 
 p
 u
 l
 l
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -257,40 +257,40 @@ e
 b
 i
 g
-
+ 
 t
 i
 m
 e
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 m
 a
 k
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 w
 i
 t
 h
-
+ 
 t
 h
 e
-
+ 
 g
 r
 e
@@ -302,17 +302,17 @@ c
 k
 s
 .
-
+ 
 W
 a
 s
-
+ 
 t
 h
 e
 r
 e
-
+ 
 a
 n
 o
@@ -320,32 +320,32 @@ t
 h
 e
 r
-
+ 
 c
 r
 o
 o
 k
-
+ 
 w
 h
 o
 '
 d
-
+ 
 h
 a
 d
-
+ 
 t
 h
 e
-
+ 
 s
 a
 m
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -359,19 +359,19 @@ d
 e
 a
 ,
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 n
 o
 w
-
+ 
 w
 a
 t
@@ -380,15 +380,15 @@ h
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 w
 a
 i
@@ -396,63 +396,63 @@ t
 i
 n
 g
-
+ 
 f
 o
 r
-
+ 
 a
-
+ 
 c
 h
 a
 n
 c
 e
-
+ 
 t
 o
-
+ 
 g
 r
 a
 b
-
+ 
 t
 h
 e
-
+ 
 f
 r
 u
 i
 t
-
+ 
 o
 f
-
+ 
 h
 i
 s
-
+ 
 l
 a
 b
 o
 r
 ?
-
+ 
 O
 r
-
+ 
 d
 i
 d
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -466,44 +466,44 @@ t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
-
+ 
 m
 e
 a
 n
-
+ 
 t
 h
 a
 t
-
+ 
 o
 n
 e
-
+ 
 o
 f
-
+ 
 m
 a
 n
 y
-
+ 
 l
 a
 w
-
+ 
 o
 f
 f
@@ -512,38 +512,38 @@ c
 e
 r
 s
-
+ 
 i
 n
-
+ 
 t
 o
 w
 n
-
+ 
 w
 a
 s
-
+ 
 o
 n
-
+ 
 t
 o
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 j
 u
 s
 t
-
+ 
 w
 a
 i
@@ -551,10 +551,10 @@ t
 i
 n
 g
-
+ 
 t
 o
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -569,35 +569,35 @@ u
 n
 c
 e
-
+ 
 a
 n
 d
-
+ 
 s
 n
 a
 p
-
+ 
 t
 h
 o
 s
 e
-
+ 
 c
 u
 f
 f
 s
-
+ 
 o
 n
-
+ 
 h
 i
 s
-
+ 
 w
 r
 i
@@ -605,10 +605,10 @@ s
 t
 s
 ?
-
+ 
 H
 e
-
+ 
 n
 e
 r
@@ -618,18 +618,18 @@ u
 s
 l
 y
-
+ 
 l
 o
 o
 k
 e
 d
-
+ 
 a
 l
 l
-
+ 
 a
 r
 o
@@ -637,7 +637,7 @@ u
 n
 d
 .
-
+ 
 S
 u
 d
@@ -646,18 +646,18 @@ e
 n
 l
 y
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -672,12 +672,12 @@ l
 e
 y
 .
-
+ 
 L
 i
 k
 e
-
+ 
 l
 i
 g
@@ -687,37 +687,37 @@ n
 i
 n
 g
-
+ 
 h
 e
-
+ 
 d
 a
 r
 t
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 o
-
+ 
 t
 h
 e
-
+ 
 l
 e
 f
 t
-
+ 
 a
 n
 d
-
+ 
 d
 i
 s
@@ -729,7 +729,7 @@ a
 r
 e
 d
-
+ 
 b
 e
 t
@@ -737,15 +737,15 @@ w
 e
 e
 n
-
+ 
 t
 h
 e
-
+ 
 t
 w
 o
-
+ 
 w
 a
 r
@@ -756,14 +756,14 @@ u
 s
 e
 s
-
+ 
 a
 l
 m
 o
 s
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -779,53 +779,53 @@ l
 i
 n
 g
-
+ 
 o
 v
 e
 r
-
+ 
 t
 h
 e
-
+ 
 t
 r
 a
 s
 h
-
+ 
 c
 a
 n
-
+ 
 l
 y
 i
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 m
 i
 d
 d
 l
 e
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 s
 i
 d
@@ -835,19 +835,19 @@ a
 l
 k
 .
-
+ 
 H
 e
-
+ 
 t
 r
 i
 e
 d
-
+ 
 t
 o
-
+ 
 n
 e
 r
@@ -857,19 +857,19 @@ u
 s
 l
 y
-
+ 
 t
 a
 p
-
+ 
 h
 i
 s
-
+ 
 w
 a
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -883,19 +883,19 @@ l
 o
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 i
 n
 k
 y
-
+ 
 d
 a
 r
@@ -904,11 +904,11 @@ n
 e
 s
 s
-
+ 
 a
 n
 d
-
+ 
 s
 u
 d
@@ -917,7 +917,7 @@ e
 n
 l
 y
-
+ 
 s
 t
 i
@@ -928,16 +928,16 @@ n
 e
 d
 :
-
+ 
 i
 t
-
+ 
 w
 a
 s
-
+ 
 a
-
+ 
 d
 e
 a
@@ -947,36 +947,36 @@ e
 n
 d
 ,
-
+ 
 h
 e
-
+ 
 w
 o
 u
 l
 d
-
+ 
 h
 a
 v
 e
-
+ 
 t
 o
-
+ 
 g
 o
-
+ 
 b
 a
 c
 k
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -988,45 +988,45 @@ e
 w
 a
 y
-
+ 
 h
 e
-
+ 
 h
 a
 d
-
+ 
 c
 o
 m
 e
 .
-
+ 
 T
 h
 e
-
+ 
 s
 t
 e
 p
 s
-
+ 
 g
 o
 t
-
+ 
 l
 o
 u
 d
 e
 r
-
+ 
 a
 n
 d
-
+ 
 l
 o
 u
@@ -1034,24 +1034,24 @@ d
 e
 r
 ,
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 b
 l
 a
 c
 k
-
+ 
 o
 u
 t
@@ -1059,26 +1059,26 @@ l
 i
 n
 e
-
+ 
 o
 f
-
+ 
 a
-
+ 
 f
 i
 g
 u
 r
 e
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1093,11 +1093,11 @@ o
 u
 n
 d
-
+ 
 t
 h
 e
-
+ 
 c
 o
 r
@@ -1105,39 +1105,39 @@ n
 e
 r
 .
-
+ 
 I
 s
-
+ 
 t
 h
 i
 s
-
+ 
 t
 h
 e
-
+ 
 e
 n
 d
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 l
 i
 n
 e
 ?
-
+ 
 h
 e
-
+ 
 t
 h
 o
@@ -1145,7 +1145,7 @@ u
 g
 h
 t
-
+ 
 p
 r
 e
@@ -1154,7 +1154,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -1162,12 +1162,12 @@ s
 e
 l
 f
-
+ 
 b
 a
 c
 k
-
+ 
 a
 g
 a
@@ -1175,16 +1175,16 @@ i
 n
 s
 t
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1199,15 +1199,15 @@ y
 i
 n
 g
-
+ 
 t
 o
-
+ 
 m
 a
 k
 e
-
+ 
 h
 i
 m
@@ -1215,7 +1215,7 @@ s
 e
 l
 f
-
+ 
 i
 n
 v
@@ -1225,33 +1225,33 @@ i
 b
 l
 e
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 w
 a
 s
-
+ 
 a
 l
 l
-
+ 
 t
 h
 a
 t
-
+ 
 p
 l
 a
@@ -1260,18 +1260,18 @@ n
 i
 n
 g
-
+ 
 a
 n
 d
-
+ 
 e
 n
 e
 r
 g
 y
-
+ 
 w
 a
 s
@@ -1279,14 +1279,14 @@ t
 e
 d
 ?
-
+ 
 H
 e
-
+ 
 w
 a
 s
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1303,76 +1303,76 @@ p
 i
 n
 g
-
+ 
 w
 i
 t
 h
-
+ 
 s
 w
 e
 a
 t
-
+ 
 n
 o
 w
 ,
-
+ 
 c
 o
 l
 d
-
+ 
 a
 n
 d
-
+ 
 w
 e
 t
 ,
-
+ 
 h
 e
-
+ 
 c
 o
 u
 l
 d
-
+ 
 s
 m
 e
 l
 l
-
+ 
 t
 h
 e
-
+ 
 f
 e
 a
 r
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 h
 i
 s
-
+ 
 c
 l
 o
@@ -1381,7 +1381,7 @@ h
 e
 s
 .
-
+ 
 S
 u
 d
@@ -1390,7 +1390,7 @@ e
 n
 l
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1403,29 +1403,29 @@ n
 e
 x
 t
-
+ 
 t
 o
-
+ 
 h
 i
 m
 ,
-
+ 
 w
 i
 t
 h
-
+ 
 a
-
+ 
 b
 a
 r
 e
 l
 y
-
+ 
 n
 o
 t
@@ -1436,7 +1436,7 @@ a
 b
 l
 e
-
+ 
 s
 q
 u
@@ -1444,20 +1444,20 @@ e
 a
 k
 ,
-
+ 
 a
-
+ 
 d
 o
 o
 r
-
+ 
 s
 w
 u
 n
 g
-
+ 
 q
 u
 i
@@ -1465,25 +1465,25 @@ e
 t
 l
 y
-
+ 
 t
 o
-
+ 
 a
 n
 d
-
+ 
 f
 r
 o
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 n
 i
 g
@@ -1491,7 +1491,7 @@ h
 t
 '
 s
-
+ 
 b
 r
 e
@@ -1499,7 +1499,7 @@ e
 z
 e
 .
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1513,74 +1513,74 @@ o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 b
 e
-
+ 
 t
 h
 e
-
+ 
 h
 a
 v
 e
 n
-
+ 
 h
 e
 '
 d
-
+ 
 p
 r
 a
 y
 e
 d
-
+ 
 f
 o
 r
 ?
-
+ 
 S
 l
 o
 w
 l
 y
-
+ 
 h
 e
-
+ 
 s
 l
 i
 d
-
+ 
 t
 o
 w
 a
 r
 d
-
+ 
 t
 h
 e
-
+ 
 d
 o
 o
 r
 ,
-
+ 
 p
 r
 e
@@ -1589,7 +1589,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -1597,16 +1597,16 @@ s
 e
 l
 f
-
+ 
 m
 o
 r
 e
-
+ 
 a
 n
 d
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1619,83 +1619,83 @@ m
 o
 r
 e
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
 ,
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 a
 w
 a
 y
-
+ 
 f
 r
 o
 m
-
+ 
 h
 i
 s
-
+ 
 e
 n
 e
 m
 y
 .
-
+ 
 W
 o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 d
 o
 o
 r
-
+ 
 s
 a
 v
 e
-
+ 
 h
 i
 s
-
+ 
 h
 i
 d
@@ -1711,73 +1711,73 @@ e
 <text:span text:style-name="text7" >
 H
 e
-
+ 
 h
 e
 a
 r
 d
-
+ 
 q
 u
 i
 e
 t
-
+ 
 s
 t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
 .
-
+ 
 T
 h
 a
 t
-
+ 
 d
 i
 d
 n
 '
 t
-
+ 
 b
 o
 d
 e
-
+ 
 w
 e
 l
 l
 .
-
+ 
 W
 h
 o
-
+ 
 c
 o
 u
 l
 d
-
+ 
 b
 e
-
+ 
 f
 o
 l
@@ -1787,24 +1787,24 @@ w
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 t
 h
 i
 s
-
+ 
 l
 a
 t
 e
-
+ 
 a
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1818,19 +1818,19 @@ i
 g
 h
 t
-
+ 
 a
 n
 d
-
+ 
 i
 n
-
+ 
 t
 h
 i
 s
-
+ 
 d
 e
 a
@@ -1839,33 +1839,33 @@ b
 e
 a
 t
-
+ 
 p
 a
 r
 t
-
+ 
 o
 f
-
+ 
 t
 o
 w
 n
 ?
-
+ 
 A
 n
 d
-
+ 
 a
 t
-
+ 
 t
 h
 i
 s
-
+ 
 p
 a
 r
@@ -1876,7 +1876,7 @@ u
 l
 a
 r
-
+ 
 m
 o
 m
@@ -1884,36 +1884,36 @@ e
 n
 t
 ,
-
+ 
 j
 u
 s
 t
-
+ 
 a
 f
 t
 e
 r
-
+ 
 h
 e
-
+ 
 p
 u
 l
 l
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1925,40 +1925,40 @@ e
 b
 i
 g
-
+ 
 t
 i
 m
 e
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 m
 a
 k
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 w
 i
 t
 h
-
+ 
 t
 h
 e
-
+ 
 g
 r
 e
@@ -1970,17 +1970,17 @@ c
 k
 s
 .
-
+ 
 W
 a
 s
-
+ 
 t
 h
 e
 r
 e
-
+ 
 a
 n
 o
@@ -1988,32 +1988,32 @@ t
 h
 e
 r
-
+ 
 c
 r
 o
 o
 k
-
+ 
 w
 h
 o
 '
 d
-
+ 
 h
 a
 d
-
+ 
 t
 h
 e
-
+ 
 s
 a
 m
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2027,19 +2027,19 @@ d
 e
 a
 ,
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 n
 o
 w
-
+ 
 w
 a
 t
@@ -2048,15 +2048,15 @@ h
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 w
 a
 i
@@ -2064,63 +2064,63 @@ t
 i
 n
 g
-
+ 
 f
 o
 r
-
+ 
 a
-
+ 
 c
 h
 a
 n
 c
 e
-
+ 
 t
 o
-
+ 
 g
 r
 a
 b
-
+ 
 t
 h
 e
-
+ 
 f
 r
 u
 i
 t
-
+ 
 o
 f
-
+ 
 h
 i
 s
-
+ 
 l
 a
 b
 o
 r
 ?
-
+ 
 O
 r
-
+ 
 d
 i
 d
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2134,44 +2134,44 @@ t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
-
+ 
 m
 e
 a
 n
-
+ 
 t
 h
 a
 t
-
+ 
 o
 n
 e
-
+ 
 o
 f
-
+ 
 m
 a
 n
 y
-
+ 
 l
 a
 w
-
+ 
 o
 f
 f
@@ -2180,38 +2180,38 @@ c
 e
 r
 s
-
+ 
 i
 n
-
+ 
 t
 o
 w
 n
-
+ 
 w
 a
 s
-
+ 
 o
 n
-
+ 
 t
 o
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 j
 u
 s
 t
-
+ 
 w
 a
 i
@@ -2219,10 +2219,10 @@ t
 i
 n
 g
-
+ 
 t
 o
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2237,35 +2237,35 @@ u
 n
 c
 e
-
+ 
 a
 n
 d
-
+ 
 s
 n
 a
 p
-
+ 
 t
 h
 o
 s
 e
-
+ 
 c
 u
 f
 f
 s
-
+ 
 o
 n
-
+ 
 h
 i
 s
-
+ 
 w
 r
 i
@@ -2273,10 +2273,10 @@ s
 t
 s
 ?
-
+ 
 H
 e
-
+ 
 n
 e
 r
@@ -2286,18 +2286,18 @@ u
 s
 l
 y
-
+ 
 l
 o
 o
 k
 e
 d
-
+ 
 a
 l
 l
-
+ 
 a
 r
 o
@@ -2305,7 +2305,7 @@ u
 n
 d
 .
-
+ 
 S
 u
 d
@@ -2314,18 +2314,18 @@ e
 n
 l
 y
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2340,12 +2340,12 @@ l
 e
 y
 .
-
+ 
 L
 i
 k
 e
-
+ 
 l
 i
 g
@@ -2355,37 +2355,37 @@ n
 i
 n
 g
-
+ 
 h
 e
-
+ 
 d
 a
 r
 t
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 o
-
+ 
 t
 h
 e
-
+ 
 l
 e
 f
 t
-
+ 
 a
 n
 d
-
+ 
 d
 i
 s
@@ -2397,7 +2397,7 @@ a
 r
 e
 d
-
+ 
 b
 e
 t
@@ -2405,15 +2405,15 @@ w
 e
 e
 n
-
+ 
 t
 h
 e
-
+ 
 t
 w
 o
-
+ 
 w
 a
 r
@@ -2424,14 +2424,14 @@ u
 s
 e
 s
-
+ 
 a
 l
 m
 o
 s
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2447,53 +2447,53 @@ l
 i
 n
 g
-
+ 
 o
 v
 e
 r
-
+ 
 t
 h
 e
-
+ 
 t
 r
 a
 s
 h
-
+ 
 c
 a
 n
-
+ 
 l
 y
 i
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 m
 i
 d
 d
 l
 e
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 s
 i
 d
@@ -2503,19 +2503,19 @@ a
 l
 k
 .
-
+ 
 H
 e
-
+ 
 t
 r
 i
 e
 d
-
+ 
 t
 o
-
+ 
 n
 e
 r
@@ -2525,19 +2525,19 @@ u
 s
 l
 y
-
+ 
 t
 a
 p
-
+ 
 h
 i
 s
-
+ 
 w
 a
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2551,19 +2551,19 @@ l
 o
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 i
 n
 k
 y
-
+ 
 d
 a
 r
@@ -2572,11 +2572,11 @@ n
 e
 s
 s
-
+ 
 a
 n
 d
-
+ 
 s
 u
 d
@@ -2585,7 +2585,7 @@ e
 n
 l
 y
-
+ 
 s
 t
 i
@@ -2596,16 +2596,16 @@ n
 e
 d
 :
-
+ 
 i
 t
-
+ 
 w
 a
 s
-
+ 
 a
-
+ 
 d
 e
 a
@@ -2615,36 +2615,36 @@ e
 n
 d
 ,
-
+ 
 h
 e
-
+ 
 w
 o
 u
 l
 d
-
+ 
 h
 a
 v
 e
-
+ 
 t
 o
-
+ 
 g
 o
-
+ 
 b
 a
 c
 k
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2656,45 +2656,45 @@ e
 w
 a
 y
-
+ 
 h
 e
-
+ 
 h
 a
 d
-
+ 
 c
 o
 m
 e
 .
-
+ 
 T
 h
 e
-
+ 
 s
 t
 e
 p
 s
-
+ 
 g
 o
 t
-
+ 
 l
 o
 u
 d
 e
 r
-
+ 
 a
 n
 d
-
+ 
 l
 o
 u
@@ -2702,24 +2702,24 @@ d
 e
 r
 ,
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 b
 l
 a
 c
 k
-
+ 
 o
 u
 t
@@ -2727,26 +2727,26 @@ l
 i
 n
 e
-
+ 
 o
 f
-
+ 
 a
-
+ 
 f
 i
 g
 u
 r
 e
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2761,11 +2761,11 @@ o
 u
 n
 d
-
+ 
 t
 h
 e
-
+ 
 c
 o
 r
@@ -2773,39 +2773,39 @@ n
 e
 r
 .
-
+ 
 I
 s
-
+ 
 t
 h
 i
 s
-
+ 
 t
 h
 e
-
+ 
 e
 n
 d
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 l
 i
 n
 e
 ?
-
+ 
 h
 e
-
+ 
 t
 h
 o
@@ -2813,7 +2813,7 @@ u
 g
 h
 t
-
+ 
 p
 r
 e
@@ -2822,7 +2822,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -2830,12 +2830,12 @@ s
 e
 l
 f
-
+ 
 b
 a
 c
 k
-
+ 
 a
 g
 a
@@ -2843,16 +2843,16 @@ i
 n
 s
 t
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2867,15 +2867,15 @@ y
 i
 n
 g
-
+ 
 t
 o
-
+ 
 m
 a
 k
 e
-
+ 
 h
 i
 m
@@ -2883,7 +2883,7 @@ s
 e
 l
 f
-
+ 
 i
 n
 v
@@ -2893,33 +2893,33 @@ i
 b
 l
 e
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 w
 a
 s
-
+ 
 a
 l
 l
-
+ 
 t
 h
 a
 t
-
+ 
 p
 l
 a
@@ -2928,18 +2928,18 @@ n
 i
 n
 g
-
+ 
 a
 n
 d
-
+ 
 e
 n
 e
 r
 g
 y
-
+ 
 w
 a
 s
@@ -2947,14 +2947,14 @@ t
 e
 d
 ?
-
+ 
 H
 e
-
+ 
 w
 a
 s
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2971,76 +2971,76 @@ p
 i
 n
 g
-
+ 
 w
 i
 t
 h
-
+ 
 s
 w
 e
 a
 t
-
+ 
 n
 o
 w
 ,
-
+ 
 c
 o
 l
 d
-
+ 
 a
 n
 d
-
+ 
 w
 e
 t
 ,
-
+ 
 h
 e
-
+ 
 c
 o
 u
 l
 d
-
+ 
 s
 m
 e
 l
 l
-
+ 
 t
 h
 e
-
+ 
 f
 e
 a
 r
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 h
 i
 s
-
+ 
 c
 l
 o
@@ -3049,7 +3049,7 @@ h
 e
 s
 .
-
+ 
 S
 u
 d
@@ -3058,7 +3058,7 @@ e
 n
 l
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3071,29 +3071,29 @@ n
 e
 x
 t
-
+ 
 t
 o
-
+ 
 h
 i
 m
 ,
-
+ 
 w
 i
 t
 h
-
+ 
 a
-
+ 
 b
 a
 r
 e
 l
 y
-
+ 
 n
 o
 t
@@ -3104,7 +3104,7 @@ a
 b
 l
 e
-
+ 
 s
 q
 u
@@ -3112,20 +3112,20 @@ e
 a
 k
 ,
-
+ 
 a
-
+ 
 d
 o
 o
 r
-
+ 
 s
 w
 u
 n
 g
-
+ 
 q
 u
 i
@@ -3133,25 +3133,25 @@ e
 t
 l
 y
-
+ 
 t
 o
-
+ 
 a
 n
 d
-
+ 
 f
 r
 o
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 n
 i
 g
@@ -3159,7 +3159,7 @@ h
 t
 '
 s
-
+ 
 b
 r
 e
@@ -3167,7 +3167,7 @@ e
 z
 e
 .
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3181,74 +3181,74 @@ o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 b
 e
-
+ 
 t
 h
 e
-
+ 
 h
 a
 v
 e
 n
-
+ 
 h
 e
 '
 d
-
+ 
 p
 r
 a
 y
 e
 d
-
+ 
 f
 o
 r
 ?
-
+ 
 S
 l
 o
 w
 l
 y
-
+ 
 h
 e
-
+ 
 s
 l
 i
 d
-
+ 
 t
 o
 w
 a
 r
 d
-
+ 
 t
 h
 e
-
+ 
 d
 o
 o
 r
 ,
-
+ 
 p
 r
 e
@@ -3257,7 +3257,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -3265,16 +3265,16 @@ s
 e
 l
 f
-
+ 
 m
 o
 r
 e
-
+ 
 a
 n
 d
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3287,83 +3287,83 @@ m
 o
 r
 e
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
 ,
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 a
 w
 a
 y
-
+ 
 f
 r
 o
 m
-
+ 
 h
 i
 s
-
+ 
 e
 n
 e
 m
 y
 .
-
+ 
 W
 o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 d
 o
 o
 r
-
+ 
 s
 a
 v
 e
-
+ 
 h
 i
 s
-
+ 
 h
 i
 d
diff --git a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_writer.xml b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_writer.xml
index 8b773553d793..254f591c0e2f 100644
--- a/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_writer.xml
+++ b/sdext/source/pdfimport/test/testdocs/pictxt_pdfi_unittest_writer.xml
@@ -43,7 +43,7 @@ UDYKMTAwIDQwCjI1NQr/////////////////////////////////////////////////////////////
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
+He heard quiet steps behind him. That didn't bode well. Who could be following him this late at 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -52,7 +52,7 @@ He heard quiet steps behind him. That didn't bode well. Who could be following h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
+night and in this deadbeat part of town? And at this particular moment, just after he pulled off the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -61,7 +61,7 @@ night and in this deadbeat part of town? And at this particular moment, just aft
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-big time and was making off with the greenbacks. Was there another crook who'd had the same
+big time and was making off with the greenbacks. Was there another crook who'd had the same 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -70,7 +70,7 @@ big time and was making off with the greenbacks. Was there another crook who'd h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
+idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -79,7 +79,7 @@ idea, and was now watching him and waiting for a chance to grab the fruit of his
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-steps behind him mean that one of many law officers in town was on to him and just waiting to
+steps behind him mean that one of many law officers in town was on to him and just waiting to 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -88,7 +88,7 @@ steps behind him mean that one of many law officers in town was on to him and ju
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
+pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -97,7 +97,7 @@ pounce and snap those cuffs on his wrists? He nervously looked all around. Sudde
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
+alley. Like lightning he darted off to the left and disappeared between the two warehouses almost 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -106,7 +106,7 @@ alley. Like lightning he darted off to the left and disappeared between the two
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
+falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -115,7 +115,7 @@ falling over the trash can lying in the middle of the sidewalk. He tried to nerv
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
+along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -124,7 +124,7 @@ along in the inky darkness and suddenly stiffened: it was a dead-end, he would h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-way he had come. The steps got louder and louder, he saw the black outline of a figure coming
+way he had come. The steps got louder and louder, he saw the black outline of a figure coming 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -133,7 +133,7 @@ way he had come. The steps got louder and louder, he saw the black outline of a
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-around the corner. Is this the end of the line? he thought pressing himself back against the wall
+around the corner. Is this the end of the line? he thought pressing himself back against the wall 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -142,7 +142,7 @@ around the corner. Is this the end of the line? he thought pressing himself back
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-trying to make himself invisible in the dark, was all that planning and energy wasted? He was
+trying to make himself invisible in the dark, was all that planning and energy wasted? He was 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -151,7 +151,7 @@ trying to make himself invisible in the dark, was all that planning and energy w
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
+dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -160,7 +160,7 @@ dripping with sweat now, cold and wet, he could smell the fear coming off his cl
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
+next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze. 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -169,7 +169,7 @@ next to him, with a barely noticeable squeak, a door swung quietly to and fro in
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
+Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -187,7 +187,7 @@ more into the wall, into the dark, away from his enemy. Would this door save his
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
+He heard quiet steps behind him. That didn't bode well. Who could be following him this late at 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -196,7 +196,7 @@ He heard quiet steps behind him. That didn't bode well. Who could be following h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
+night and in this deadbeat part of town? And at this particular moment, just after he pulled off the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -205,7 +205,7 @@ night and in this deadbeat part of town? And at this particular moment, just aft
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-big time and was making off with the greenbacks. Was there another crook who'd had the same
+big time and was making off with the greenbacks. Was there another crook who'd had the same 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -214,7 +214,7 @@ big time and was making off with the greenbacks. Was there another crook who'd h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
+idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -223,7 +223,7 @@ idea, and was now watching him and waiting for a chance to grab the fruit of his
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-steps behind him mean that one of many law officers in town was on to him and just waiting to
+steps behind him mean that one of many law officers in town was on to him and just waiting to 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -232,7 +232,7 @@ steps behind him mean that one of many law officers in town was on to him and ju
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
+pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -241,7 +241,7 @@ pounce and snap those cuffs on his wrists? He nervously looked all around. Sudde
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
+alley. Like lightning he darted off to the left and disappeared between the two warehouses almost 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -250,7 +250,7 @@ alley. Like lightning he darted off to the left and disappeared between the two
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
+falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -259,7 +259,7 @@ falling over the trash can lying in the middle of the sidewalk. He tried to nerv
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
+along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -268,7 +268,7 @@ along in the inky darkness and suddenly stiffened: it was a dead-end, he would h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-way he had come. The steps got louder and louder, he saw the black outline of a figure coming
+way he had come. The steps got louder and louder, he saw the black outline of a figure coming 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -277,7 +277,7 @@ way he had come. The steps got louder and louder, he saw the black outline of a
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-around the corner. Is this the end of the line? he thought pressing himself back against the wall
+around the corner. Is this the end of the line? he thought pressing himself back against the wall 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -286,7 +286,7 @@ around the corner. Is this the end of the line? he thought pressing himself back
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-trying to make himself invisible in the dark, was all that planning and energy wasted? He was
+trying to make himself invisible in the dark, was all that planning and energy wasted? He was 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -295,7 +295,7 @@ trying to make himself invisible in the dark, was all that planning and energy w
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
+dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -304,7 +304,7 @@ dripping with sweat now, cold and wet, he could smell the fear coming off his cl
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
+next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze. 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -313,7 +313,7 @@ next to him, with a barely noticeable squeak, a door swung quietly to and fro in
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
+Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and 
 </text:span>
 </text:p>
 </draw:text-box>
diff --git a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_draw.xml b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_draw.xml
index da1251864b43..c86473047278 100644
--- a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_draw.xml
+++ b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_draw.xml
@@ -36,73 +36,73 @@
 <text:span text:style-name="text7" >
 H
 e
-
+ 
 h
 e
 a
 r
 d
-
+ 
 q
 u
 i
 e
 t
-
+ 
 s
 t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
 .
-
+ 
 T
 h
 a
 t
-
+ 
 d
 i
 d
 n
 '
 t
-
+ 
 b
 o
 d
 e
-
+ 
 w
 e
 l
 l
 .
-
+ 
 W
 h
 o
-
+ 
 c
 o
 u
 l
 d
-
+ 
 b
 e
-
+ 
 f
 o
 l
@@ -112,24 +112,24 @@ w
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 t
 h
 i
 s
-
+ 
 l
 a
 t
 e
-
+ 
 a
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -143,19 +143,19 @@ i
 g
 h
 t
-
+ 
 a
 n
 d
-
+ 
 i
 n
-
+ 
 t
 h
 i
 s
-
+ 
 d
 e
 a
@@ -164,33 +164,33 @@ b
 e
 a
 t
-
+ 
 p
 a
 r
 t
-
+ 
 o
 f
-
+ 
 t
 o
 w
 n
 ?
-
+ 
 A
 n
 d
-
+ 
 a
 t
-
+ 
 t
 h
 i
 s
-
+ 
 p
 a
 r
@@ -201,7 +201,7 @@ u
 l
 a
 r
-
+ 
 m
 o
 m
@@ -209,36 +209,36 @@ e
 n
 t
 ,
-
+ 
 j
 u
 s
 t
-
+ 
 a
 f
 t
 e
 r
-
+ 
 h
 e
-
+ 
 p
 u
 l
 l
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -250,40 +250,40 @@ e
 b
 i
 g
-
+ 
 t
 i
 m
 e
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 m
 a
 k
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 w
 i
 t
 h
-
+ 
 t
 h
 e
-
+ 
 g
 r
 e
@@ -295,17 +295,17 @@ c
 k
 s
 .
-
+ 
 W
 a
 s
-
+ 
 t
 h
 e
 r
 e
-
+ 
 a
 n
 o
@@ -313,32 +313,32 @@ t
 h
 e
 r
-
+ 
 c
 r
 o
 o
 k
-
+ 
 w
 h
 o
 '
 d
-
+ 
 h
 a
 d
-
+ 
 t
 h
 e
-
+ 
 s
 a
 m
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -352,19 +352,19 @@ d
 e
 a
 ,
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 n
 o
 w
-
+ 
 w
 a
 t
@@ -373,15 +373,15 @@ h
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 w
 a
 i
@@ -389,63 +389,63 @@ t
 i
 n
 g
-
+ 
 f
 o
 r
-
+ 
 a
-
+ 
 c
 h
 a
 n
 c
 e
-
+ 
 t
 o
-
+ 
 g
 r
 a
 b
-
+ 
 t
 h
 e
-
+ 
 f
 r
 u
 i
 t
-
+ 
 o
 f
-
+ 
 h
 i
 s
-
+ 
 l
 a
 b
 o
 r
 ?
-
+ 
 O
 r
-
+ 
 d
 i
 d
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -459,44 +459,44 @@ t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
-
+ 
 m
 e
 a
 n
-
+ 
 t
 h
 a
 t
-
+ 
 o
 n
 e
-
+ 
 o
 f
-
+ 
 m
 a
 n
 y
-
+ 
 l
 a
 w
-
+ 
 o
 f
 f
@@ -505,38 +505,38 @@ c
 e
 r
 s
-
+ 
 i
 n
-
+ 
 t
 o
 w
 n
-
+ 
 w
 a
 s
-
+ 
 o
 n
-
+ 
 t
 o
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 j
 u
 s
 t
-
+ 
 w
 a
 i
@@ -544,10 +544,10 @@ t
 i
 n
 g
-
+ 
 t
 o
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -562,35 +562,35 @@ u
 n
 c
 e
-
+ 
 a
 n
 d
-
+ 
 s
 n
 a
 p
-
+ 
 t
 h
 o
 s
 e
-
+ 
 c
 u
 f
 f
 s
-
+ 
 o
 n
-
+ 
 h
 i
 s
-
+ 
 w
 r
 i
@@ -598,10 +598,10 @@ s
 t
 s
 ?
-
+ 
 H
 e
-
+ 
 n
 e
 r
@@ -611,18 +611,18 @@ u
 s
 l
 y
-
+ 
 l
 o
 o
 k
 e
 d
-
+ 
 a
 l
 l
-
+ 
 a
 r
 o
@@ -630,7 +630,7 @@ u
 n
 d
 .
-
+ 
 S
 u
 d
@@ -639,18 +639,18 @@ e
 n
 l
 y
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -665,12 +665,12 @@ l
 e
 y
 .
-
+ 
 L
 i
 k
 e
-
+ 
 l
 i
 g
@@ -680,37 +680,37 @@ n
 i
 n
 g
-
+ 
 h
 e
-
+ 
 d
 a
 r
 t
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 o
-
+ 
 t
 h
 e
-
+ 
 l
 e
 f
 t
-
+ 
 a
 n
 d
-
+ 
 d
 i
 s
@@ -722,7 +722,7 @@ a
 r
 e
 d
-
+ 
 b
 e
 t
@@ -730,15 +730,15 @@ w
 e
 e
 n
-
+ 
 t
 h
 e
-
+ 
 t
 w
 o
-
+ 
 w
 a
 r
@@ -749,14 +749,14 @@ u
 s
 e
 s
-
+ 
 a
 l
 m
 o
 s
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -772,53 +772,53 @@ l
 i
 n
 g
-
+ 
 o
 v
 e
 r
-
+ 
 t
 h
 e
-
+ 
 t
 r
 a
 s
 h
-
+ 
 c
 a
 n
-
+ 
 l
 y
 i
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 m
 i
 d
 d
 l
 e
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 s
 i
 d
@@ -828,19 +828,19 @@ a
 l
 k
 .
-
+ 
 H
 e
-
+ 
 t
 r
 i
 e
 d
-
+ 
 t
 o
-
+ 
 n
 e
 r
@@ -850,19 +850,19 @@ u
 s
 l
 y
-
+ 
 t
 a
 p
-
+ 
 h
 i
 s
-
+ 
 w
 a
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -876,19 +876,19 @@ l
 o
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 i
 n
 k
 y
-
+ 
 d
 a
 r
@@ -897,11 +897,11 @@ n
 e
 s
 s
-
+ 
 a
 n
 d
-
+ 
 s
 u
 d
@@ -910,7 +910,7 @@ e
 n
 l
 y
-
+ 
 s
 t
 i
@@ -921,16 +921,16 @@ n
 e
 d
 :
-
+ 
 i
 t
-
+ 
 w
 a
 s
-
+ 
 a
-
+ 
 d
 e
 a
@@ -940,36 +940,36 @@ e
 n
 d
 ,
-
+ 
 h
 e
-
+ 
 w
 o
 u
 l
 d
-
+ 
 h
 a
 v
 e
-
+ 
 t
 o
-
+ 
 g
 o
-
+ 
 b
 a
 c
 k
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -981,45 +981,45 @@ e
 w
 a
 y
-
+ 
 h
 e
-
+ 
 h
 a
 d
-
+ 
 c
 o
 m
 e
 .
-
+ 
 T
 h
 e
-
+ 
 s
 t
 e
 p
 s
-
+ 
 g
 o
 t
-
+ 
 l
 o
 u
 d
 e
 r
-
+ 
 a
 n
 d
-
+ 
 l
 o
 u
@@ -1027,24 +1027,24 @@ d
 e
 r
 ,
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 b
 l
 a
 c
 k
-
+ 
 o
 u
 t
@@ -1052,26 +1052,26 @@ l
 i
 n
 e
-
+ 
 o
 f
-
+ 
 a
-
+ 
 f
 i
 g
 u
 r
 e
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1086,11 +1086,11 @@ o
 u
 n
 d
-
+ 
 t
 h
 e
-
+ 
 c
 o
 r
@@ -1098,39 +1098,39 @@ n
 e
 r
 .
-
+ 
 I
 s
-
+ 
 t
 h
 i
 s
-
+ 
 t
 h
 e
-
+ 
 e
 n
 d
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 l
 i
 n
 e
 ?
-
+ 
 h
 e
-
+ 
 t
 h
 o
@@ -1138,7 +1138,7 @@ u
 g
 h
 t
-
+ 
 p
 r
 e
@@ -1147,7 +1147,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -1155,12 +1155,12 @@ s
 e
 l
 f
-
+ 
 b
 a
 c
 k
-
+ 
 a
 g
 a
@@ -1168,16 +1168,16 @@ i
 n
 s
 t
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1192,15 +1192,15 @@ y
 i
 n
 g
-
+ 
 t
 o
-
+ 
 m
 a
 k
 e
-
+ 
 h
 i
 m
@@ -1208,7 +1208,7 @@ s
 e
 l
 f
-
+ 
 i
 n
 v
@@ -1218,33 +1218,33 @@ i
 b
 l
 e
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 w
 a
 s
-
+ 
 a
 l
 l
-
+ 
 t
 h
 a
 t
-
+ 
 p
 l
 a
@@ -1253,18 +1253,18 @@ n
 i
 n
 g
-
+ 
 a
 n
 d
-
+ 
 e
 n
 e
 r
 g
 y
-
+ 
 w
 a
 s
@@ -1272,14 +1272,14 @@ t
 e
 d
 ?
-
+ 
 H
 e
-
+ 
 w
 a
 s
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1296,76 +1296,76 @@ p
 i
 n
 g
-
+ 
 w
 i
 t
 h
-
+ 
 s
 w
 e
 a
 t
-
+ 
 n
 o
 w
 ,
-
+ 
 c
 o
 l
 d
-
+ 
 a
 n
 d
-
+ 
 w
 e
 t
 ,
-
+ 
 h
 e
-
+ 
 c
 o
 u
 l
 d
-
+ 
 s
 m
 e
 l
 l
-
+ 
 t
 h
 e
-
+ 
 f
 e
 a
 r
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 h
 i
 s
-
+ 
 c
 l
 o
@@ -1374,7 +1374,7 @@ h
 e
 s
 .
-
+ 
 S
 u
 d
@@ -1383,7 +1383,7 @@ e
 n
 l
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1396,29 +1396,29 @@ n
 e
 x
 t
-
+ 
 t
 o
-
+ 
 h
 i
 m
 ,
-
+ 
 w
 i
 t
 h
-
+ 
 a
-
+ 
 b
 a
 r
 e
 l
 y
-
+ 
 n
 o
 t
@@ -1429,7 +1429,7 @@ a
 b
 l
 e
-
+ 
 s
 q
 u
@@ -1437,20 +1437,20 @@ e
 a
 k
 ,
-
+ 
 a
-
+ 
 d
 o
 o
 r
-
+ 
 s
 w
 u
 n
 g
-
+ 
 q
 u
 i
@@ -1458,25 +1458,25 @@ e
 t
 l
 y
-
+ 
 t
 o
-
+ 
 a
 n
 d
-
+ 
 f
 r
 o
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 n
 i
 g
@@ -1484,7 +1484,7 @@ h
 t
 '
 s
-
+ 
 b
 r
 e
@@ -1492,7 +1492,7 @@ e
 z
 e
 .
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1506,74 +1506,74 @@ o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 b
 e
-
+ 
 t
 h
 e
-
+ 
 h
 a
 v
 e
 n
-
+ 
 h
 e
 '
 d
-
+ 
 p
 r
 a
 y
 e
 d
-
+ 
 f
 o
 r
 ?
-
+ 
 S
 l
 o
 w
 l
 y
-
+ 
 h
 e
-
+ 
 s
 l
 i
 d
-
+ 
 t
 o
 w
 a
 r
 d
-
+ 
 t
 h
 e
-
+ 
 d
 o
 o
 r
 ,
-
+ 
 p
 r
 e
@@ -1582,7 +1582,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -1590,16 +1590,16 @@ s
 e
 l
 f
-
+ 
 m
 o
 r
 e
-
+ 
 a
 n
 d
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1612,83 +1612,83 @@ m
 o
 r
 e
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
 ,
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 a
 w
 a
 y
-
+ 
 f
 r
 o
 m
-
+ 
 h
 i
 s
-
+ 
 e
 n
 e
 m
 y
 .
-
+ 
 W
 o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 d
 o
 o
 r
-
+ 
 s
 a
 v
 e
-
+ 
 h
 i
 s
-
+ 
 h
 i
 d
@@ -1704,73 +1704,73 @@ e
 <text:span text:style-name="text7" >
 H
 e
-
+ 
 h
 e
 a
 r
 d
-
+ 
 q
 u
 i
 e
 t
-
+ 
 s
 t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
 .
-
+ 
 T
 h
 a
 t
-
+ 
 d
 i
 d
 n
 '
 t
-
+ 
 b
 o
 d
 e
-
+ 
 w
 e
 l
 l
 .
-
+ 
 W
 h
 o
-
+ 
 c
 o
 u
 l
 d
-
+ 
 b
 e
-
+ 
 f
 o
 l
@@ -1780,24 +1780,24 @@ w
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 t
 h
 i
 s
-
+ 
 l
 a
 t
 e
-
+ 
 a
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1811,19 +1811,19 @@ i
 g
 h
 t
-
+ 
 a
 n
 d
-
+ 
 i
 n
-
+ 
 t
 h
 i
 s
-
+ 
 d
 e
 a
@@ -1832,33 +1832,33 @@ b
 e
 a
 t
-
+ 
 p
 a
 r
 t
-
+ 
 o
 f
-
+ 
 t
 o
 w
 n
 ?
-
+ 
 A
 n
 d
-
+ 
 a
 t
-
+ 
 t
 h
 i
 s
-
+ 
 p
 a
 r
@@ -1869,7 +1869,7 @@ u
 l
 a
 r
-
+ 
 m
 o
 m
@@ -1877,36 +1877,36 @@ e
 n
 t
 ,
-
+ 
 j
 u
 s
 t
-
+ 
 a
 f
 t
 e
 r
-
+ 
 h
 e
-
+ 
 p
 u
 l
 l
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1918,40 +1918,40 @@ e
 b
 i
 g
-
+ 
 t
 i
 m
 e
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 m
 a
 k
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 w
 i
 t
 h
-
+ 
 t
 h
 e
-
+ 
 g
 r
 e
@@ -1963,17 +1963,17 @@ c
 k
 s
 .
-
+ 
 W
 a
 s
-
+ 
 t
 h
 e
 r
 e
-
+ 
 a
 n
 o
@@ -1981,32 +1981,32 @@ t
 h
 e
 r
-
+ 
 c
 r
 o
 o
 k
-
+ 
 w
 h
 o
 '
 d
-
+ 
 h
 a
 d
-
+ 
 t
 h
 e
-
+ 
 s
 a
 m
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2020,19 +2020,19 @@ d
 e
 a
 ,
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 n
 o
 w
-
+ 
 w
 a
 t
@@ -2041,15 +2041,15 @@ h
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 w
 a
 i
@@ -2057,63 +2057,63 @@ t
 i
 n
 g
-
+ 
 f
 o
 r
-
+ 
 a
-
+ 
 c
 h
 a
 n
 c
 e
-
+ 
 t
 o
-
+ 
 g
 r
 a
 b
-
+ 
 t
 h
 e
-
+ 
 f
 r
 u
 i
 t
-
+ 
 o
 f
-
+ 
 h
 i
 s
-
+ 
 l
 a
 b
 o
 r
 ?
-
+ 
 O
 r
-
+ 
 d
 i
 d
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2127,44 +2127,44 @@ t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
-
+ 
 m
 e
 a
 n
-
+ 
 t
 h
 a
 t
-
+ 
 o
 n
 e
-
+ 
 o
 f
-
+ 
 m
 a
 n
 y
-
+ 
 l
 a
 w
-
+ 
 o
 f
 f
@@ -2173,38 +2173,38 @@ c
 e
 r
 s
-
+ 
 i
 n
-
+ 
 t
 o
 w
 n
-
+ 
 w
 a
 s
-
+ 
 o
 n
-
+ 
 t
 o
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 j
 u
 s
 t
-
+ 
 w
 a
 i
@@ -2212,10 +2212,10 @@ t
 i
 n
 g
-
+ 
 t
 o
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2230,35 +2230,35 @@ u
 n
 c
 e
-
+ 
 a
 n
 d
-
+ 
 s
 n
 a
 p
-
+ 
 t
 h
 o
 s
 e
-
+ 
 c
 u
 f
 f
 s
-
+ 
 o
 n
-
+ 
 h
 i
 s
-
+ 
 w
 r
 i
@@ -2266,10 +2266,10 @@ s
 t
 s
 ?
-
+ 
 H
 e
-
+ 
 n
 e
 r
@@ -2279,18 +2279,18 @@ u
 s
 l
 y
-
+ 
 l
 o
 o
 k
 e
 d
-
+ 
 a
 l
 l
-
+ 
 a
 r
 o
@@ -2298,7 +2298,7 @@ u
 n
 d
 .
-
+ 
 S
 u
 d
@@ -2307,18 +2307,18 @@ e
 n
 l
 y
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2333,12 +2333,12 @@ l
 e
 y
 .
-
+ 
 L
 i
 k
 e
-
+ 
 l
 i
 g
@@ -2348,37 +2348,37 @@ n
 i
 n
 g
-
+ 
 h
 e
-
+ 
 d
 a
 r
 t
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 o
-
+ 
 t
 h
 e
-
+ 
 l
 e
 f
 t
-
+ 
 a
 n
 d
-
+ 
 d
 i
 s
@@ -2390,7 +2390,7 @@ a
 r
 e
 d
-
+ 
 b
 e
 t
@@ -2398,15 +2398,15 @@ w
 e
 e
 n
-
+ 
 t
 h
 e
-
+ 
 t
 w
 o
-
+ 
 w
 a
 r
@@ -2417,14 +2417,14 @@ u
 s
 e
 s
-
+ 
 a
 l
 m
 o
 s
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2440,53 +2440,53 @@ l
 i
 n
 g
-
+ 
 o
 v
 e
 r
-
+ 
 t
 h
 e
-
+ 
 t
 r
 a
 s
 h
-
+ 
 c
 a
 n
-
+ 
 l
 y
 i
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 m
 i
 d
 d
 l
 e
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 s
 i
 d
@@ -2496,19 +2496,19 @@ a
 l
 k
 .
-
+ 
 H
 e
-
+ 
 t
 r
 i
 e
 d
-
+ 
 t
 o
-
+ 
 n
 e
 r
@@ -2518,19 +2518,19 @@ u
 s
 l
 y
-
+ 
 t
 a
 p
-
+ 
 h
 i
 s
-
+ 
 w
 a
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2544,19 +2544,19 @@ l
 o
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 i
 n
 k
 y
-
+ 
 d
 a
 r
@@ -2565,11 +2565,11 @@ n
 e
 s
 s
-
+ 
 a
 n
 d
-
+ 
 s
 u
 d
@@ -2578,7 +2578,7 @@ e
 n
 l
 y
-
+ 
 s
 t
 i
@@ -2589,16 +2589,16 @@ n
 e
 d
 :
-
+ 
 i
 t
-
+ 
 w
 a
 s
-
+ 
 a
-
+ 
 d
 e
 a
@@ -2608,36 +2608,36 @@ e
 n
 d
 ,
-
+ 
 h
 e
-
+ 
 w
 o
 u
 l
 d
-
+ 
 h
 a
 v
 e
-
+ 
 t
 o
-
+ 
 g
 o
-
+ 
 b
 a
 c
 k
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2649,45 +2649,45 @@ e
 w
 a
 y
-
+ 
 h
 e
-
+ 
 h
 a
 d
-
+ 
 c
 o
 m
 e
 .
-
+ 
 T
 h
 e
-
+ 
 s
 t
 e
 p
 s
-
+ 
 g
 o
 t
-
+ 
 l
 o
 u
 d
 e
 r
-
+ 
 a
 n
 d
-
+ 
 l
 o
 u
@@ -2695,24 +2695,24 @@ d
 e
 r
 ,
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 b
 l
 a
 c
 k
-
+ 
 o
 u
 t
@@ -2720,26 +2720,26 @@ l
 i
 n
 e
-
+ 
 o
 f
-
+ 
 a
-
+ 
 f
 i
 g
 u
 r
 e
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2754,11 +2754,11 @@ o
 u
 n
 d
-
+ 
 t
 h
 e
-
+ 
 c
 o
 r
@@ -2766,39 +2766,39 @@ n
 e
 r
 .
-
+ 
 I
 s
-
+ 
 t
 h
 i
 s
-
+ 
 t
 h
 e
-
+ 
 e
 n
 d
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 l
 i
 n
 e
 ?
-
+ 
 h
 e
-
+ 
 t
 h
 o
@@ -2806,7 +2806,7 @@ u
 g
 h
 t
-
+ 
 p
 r
 e
@@ -2815,7 +2815,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -2823,12 +2823,12 @@ s
 e
 l
 f
-
+ 
 b
 a
 c
 k
-
+ 
 a
 g
 a
@@ -2836,16 +2836,16 @@ i
 n
 s
 t
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2860,15 +2860,15 @@ y
 i
 n
 g
-
+ 
 t
 o
-
+ 
 m
 a
 k
 e
-
+ 
 h
 i
 m
@@ -2876,7 +2876,7 @@ s
 e
 l
 f
-
+ 
 i
 n
 v
@@ -2886,33 +2886,33 @@ i
 b
 l
 e
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 w
 a
 s
-
+ 
 a
 l
 l
-
+ 
 t
 h
 a
 t
-
+ 
 p
 l
 a
@@ -2921,18 +2921,18 @@ n
 i
 n
 g
-
+ 
 a
 n
 d
-
+ 
 e
 n
 e
 r
 g
 y
-
+ 
 w
 a
 s
@@ -2940,14 +2940,14 @@ t
 e
 d
 ?
-
+ 
 H
 e
-
+ 
 w
 a
 s
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2964,76 +2964,76 @@ p
 i
 n
 g
-
+ 
 w
 i
 t
 h
-
+ 
 s
 w
 e
 a
 t
-
+ 
 n
 o
 w
 ,
-
+ 
 c
 o
 l
 d
-
+ 
 a
 n
 d
-
+ 
 w
 e
 t
 ,
-
+ 
 h
 e
-
+ 
 c
 o
 u
 l
 d
-
+ 
 s
 m
 e
 l
 l
-
+ 
 t
 h
 e
-
+ 
 f
 e
 a
 r
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 h
 i
 s
-
+ 
 c
 l
 o
@@ -3042,7 +3042,7 @@ h
 e
 s
 .
-
+ 
 S
 u
 d
@@ -3051,7 +3051,7 @@ e
 n
 l
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3064,29 +3064,29 @@ n
 e
 x
 t
-
+ 
 t
 o
-
+ 
 h
 i
 m
 ,
-
+ 
 w
 i
 t
 h
-
+ 
 a
-
+ 
 b
 a
 r
 e
 l
 y
-
+ 
 n
 o
 t
@@ -3097,7 +3097,7 @@ a
 b
 l
 e
-
+ 
 s
 q
 u
@@ -3105,20 +3105,20 @@ e
 a
 k
 ,
-
+ 
 a
-
+ 
 d
 o
 o
 r
-
+ 
 s
 w
 u
 n
 g
-
+ 
 q
 u
 i
@@ -3126,25 +3126,25 @@ e
 t
 l
 y
-
+ 
 t
 o
-
+ 
 a
 n
 d
-
+ 
 f
 r
 o
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 n
 i
 g
@@ -3152,7 +3152,7 @@ h
 t
 '
 s
-
+ 
 b
 r
 e
@@ -3160,7 +3160,7 @@ e
 z
 e
 .
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3174,74 +3174,74 @@ o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 b
 e
-
+ 
 t
 h
 e
-
+ 
 h
 a
 v
 e
 n
-
+ 
 h
 e
 '
 d
-
+ 
 p
 r
 a
 y
 e
 d
-
+ 
 f
 o
 r
 ?
-
+ 
 S
 l
 o
 w
 l
 y
-
+ 
 h
 e
-
+ 
 s
 l
 i
 d
-
+ 
 t
 o
 w
 a
 r
 d
-
+ 
 t
 h
 e
-
+ 
 d
 o
 o
 r
 ,
-
+ 
 p
 r
 e
@@ -3250,7 +3250,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -3258,16 +3258,16 @@ s
 e
 l
 f
-
+ 
 m
 o
 r
 e
-
+ 
 a
 n
 d
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3280,83 +3280,83 @@ m
 o
 r
 e
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
 ,
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 a
 w
 a
 y
-
+ 
 f
 r
 o
 m
-
+ 
 h
 i
 s
-
+ 
 e
 n
 e
 m
 y
 .
-
+ 
 W
 o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 d
 o
 o
 r
-
+ 
 s
 a
 v
 e
-
+ 
 h
 i
 s
-
+ 
 h
 i
 d
diff --git a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_impress.xml b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_impress.xml
index a57b2bc750de..eb0bedc3fd69 100644
--- a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_impress.xml
+++ b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_impress.xml
@@ -36,73 +36,73 @@
 <text:span text:style-name="text7" >
 H
 e
-
+ 
 h
 e
 a
 r
 d
-
+ 
 q
 u
 i
 e
 t
-
+ 
 s
 t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
 .
-
+ 
 T
 h
 a
 t
-
+ 
 d
 i
 d
 n
 '
 t
-
+ 
 b
 o
 d
 e
-
+ 
 w
 e
 l
 l
 .
-
+ 
 W
 h
 o
-
+ 
 c
 o
 u
 l
 d
-
+ 
 b
 e
-
+ 
 f
 o
 l
@@ -112,24 +112,24 @@ w
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 t
 h
 i
 s
-
+ 
 l
 a
 t
 e
-
+ 
 a
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -143,19 +143,19 @@ i
 g
 h
 t
-
+ 
 a
 n
 d
-
+ 
 i
 n
-
+ 
 t
 h
 i
 s
-
+ 
 d
 e
 a
@@ -164,33 +164,33 @@ b
 e
 a
 t
-
+ 
 p
 a
 r
 t
-
+ 
 o
 f
-
+ 
 t
 o
 w
 n
 ?
-
+ 
 A
 n
 d
-
+ 
 a
 t
-
+ 
 t
 h
 i
 s
-
+ 
 p
 a
 r
@@ -201,7 +201,7 @@ u
 l
 a
 r
-
+ 
 m
 o
 m
@@ -209,36 +209,36 @@ e
 n
 t
 ,
-
+ 
 j
 u
 s
 t
-
+ 
 a
 f
 t
 e
 r
-
+ 
 h
 e
-
+ 
 p
 u
 l
 l
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -250,40 +250,40 @@ e
 b
 i
 g
-
+ 
 t
 i
 m
 e
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 m
 a
 k
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 w
 i
 t
 h
-
+ 
 t
 h
 e
-
+ 
 g
 r
 e
@@ -295,17 +295,17 @@ c
 k
 s
 .
-
+ 
 W
 a
 s
-
+ 
 t
 h
 e
 r
 e
-
+ 
 a
 n
 o
@@ -313,32 +313,32 @@ t
 h
 e
 r
-
+ 
 c
 r
 o
 o
 k
-
+ 
 w
 h
 o
 '
 d
-
+ 
 h
 a
 d
-
+ 
 t
 h
 e
-
+ 
 s
 a
 m
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -352,19 +352,19 @@ d
 e
 a
 ,
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 n
 o
 w
-
+ 
 w
 a
 t
@@ -373,15 +373,15 @@ h
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 w
 a
 i
@@ -389,63 +389,63 @@ t
 i
 n
 g
-
+ 
 f
 o
 r
-
+ 
 a
-
+ 
 c
 h
 a
 n
 c
 e
-
+ 
 t
 o
-
+ 
 g
 r
 a
 b
-
+ 
 t
 h
 e
-
+ 
 f
 r
 u
 i
 t
-
+ 
 o
 f
-
+ 
 h
 i
 s
-
+ 
 l
 a
 b
 o
 r
 ?
-
+ 
 O
 r
-
+ 
 d
 i
 d
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -459,44 +459,44 @@ t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
-
+ 
 m
 e
 a
 n
-
+ 
 t
 h
 a
 t
-
+ 
 o
 n
 e
-
+ 
 o
 f
-
+ 
 m
 a
 n
 y
-
+ 
 l
 a
 w
-
+ 
 o
 f
 f
@@ -505,38 +505,38 @@ c
 e
 r
 s
-
+ 
 i
 n
-
+ 
 t
 o
 w
 n
-
+ 
 w
 a
 s
-
+ 
 o
 n
-
+ 
 t
 o
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 j
 u
 s
 t
-
+ 
 w
 a
 i
@@ -544,10 +544,10 @@ t
 i
 n
 g
-
+ 
 t
 o
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -562,35 +562,35 @@ u
 n
 c
 e
-
+ 
 a
 n
 d
-
+ 
 s
 n
 a
 p
-
+ 
 t
 h
 o
 s
 e
-
+ 
 c
 u
 f
 f
 s
-
+ 
 o
 n
-
+ 
 h
 i
 s
-
+ 
 w
 r
 i
@@ -598,10 +598,10 @@ s
 t
 s
 ?
-
+ 
 H
 e
-
+ 
 n
 e
 r
@@ -611,18 +611,18 @@ u
 s
 l
 y
-
+ 
 l
 o
 o
 k
 e
 d
-
+ 
 a
 l
 l
-
+ 
 a
 r
 o
@@ -630,7 +630,7 @@ u
 n
 d
 .
-
+ 
 S
 u
 d
@@ -639,18 +639,18 @@ e
 n
 l
 y
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -665,12 +665,12 @@ l
 e
 y
 .
-
+ 
 L
 i
 k
 e
-
+ 
 l
 i
 g
@@ -680,37 +680,37 @@ n
 i
 n
 g
-
+ 
 h
 e
-
+ 
 d
 a
 r
 t
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 o
-
+ 
 t
 h
 e
-
+ 
 l
 e
 f
 t
-
+ 
 a
 n
 d
-
+ 
 d
 i
 s
@@ -722,7 +722,7 @@ a
 r
 e
 d
-
+ 
 b
 e
 t
@@ -730,15 +730,15 @@ w
 e
 e
 n
-
+ 
 t
 h
 e
-
+ 
 t
 w
 o
-
+ 
 w
 a
 r
@@ -749,14 +749,14 @@ u
 s
 e
 s
-
+ 
 a
 l
 m
 o
 s
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -772,53 +772,53 @@ l
 i
 n
 g
-
+ 
 o
 v
 e
 r
-
+ 
 t
 h
 e
-
+ 
 t
 r
 a
 s
 h
-
+ 
 c
 a
 n
-
+ 
 l
 y
 i
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 m
 i
 d
 d
 l
 e
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 s
 i
 d
@@ -828,19 +828,19 @@ a
 l
 k
 .
-
+ 
 H
 e
-
+ 
 t
 r
 i
 e
 d
-
+ 
 t
 o
-
+ 
 n
 e
 r
@@ -850,19 +850,19 @@ u
 s
 l
 y
-
+ 
 t
 a
 p
-
+ 
 h
 i
 s
-
+ 
 w
 a
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -876,19 +876,19 @@ l
 o
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 i
 n
 k
 y
-
+ 
 d
 a
 r
@@ -897,11 +897,11 @@ n
 e
 s
 s
-
+ 
 a
 n
 d
-
+ 
 s
 u
 d
@@ -910,7 +910,7 @@ e
 n
 l
 y
-
+ 
 s
 t
 i
@@ -921,16 +921,16 @@ n
 e
 d
 :
-
+ 
 i
 t
-
+ 
 w
 a
 s
-
+ 
 a
-
+ 
 d
 e
 a
@@ -940,36 +940,36 @@ e
 n
 d
 ,
-
+ 
 h
 e
-
+ 
 w
 o
 u
 l
 d
-
+ 
 h
 a
 v
 e
-
+ 
 t
 o
-
+ 
 g
 o
-
+ 
 b
 a
 c
 k
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -981,45 +981,45 @@ e
 w
 a
 y
-
+ 
 h
 e
-
+ 
 h
 a
 d
-
+ 
 c
 o
 m
 e
 .
-
+ 
 T
 h
 e
-
+ 
 s
 t
 e
 p
 s
-
+ 
 g
 o
 t
-
+ 
 l
 o
 u
 d
 e
 r
-
+ 
 a
 n
 d
-
+ 
 l
 o
 u
@@ -1027,24 +1027,24 @@ d
 e
 r
 ,
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 b
 l
 a
 c
 k
-
+ 
 o
 u
 t
@@ -1052,26 +1052,26 @@ l
 i
 n
 e
-
+ 
 o
 f
-
+ 
 a
-
+ 
 f
 i
 g
 u
 r
 e
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1086,11 +1086,11 @@ o
 u
 n
 d
-
+ 
 t
 h
 e
-
+ 
 c
 o
 r
@@ -1098,39 +1098,39 @@ n
 e
 r
 .
-
+ 
 I
 s
-
+ 
 t
 h
 i
 s
-
+ 
 t
 h
 e
-
+ 
 e
 n
 d
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 l
 i
 n
 e
 ?
-
+ 
 h
 e
-
+ 
 t
 h
 o
@@ -1138,7 +1138,7 @@ u
 g
 h
 t
-
+ 
 p
 r
 e
@@ -1147,7 +1147,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -1155,12 +1155,12 @@ s
 e
 l
 f
-
+ 
 b
 a
 c
 k
-
+ 
 a
 g
 a
@@ -1168,16 +1168,16 @@ i
 n
 s
 t
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1192,15 +1192,15 @@ y
 i
 n
 g
-
+ 
 t
 o
-
+ 
 m
 a
 k
 e
-
+ 
 h
 i
 m
@@ -1208,7 +1208,7 @@ s
 e
 l
 f
-
+ 
 i
 n
 v
@@ -1218,33 +1218,33 @@ i
 b
 l
 e
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 w
 a
 s
-
+ 
 a
 l
 l
-
+ 
 t
 h
 a
 t
-
+ 
 p
 l
 a
@@ -1253,18 +1253,18 @@ n
 i
 n
 g
-
+ 
 a
 n
 d
-
+ 
 e
 n
 e
 r
 g
 y
-
+ 
 w
 a
 s
@@ -1272,14 +1272,14 @@ t
 e
 d
 ?
-
+ 
 H
 e
-
+ 
 w
 a
 s
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1296,76 +1296,76 @@ p
 i
 n
 g
-
+ 
 w
 i
 t
 h
-
+ 
 s
 w
 e
 a
 t
-
+ 
 n
 o
 w
 ,
-
+ 
 c
 o
 l
 d
-
+ 
 a
 n
 d
-
+ 
 w
 e
 t
 ,
-
+ 
 h
 e
-
+ 
 c
 o
 u
 l
 d
-
+ 
 s
 m
 e
 l
 l
-
+ 
 t
 h
 e
-
+ 
 f
 e
 a
 r
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 h
 i
 s
-
+ 
 c
 l
 o
@@ -1374,7 +1374,7 @@ h
 e
 s
 .
-
+ 
 S
 u
 d
@@ -1383,7 +1383,7 @@ e
 n
 l
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1396,29 +1396,29 @@ n
 e
 x
 t
-
+ 
 t
 o
-
+ 
 h
 i
 m
 ,
-
+ 
 w
 i
 t
 h
-
+ 
 a
-
+ 
 b
 a
 r
 e
 l
 y
-
+ 
 n
 o
 t
@@ -1429,7 +1429,7 @@ a
 b
 l
 e
-
+ 
 s
 q
 u
@@ -1437,20 +1437,20 @@ e
 a
 k
 ,
-
+ 
 a
-
+ 
 d
 o
 o
 r
-
+ 
 s
 w
 u
 n
 g
-
+ 
 q
 u
 i
@@ -1458,25 +1458,25 @@ e
 t
 l
 y
-
+ 
 t
 o
-
+ 
 a
 n
 d
-
+ 
 f
 r
 o
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 n
 i
 g
@@ -1484,7 +1484,7 @@ h
 t
 '
 s
-
+ 
 b
 r
 e
@@ -1492,7 +1492,7 @@ e
 z
 e
 .
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1506,74 +1506,74 @@ o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 b
 e
-
+ 
 t
 h
 e
-
+ 
 h
 a
 v
 e
 n
-
+ 
 h
 e
 '
 d
-
+ 
 p
 r
 a
 y
 e
 d
-
+ 
 f
 o
 r
 ?
-
+ 
 S
 l
 o
 w
 l
 y
-
+ 
 h
 e
-
+ 
 s
 l
 i
 d
-
+ 
 t
 o
 w
 a
 r
 d
-
+ 
 t
 h
 e
-
+ 
 d
 o
 o
 r
 ,
-
+ 
 p
 r
 e
@@ -1582,7 +1582,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -1590,16 +1590,16 @@ s
 e
 l
 f
-
+ 
 m
 o
 r
 e
-
+ 
 a
 n
 d
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1612,83 +1612,83 @@ m
 o
 r
 e
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
 ,
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 a
 w
 a
 y
-
+ 
 f
 r
 o
 m
-
+ 
 h
 i
 s
-
+ 
 e
 n
 e
 m
 y
 .
-
+ 
 W
 o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 d
 o
 o
 r
-
+ 
 s
 a
 v
 e
-
+ 
 h
 i
 s
-
+ 
 h
 i
 d
@@ -1704,73 +1704,73 @@ e
 <text:span text:style-name="text7" >
 H
 e
-
+ 
 h
 e
 a
 r
 d
-
+ 
 q
 u
 i
 e
 t
-
+ 
 s
 t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
 .
-
+ 
 T
 h
 a
 t
-
+ 
 d
 i
 d
 n
 '
 t
-
+ 
 b
 o
 d
 e
-
+ 
 w
 e
 l
 l
 .
-
+ 
 W
 h
 o
-
+ 
 c
 o
 u
 l
 d
-
+ 
 b
 e
-
+ 
 f
 o
 l
@@ -1780,24 +1780,24 @@ w
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 t
 h
 i
 s
-
+ 
 l
 a
 t
 e
-
+ 
 a
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1811,19 +1811,19 @@ i
 g
 h
 t
-
+ 
 a
 n
 d
-
+ 
 i
 n
-
+ 
 t
 h
 i
 s
-
+ 
 d
 e
 a
@@ -1832,33 +1832,33 @@ b
 e
 a
 t
-
+ 
 p
 a
 r
 t
-
+ 
 o
 f
-
+ 
 t
 o
 w
 n
 ?
-
+ 
 A
 n
 d
-
+ 
 a
 t
-
+ 
 t
 h
 i
 s
-
+ 
 p
 a
 r
@@ -1869,7 +1869,7 @@ u
 l
 a
 r
-
+ 
 m
 o
 m
@@ -1877,36 +1877,36 @@ e
 n
 t
 ,
-
+ 
 j
 u
 s
 t
-
+ 
 a
 f
 t
 e
 r
-
+ 
 h
 e
-
+ 
 p
 u
 l
 l
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1918,40 +1918,40 @@ e
 b
 i
 g
-
+ 
 t
 i
 m
 e
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 m
 a
 k
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 w
 i
 t
 h
-
+ 
 t
 h
 e
-
+ 
 g
 r
 e
@@ -1963,17 +1963,17 @@ c
 k
 s
 .
-
+ 
 W
 a
 s
-
+ 
 t
 h
 e
 r
 e
-
+ 
 a
 n
 o
@@ -1981,32 +1981,32 @@ t
 h
 e
 r
-
+ 
 c
 r
 o
 o
 k
-
+ 
 w
 h
 o
 '
 d
-
+ 
 h
 a
 d
-
+ 
 t
 h
 e
-
+ 
 s
 a
 m
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2020,19 +2020,19 @@ d
 e
 a
 ,
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 n
 o
 w
-
+ 
 w
 a
 t
@@ -2041,15 +2041,15 @@ h
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 w
 a
 i
@@ -2057,63 +2057,63 @@ t
 i
 n
 g
-
+ 
 f
 o
 r
-
+ 
 a
-
+ 
 c
 h
 a
 n
 c
 e
-
+ 
 t
 o
-
+ 
 g
 r
 a
 b
-
+ 
 t
 h
 e
-
+ 
 f
 r
 u
 i
 t
-
+ 
 o
 f
-
+ 
 h
 i
 s
-
+ 
 l
 a
 b
 o
 r
 ?
-
+ 
 O
 r
-
+ 
 d
 i
 d
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2127,44 +2127,44 @@ t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
-
+ 
 m
 e
 a
 n
-
+ 
 t
 h
 a
 t
-
+ 
 o
 n
 e
-
+ 
 o
 f
-
+ 
 m
 a
 n
 y
-
+ 
 l
 a
 w
-
+ 
 o
 f
 f
@@ -2173,38 +2173,38 @@ c
 e
 r
 s
-
+ 
 i
 n
-
+ 
 t
 o
 w
 n
-
+ 
 w
 a
 s
-
+ 
 o
 n
-
+ 
 t
 o
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 j
 u
 s
 t
-
+ 
 w
 a
 i
@@ -2212,10 +2212,10 @@ t
 i
 n
 g
-
+ 
 t
 o
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2230,35 +2230,35 @@ u
 n
 c
 e
-
+ 
 a
 n
 d
-
+ 
 s
 n
 a
 p
-
+ 
 t
 h
 o
 s
 e
-
+ 
 c
 u
 f
 f
 s
-
+ 
 o
 n
-
+ 
 h
 i
 s
-
+ 
 w
 r
 i
@@ -2266,10 +2266,10 @@ s
 t
 s
 ?
-
+ 
 H
 e
-
+ 
 n
 e
 r
@@ -2279,18 +2279,18 @@ u
 s
 l
 y
-
+ 
 l
 o
 o
 k
 e
 d
-
+ 
 a
 l
 l
-
+ 
 a
 r
 o
@@ -2298,7 +2298,7 @@ u
 n
 d
 .
-
+ 
 S
 u
 d
@@ -2307,18 +2307,18 @@ e
 n
 l
 y
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2333,12 +2333,12 @@ l
 e
 y
 .
-
+ 
 L
 i
 k
 e
-
+ 
 l
 i
 g
@@ -2348,37 +2348,37 @@ n
 i
 n
 g
-
+ 
 h
 e
-
+ 
 d
 a
 r
 t
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 o
-
+ 
 t
 h
 e
-
+ 
 l
 e
 f
 t
-
+ 
 a
 n
 d
-
+ 
 d
 i
 s
@@ -2390,7 +2390,7 @@ a
 r
 e
 d
-
+ 
 b
 e
 t
@@ -2398,15 +2398,15 @@ w
 e
 e
 n
-
+ 
 t
 h
 e
-
+ 
 t
 w
 o
-
+ 
 w
 a
 r
@@ -2417,14 +2417,14 @@ u
 s
 e
 s
-
+ 
 a
 l
 m
 o
 s
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2440,53 +2440,53 @@ l
 i
 n
 g
-
+ 
 o
 v
 e
 r
-
+ 
 t
 h
 e
-
+ 
 t
 r
 a
 s
 h
-
+ 
 c
 a
 n
-
+ 
 l
 y
 i
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 m
 i
 d
 d
 l
 e
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 s
 i
 d
@@ -2496,19 +2496,19 @@ a
 l
 k
 .
-
+ 
 H
 e
-
+ 
 t
 r
 i
 e
 d
-
+ 
 t
 o
-
+ 
 n
 e
 r
@@ -2518,19 +2518,19 @@ u
 s
 l
 y
-
+ 
 t
 a
 p
-
+ 
 h
 i
 s
-
+ 
 w
 a
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2544,19 +2544,19 @@ l
 o
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 i
 n
 k
 y
-
+ 
 d
 a
 r
@@ -2565,11 +2565,11 @@ n
 e
 s
 s
-
+ 
 a
 n
 d
-
+ 
 s
 u
 d
@@ -2578,7 +2578,7 @@ e
 n
 l
 y
-
+ 
 s
 t
 i
@@ -2589,16 +2589,16 @@ n
 e
 d
 :
-
+ 
 i
 t
-
+ 
 w
 a
 s
-
+ 
 a
-
+ 
 d
 e
 a
@@ -2608,36 +2608,36 @@ e
 n
 d
 ,
-
+ 
 h
 e
-
+ 
 w
 o
 u
 l
 d
-
+ 
 h
 a
 v
 e
-
+ 
 t
 o
-
+ 
 g
 o
-
+ 
 b
 a
 c
 k
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2649,45 +2649,45 @@ e
 w
 a
 y
-
+ 
 h
 e
-
+ 
 h
 a
 d
-
+ 
 c
 o
 m
 e
 .
-
+ 
 T
 h
 e
-
+ 
 s
 t
 e
 p
 s
-
+ 
 g
 o
 t
-
+ 
 l
 o
 u
 d
 e
 r
-
+ 
 a
 n
 d
-
+ 
 l
 o
 u
@@ -2695,24 +2695,24 @@ d
 e
 r
 ,
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 b
 l
 a
 c
 k
-
+ 
 o
 u
 t
@@ -2720,26 +2720,26 @@ l
 i
 n
 e
-
+ 
 o
 f
-
+ 
 a
-
+ 
 f
 i
 g
 u
 r
 e
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2754,11 +2754,11 @@ o
 u
 n
 d
-
+ 
 t
 h
 e
-
+ 
 c
 o
 r
@@ -2766,39 +2766,39 @@ n
 e
 r
 .
-
+ 
 I
 s
-
+ 
 t
 h
 i
 s
-
+ 
 t
 h
 e
-
+ 
 e
 n
 d
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 l
 i
 n
 e
 ?
-
+ 
 h
 e
-
+ 
 t
 h
 o
@@ -2806,7 +2806,7 @@ u
 g
 h
 t
-
+ 
 p
 r
 e
@@ -2815,7 +2815,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -2823,12 +2823,12 @@ s
 e
 l
 f
-
+ 
 b
 a
 c
 k
-
+ 
 a
 g
 a
@@ -2836,16 +2836,16 @@ i
 n
 s
 t
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2860,15 +2860,15 @@ y
 i
 n
 g
-
+ 
 t
 o
-
+ 
 m
 a
 k
 e
-
+ 
 h
 i
 m
@@ -2876,7 +2876,7 @@ s
 e
 l
 f
-
+ 
 i
 n
 v
@@ -2886,33 +2886,33 @@ i
 b
 l
 e
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 w
 a
 s
-
+ 
 a
 l
 l
-
+ 
 t
 h
 a
 t
-
+ 
 p
 l
 a
@@ -2921,18 +2921,18 @@ n
 i
 n
 g
-
+ 
 a
 n
 d
-
+ 
 e
 n
 e
 r
 g
 y
-
+ 
 w
 a
 s
@@ -2940,14 +2940,14 @@ t
 e
 d
 ?
-
+ 
 H
 e
-
+ 
 w
 a
 s
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2964,76 +2964,76 @@ p
 i
 n
 g
-
+ 
 w
 i
 t
 h
-
+ 
 s
 w
 e
 a
 t
-
+ 
 n
 o
 w
 ,
-
+ 
 c
 o
 l
 d
-
+ 
 a
 n
 d
-
+ 
 w
 e
 t
 ,
-
+ 
 h
 e
-
+ 
 c
 o
 u
 l
 d
-
+ 
 s
 m
 e
 l
 l
-
+ 
 t
 h
 e
-
+ 
 f
 e
 a
 r
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 h
 i
 s
-
+ 
 c
 l
 o
@@ -3042,7 +3042,7 @@ h
 e
 s
 .
-
+ 
 S
 u
 d
@@ -3051,7 +3051,7 @@ e
 n
 l
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3064,29 +3064,29 @@ n
 e
 x
 t
-
+ 
 t
 o
-
+ 
 h
 i
 m
 ,
-
+ 
 w
 i
 t
 h
-
+ 
 a
-
+ 
 b
 a
 r
 e
 l
 y
-
+ 
 n
 o
 t
@@ -3097,7 +3097,7 @@ a
 b
 l
 e
-
+ 
 s
 q
 u
@@ -3105,20 +3105,20 @@ e
 a
 k
 ,
-
+ 
 a
-
+ 
 d
 o
 o
 r
-
+ 
 s
 w
 u
 n
 g
-
+ 
 q
 u
 i
@@ -3126,25 +3126,25 @@ e
 t
 l
 y
-
+ 
 t
 o
-
+ 
 a
 n
 d
-
+ 
 f
 r
 o
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 n
 i
 g
@@ -3152,7 +3152,7 @@ h
 t
 '
 s
-
+ 
 b
 r
 e
@@ -3160,7 +3160,7 @@ e
 z
 e
 .
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3174,74 +3174,74 @@ o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 b
 e
-
+ 
 t
 h
 e
-
+ 
 h
 a
 v
 e
 n
-
+ 
 h
 e
 '
 d
-
+ 
 p
 r
 a
 y
 e
 d
-
+ 
 f
 o
 r
 ?
-
+ 
 S
 l
 o
 w
 l
 y
-
+ 
 h
 e
-
+ 
 s
 l
 i
 d
-
+ 
 t
 o
 w
 a
 r
 d
-
+ 
 t
 h
 e
-
+ 
 d
 o
 o
 r
 ,
-
+ 
 p
 r
 e
@@ -3250,7 +3250,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -3258,16 +3258,16 @@ s
 e
 l
 f
-
+ 
 m
 o
 r
 e
-
+ 
 a
 n
 d
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3280,83 +3280,83 @@ m
 o
 r
 e
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
 ,
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 a
 w
 a
 y
-
+ 
 f
 r
 o
 m
-
+ 
 h
 i
 s
-
+ 
 e
 n
 e
 m
 y
 .
-
+ 
 W
 o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 d
 o
 o
 r
-
+ 
 s
 a
 v
 e
-
+ 
 h
 i
 s
-
+ 
 h
 i
 d
diff --git a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_writer.xml b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_writer.xml
index 955b81b73a36..75d8958f3a92 100644
--- a/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_writer.xml
+++ b/sdext/source/pdfimport/test/testdocs/txtpic_pdfi_unittest_writer.xml
@@ -36,7 +36,7 @@
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
+He heard quiet steps behind him. That didn't bode well. Who could be following him this late at 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -45,7 +45,7 @@ He heard quiet steps behind him. That didn't bode well. Who could be following h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
+night and in this deadbeat part of town? And at this particular moment, just after he pulled off the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -54,7 +54,7 @@ night and in this deadbeat part of town? And at this particular moment, just aft
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-big time and was making off with the greenbacks. Was there another crook who'd had the same
+big time and was making off with the greenbacks. Was there another crook who'd had the same 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -63,7 +63,7 @@ big time and was making off with the greenbacks. Was there another crook who'd h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
+idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -72,7 +72,7 @@ idea, and was now watching him and waiting for a chance to grab the fruit of his
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-steps behind him mean that one of many law officers in town was on to him and just waiting to
+steps behind him mean that one of many law officers in town was on to him and just waiting to 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -81,7 +81,7 @@ steps behind him mean that one of many law officers in town was on to him and ju
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
+pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -90,7 +90,7 @@ pounce and snap those cuffs on his wrists? He nervously looked all around. Sudde
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
+alley. Like lightning he darted off to the left and disappeared between the two warehouses almost 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -99,7 +99,7 @@ alley. Like lightning he darted off to the left and disappeared between the two
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
+falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -108,7 +108,7 @@ falling over the trash can lying in the middle of the sidewalk. He tried to nerv
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
+along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -117,7 +117,7 @@ along in the inky darkness and suddenly stiffened: it was a dead-end, he would h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-way he had come. The steps got louder and louder, he saw the black outline of a figure coming
+way he had come. The steps got louder and louder, he saw the black outline of a figure coming 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -126,7 +126,7 @@ way he had come. The steps got louder and louder, he saw the black outline of a
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-around the corner. Is this the end of the line? he thought pressing himself back against the wall
+around the corner. Is this the end of the line? he thought pressing himself back against the wall 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -135,7 +135,7 @@ around the corner. Is this the end of the line? he thought pressing himself back
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-trying to make himself invisible in the dark, was all that planning and energy wasted? He was
+trying to make himself invisible in the dark, was all that planning and energy wasted? He was 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -144,7 +144,7 @@ trying to make himself invisible in the dark, was all that planning and energy w
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
+dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -153,7 +153,7 @@ dripping with sweat now, cold and wet, he could smell the fear coming off his cl
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
+next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze. 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -162,7 +162,7 @@ next to him, with a barely noticeable squeak, a door swung quietly to and fro in
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
+Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -180,7 +180,7 @@ more into the wall, into the dark, away from his enemy. Would this door save his
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
+He heard quiet steps behind him. That didn't bode well. Who could be following him this late at 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -189,7 +189,7 @@ He heard quiet steps behind him. That didn't bode well. Who could be following h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
+night and in this deadbeat part of town? And at this particular moment, just after he pulled off the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -198,7 +198,7 @@ night and in this deadbeat part of town? And at this particular moment, just aft
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-big time and was making off with the greenbacks. Was there another crook who'd had the same
+big time and was making off with the greenbacks. Was there another crook who'd had the same 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -207,7 +207,7 @@ big time and was making off with the greenbacks. Was there another crook who'd h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
+idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -216,7 +216,7 @@ idea, and was now watching him and waiting for a chance to grab the fruit of his
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-steps behind him mean that one of many law officers in town was on to him and just waiting to
+steps behind him mean that one of many law officers in town was on to him and just waiting to 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -225,7 +225,7 @@ steps behind him mean that one of many law officers in town was on to him and ju
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
+pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -234,7 +234,7 @@ pounce and snap those cuffs on his wrists? He nervously looked all around. Sudde
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
+alley. Like lightning he darted off to the left and disappeared between the two warehouses almost 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -243,7 +243,7 @@ alley. Like lightning he darted off to the left and disappeared between the two
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
+falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -252,7 +252,7 @@ falling over the trash can lying in the middle of the sidewalk. He tried to nerv
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
+along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -261,7 +261,7 @@ along in the inky darkness and suddenly stiffened: it was a dead-end, he would h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-way he had come. The steps got louder and louder, he saw the black outline of a figure coming
+way he had come. The steps got louder and louder, he saw the black outline of a figure coming 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -270,7 +270,7 @@ way he had come. The steps got louder and louder, he saw the black outline of a
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-around the corner. Is this the end of the line? he thought pressing himself back against the wall
+around the corner. Is this the end of the line? he thought pressing himself back against the wall 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -279,7 +279,7 @@ around the corner. Is this the end of the line? he thought pressing himself back
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-trying to make himself invisible in the dark, was all that planning and energy wasted? He was
+trying to make himself invisible in the dark, was all that planning and energy wasted? He was 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -288,7 +288,7 @@ trying to make himself invisible in the dark, was all that planning and energy w
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
+dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -297,7 +297,7 @@ dripping with sweat now, cold and wet, he could smell the fear coming off his cl
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
+next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze. 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -306,7 +306,7 @@ next to him, with a barely noticeable squeak, a door swung quietly to and fro in
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
+Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and 
 </text:span>
 </text:p>
 </draw:text-box>
diff --git a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_draw.xml b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_draw.xml
index 01cdab8eaf68..afb83c75e754 100644
--- a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_draw.xml
+++ b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_draw.xml
@@ -36,73 +36,73 @@
 <text:span text:style-name="text7" >
 H
 e
-
+ 
 h
 e
 a
 r
 d
-
+ 
 q
 u
 i
 e
 t
-
+ 
 s
 t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
 .
-
+ 
 T
 h
 a
 t
-
+ 
 d
 i
 d
 n
 '
 t
-
+ 
 b
 o
 d
 e
-
+ 
 w
 e
 l
 l
 .
-
+ 
 W
 h
 o
-
+ 
 c
 o
 u
 l
 d
-
+ 
 b
 e
-
+ 
 f
 o
 l
@@ -112,24 +112,24 @@ w
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 t
 h
 i
 s
-
+ 
 l
 a
 t
 e
-
+ 
 a
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -143,19 +143,19 @@ i
 g
 h
 t
-
+ 
 a
 n
 d
-
+ 
 i
 n
-
+ 
 t
 h
 i
 s
-
+ 
 d
 e
 a
@@ -164,33 +164,33 @@ b
 e
 a
 t
-
+ 
 p
 a
 r
 t
-
+ 
 o
 f
-
+ 
 t
 o
 w
 n
 ?
-
+ 
 A
 n
 d
-
+ 
 a
 t
-
+ 
 t
 h
 i
 s
-
+ 
 p
 a
 r
@@ -201,7 +201,7 @@ u
 l
 a
 r
-
+ 
 m
 o
 m
@@ -209,36 +209,36 @@ e
 n
 t
 ,
-
+ 
 j
 u
 s
 t
-
+ 
 a
 f
 t
 e
 r
-
+ 
 h
 e
-
+ 
 p
 u
 l
 l
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -250,40 +250,40 @@ e
 b
 i
 g
-
+ 
 t
 i
 m
 e
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 m
 a
 k
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 w
 i
 t
 h
-
+ 
 t
 h
 e
-
+ 
 g
 r
 e
@@ -295,17 +295,17 @@ c
 k
 s
 .
-
+ 
 W
 a
 s
-
+ 
 t
 h
 e
 r
 e
-
+ 
 a
 n
 o
@@ -313,32 +313,32 @@ t
 h
 e
 r
-
+ 
 c
 r
 o
 o
 k
-
+ 
 w
 h
 o
 '
 d
-
+ 
 h
 a
 d
-
+ 
 t
 h
 e
-
+ 
 s
 a
 m
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -352,19 +352,19 @@ d
 e
 a
 ,
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 n
 o
 w
-
+ 
 w
 a
 t
@@ -373,15 +373,15 @@ h
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 w
 a
 i
@@ -389,63 +389,63 @@ t
 i
 n
 g
-
+ 
 f
 o
 r
-
+ 
 a
-
+ 
 c
 h
 a
 n
 c
 e
-
+ 
 t
 o
-
+ 
 g
 r
 a
 b
-
+ 
 t
 h
 e
-
+ 
 f
 r
 u
 i
 t
-
+ 
 o
 f
-
+ 
 h
 i
 s
-
+ 
 l
 a
 b
 o
 r
 ?
-
+ 
 O
 r
-
+ 
 d
 i
 d
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -459,44 +459,44 @@ t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
-
+ 
 m
 e
 a
 n
-
+ 
 t
 h
 a
 t
-
+ 
 o
 n
 e
-
+ 
 o
 f
-
+ 
 m
 a
 n
 y
-
+ 
 l
 a
 w
-
+ 
 o
 f
 f
@@ -505,38 +505,38 @@ c
 e
 r
 s
-
+ 
 i
 n
-
+ 
 t
 o
 w
 n
-
+ 
 w
 a
 s
-
+ 
 o
 n
-
+ 
 t
 o
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 j
 u
 s
 t
-
+ 
 w
 a
 i
@@ -544,10 +544,10 @@ t
 i
 n
 g
-
+ 
 t
 o
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -562,35 +562,35 @@ u
 n
 c
 e
-
+ 
 a
 n
 d
-
+ 
 s
 n
 a
 p
-
+ 
 t
 h
 o
 s
 e
-
+ 
 c
 u
 f
 f
 s
-
+ 
 o
 n
-
+ 
 h
 i
 s
-
+ 
 w
 r
 i
@@ -598,10 +598,10 @@ s
 t
 s
 ?
-
+ 
 H
 e
-
+ 
 n
 e
 r
@@ -611,18 +611,18 @@ u
 s
 l
 y
-
+ 
 l
 o
 o
 k
 e
 d
-
+ 
 a
 l
 l
-
+ 
 a
 r
 o
@@ -630,7 +630,7 @@ u
 n
 d
 .
-
+ 
 S
 u
 d
@@ -639,18 +639,18 @@ e
 n
 l
 y
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -665,12 +665,12 @@ l
 e
 y
 .
-
+ 
 L
 i
 k
 e
-
+ 
 l
 i
 g
@@ -680,37 +680,37 @@ n
 i
 n
 g
-
+ 
 h
 e
-
+ 
 d
 a
 r
 t
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 o
-
+ 
 t
 h
 e
-
+ 
 l
 e
 f
 t
-
+ 
 a
 n
 d
-
+ 
 d
 i
 s
@@ -722,7 +722,7 @@ a
 r
 e
 d
-
+ 
 b
 e
 t
@@ -730,15 +730,15 @@ w
 e
 e
 n
-
+ 
 t
 h
 e
-
+ 
 t
 w
 o
-
+ 
 w
 a
 r
@@ -749,14 +749,14 @@ u
 s
 e
 s
-
+ 
 a
 l
 m
 o
 s
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -772,53 +772,53 @@ l
 i
 n
 g
-
+ 
 o
 v
 e
 r
-
+ 
 t
 h
 e
-
+ 
 t
 r
 a
 s
 h
-
+ 
 c
 a
 n
-
+ 
 l
 y
 i
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 m
 i
 d
 d
 l
 e
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 s
 i
 d
@@ -828,19 +828,19 @@ a
 l
 k
 .
-
+ 
 H
 e
-
+ 
 t
 r
 i
 e
 d
-
+ 
 t
 o
-
+ 
 n
 e
 r
@@ -850,19 +850,19 @@ u
 s
 l
 y
-
+ 
 t
 a
 p
-
+ 
 h
 i
 s
-
+ 
 w
 a
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -876,19 +876,19 @@ l
 o
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 i
 n
 k
 y
-
+ 
 d
 a
 r
@@ -897,11 +897,11 @@ n
 e
 s
 s
-
+ 
 a
 n
 d
-
+ 
 s
 u
 d
@@ -910,7 +910,7 @@ e
 n
 l
 y
-
+ 
 s
 t
 i
@@ -921,16 +921,16 @@ n
 e
 d
 :
-
+ 
 i
 t
-
+ 
 w
 a
 s
-
+ 
 a
-
+ 
 d
 e
 a
@@ -940,36 +940,36 @@ e
 n
 d
 ,
-
+ 
 h
 e
-
+ 
 w
 o
 u
 l
 d
-
+ 
 h
 a
 v
 e
-
+ 
 t
 o
-
+ 
 g
 o
-
+ 
 b
 a
 c
 k
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -981,45 +981,45 @@ e
 w
 a
 y
-
+ 
 h
 e
-
+ 
 h
 a
 d
-
+ 
 c
 o
 m
 e
 .
-
+ 
 T
 h
 e
-
+ 
 s
 t
 e
 p
 s
-
+ 
 g
 o
 t
-
+ 
 l
 o
 u
 d
 e
 r
-
+ 
 a
 n
 d
-
+ 
 l
 o
 u
@@ -1027,24 +1027,24 @@ d
 e
 r
 ,
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 b
 l
 a
 c
 k
-
+ 
 o
 u
 t
@@ -1052,26 +1052,26 @@ l
 i
 n
 e
-
+ 
 o
 f
-
+ 
 a
-
+ 
 f
 i
 g
 u
 r
 e
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1086,11 +1086,11 @@ o
 u
 n
 d
-
+ 
 t
 h
 e
-
+ 
 c
 o
 r
@@ -1098,39 +1098,39 @@ n
 e
 r
 .
-
+ 
 I
 s
-
+ 
 t
 h
 i
 s
-
+ 
 t
 h
 e
-
+ 
 e
 n
 d
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 l
 i
 n
 e
 ?
-
+ 
 h
 e
-
+ 
 t
 h
 o
@@ -1138,7 +1138,7 @@ u
 g
 h
 t
-
+ 
 p
 r
 e
@@ -1147,7 +1147,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -1155,12 +1155,12 @@ s
 e
 l
 f
-
+ 
 b
 a
 c
 k
-
+ 
 a
 g
 a
@@ -1168,16 +1168,16 @@ i
 n
 s
 t
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1192,15 +1192,15 @@ y
 i
 n
 g
-
+ 
 t
 o
-
+ 
 m
 a
 k
 e
-
+ 
 h
 i
 m
@@ -1208,7 +1208,7 @@ s
 e
 l
 f
-
+ 
 i
 n
 v
@@ -1218,33 +1218,33 @@ i
 b
 l
 e
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 w
 a
 s
-
+ 
 a
 l
 l
-
+ 
 t
 h
 a
 t
-
+ 
 p
 l
 a
@@ -1253,18 +1253,18 @@ n
 i
 n
 g
-
+ 
 a
 n
 d
-
+ 
 e
 n
 e
 r
 g
 y
-
+ 
 w
 a
 s
@@ -1272,14 +1272,14 @@ t
 e
 d
 ?
-
+ 
 H
 e
-
+ 
 w
 a
 s
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1296,76 +1296,76 @@ p
 i
 n
 g
-
+ 
 w
 i
 t
 h
-
+ 
 s
 w
 e
 a
 t
-
+ 
 n
 o
 w
 ,
-
+ 
 c
 o
 l
 d
-
+ 
 a
 n
 d
-
+ 
 w
 e
 t
 ,
-
+ 
 h
 e
-
+ 
 c
 o
 u
 l
 d
-
+ 
 s
 m
 e
 l
 l
-
+ 
 t
 h
 e
-
+ 
 f
 e
 a
 r
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 h
 i
 s
-
+ 
 c
 l
 o
@@ -1374,7 +1374,7 @@ h
 e
 s
 .
-
+ 
 S
 u
 d
@@ -1383,7 +1383,7 @@ e
 n
 l
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1396,29 +1396,29 @@ n
 e
 x
 t
-
+ 
 t
 o
-
+ 
 h
 i
 m
 ,
-
+ 
 w
 i
 t
 h
-
+ 
 a
-
+ 
 b
 a
 r
 e
 l
 y
-
+ 
 n
 o
 t
@@ -1429,7 +1429,7 @@ a
 b
 l
 e
-
+ 
 s
 q
 u
@@ -1437,20 +1437,20 @@ e
 a
 k
 ,
-
+ 
 a
-
+ 
 d
 o
 o
 r
-
+ 
 s
 w
 u
 n
 g
-
+ 
 q
 u
 i
@@ -1458,25 +1458,25 @@ e
 t
 l
 y
-
+ 
 t
 o
-
+ 
 a
 n
 d
-
+ 
 f
 r
 o
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 n
 i
 g
@@ -1484,7 +1484,7 @@ h
 t
 '
 s
-
+ 
 b
 r
 e
@@ -1492,7 +1492,7 @@ e
 z
 e
 .
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1506,74 +1506,74 @@ o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 b
 e
-
+ 
 t
 h
 e
-
+ 
 h
 a
 v
 e
 n
-
+ 
 h
 e
 '
 d
-
+ 
 p
 r
 a
 y
 e
 d
-
+ 
 f
 o
 r
 ?
-
+ 
 S
 l
 o
 w
 l
 y
-
+ 
 h
 e
-
+ 
 s
 l
 i
 d
-
+ 
 t
 o
 w
 a
 r
 d
-
+ 
 t
 h
 e
-
+ 
 d
 o
 o
 r
 ,
-
+ 
 p
 r
 e
@@ -1582,7 +1582,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -1590,16 +1590,16 @@ s
 e
 l
 f
-
+ 
 m
 o
 r
 e
-
+ 
 a
 n
 d
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1612,83 +1612,83 @@ m
 o
 r
 e
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
 ,
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 a
 w
 a
 y
-
+ 
 f
 r
 o
 m
-
+ 
 h
 i
 s
-
+ 
 e
 n
 e
 m
 y
 .
-
+ 
 W
 o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 d
 o
 o
 r
-
+ 
 s
 a
 v
 e
-
+ 
 h
 i
 s
-
+ 
 h
 i
 d
@@ -1704,73 +1704,73 @@ e
 <text:span text:style-name="text7" >
 H
 e
-
+ 
 h
 e
 a
 r
 d
-
+ 
 q
 u
 i
 e
 t
-
+ 
 s
 t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
 .
-
+ 
 T
 h
 a
 t
-
+ 
 d
 i
 d
 n
 '
 t
-
+ 
 b
 o
 d
 e
-
+ 
 w
 e
 l
 l
 .
-
+ 
 W
 h
 o
-
+ 
 c
 o
 u
 l
 d
-
+ 
 b
 e
-
+ 
 f
 o
 l
@@ -1780,24 +1780,24 @@ w
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 t
 h
 i
 s
-
+ 
 l
 a
 t
 e
-
+ 
 a
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1811,19 +1811,19 @@ i
 g
 h
 t
-
+ 
 a
 n
 d
-
+ 
 i
 n
-
+ 
 t
 h
 i
 s
-
+ 
 d
 e
 a
@@ -1832,33 +1832,33 @@ b
 e
 a
 t
-
+ 
 p
 a
 r
 t
-
+ 
 o
 f
-
+ 
 t
 o
 w
 n
 ?
-
+ 
 A
 n
 d
-
+ 
 a
 t
-
+ 
 t
 h
 i
 s
-
+ 
 p
 a
 r
@@ -1869,7 +1869,7 @@ u
 l
 a
 r
-
+ 
 m
 o
 m
@@ -1877,36 +1877,36 @@ e
 n
 t
 ,
-
+ 
 j
 u
 s
 t
-
+ 
 a
 f
 t
 e
 r
-
+ 
 h
 e
-
+ 
 p
 u
 l
 l
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1918,40 +1918,40 @@ e
 b
 i
 g
-
+ 
 t
 i
 m
 e
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 m
 a
 k
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 w
 i
 t
 h
-
+ 
 t
 h
 e
-
+ 
 g
 r
 e
@@ -1963,17 +1963,17 @@ c
 k
 s
 .
-
+ 
 W
 a
 s
-
+ 
 t
 h
 e
 r
 e
-
+ 
 a
 n
 o
@@ -1981,32 +1981,32 @@ t
 h
 e
 r
-
+ 
 c
 r
 o
 o
 k
-
+ 
 w
 h
 o
 '
 d
-
+ 
 h
 a
 d
-
+ 
 t
 h
 e
-
+ 
 s
 a
 m
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2020,19 +2020,19 @@ d
 e
 a
 ,
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 n
 o
 w
-
+ 
 w
 a
 t
@@ -2041,15 +2041,15 @@ h
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 w
 a
 i
@@ -2057,63 +2057,63 @@ t
 i
 n
 g
-
+ 
 f
 o
 r
-
+ 
 a
-
+ 
 c
 h
 a
 n
 c
 e
-
+ 
 t
 o
-
+ 
 g
 r
 a
 b
-
+ 
 t
 h
 e
-
+ 
 f
 r
 u
 i
 t
-
+ 
 o
 f
-
+ 
 h
 i
 s
-
+ 
 l
 a
 b
 o
 r
 ?
-
+ 
 O
 r
-
+ 
 d
 i
 d
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2127,44 +2127,44 @@ t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
-
+ 
 m
 e
 a
 n
-
+ 
 t
 h
 a
 t
-
+ 
 o
 n
 e
-
+ 
 o
 f
-
+ 
 m
 a
 n
 y
-
+ 
 l
 a
 w
-
+ 
 o
 f
 f
@@ -2173,38 +2173,38 @@ c
 e
 r
 s
-
+ 
 i
 n
-
+ 
 t
 o
 w
 n
-
+ 
 w
 a
 s
-
+ 
 o
 n
-
+ 
 t
 o
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 j
 u
 s
 t
-
+ 
 w
 a
 i
@@ -2212,10 +2212,10 @@ t
 i
 n
 g
-
+ 
 t
 o
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2230,35 +2230,35 @@ u
 n
 c
 e
-
+ 
 a
 n
 d
-
+ 
 s
 n
 a
 p
-
+ 
 t
 h
 o
 s
 e
-
+ 
 c
 u
 f
 f
 s
-
+ 
 o
 n
-
+ 
 h
 i
 s
-
+ 
 w
 r
 i
@@ -2266,10 +2266,10 @@ s
 t
 s
 ?
-
+ 
 H
 e
-
+ 
 n
 e
 r
@@ -2279,18 +2279,18 @@ u
 s
 l
 y
-
+ 
 l
 o
 o
 k
 e
 d
-
+ 
 a
 l
 l
-
+ 
 a
 r
 o
@@ -2298,7 +2298,7 @@ u
 n
 d
 .
-
+ 
 S
 u
 d
@@ -2307,18 +2307,18 @@ e
 n
 l
 y
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2333,12 +2333,12 @@ l
 e
 y
 .
-
+ 
 L
 i
 k
 e
-
+ 
 l
 i
 g
@@ -2348,37 +2348,37 @@ n
 i
 n
 g
-
+ 
 h
 e
-
+ 
 d
 a
 r
 t
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 o
-
+ 
 t
 h
 e
-
+ 
 l
 e
 f
 t
-
+ 
 a
 n
 d
-
+ 
 d
 i
 s
@@ -2390,7 +2390,7 @@ a
 r
 e
 d
-
+ 
 b
 e
 t
@@ -2398,15 +2398,15 @@ w
 e
 e
 n
-
+ 
 t
 h
 e
-
+ 
 t
 w
 o
-
+ 
 w
 a
 r
@@ -2417,14 +2417,14 @@ u
 s
 e
 s
-
+ 
 a
 l
 m
 o
 s
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2440,53 +2440,53 @@ l
 i
 n
 g
-
+ 
 o
 v
 e
 r
-
+ 
 t
 h
 e
-
+ 
 t
 r
 a
 s
 h
-
+ 
 c
 a
 n
-
+ 
 l
 y
 i
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 m
 i
 d
 d
 l
 e
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 s
 i
 d
@@ -2496,19 +2496,19 @@ a
 l
 k
 .
-
+ 
 H
 e
-
+ 
 t
 r
 i
 e
 d
-
+ 
 t
 o
-
+ 
 n
 e
 r
@@ -2518,19 +2518,19 @@ u
 s
 l
 y
-
+ 
 t
 a
 p
-
+ 
 h
 i
 s
-
+ 
 w
 a
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2551,19 +2551,19 @@ l
 o
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 i
 n
 k
 y
-
+ 
 d
 a
 r
@@ -2572,11 +2572,11 @@ n
 e
 s
 s
-
+ 
 a
 n
 d
-
+ 
 s
 u
 d
@@ -2585,7 +2585,7 @@ e
 n
 l
 y
-
+ 
 s
 t
 i
@@ -2596,16 +2596,16 @@ n
 e
 d
 :
-
+ 
 i
 t
-
+ 
 w
 a
 s
-
+ 
 a
-
+ 
 d
 e
 a
@@ -2615,36 +2615,36 @@ e
 n
 d
 ,
-
+ 
 h
 e
-
+ 
 w
 o
 u
 l
 d
-
+ 
 h
 a
 v
 e
-
+ 
 t
 o
-
+ 
 g
 o
-
+ 
 b
 a
 c
 k
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2656,45 +2656,45 @@ e
 w
 a
 y
-
+ 
 h
 e
-
+ 
 h
 a
 d
-
+ 
 c
 o
 m
 e
 .
-
+ 
 T
 h
 e
-
+ 
 s
 t
 e
 p
 s
-
+ 
 g
 o
 t
-
+ 
 l
 o
 u
 d
 e
 r
-
+ 
 a
 n
 d
-
+ 
 l
 o
 u
@@ -2702,24 +2702,24 @@ d
 e
 r
 ,
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 b
 l
 a
 c
 k
-
+ 
 o
 u
 t
@@ -2727,26 +2727,26 @@ l
 i
 n
 e
-
+ 
 o
 f
-
+ 
 a
-
+ 
 f
 i
 g
 u
 r
 e
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2761,11 +2761,11 @@ o
 u
 n
 d
-
+ 
 t
 h
 e
-
+ 
 c
 o
 r
@@ -2773,39 +2773,39 @@ n
 e
 r
 .
-
+ 
 I
 s
-
+ 
 t
 h
 i
 s
-
+ 
 t
 h
 e
-
+ 
 e
 n
 d
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 l
 i
 n
 e
 ?
-
+ 
 h
 e
-
+ 
 t
 h
 o
@@ -2813,7 +2813,7 @@ u
 g
 h
 t
-
+ 
 p
 r
 e
@@ -2822,7 +2822,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -2830,12 +2830,12 @@ s
 e
 l
 f
-
+ 
 b
 a
 c
 k
-
+ 
 a
 g
 a
@@ -2843,16 +2843,16 @@ i
 n
 s
 t
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2867,15 +2867,15 @@ y
 i
 n
 g
-
+ 
 t
 o
-
+ 
 m
 a
 k
 e
-
+ 
 h
 i
 m
@@ -2883,7 +2883,7 @@ s
 e
 l
 f
-
+ 
 i
 n
 v
@@ -2893,33 +2893,33 @@ i
 b
 l
 e
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 w
 a
 s
-
+ 
 a
 l
 l
-
+ 
 t
 h
 a
 t
-
+ 
 p
 l
 a
@@ -2928,18 +2928,18 @@ n
 i
 n
 g
-
+ 
 a
 n
 d
-
+ 
 e
 n
 e
 r
 g
 y
-
+ 
 w
 a
 s
@@ -2947,14 +2947,14 @@ t
 e
 d
 ?
-
+ 
 H
 e
-
+ 
 w
 a
 s
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2971,76 +2971,76 @@ p
 i
 n
 g
-
+ 
 w
 i
 t
 h
-
+ 
 s
 w
 e
 a
 t
-
+ 
 n
 o
 w
 ,
-
+ 
 c
 o
 l
 d
-
+ 
 a
 n
 d
-
+ 
 w
 e
 t
 ,
-
+ 
 h
 e
-
+ 
 c
 o
 u
 l
 d
-
+ 
 s
 m
 e
 l
 l
-
+ 
 t
 h
 e
-
+ 
 f
 e
 a
 r
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 h
 i
 s
-
+ 
 c
 l
 o
@@ -3049,7 +3049,7 @@ h
 e
 s
 .
-
+ 
 S
 u
 d
@@ -3058,7 +3058,7 @@ e
 n
 l
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3071,29 +3071,29 @@ n
 e
 x
 t
-
+ 
 t
 o
-
+ 
 h
 i
 m
 ,
-
+ 
 w
 i
 t
 h
-
+ 
 a
-
+ 
 b
 a
 r
 e
 l
 y
-
+ 
 n
 o
 t
@@ -3104,7 +3104,7 @@ a
 b
 l
 e
-
+ 
 s
 q
 u
@@ -3112,20 +3112,20 @@ e
 a
 k
 ,
-
+ 
 a
-
+ 
 d
 o
 o
 r
-
+ 
 s
 w
 u
 n
 g
-
+ 
 q
 u
 i
@@ -3133,25 +3133,25 @@ e
 t
 l
 y
-
+ 
 t
 o
-
+ 
 a
 n
 d
-
+ 
 f
 r
 o
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 n
 i
 g
@@ -3159,7 +3159,7 @@ h
 t
 '
 s
-
+ 
 b
 r
 e
@@ -3167,7 +3167,7 @@ e
 z
 e
 .
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3181,74 +3181,74 @@ o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 b
 e
-
+ 
 t
 h
 e
-
+ 
 h
 a
 v
 e
 n
-
+ 
 h
 e
 '
 d
-
+ 
 p
 r
 a
 y
 e
 d
-
+ 
 f
 o
 r
 ?
-
+ 
 S
 l
 o
 w
 l
 y
-
+ 
 h
 e
-
+ 
 s
 l
 i
 d
-
+ 
 t
 o
 w
 a
 r
 d
-
+ 
 t
 h
 e
-
+ 
 d
 o
 o
 r
 ,
-
+ 
 p
 r
 e
@@ -3257,7 +3257,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -3265,16 +3265,16 @@ s
 e
 l
 f
-
+ 
 m
 o
 r
 e
-
+ 
 a
 n
 d
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3287,83 +3287,83 @@ m
 o
 r
 e
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
 ,
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 a
 w
 a
 y
-
+ 
 f
 r
 o
 m
-
+ 
 h
 i
 s
-
+ 
 e
 n
 e
 m
 y
 .
-
+ 
 W
 o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 d
 o
 o
 r
-
+ 
 s
 a
 v
 e
-
+ 
 h
 i
 s
-
+ 
 h
 i
 d
diff --git a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_impress.xml b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_impress.xml
index b4e9bfdc2468..b24a1ed4df12 100644
--- a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_impress.xml
+++ b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_impress.xml
@@ -36,73 +36,73 @@
 <text:span text:style-name="text7" >
 H
 e
-
+ 
 h
 e
 a
 r
 d
-
+ 
 q
 u
 i
 e
 t
-
+ 
 s
 t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
 .
-
+ 
 T
 h
 a
 t
-
+ 
 d
 i
 d
 n
 '
 t
-
+ 
 b
 o
 d
 e
-
+ 
 w
 e
 l
 l
 .
-
+ 
 W
 h
 o
-
+ 
 c
 o
 u
 l
 d
-
+ 
 b
 e
-
+ 
 f
 o
 l
@@ -112,24 +112,24 @@ w
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 t
 h
 i
 s
-
+ 
 l
 a
 t
 e
-
+ 
 a
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -143,19 +143,19 @@ i
 g
 h
 t
-
+ 
 a
 n
 d
-
+ 
 i
 n
-
+ 
 t
 h
 i
 s
-
+ 
 d
 e
 a
@@ -164,33 +164,33 @@ b
 e
 a
 t
-
+ 
 p
 a
 r
 t
-
+ 
 o
 f
-
+ 
 t
 o
 w
 n
 ?
-
+ 
 A
 n
 d
-
+ 
 a
 t
-
+ 
 t
 h
 i
 s
-
+ 
 p
 a
 r
@@ -201,7 +201,7 @@ u
 l
 a
 r
-
+ 
 m
 o
 m
@@ -209,36 +209,36 @@ e
 n
 t
 ,
-
+ 
 j
 u
 s
 t
-
+ 
 a
 f
 t
 e
 r
-
+ 
 h
 e
-
+ 
 p
 u
 l
 l
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -250,40 +250,40 @@ e
 b
 i
 g
-
+ 
 t
 i
 m
 e
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 m
 a
 k
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 w
 i
 t
 h
-
+ 
 t
 h
 e
-
+ 
 g
 r
 e
@@ -295,17 +295,17 @@ c
 k
 s
 .
-
+ 
 W
 a
 s
-
+ 
 t
 h
 e
 r
 e
-
+ 
 a
 n
 o
@@ -313,32 +313,32 @@ t
 h
 e
 r
-
+ 
 c
 r
 o
 o
 k
-
+ 
 w
 h
 o
 '
 d
-
+ 
 h
 a
 d
-
+ 
 t
 h
 e
-
+ 
 s
 a
 m
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -352,19 +352,19 @@ d
 e
 a
 ,
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 n
 o
 w
-
+ 
 w
 a
 t
@@ -373,15 +373,15 @@ h
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 w
 a
 i
@@ -389,63 +389,63 @@ t
 i
 n
 g
-
+ 
 f
 o
 r
-
+ 
 a
-
+ 
 c
 h
 a
 n
 c
 e
-
+ 
 t
 o
-
+ 
 g
 r
 a
 b
-
+ 
 t
 h
 e
-
+ 
 f
 r
 u
 i
 t
-
+ 
 o
 f
-
+ 
 h
 i
 s
-
+ 
 l
 a
 b
 o
 r
 ?
-
+ 
 O
 r
-
+ 
 d
 i
 d
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -459,44 +459,44 @@ t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
-
+ 
 m
 e
 a
 n
-
+ 
 t
 h
 a
 t
-
+ 
 o
 n
 e
-
+ 
 o
 f
-
+ 
 m
 a
 n
 y
-
+ 
 l
 a
 w
-
+ 
 o
 f
 f
@@ -505,38 +505,38 @@ c
 e
 r
 s
-
+ 
 i
 n
-
+ 
 t
 o
 w
 n
-
+ 
 w
 a
 s
-
+ 
 o
 n
-
+ 
 t
 o
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 j
 u
 s
 t
-
+ 
 w
 a
 i
@@ -544,10 +544,10 @@ t
 i
 n
 g
-
+ 
 t
 o
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -562,35 +562,35 @@ u
 n
 c
 e
-
+ 
 a
 n
 d
-
+ 
 s
 n
 a
 p
-
+ 
 t
 h
 o
 s
 e
-
+ 
 c
 u
 f
 f
 s
-
+ 
 o
 n
-
+ 
 h
 i
 s
-
+ 
 w
 r
 i
@@ -598,10 +598,10 @@ s
 t
 s
 ?
-
+ 
 H
 e
-
+ 
 n
 e
 r
@@ -611,18 +611,18 @@ u
 s
 l
 y
-
+ 
 l
 o
 o
 k
 e
 d
-
+ 
 a
 l
 l
-
+ 
 a
 r
 o
@@ -630,7 +630,7 @@ u
 n
 d
 .
-
+ 
 S
 u
 d
@@ -639,18 +639,18 @@ e
 n
 l
 y
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -665,12 +665,12 @@ l
 e
 y
 .
-
+ 
 L
 i
 k
 e
-
+ 
 l
 i
 g
@@ -680,37 +680,37 @@ n
 i
 n
 g
-
+ 
 h
 e
-
+ 
 d
 a
 r
 t
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 o
-
+ 
 t
 h
 e
-
+ 
 l
 e
 f
 t
-
+ 
 a
 n
 d
-
+ 
 d
 i
 s
@@ -722,7 +722,7 @@ a
 r
 e
 d
-
+ 
 b
 e
 t
@@ -730,15 +730,15 @@ w
 e
 e
 n
-
+ 
 t
 h
 e
-
+ 
 t
 w
 o
-
+ 
 w
 a
 r
@@ -749,14 +749,14 @@ u
 s
 e
 s
-
+ 
 a
 l
 m
 o
 s
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -772,53 +772,53 @@ l
 i
 n
 g
-
+ 
 o
 v
 e
 r
-
+ 
 t
 h
 e
-
+ 
 t
 r
 a
 s
 h
-
+ 
 c
 a
 n
-
+ 
 l
 y
 i
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 m
 i
 d
 d
 l
 e
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 s
 i
 d
@@ -828,19 +828,19 @@ a
 l
 k
 .
-
+ 
 H
 e
-
+ 
 t
 r
 i
 e
 d
-
+ 
 t
 o
-
+ 
 n
 e
 r
@@ -850,19 +850,19 @@ u
 s
 l
 y
-
+ 
 t
 a
 p
-
+ 
 h
 i
 s
-
+ 
 w
 a
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -876,19 +876,19 @@ l
 o
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 i
 n
 k
 y
-
+ 
 d
 a
 r
@@ -897,11 +897,11 @@ n
 e
 s
 s
-
+ 
 a
 n
 d
-
+ 
 s
 u
 d
@@ -910,7 +910,7 @@ e
 n
 l
 y
-
+ 
 s
 t
 i
@@ -921,16 +921,16 @@ n
 e
 d
 :
-
+ 
 i
 t
-
+ 
 w
 a
 s
-
+ 
 a
-
+ 
 d
 e
 a
@@ -940,36 +940,36 @@ e
 n
 d
 ,
-
+ 
 h
 e
-
+ 
 w
 o
 u
 l
 d
-
+ 
 h
 a
 v
 e
-
+ 
 t
 o
-
+ 
 g
 o
-
+ 
 b
 a
 c
 k
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -981,45 +981,45 @@ e
 w
 a
 y
-
+ 
 h
 e
-
+ 
 h
 a
 d
-
+ 
 c
 o
 m
 e
 .
-
+ 
 T
 h
 e
-
+ 
 s
 t
 e
 p
 s
-
+ 
 g
 o
 t
-
+ 
 l
 o
 u
 d
 e
 r
-
+ 
 a
 n
 d
-
+ 
 l
 o
 u
@@ -1027,24 +1027,24 @@ d
 e
 r
 ,
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 b
 l
 a
 c
 k
-
+ 
 o
 u
 t
@@ -1052,26 +1052,26 @@ l
 i
 n
 e
-
+ 
 o
 f
-
+ 
 a
-
+ 
 f
 i
 g
 u
 r
 e
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1086,11 +1086,11 @@ o
 u
 n
 d
-
+ 
 t
 h
 e
-
+ 
 c
 o
 r
@@ -1098,39 +1098,39 @@ n
 e
 r
 .
-
+ 
 I
 s
-
+ 
 t
 h
 i
 s
-
+ 
 t
 h
 e
-
+ 
 e
 n
 d
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 l
 i
 n
 e
 ?
-
+ 
 h
 e
-
+ 
 t
 h
 o
@@ -1138,7 +1138,7 @@ u
 g
 h
 t
-
+ 
 p
 r
 e
@@ -1147,7 +1147,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -1155,12 +1155,12 @@ s
 e
 l
 f
-
+ 
 b
 a
 c
 k
-
+ 
 a
 g
 a
@@ -1168,16 +1168,16 @@ i
 n
 s
 t
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1192,15 +1192,15 @@ y
 i
 n
 g
-
+ 
 t
 o
-
+ 
 m
 a
 k
 e
-
+ 
 h
 i
 m
@@ -1208,7 +1208,7 @@ s
 e
 l
 f
-
+ 
 i
 n
 v
@@ -1218,33 +1218,33 @@ i
 b
 l
 e
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 w
 a
 s
-
+ 
 a
 l
 l
-
+ 
 t
 h
 a
 t
-
+ 
 p
 l
 a
@@ -1253,18 +1253,18 @@ n
 i
 n
 g
-
+ 
 a
 n
 d
-
+ 
 e
 n
 e
 r
 g
 y
-
+ 
 w
 a
 s
@@ -1272,14 +1272,14 @@ t
 e
 d
 ?
-
+ 
 H
 e
-
+ 
 w
 a
 s
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1296,76 +1296,76 @@ p
 i
 n
 g
-
+ 
 w
 i
 t
 h
-
+ 
 s
 w
 e
 a
 t
-
+ 
 n
 o
 w
 ,
-
+ 
 c
 o
 l
 d
-
+ 
 a
 n
 d
-
+ 
 w
 e
 t
 ,
-
+ 
 h
 e
-
+ 
 c
 o
 u
 l
 d
-
+ 
 s
 m
 e
 l
 l
-
+ 
 t
 h
 e
-
+ 
 f
 e
 a
 r
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 h
 i
 s
-
+ 
 c
 l
 o
@@ -1374,7 +1374,7 @@ h
 e
 s
 .
-
+ 
 S
 u
 d
@@ -1383,7 +1383,7 @@ e
 n
 l
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1396,29 +1396,29 @@ n
 e
 x
 t
-
+ 
 t
 o
-
+ 
 h
 i
 m
 ,
-
+ 
 w
 i
 t
 h
-
+ 
 a
-
+ 
 b
 a
 r
 e
 l
 y
-
+ 
 n
 o
 t
@@ -1429,7 +1429,7 @@ a
 b
 l
 e
-
+ 
 s
 q
 u
@@ -1437,20 +1437,20 @@ e
 a
 k
 ,
-
+ 
 a
-
+ 
 d
 o
 o
 r
-
+ 
 s
 w
 u
 n
 g
-
+ 
 q
 u
 i
@@ -1458,25 +1458,25 @@ e
 t
 l
 y
-
+ 
 t
 o
-
+ 
 a
 n
 d
-
+ 
 f
 r
 o
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 n
 i
 g
@@ -1484,7 +1484,7 @@ h
 t
 '
 s
-
+ 
 b
 r
 e
@@ -1492,7 +1492,7 @@ e
 z
 e
 .
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1506,74 +1506,74 @@ o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 b
 e
-
+ 
 t
 h
 e
-
+ 
 h
 a
 v
 e
 n
-
+ 
 h
 e
 '
 d
-
+ 
 p
 r
 a
 y
 e
 d
-
+ 
 f
 o
 r
 ?
-
+ 
 S
 l
 o
 w
 l
 y
-
+ 
 h
 e
-
+ 
 s
 l
 i
 d
-
+ 
 t
 o
 w
 a
 r
 d
-
+ 
 t
 h
 e
-
+ 
 d
 o
 o
 r
 ,
-
+ 
 p
 r
 e
@@ -1582,7 +1582,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -1590,16 +1590,16 @@ s
 e
 l
 f
-
+ 
 m
 o
 r
 e
-
+ 
 a
 n
 d
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1612,83 +1612,83 @@ m
 o
 r
 e
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
 ,
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 a
 w
 a
 y
-
+ 
 f
 r
 o
 m
-
+ 
 h
 i
 s
-
+ 
 e
 n
 e
 m
 y
 .
-
+ 
 W
 o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 d
 o
 o
 r
-
+ 
 s
 a
 v
 e
-
+ 
 h
 i
 s
-
+ 
 h
 i
 d
@@ -1704,73 +1704,73 @@ e
 <text:span text:style-name="text7" >
 H
 e
-
+ 
 h
 e
 a
 r
 d
-
+ 
 q
 u
 i
 e
 t
-
+ 
 s
 t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
 .
-
+ 
 T
 h
 a
 t
-
+ 
 d
 i
 d
 n
 '
 t
-
+ 
 b
 o
 d
 e
-
+ 
 w
 e
 l
 l
 .
-
+ 
 W
 h
 o
-
+ 
 c
 o
 u
 l
 d
-
+ 
 b
 e
-
+ 
 f
 o
 l
@@ -1780,24 +1780,24 @@ w
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 t
 h
 i
 s
-
+ 
 l
 a
 t
 e
-
+ 
 a
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1811,19 +1811,19 @@ i
 g
 h
 t
-
+ 
 a
 n
 d
-
+ 
 i
 n
-
+ 
 t
 h
 i
 s
-
+ 
 d
 e
 a
@@ -1832,33 +1832,33 @@ b
 e
 a
 t
-
+ 
 p
 a
 r
 t
-
+ 
 o
 f
-
+ 
 t
 o
 w
 n
 ?
-
+ 
 A
 n
 d
-
+ 
 a
 t
-
+ 
 t
 h
 i
 s
-
+ 
 p
 a
 r
@@ -1869,7 +1869,7 @@ u
 l
 a
 r
-
+ 
 m
 o
 m
@@ -1877,36 +1877,36 @@ e
 n
 t
 ,
-
+ 
 j
 u
 s
 t
-
+ 
 a
 f
 t
 e
 r
-
+ 
 h
 e
-
+ 
 p
 u
 l
 l
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -1918,40 +1918,40 @@ e
 b
 i
 g
-
+ 
 t
 i
 m
 e
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 m
 a
 k
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 w
 i
 t
 h
-
+ 
 t
 h
 e
-
+ 
 g
 r
 e
@@ -1963,17 +1963,17 @@ c
 k
 s
 .
-
+ 
 W
 a
 s
-
+ 
 t
 h
 e
 r
 e
-
+ 
 a
 n
 o
@@ -1981,32 +1981,32 @@ t
 h
 e
 r
-
+ 
 c
 r
 o
 o
 k
-
+ 
 w
 h
 o
 '
 d
-
+ 
 h
 a
 d
-
+ 
 t
 h
 e
-
+ 
 s
 a
 m
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2020,19 +2020,19 @@ d
 e
 a
 ,
-
+ 
 a
 n
 d
-
+ 
 w
 a
 s
-
+ 
 n
 o
 w
-
+ 
 w
 a
 t
@@ -2041,15 +2041,15 @@ h
 i
 n
 g
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 w
 a
 i
@@ -2057,63 +2057,63 @@ t
 i
 n
 g
-
+ 
 f
 o
 r
-
+ 
 a
-
+ 
 c
 h
 a
 n
 c
 e
-
+ 
 t
 o
-
+ 
 g
 r
 a
 b
-
+ 
 t
 h
 e
-
+ 
 f
 r
 u
 i
 t
-
+ 
 o
 f
-
+ 
 h
 i
 s
-
+ 
 l
 a
 b
 o
 r
 ?
-
+ 
 O
 r
-
+ 
 d
 i
 d
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2127,44 +2127,44 @@ t
 e
 p
 s
-
+ 
 b
 e
 h
 i
 n
 d
-
+ 
 h
 i
 m
-
+ 
 m
 e
 a
 n
-
+ 
 t
 h
 a
 t
-
+ 
 o
 n
 e
-
+ 
 o
 f
-
+ 
 m
 a
 n
 y
-
+ 
 l
 a
 w
-
+ 
 o
 f
 f
@@ -2173,38 +2173,38 @@ c
 e
 r
 s
-
+ 
 i
 n
-
+ 
 t
 o
 w
 n
-
+ 
 w
 a
 s
-
+ 
 o
 n
-
+ 
 t
 o
-
+ 
 h
 i
 m
-
+ 
 a
 n
 d
-
+ 
 j
 u
 s
 t
-
+ 
 w
 a
 i
@@ -2212,10 +2212,10 @@ t
 i
 n
 g
-
+ 
 t
 o
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2230,35 +2230,35 @@ u
 n
 c
 e
-
+ 
 a
 n
 d
-
+ 
 s
 n
 a
 p
-
+ 
 t
 h
 o
 s
 e
-
+ 
 c
 u
 f
 f
 s
-
+ 
 o
 n
-
+ 
 h
 i
 s
-
+ 
 w
 r
 i
@@ -2266,10 +2266,10 @@ s
 t
 s
 ?
-
+ 
 H
 e
-
+ 
 n
 e
 r
@@ -2279,18 +2279,18 @@ u
 s
 l
 y
-
+ 
 l
 o
 o
 k
 e
 d
-
+ 
 a
 l
 l
-
+ 
 a
 r
 o
@@ -2298,7 +2298,7 @@ u
 n
 d
 .
-
+ 
 S
 u
 d
@@ -2307,18 +2307,18 @@ e
 n
 l
 y
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2333,12 +2333,12 @@ l
 e
 y
 .
-
+ 
 L
 i
 k
 e
-
+ 
 l
 i
 g
@@ -2348,37 +2348,37 @@ n
 i
 n
 g
-
+ 
 h
 e
-
+ 
 d
 a
 r
 t
 e
 d
-
+ 
 o
 f
 f
-
+ 
 t
 o
-
+ 
 t
 h
 e
-
+ 
 l
 e
 f
 t
-
+ 
 a
 n
 d
-
+ 
 d
 i
 s
@@ -2390,7 +2390,7 @@ a
 r
 e
 d
-
+ 
 b
 e
 t
@@ -2398,15 +2398,15 @@ w
 e
 e
 n
-
+ 
 t
 h
 e
-
+ 
 t
 w
 o
-
+ 
 w
 a
 r
@@ -2417,14 +2417,14 @@ u
 s
 e
 s
-
+ 
 a
 l
 m
 o
 s
 t
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2440,53 +2440,53 @@ l
 i
 n
 g
-
+ 
 o
 v
 e
 r
-
+ 
 t
 h
 e
-
+ 
 t
 r
 a
 s
 h
-
+ 
 c
 a
 n
-
+ 
 l
 y
 i
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 m
 i
 d
 d
 l
 e
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 s
 i
 d
@@ -2496,19 +2496,19 @@ a
 l
 k
 .
-
+ 
 H
 e
-
+ 
 t
 r
 i
 e
 d
-
+ 
 t
 o
-
+ 
 n
 e
 r
@@ -2518,19 +2518,19 @@ u
 s
 l
 y
-
+ 
 t
 a
 p
-
+ 
 h
 i
 s
-
+ 
 w
 a
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2551,19 +2551,19 @@ l
 o
 n
 g
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 i
 n
 k
 y
-
+ 
 d
 a
 r
@@ -2572,11 +2572,11 @@ n
 e
 s
 s
-
+ 
 a
 n
 d
-
+ 
 s
 u
 d
@@ -2585,7 +2585,7 @@ e
 n
 l
 y
-
+ 
 s
 t
 i
@@ -2596,16 +2596,16 @@ n
 e
 d
 :
-
+ 
 i
 t
-
+ 
 w
 a
 s
-
+ 
 a
-
+ 
 d
 e
 a
@@ -2615,36 +2615,36 @@ e
 n
 d
 ,
-
+ 
 h
 e
-
+ 
 w
 o
 u
 l
 d
-
+ 
 h
 a
 v
 e
-
+ 
 t
 o
-
+ 
 g
 o
-
+ 
 b
 a
 c
 k
-
+ 
 t
 h
 e
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2656,45 +2656,45 @@ e
 w
 a
 y
-
+ 
 h
 e
-
+ 
 h
 a
 d
-
+ 
 c
 o
 m
 e
 .
-
+ 
 T
 h
 e
-
+ 
 s
 t
 e
 p
 s
-
+ 
 g
 o
 t
-
+ 
 l
 o
 u
 d
 e
 r
-
+ 
 a
 n
 d
-
+ 
 l
 o
 u
@@ -2702,24 +2702,24 @@ d
 e
 r
 ,
-
+ 
 h
 e
-
+ 
 s
 a
 w
-
+ 
 t
 h
 e
-
+ 
 b
 l
 a
 c
 k
-
+ 
 o
 u
 t
@@ -2727,26 +2727,26 @@ l
 i
 n
 e
-
+ 
 o
 f
-
+ 
 a
-
+ 
 f
 i
 g
 u
 r
 e
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2761,11 +2761,11 @@ o
 u
 n
 d
-
+ 
 t
 h
 e
-
+ 
 c
 o
 r
@@ -2773,39 +2773,39 @@ n
 e
 r
 .
-
+ 
 I
 s
-
+ 
 t
 h
 i
 s
-
+ 
 t
 h
 e
-
+ 
 e
 n
 d
-
+ 
 o
 f
-
+ 
 t
 h
 e
-
+ 
 l
 i
 n
 e
 ?
-
+ 
 h
 e
-
+ 
 t
 h
 o
@@ -2813,7 +2813,7 @@ u
 g
 h
 t
-
+ 
 p
 r
 e
@@ -2822,7 +2822,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -2830,12 +2830,12 @@ s
 e
 l
 f
-
+ 
 b
 a
 c
 k
-
+ 
 a
 g
 a
@@ -2843,16 +2843,16 @@ i
 n
 s
 t
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2867,15 +2867,15 @@ y
 i
 n
 g
-
+ 
 t
 o
-
+ 
 m
 a
 k
 e
-
+ 
 h
 i
 m
@@ -2883,7 +2883,7 @@ s
 e
 l
 f
-
+ 
 i
 n
 v
@@ -2893,33 +2893,33 @@ i
 b
 l
 e
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 w
 a
 s
-
+ 
 a
 l
 l
-
+ 
 t
 h
 a
 t
-
+ 
 p
 l
 a
@@ -2928,18 +2928,18 @@ n
 i
 n
 g
-
+ 
 a
 n
 d
-
+ 
 e
 n
 e
 r
 g
 y
-
+ 
 w
 a
 s
@@ -2947,14 +2947,14 @@ t
 e
 d
 ?
-
+ 
 H
 e
-
+ 
 w
 a
 s
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -2971,76 +2971,76 @@ p
 i
 n
 g
-
+ 
 w
 i
 t
 h
-
+ 
 s
 w
 e
 a
 t
-
+ 
 n
 o
 w
 ,
-
+ 
 c
 o
 l
 d
-
+ 
 a
 n
 d
-
+ 
 w
 e
 t
 ,
-
+ 
 h
 e
-
+ 
 c
 o
 u
 l
 d
-
+ 
 s
 m
 e
 l
 l
-
+ 
 t
 h
 e
-
+ 
 f
 e
 a
 r
-
+ 
 c
 o
 m
 i
 n
 g
-
+ 
 o
 f
 f
-
+ 
 h
 i
 s
-
+ 
 c
 l
 o
@@ -3049,7 +3049,7 @@ h
 e
 s
 .
-
+ 
 S
 u
 d
@@ -3058,7 +3058,7 @@ e
 n
 l
 y
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3071,29 +3071,29 @@ n
 e
 x
 t
-
+ 
 t
 o
-
+ 
 h
 i
 m
 ,
-
+ 
 w
 i
 t
 h
-
+ 
 a
-
+ 
 b
 a
 r
 e
 l
 y
-
+ 
 n
 o
 t
@@ -3104,7 +3104,7 @@ a
 b
 l
 e
-
+ 
 s
 q
 u
@@ -3112,20 +3112,20 @@ e
 a
 k
 ,
-
+ 
 a
-
+ 
 d
 o
 o
 r
-
+ 
 s
 w
 u
 n
 g
-
+ 
 q
 u
 i
@@ -3133,25 +3133,25 @@ e
 t
 l
 y
-
+ 
 t
 o
-
+ 
 a
 n
 d
-
+ 
 f
 r
 o
-
+ 
 i
 n
-
+ 
 t
 h
 e
-
+ 
 n
 i
 g
@@ -3159,7 +3159,7 @@ h
 t
 '
 s
-
+ 
 b
 r
 e
@@ -3167,7 +3167,7 @@ e
 z
 e
 .
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3181,74 +3181,74 @@ o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 b
 e
-
+ 
 t
 h
 e
-
+ 
 h
 a
 v
 e
 n
-
+ 
 h
 e
 '
 d
-
+ 
 p
 r
 a
 y
 e
 d
-
+ 
 f
 o
 r
 ?
-
+ 
 S
 l
 o
 w
 l
 y
-
+ 
 h
 e
-
+ 
 s
 l
 i
 d
-
+ 
 t
 o
 w
 a
 r
 d
-
+ 
 t
 h
 e
-
+ 
 d
 o
 o
 r
 ,
-
+ 
 p
 r
 e
@@ -3257,7 +3257,7 @@ s
 i
 n
 g
-
+ 
 h
 i
 m
@@ -3265,16 +3265,16 @@ s
 e
 l
 f
-
+ 
 m
 o
 r
 e
-
+ 
 a
 n
 d
-
+ 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -3287,83 +3287,83 @@ m
 o
 r
 e
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 w
 a
 l
 l
 ,
-
+ 
 i
 n
 t
 o
-
+ 
 t
 h
 e
-
+ 
 d
 a
 r
 k
 ,
-
+ 
 a
 w
 a
 y
-
+ 
 f
 r
 o
 m
-
+ 
 h
 i
 s
-
+ 
 e
 n
 e
 m
 y
 .
-
+ 
 W
 o
 u
 l
 d
-
+ 
 t
 h
 i
 s
-
+ 
 d
 o
 o
 r
-
+ 
 s
 a
 v
 e
-
+ 
 h
 i
 s
-
+ 
 h
 i
 d
diff --git a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_writer.xml b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_writer.xml
index 2b68f12e6bb5..fda03d3589de 100644
--- a/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_writer.xml
+++ b/sdext/source/pdfimport/test/testdocs/txtpictxt_pdfi_unittest_writer.xml
@@ -36,7 +36,7 @@
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
+He heard quiet steps behind him. That didn't bode well. Who could be following him this late at 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -45,7 +45,7 @@ He heard quiet steps behind him. That didn't bode well. Who could be following h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
+night and in this deadbeat part of town? And at this particular moment, just after he pulled off the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -54,7 +54,7 @@ night and in this deadbeat part of town? And at this particular moment, just aft
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-big time and was making off with the greenbacks. Was there another crook who'd had the same
+big time and was making off with the greenbacks. Was there another crook who'd had the same 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -63,7 +63,7 @@ big time and was making off with the greenbacks. Was there another crook who'd h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
+idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -72,7 +72,7 @@ idea, and was now watching him and waiting for a chance to grab the fruit of his
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-steps behind him mean that one of many law officers in town was on to him and just waiting to
+steps behind him mean that one of many law officers in town was on to him and just waiting to 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -81,7 +81,7 @@ steps behind him mean that one of many law officers in town was on to him and ju
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
+pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -90,7 +90,7 @@ pounce and snap those cuffs on his wrists? He nervously looked all around. Sudde
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
+alley. Like lightning he darted off to the left and disappeared between the two warehouses almost 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -99,7 +99,7 @@ alley. Like lightning he darted off to the left and disappeared between the two
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
+falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -108,7 +108,7 @@ falling over the trash can lying in the middle of the sidewalk. He tried to nerv
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
+along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -117,7 +117,7 @@ along in the inky darkness and suddenly stiffened: it was a dead-end, he would h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-way he had come. The steps got louder and louder, he saw the black outline of a figure coming
+way he had come. The steps got louder and louder, he saw the black outline of a figure coming 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -126,7 +126,7 @@ way he had come. The steps got louder and louder, he saw the black outline of a
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-around the corner. Is this the end of the line? he thought pressing himself back against the wall
+around the corner. Is this the end of the line? he thought pressing himself back against the wall 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -135,7 +135,7 @@ around the corner. Is this the end of the line? he thought pressing himself back
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-trying to make himself invisible in the dark, was all that planning and energy wasted? He was
+trying to make himself invisible in the dark, was all that planning and energy wasted? He was 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -144,7 +144,7 @@ trying to make himself invisible in the dark, was all that planning and energy w
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
+dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -153,7 +153,7 @@ dripping with sweat now, cold and wet, he could smell the fear coming off his cl
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
+next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze. 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -162,7 +162,7 @@ next to him, with a barely noticeable squeak, a door swung quietly to and fro in
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
+Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -180,7 +180,7 @@ more into the wall, into the dark, away from his enemy. Would this door save his
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-He heard quiet steps behind him. That didn't bode well. Who could be following him this late at
+He heard quiet steps behind him. That didn't bode well. Who could be following him this late at 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -189,7 +189,7 @@ He heard quiet steps behind him. That didn't bode well. Who could be following h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-night and in this deadbeat part of town? And at this particular moment, just after he pulled off the
+night and in this deadbeat part of town? And at this particular moment, just after he pulled off the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -198,7 +198,7 @@ night and in this deadbeat part of town? And at this particular moment, just aft
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-big time and was making off with the greenbacks. Was there another crook who'd had the same
+big time and was making off with the greenbacks. Was there another crook who'd had the same 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -207,7 +207,7 @@ big time and was making off with the greenbacks. Was there another crook who'd h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the
+idea, and was now watching him and waiting for a chance to grab the fruit of his labor? Or did the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -216,7 +216,7 @@ idea, and was now watching him and waiting for a chance to grab the fruit of his
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-steps behind him mean that one of many law officers in town was on to him and just waiting to
+steps behind him mean that one of many law officers in town was on to him and just waiting to 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -225,7 +225,7 @@ steps behind him mean that one of many law officers in town was on to him and ju
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the
+pounce and snap those cuffs on his wrists? He nervously looked all around. Suddenly he saw the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -234,7 +234,7 @@ pounce and snap those cuffs on his wrists? He nervously looked all around. Sudde
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-alley. Like lightning he darted off to the left and disappeared between the two warehouses almost
+alley. Like lightning he darted off to the left and disappeared between the two warehouses almost 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -243,7 +243,7 @@ alley. Like lightning he darted off to the left and disappeared between the two
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way
+falling over the trash can lying in the middle of the sidewalk. He tried to nervously tap his way 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -259,7 +259,7 @@ UDYKMTAwIDQwCjI1NQr/////////////////////////////////////////////////////////////
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the
+along in the inky darkness and suddenly stiffened: it was a dead-end, he would have to go back the 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -268,7 +268,7 @@ along in the inky darkness and suddenly stiffened: it was a dead-end, he would h
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-way he had come. The steps got louder and louder, he saw the black outline of a figure coming
+way he had come. The steps got louder and louder, he saw the black outline of a figure coming 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -277,7 +277,7 @@ way he had come. The steps got louder and louder, he saw the black outline of a
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-around the corner. Is this the end of the line? he thought pressing himself back against the wall
+around the corner. Is this the end of the line? he thought pressing himself back against the wall 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -286,7 +286,7 @@ around the corner. Is this the end of the line? he thought pressing himself back
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-trying to make himself invisible in the dark, was all that planning and energy wasted? He was
+trying to make himself invisible in the dark, was all that planning and energy wasted? He was 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -295,7 +295,7 @@ trying to make himself invisible in the dark, was all that planning and energy w
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly
+dripping with sweat now, cold and wet, he could smell the fear coming off his clothes. Suddenly 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -304,7 +304,7 @@ dripping with sweat now, cold and wet, he could smell the fear coming off his cl
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze.
+next to him, with a barely noticeable squeak, a door swung quietly to and fro in the night's breeze. 
 </text:span>
 </text:p>
 </draw:text-box>
@@ -313,7 +313,7 @@ next to him, with a barely noticeable squeak, a door swung quietly to and fro in
 <draw:text-box >
 <text:p >
 <text:span text:style-name="text7" >
-Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and
+Could this be the haven he'd prayed for? Slowly he slid toward the door, pressing himself more and 
 </text:span>
 </text:p>
 </draw:text-box>
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index 63cdaa88466a..cccff7dc441e 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -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
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index bc24000025c2..bb6c6c6d3451 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -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
@@ -80,19 +80,19 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >
     return mxBreakIter;
 }
 
-void DrawXmlEmitter::visit( HyperlinkElement& elem, const std::list< Element* >::const_iterator&   )
-{
+void DrawXmlEmitter::visit( HyperlinkElement& elem, const std::list< Element* >::const_iterator&   ) 
+{ 
     if( elem.Children.empty() )
         return;
-
+    
     const char* pType = dynamic_cast<DrawElement*>(elem.Children.front()) ? "draw:a" : "text:a";
-
+    
     PropertyMap aProps;
     aProps[ USTR( "xlink:type" ) ] = USTR( "simple" );
     aProps[ USTR( "xlink:href" ) ] = elem.URI;
     aProps[ USTR( "office:target-frame-name" ) ] = USTR( "_blank" );
     aProps[ USTR( "xlink:show" ) ] = USTR( "new" );
-
+    
     m_rEmitContext.rEmitter.beginTag( pType, aProps );
     std::list< Element* >::iterator this_it =  elem.Children.begin();
     while( this_it !=elem.Children.end() && *this_it != &elem )
@@ -103,18 +103,18 @@ void DrawXmlEmitter::visit( HyperlinkElement& elem, const std::list< Element* >:
     m_rEmitContext.rEmitter.endTag( pType );
 }
 
-void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::const_iterator&   )
+void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::const_iterator&   ) 
 {
     if( ! elem.Text.getLength() )
         return;
-
+    
     rtl::OUString strSpace(32);
     rtl::OUString strNbSpace(160);
     rtl::OUString tabSpace(0x09);
     PropertyMap aProps;
     if( elem.StyleId != -1 )
     {
-        aProps[ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text:style-name" ) ) ] =
+        aProps[ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text:style-name" ) ) ] = 
             m_rEmitContext.rStyles.getStyleName( elem.StyleId );
     }
 
@@ -127,7 +127,7 @@ void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::cons
     sal_Int16 nType = GetBreakIterator()->getScriptType( str, i + 1);
     if (nType == ::com::sun::star::i18n::ScriptType::COMPLEX)
         isComplex = true;
-    }
+    } 
 
     m_rEmitContext.rEmitter.beginTag( "text:span", aProps );
 
@@ -152,7 +152,7 @@ void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::cons
                 m_rEmitContext.rEmitter.write( strToken );
             }
         }
-    }
+    } 
 
     std::list< Element* >::iterator this_it =  elem.Children.begin();
     while( this_it !=elem.Children.end() && *this_it != &elem )
@@ -160,7 +160,7 @@ void DrawXmlEmitter::visit( TextElement& elem, const std::list< Element* >::cons
         (*this_it)->visitedBy( *this, this_it );
         this_it++;
     }
-
+    
     m_rEmitContext.rEmitter.endTag( "text:span" );
 }
 
@@ -175,28 +175,28 @@ void DrawXmlEmitter::visit( ParagraphElement& elem, const std::list< Element* >:
     if( elem.Type == elem.Headline )
         pTagType = "text:h";
     m_rEmitContext.rEmitter.beginTag( pTagType, aProps );
-
+    
     std::list< Element* >::iterator this_it =  elem.Children.begin();
     while( this_it !=elem.Children.end() && *this_it != &elem )
     {
         (*this_it)->visitedBy( *this, this_it );
         this_it++;
     }
-
+    
     m_rEmitContext.rEmitter.endTag( pTagType );
 }
 
-void DrawXmlEmitter::fillFrameProps( DrawElement&       rElem,
-                                     PropertyMap&       rProps,
+void DrawXmlEmitter::fillFrameProps( DrawElement&       rElem, 
+                                     PropertyMap&       rProps, 
                                      const EmitContext& rEmitContext )
 {
     double rel_x = rElem.x, rel_y = rElem.y;
-
+  
     rProps[ USTR( "draw:z-index" ) ] = rtl::OUString::valueOf( rElem.ZOrder );
     rProps[ USTR( "draw:style-name" )] = rEmitContext.rStyles.getStyleName( rElem.StyleId );
     rProps[ USTR( "svg:width" ) ]   = convertPixelToUnitString( rElem.w );
     rProps[ USTR( "svg:height" ) ]  = convertPixelToUnitString( rElem.h );
-
+    
     const GraphicsContext& rGC =
         rEmitContext.rProcessor.getGraphicsContext( rElem.GCId );
     if( rGC.Transformation.isIdentity() )
@@ -208,14 +208,14 @@ void DrawXmlEmitter::fillFrameProps( DrawElement&       rElem,
     {
         basegfx::B2DTuple aScale, aTranslation;
         double fRotate, fShearX;
-
+        
         rGC.Transformation.decompose( aScale, aTranslation, fRotate, fShearX );
-
+        
         rtl::OUStringBuffer aBuf( 256 );
 
-        // TODO(F2): general transformation case missing; if implemented, note
+        // TODO(F2): general transformation case missing; if implemented, note 
         // that ODF rotation is oriented the other way
-
+        
         // vertical mirroring is done by horizontally mirroring and rotaing 180 degree
         // quaint !
         if( rElem.MirrorVertical )
@@ -244,36 +244,36 @@ void DrawXmlEmitter::fillFrameProps( DrawElement&       rElem,
         aBuf.append( sal_Unicode(' ') );
         aBuf.append( convertPixelToUnitString( rel_y ) );
         aBuf.appendAscii( " )" );
-
+     
         rProps[ USTR( "draw:transform" ) ] = aBuf.makeStringAndClear();
     }
 }
 
-void DrawXmlEmitter::visit( FrameElement& elem, const std::list< Element* >::const_iterator&   )
-{
+void DrawXmlEmitter::visit( FrameElement& elem, const std::list< Element* >::const_iterator&   ) 
+{      
     if( elem.Children.empty() )
         return;
-
+    
     bool bTextBox = (dynamic_cast<ParagraphElement*>(elem.Children.front()) != NULL);
     PropertyMap aFrameProps;
     fillFrameProps( elem, aFrameProps, m_rEmitContext );
     m_rEmitContext.rEmitter.beginTag( "draw:frame", aFrameProps );
     if( bTextBox )
         m_rEmitContext.rEmitter.beginTag( "draw:text-box", PropertyMap() );
-
+    
     std::list< Element* >::iterator this_it =  elem.Children.begin();
     while( this_it !=elem.Children.end() && *this_it != &elem )
     {
         (*this_it)->visitedBy( *this, this_it );
         this_it++;
     }
-
+    
     if( bTextBox )
         m_rEmitContext.rEmitter.endTag( "draw:text-box" );
     m_rEmitContext.rEmitter.endTag( "draw:frame" );
 }
 
-void DrawXmlEmitter::visit( PolyPolyElement& elem, const std::list< Element* >::const_iterator& )
+void DrawXmlEmitter::visit( PolyPolyElement& elem, const std::list< Element* >::const_iterator& ) 
 {
     elem.updateGeometry();
     /* note:
@@ -287,44 +287,44 @@ void DrawXmlEmitter::visit( PolyPolyElement& elem, const std::list< Element* >::
     {
         basegfx::B2DPolygon b2dPolygon;
         b2dPolygon =  elem.PolyPoly.getB2DPolygon( i );
-
+        
         for ( sal_uInt32 j = 0; j< b2dPolygon.count(); j++ )
         {
             basegfx::B2DPoint point;
             basegfx::B2DPoint nextPoint;
             point = b2dPolygon.getB2DPoint( j );
-
+            
             basegfx::B2DPoint prevPoint;
             prevPoint = b2dPolygon.getPrevControlPoint( j ) ;
-
-            point.setX( convPx2mmPrec2( point.getX() )*100.0 );
+            
+            point.setX( convPx2mmPrec2( point.getX() )*100.0 ); 
             point.setY( convPx2mmPrec2( point.getY() )*100.0 );
-
+            
             if ( b2dPolygon.isPrevControlPointUsed( j ) )
             {
-                prevPoint.setX( convPx2mmPrec2( prevPoint.getX() )*100.0 );
+                prevPoint.setX( convPx2mmPrec2( prevPoint.getX() )*100.0 ); 
                 prevPoint.setY( convPx2mmPrec2( prevPoint.getY() )*100.0 );
             }
-
+            
             if ( b2dPolygon.isNextControlPointUsed( j ) )
             {
                 nextPoint = b2dPolygon.getNextControlPoint( j ) ;
-                nextPoint.setX( convPx2mmPrec2( nextPoint.getX() )*100.0 );
+                nextPoint.setX( convPx2mmPrec2( nextPoint.getX() )*100.0 ); 
                 nextPoint.setY( convPx2mmPrec2( nextPoint.getY() )*100.0 );
-            }
-
+            } 
+            
             b2dPolygon.setB2DPoint( j, point );
-
+            
             if ( b2dPolygon.isPrevControlPointUsed( j ) )
                 b2dPolygon.setPrevControlPoint( j , prevPoint ) ;
-
+            
             if ( b2dPolygon.isNextControlPointUsed( j ) )
                 b2dPolygon.setNextControlPoint( j , nextPoint ) ;
         }
-
+        
         elem.PolyPoly.setB2DPolygon( i, b2dPolygon );
     }
-
+    
     PropertyMap aProps;
     fillFrameProps( elem, aProps, m_rEmitContext );
     rtl::OUStringBuffer aBuf( 64 );
@@ -334,14 +334,14 @@ void DrawXmlEmitter::visit( PolyPolyElement& elem, const std::list< Element* >::
     aBuf.append( convPx2mmPrec2(elem.h)*100.0 );
     aProps[ USTR( "svg:viewBox" ) ] = aBuf.makeStringAndClear();
     aProps[ USTR( "svg:d" ) ]       = basegfx::tools::exportToSvgD( elem.PolyPoly );
-
+    
     m_rEmitContext.rEmitter.beginTag( "draw:path", aProps );
     m_rEmitContext.rEmitter.endTag( "draw:path" );
 }
 
-void DrawXmlEmitter::visit( ImageElement& elem, const std::list< Element* >::const_iterator& )
+void DrawXmlEmitter::visit( ImageElement& elem, const std::list< Element* >::const_iterator& ) 
 {
-    PropertyMap aImageProps;
+    PropertyMap aImageProps;    
     m_rEmitContext.rEmitter.beginTag( "draw:image", aImageProps );
     m_rEmitContext.rEmitter.beginTag( "office:binary-data", PropertyMap() );
     m_rEmitContext.rImages.writeBase64EncodedStream( elem.Image, m_rEmitContext);
@@ -353,9 +353,9 @@ void DrawXmlEmitter::visit( PageElement& elem, const std::list< Element* >::cons
 {
     PropertyMap aPageProps;
     aPageProps[ USTR( "draw:master-page-name" ) ] = m_rEmitContext.rStyles.getStyleName( elem.StyleId );
-
+    
     m_rEmitContext.rEmitter.beginTag("draw:page", aPageProps);
-
+    
     if( m_rEmitContext.xStatusIndicator.is() )
         m_rEmitContext.xStatusIndicator->setValue( elem.PageNumber );
 
@@ -365,23 +365,23 @@ void DrawXmlEmitter::visit( PageElement& elem, const std::list< Element* >::cons
         (*this_it)->visitedBy( *this, this_it );
         this_it++;
     }
-
+    
     m_rEmitContext.rEmitter.endTag("draw:page");
 }
-
+    
 void DrawXmlEmitter::visit( DocumentElement& elem, const std::list< Element* >::const_iterator&)
 {
     m_rEmitContext.rEmitter.beginTag( "office:body", PropertyMap() );
-    m_rEmitContext.rEmitter.beginTag( m_bWriteDrawDocument ? "office:drawing" : "office:presentation",
+    m_rEmitContext.rEmitter.beginTag( m_bWriteDrawDocument ? "office:drawing" : "office:presentation", 
                                       PropertyMap() );
-
+    
     std::list< Element* >::iterator this_it =  elem.Children.begin();
     while( this_it !=elem.Children.end() && *this_it != &elem )
     {
         (*this_it)->visitedBy( *this, this_it );
         this_it++;
     }
-
+    
     m_rEmitContext.rEmitter.endTag( m_bWriteDrawDocument ? "office:drawing" : "office:presentation" );
     m_rEmitContext.rEmitter.endTag( "office:body" );
 }
@@ -412,12 +412,12 @@ void DrawXmlOptimizer::visit( PolyPolyElement& elem, const std::list< Element* >
      *     the other is a fill
      */
     if( elem.Parent )
-    {
-        // find following PolyPolyElement in parent's children list
+    {    
+        // find following PolyPolyElement in parent's children list 
         std::list< Element* >::iterator this_it = elem.Parent->Children.begin();
         while( this_it != elem.Parent->Children.end() && *this_it != &elem )
             ++this_it;
-
+        
         if( this_it != elem.Parent->Children.end() )
         {
             std::list< Element* >::iterator next_it = this_it;
@@ -477,15 +477,15 @@ void DrawXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::co
     if( m_rProcessor.getStatusIndicator().is() )
         m_rProcessor.getStatusIndicator()->setValue( elem.PageNumber );
 
-    // resolve hyperlinks
+    // resolve hyperlinks   
     elem.resolveHyperlinks();
-
+    
     elem.resolveFontStyles( m_rProcessor ); // underlines and such
-
-    // FIXME: until hyperlinks and font effects are adjusted for
-    // geometrical search handle them before sorting
+    
+    // FIXME: until hyperlinks and font effects are adjusted for    
+    // geometrical search handle them before sorting    
     m_rProcessor.sortElements( &elem );
-
+    
     // find paragraphs in text
     ParagraphElement* pCurPara = NULL;
     std::list< Element* >::iterator page_element, next_page_element;
@@ -514,7 +514,7 @@ void DrawXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::co
                     fCurLineHeight = (fCurLineHeight*double(nCurLineElements) + pTestText->h)/double(nCurLineElements+1);
                     nCurLineElements++;
                 }
-            }
+            } 
             continue;
         }
 
@@ -525,7 +525,7 @@ void DrawXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::co
         if( pDraw )
         {
             // insert small drawing objects as character, else leave them page bound
-
+            
             bool bInsertToParagraph = false;
             // first check if this is either inside the paragraph
             if( pCurPara && pDraw->y < pCurPara->y + pCurPara->h )
@@ -568,14 +568,14 @@ void DrawXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::co
                     pDraw->isCharacter = true;
                 }
             }
-
+            
             if( ! bInsertToParagraph )
             {
                 pCurPara = NULL;
                 continue;
             }
         }
-
+        
         TextElement* pText = dynamic_cast<TextElement*>(*page_element);
         if( ! pText && pLink && ! pLink->Children.empty() )
             pText = dynamic_cast<TextElement*>(pLink->Children.front());
@@ -604,10 +604,10 @@ void DrawXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::co
                     }
                 }
 
-
+               
             }
 
-
+            
             // update line height/width
             if( pCurPara )
             {
@@ -626,8 +626,8 @@ void DrawXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::co
                 line_right = pGeo->x + pGeo->w;
             }
         }
-
-
+        
+        
         // move element to current paragraph
        if (! pCurPara )  // new paragraph, insert one
        {
@@ -662,7 +662,7 @@ bool isSpaces(TextElement* pTextElem)
         rtl::OUString strToken =  ouTxt2.copy(i,1) ;
         if( !strSpace.equals(strToken) )
             return false;
-    }
+    } 
     return true;
 }
 
@@ -672,7 +672,7 @@ bool notTransformed(GraphicsContext GC)
         GC.Transformation.get(0,0) ==  100.00 &&
         GC.Transformation.get(1,0) ==    0.00 &&
         GC.Transformation.get(0,1) ==    0.00 &&
-        GC.Transformation.get(1,1) == -100.00
+        GC.Transformation.get(1,1) == -100.00 
        );
 }
 
@@ -683,7 +683,7 @@ void DrawXmlOptimizer::optimizeTextElements(Element& rParent)
         OSL_ENSURE( 0, "empty paragraph optimized" );
         return;
     }
-
+    
     // concatenate child elements with same font id
     std::list< Element* >::iterator next = rParent.Children.begin();
     std::list< Element* >::iterator it = next++;
@@ -705,12 +705,12 @@ void DrawXmlOptimizer::optimizeTextElements(Element& rParent)
             TextElement* pNext = dynamic_cast<TextElement*>(*next);
             bool isComplex = false;
             rtl::OUString str(pCur->Text.getStr());
-            for(int i=0; i< str.getLength(); i++)
+            for(int i=0; i< str.getLength(); i++) 
             {
                 sal_Int16 nType = GetBreakIterator()->getScriptType( str, i );
                 if (nType == ::com::sun::star::i18n::ScriptType::COMPLEX)
                     isComplex = true;
-            }
+            } 
             bool bPara = strspn("ParagraphElement", typeid(rParent).name());
             ParagraphElement* pPara = dynamic_cast<ParagraphElement*>(&rParent);
             if (bPara && isComplex)
@@ -719,9 +719,9 @@ void DrawXmlOptimizer::optimizeTextElements(Element& rParent)
             {
                 const GraphicsContext& rCurGC = m_rProcessor.getGraphicsContext( pCur->GCId );
                 const GraphicsContext& rNextGC = m_rProcessor.getGraphicsContext( pNext->GCId );
-
+                
                 // line and space optimization; works only in strictly horizontal mode
-
+                
                 // concatenate consecutive text elements unless there is a
                 // font or text color or matrix change, leave a new span in that case
                 if( (pCur->FontId == pNext->FontId || isSpaces(pNext)) &&
@@ -729,7 +729,7 @@ void DrawXmlOptimizer::optimizeTextElements(Element& rParent)
                     rCurGC.FillColor.Green == rNextGC.FillColor.Green &&
                     rCurGC.FillColor.Blue == rNextGC.FillColor.Blue &&
                     rCurGC.FillColor.Alpha == rNextGC.FillColor.Alpha &&
-                    (rCurGC.Transformation == rNextGC.Transformation || notTransformed(rNextGC))
+                    (rCurGC.Transformation == rNextGC.Transformation || notTransformed(rNextGC)) 
                     )
                 {
                     pCur->updateGeometryWith( pNext );
@@ -737,7 +737,7 @@ void DrawXmlOptimizer::optimizeTextElements(Element& rParent)
                         pCur->Text.append( pNext->Text.getStr(), pNext->Text.getLength() );
 
                         str = pCur->Text.getStr();
-                    for(int i=0; i< str.getLength(); i++)
+                    for(int i=0; i< str.getLength(); i++) 
                     {
                         sal_Int16 nType = GetBreakIterator()->getScriptType( str, i );
                         if (nType == ::com::sun::star::i18n::ScriptType::COMPLEX)
@@ -761,7 +761,7 @@ void DrawXmlOptimizer::optimizeTextElements(Element& rParent)
         if ( bConcat )
             next = it;
         else
-            ++it;
+            ++it;        
         ++next;
     }
 }
@@ -783,7 +783,7 @@ void DrawXmlFinalizer::visit( PolyPolyElement& elem, const std::list< Element* >
     aProps[ USTR( "style:parent-style-name") ] = USTR( "standard" );
     // generate standard graphic style if necessary
     m_rStyleContainer.getStandardStyleId( "graphic" );
-
+    
     PropertyMap aGCProps;
 
     // TODO(F3): proper dash emulation
@@ -821,7 +821,7 @@ void DrawXmlFinalizer::visit( PolyPolyElement& elem, const std::list< Element* >
     StyleContainer::Style aStyle( "style:style", aProps );
     StyleContainer::Style aSubStyle( "style:graphic-properties", aGCProps );
     aStyle.SubStyles.push_back( &aSubStyle );
-
+    
     elem.StyleId = m_rStyleContainer.getStyleId( aStyle );
 }
 
@@ -830,22 +830,22 @@ void DrawXmlFinalizer::visit( HyperlinkElement&, const std::list< Element* >::co
 }
 
 void DrawXmlFinalizer::visit( TextElement& elem, const std::list< Element* >::const_iterator& )
-{
+{    
     const FontAttributes& rFont = m_rProcessor.getFont( elem.FontId );
     PropertyMap aProps;
     aProps[ USTR( "style:family" ) ] = USTR( "text" );
 
     PropertyMap aFontProps;
-
+    
     // family name
     aFontProps[ USTR( "fo:font-family" ) ] = rFont.familyName;
     aFontProps[ USTR( "style:font-family-complex" ) ] = rFont.familyName;
-
+    
     // bold
     if( rFont.isBold )
     {
         aFontProps[ USTR( "fo:font-weight" ) ]         = USTR( "bold" );
-        aFontProps[ USTR( "fo:font-weight-asian" ) ]   = USTR( "bold" );
+        aFontProps[ USTR( "fo:font-weight-asian" ) ]   = USTR( "bold" ); 
         aFontProps[ USTR( "style:font-weight-complex" ) ] = USTR( "bold" );
     }
     // italic
@@ -853,7 +853,7 @@ void DrawXmlFinalizer::visit( TextElement& elem, const std::list< Element* >::co
     {
         aFontProps[ USTR( "fo:font-style" ) ]         = USTR( "italic" );
         aFontProps[ USTR( "fo:font-style-asian" ) ]   = USTR( "italic" );
-        aFontProps[ USTR( "style:font-style-complex" ) ] = USTR( "italic" );
+        aFontProps[ USTR( "style:font-style-complex" ) ] = USTR( "italic" ); 
     }
     // underline
     if( rFont.isUnderline )
@@ -878,7 +878,7 @@ void DrawXmlFinalizer::visit( TextElement& elem, const std::list< Element* >::co
     // color
     const GraphicsContext& rGC = m_rProcessor.getGraphicsContext( elem.GCId );
     aFontProps[ USTR( "fo:color" ) ]                 =  getColorString( rFont.isOutline ? rGC.LineColor : rGC.FillColor );
-
+    
     StyleContainer::Style aStyle( "style:style", aProps );
     StyleContainer::Style aSubStyle( "style:text-properties", aFontProps );
     aStyle.SubStyles.push_back( &aSubStyle );
@@ -886,13 +886,13 @@ void DrawXmlFinalizer::visit( TextElement& elem, const std::list< Element* >::co
 }
 
 void DrawXmlFinalizer::visit( ParagraphElement& elem, const std::list< Element* >::const_iterator& )
-{
+{ 
 
     PropertyMap aProps;
     aProps[ USTR( "style:family" ) ] = USTR( "paragraph" );
     // generate standard paragraph style if necessary
     m_rStyleContainer.getStandardStyleId( "paragraph" );
-
+    
     PropertyMap aParProps;
 
     aParProps[ USTR("fo:text-align")]                   = USTR("start");
@@ -900,11 +900,11 @@ void DrawXmlFinalizer::visit( ParagraphElement& elem, const std::list< Element*
         aParProps[ USTR("style:writing-mode")]                    = USTR("rl-tb");
     else
         aParProps[ USTR("style:writing-mode")]                    = USTR("lr-tb");
-
+    
     StyleContainer::Style aStyle( "style:style", aProps );
     StyleContainer::Style aSubStyle( "style:paragraph-properties", aParProps );
     aStyle.SubStyles.push_back( &aSubStyle );
-
+    
     elem.StyleId = m_rStyleContainer.getStyleId( aStyle );
 
     // update page boundaries
@@ -916,7 +916,7 @@ void DrawXmlFinalizer::visit( ParagraphElement& elem, const std::list< Element*
         double p_y = elem.Parent->y;
         double p_w = elem.Parent->w;
         double p_h = elem.Parent->h;
-
+        
         PageElement* pPage = dynamic_cast<PageElement*>(elem.Parent);
         if( pPage )
         {
@@ -937,7 +937,7 @@ void DrawXmlFinalizer::visit( FrameElement& elem, const std::list< Element* >::c
     aProps[ USTR( "style:parent-style-name") ] = USTR( "standard" );
     // generate standard graphic style if necessary
     m_rStyleContainer.getStandardStyleId( "graphic" );
-
+    
     PropertyMap aGCProps;
 
     aGCProps[ USTR("draw:stroke") ]                    = USTR("none");
@@ -952,18 +952,18 @@ void DrawXmlFinalizer::visit( FrameElement& elem, const std::list< Element* >::c
     aGCProps[ USTR("fo:padding-left") ]                = USTR("0cm");
     aGCProps[ USTR("fo:padding-right") ]               = USTR("0cm");
     aGCProps[ USTR("fo:padding-bottom") ]              = USTR("0cm");
-
+    
     // remark: vertical mirroring is done in current OOO by
     // mirroring horzontally and rotating 180 degrees
     // this is quaint, but unfortunately it seems
     // mirror=vertical is defined but not implemented in current code
     if( elem.MirrorVertical )
         aGCProps[ USTR("style:mirror") ] = USTR("horizontal");
-
+    
     StyleContainer::Style aStyle( "style:style", aProps );
     StyleContainer::Style aSubStyle( "style:graphic-properties", aGCProps );
     aStyle.SubStyles.push_back( &aSubStyle );
-
+    
     elem.StyleId = m_rStyleContainer.getStyleId( aStyle );
     elem.applyToChildren(*this);
 }
@@ -976,10 +976,10 @@ void DrawXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::co
 {
     if( m_rProcessor.getStatusIndicator().is() )
         m_rProcessor.getStatusIndicator()->setValue( elem.PageNumber );
-
+    
     // transform from pixel to mm
     double page_width = convPx2mm( elem.w ), page_height = convPx2mm( elem.h );
-
+    
     // calculate page margins out of the relevant children (paragraphs)
     elem.TopMargin = elem.h, elem.BottomMargin = 0, elem.LeftMargin = elem.w, elem.RightMargin = 0;
 
@@ -994,20 +994,20 @@ void DrawXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::co
         if( (*it)->y + (*it)->h > elem.BottomMargin )
             elem.BottomMargin = ((*it)->y + (*it)->h);
     }
-
+    
     // transform margins to mm
     double left_margin     = convPx2mm( elem.LeftMargin );
     double right_margin    = convPx2mm( elem.RightMargin );
     double top_margin      = convPx2mm( elem.TopMargin );
     double bottom_margin   = convPx2mm( elem.BottomMargin );
-
+    
     // round left/top margin to nearest mm
     left_margin     = rtl_math_round( left_margin, 0, rtl_math_RoundingMode_Floor );
     top_margin      = rtl_math_round( top_margin, 0, rtl_math_RoundingMode_Floor );
     // round (fuzzy) right/bottom margin to nearest cm
     right_margin    = rtl_math_round( right_margin, right_margin >= 10 ? -1 : 0, rtl_math_RoundingMode_Floor );
-    bottom_margin   = rtl_math_round( bottom_margin, bottom_margin >= 10 ? -1 : 0, rtl_math_RoundingMode_Floor );
-
+    bottom_margin   = rtl_math_round( bottom_margin, bottom_margin >= 10 ? -1 : 0, rtl_math_RoundingMode_Floor );    
+    
     // set reasonable default in case of way too large margins
     // e.g. no paragraph case
     if( left_margin > page_width/2.0 - 10 )
@@ -1018,7 +1018,7 @@ void DrawXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::co
         top_margin = 10;
     if( bottom_margin > page_height/2.0 - 10 )
         bottom_margin = 10;
-
+    
     // catch the weird cases
     if( left_margin < 0 )
         left_margin = 0;
@@ -1028,16 +1028,16 @@ void DrawXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::co
         top_margin = 0;
     if( bottom_margin < 0 )
         bottom_margin = 0;
-
+    
     // widely differing margins are unlikely to be correct
     if( right_margin > left_margin*1.5 )
         right_margin = left_margin;
-
+    
     elem.LeftMargin      = convmm2Px( left_margin );
     elem.RightMargin     = convmm2Px( right_margin );
     elem.TopMargin       = convmm2Px( top_margin );
     elem.BottomMargin    = convmm2Px( bottom_margin );
-
+    
     // get styles for paragraphs
     PropertyMap aPageProps;
     PropertyMap aPageLayoutProps;
@@ -1048,26 +1048,26 @@ void DrawXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::co
     aPageLayoutProps[ USTR( "fo:margin-right" ) ]   =  unitMMString( right_margin );
     aPageLayoutProps[ USTR( "fo:page-width" ) ]     =  unitMMString( page_width );
     aPageLayoutProps[ USTR( "fo:page-height" ) ]    =  unitMMString( page_height );
-    aPageLayoutProps[ USTR( "style:print-orientation" ) ]= elem.w < elem.h ? USTR( "portrait" ) : USTR( "landscape" );
+    aPageLayoutProps[ USTR( "style:print-orientation" ) ]= elem.w < elem.h ? USTR( "portrait" ) : USTR( "landscape" ); 
     aPageLayoutProps[ USTR( "style:writing-mode" ) ]= USTR( "lr-tb" );
-
-    StyleContainer::Style aStyle( "style:page-layout", aPageProps);
-    StyleContainer::Style aSubStyle( "style:page-layout-properties", aPageLayoutProps);
+    
+    StyleContainer::Style aStyle( "style:page-layout", aPageProps);   
+    StyleContainer::Style aSubStyle( "style:page-layout-properties", aPageLayoutProps); 
     aStyle.SubStyles.push_back(&aSubStyle);
     sal_Int32 nPageStyle = m_rStyleContainer.impl_getStyleId( aStyle, false );
 
     // create master page
     rtl::OUString aMasterPageLayoutName = m_rStyleContainer.getStyleName( nPageStyle );
-    aPageProps[ USTR( "style:page-layout-name" ) ] = aMasterPageLayoutName;
-
-    StyleContainer::Style aMPStyle( "style:master-page", aPageProps);
-
+    aPageProps[ USTR( "style:page-layout-name" ) ] = aMasterPageLayoutName; 
+     
+    StyleContainer::Style aMPStyle( "style:master-page", aPageProps); 
+   
     StyleContainer::Style aHeaderStyle( "style:header", PropertyMap() );
     StyleContainer::Style aFooterStyle( "style:footer", PropertyMap() );
 
     elem.StyleId = m_rStyleContainer.impl_getStyleId( aMPStyle,false );
 
-
+    
     rtl::OUString aMasterPageName = m_rStyleContainer.getStyleName( elem.StyleId );
 
     // create styles for children
@@ -1075,7 +1075,7 @@ void DrawXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::co
 }
 
 void DrawXmlFinalizer::visit( DocumentElement& elem, const std::list< Element* >::const_iterator& )
-{
+{    
     elem.applyToChildren(*this);
 }
 
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.hxx b/sdext/source/pdfimport/tree/drawtreevisiting.hxx
index cc41e76c5065..1671b93e808f 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.hxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.hxx
@@ -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
@@ -60,7 +60,7 @@ namespace pdfi
         virtual void visit( PageElement&, const std::list< Element* >::const_iterator&  );
         virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator&  );
     };
-
+   
     class DrawXmlFinalizer : public ElementTreeVisitor
     {
     private:
@@ -83,7 +83,7 @@ namespace pdfi
         virtual void visit( PageElement&, const std::list< Element* >::const_iterator&  );
         virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator&  );
     };
-
+   
     class DrawXmlEmitter : public ElementTreeVisitor
     {
     private:
@@ -95,8 +95,8 @@ namespace pdfi
         /// writes Impress doc when false
         const bool   m_bWriteDrawDocument;
 
-        void fillFrameProps( DrawElement&       rElem,
-                             PropertyMap&       rProps,
+        void fillFrameProps( DrawElement&       rElem, 
+                             PropertyMap&       rProps, 
                              const EmitContext& rEmitContext );
 
     public:
@@ -115,7 +115,7 @@ namespace pdfi
         virtual void visit( ImageElement&, const std::list< Element* >::const_iterator&  );
         virtual void visit( PageElement&, const std::list< Element* >::const_iterator&  );
         virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator&  );
-    };
+    };   
 }
 
 #endif
diff --git a/sdext/source/pdfimport/tree/genericelements.cxx b/sdext/source/pdfimport/tree/genericelements.cxx
index e6a50a0331db..d8696ddcb850 100644
--- a/sdext/source/pdfimport/tree/genericelements.cxx
+++ b/sdext/source/pdfimport/tree/genericelements.cxx
@@ -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
@@ -34,7 +34,7 @@
 #include "pdfiprocessor.hxx"
 #include "pdfihelper.hxx"
 #include "style.hxx"
-
+ 
 
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/range/b2drange.hxx>
@@ -55,7 +55,7 @@ Element::~Element()
         Children.pop_front();
     }
 }
-
+ 
 void Element::applyToChildren( ElementTreeVisitor& rVisitor )
 {
     for( std::list< Element* >::iterator it = Children.begin(); it != Children.end(); ++it )
@@ -124,7 +124,7 @@ void HyperlinkElement::visitedBy( ElementTreeVisitor&                          r
 {
     rVisitor.visit(*this,rParentIt);
 }
-
+ 
 void TextElement::visitedBy( ElementTreeVisitor&                          rVisitor,
                              const std::list< Element* >::const_iterator& rParentIt )
 {
@@ -142,8 +142,8 @@ void ImageElement::visitedBy( ElementTreeVisitor&                          rVisi
 {
     rVisitor.visit( *this, rParentIt);
 }
-
-PolyPolyElement::PolyPolyElement( Element*                       pParent,
+ 
+PolyPolyElement::PolyPolyElement( Element*                       pParent, 
                                   sal_Int32                      nGCId,
                                   const basegfx::B2DPolyPolygon& rPolyPoly,
                                   sal_Int8                       nAction )
@@ -214,7 +214,7 @@ bool ParagraphElement::isSingleLined( PDFIProcessor& rProc ) const
         // a paragraph containing subparagraphs cannot be single lined
         if( dynamic_cast< ParagraphElement* >(*it) != NULL )
             return false;
-
+        
         pText = dynamic_cast< TextElement* >(*it);
         if( pText )
         {
@@ -232,7 +232,7 @@ bool ParagraphElement::isSingleLined( PDFIProcessor& rProc ) const
         }
         ++it;
     }
-
+    
     // a paragraph without a single text is not considered single lined
     return pLastText != NULL;
 }
@@ -281,7 +281,7 @@ PageElement::~PageElement()
     if( FooterElement )
         delete FooterElement;
 }
-
+ 
 void PageElement::visitedBy( ElementTreeVisitor&                          rVisitor,
                              const std::list< Element* >::const_iterator& rParentIt )
 {
@@ -323,7 +323,7 @@ bool PageElement::resolveHyperlink( std::list<Element*>::iterator link_it, std::
     HyperlinkElement* pLink = dynamic_cast<HyperlinkElement*>(*link_it);
     if( ! pLink ) // sanity check
         return false;
-
+    
     for( std::list<Element*>::iterator it = rElements.begin(); it != rElements.end(); ++it )
     {
         if( (*it)->x >= pLink->x && (*it)->x + (*it)->w <= pLink->x + pLink->w &&
@@ -391,7 +391,7 @@ void PageElement::resolveUnderlines( PDFIProcessor& rProc )
 {
     // FIXME: currently the algorithm used is quadratic
     // this could be solved by some sorting beforehand
-
+    
     std::list< Element* >::iterator poly_it = Children.begin();
     while( poly_it != Children.end() )
     {
@@ -415,7 +415,7 @@ void PageElement::resolveUnderlines( PDFIProcessor& rProc )
             ++poly_it;
             continue;
         }
-
+        
         bool bRemovePoly = false;
         basegfx::B2DPolygon aPoly = pPoly->PolyPoly.getB2DPolygon(0);
         if( aPoly.count() != 2 ||
@@ -489,7 +489,7 @@ void DocumentElement::visitedBy( ElementTreeVisitor&                          rV
 {
     rVisitor.visit(*this, rParentIt);
 }
-
+ 
 
 }
 
diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx
index b2122a6c7cc2..158f251a8ef5 100644
--- a/sdext/source/pdfimport/tree/genericelements.hxx
+++ b/sdext/source/pdfimport/tree/genericelements.hxx
@@ -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
@@ -48,7 +48,7 @@ namespace pdfi
     class ImageContainer;
     class PDFIProcessor;
     class ElementFactory;
-
+    
 
     struct EmitContext
     {
@@ -58,7 +58,7 @@ namespace pdfi
             ImageContainer&                          _rImages,
             PDFIProcessor&                           _rProcessor,
             const com::sun::star::uno::Reference<
-            com::sun::star::task::XStatusIndicator>& _xStatusIndicator,
+            com::sun::star::task::XStatusIndicator>& _xStatusIndicator,  
             com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >  xContext)
         :
             rEmitter(_rEmitter),
@@ -75,7 +75,7 @@ namespace pdfi
         PDFIProcessor&  rProcessor;
         com::sun::star::uno::Reference<
             com::sun::star::task::XStatusIndicator> xStatusIndicator;
-        com::sun::star::uno::Reference<
+        com::sun::star::uno::Reference< 
             com::sun::star::uno::XComponentContext >  m_xContext;
     };
 
@@ -105,20 +105,20 @@ namespace pdfi
             pNewParent must not be NULL
         */
         static void setParent( std::list<Element*>::iterator& el, Element* pNewParent );
-
+        
         double              x, y, w, h;
         sal_Int32           StyleId;
         Element*            Parent;
         std::list<Element*> Children;
     };
-
+    
     struct ListElement : public Element
     {
         ListElement() : Element( NULL ) {}
         // ElementTreeVisitable
         virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& );
     };
-
+    
     struct HyperlinkElement : public Element
     {
         friend class ElementFactory;
@@ -131,10 +131,10 @@ namespace pdfi
 
         rtl::OUString URI;
     };
-
+    
     struct GraphicalElement : public Element
     {
-    protected:
+    protected: 
         GraphicalElement( Element* pParent, sal_Int32 nGCId )
         : Element( pParent ), GCId( nGCId ), MirrorVertical( false ) {}
 
@@ -142,7 +142,7 @@ namespace pdfi
         sal_Int32 GCId;
         bool      MirrorVertical;
     };
-
+    
     struct DrawElement : public GraphicalElement
     {
     protected:
@@ -153,7 +153,7 @@ namespace pdfi
         bool      isCharacter;
         sal_Int32 ZOrder;
     };
-
+    
     struct FrameElement : public DrawElement
     {
         friend class ElementFactory;
@@ -165,7 +165,7 @@ namespace pdfi
         // ElementTreeVisitable
         virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& );
     };
-
+    
     struct TextElement : public GraphicalElement
     {
         friend class ElementFactory;
@@ -176,7 +176,7 @@ namespace pdfi
     public:
         // ElementTreeVisitable
         virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& );
-
+       
         rtl::OUStringBuffer Text;
         sal_Int32           FontId;
     };
@@ -190,7 +190,7 @@ namespace pdfi
     public:
         // ElementTreeVisitable
         virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt );
-
+        
         // returns true only if only a single line is contained
         bool isSingleLined( PDFIProcessor& rProc ) const;
         // returns the highest line height of the contained textelements
@@ -198,13 +198,13 @@ namespace pdfi
         double getLineHeight( PDFIProcessor& rProc ) const;
         // returns the first text element child; does not recurse through subparagraphs
         TextElement* getFirstTextChild() const;
-
+        
         enum ParagraphType { Normal, Headline };
         ParagraphType       Type;
     bool bRtl;
     };
 
-    struct PolyPolyElement : public DrawElement
+    struct PolyPolyElement : public DrawElement 
     {
         friend class ElementFactory;
     protected:
@@ -214,17 +214,17 @@ namespace pdfi
     public:
         // ElementTreeVisitable
         virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt );
-
+     
         void updateGeometry();
 
 #if OSL_DEBUG_LEVEL > 1
         virtual void emitStructure( int nLevel );
 #endif
-
+        
         basegfx::B2DPolyPolygon PolyPoly;
         sal_Int8                Action;
     };
-
+    
     struct ImageElement : public DrawElement
     {
         friend class ElementFactory;
@@ -235,7 +235,7 @@ namespace pdfi
     public:
         // ElementTreeVisitable
         virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& );
-
+       
         ImageId Image;
     };
 
@@ -256,13 +256,13 @@ namespace pdfi
 
         // ElementTreeVisitable
         virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& rParentIt );
-
-        void emitPageAnchoredElements( EmitContext& rEmitContext );
+       
+        void emitPageAnchoredElements( EmitContext& rEmitContext );        
         static void updateParagraphGeometry( Element* pEle );
         void resolveHyperlinks();
         void resolveFontStyles( PDFIProcessor& rProc );
         void resolveUnderlines( PDFIProcessor& rProc );
-
+        
         sal_Int32      PageNumber;
         ListElement    Hyperlinks; // contains not yet realized links on this page
         double         TopMargin;
@@ -280,12 +280,12 @@ namespace pdfi
         DocumentElement() : Element( NULL ) {}
     public:
         virtual ~DocumentElement();
-
+        
         // ElementTreeVisitable
-        virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& );
-
+        virtual void visitedBy( ElementTreeVisitor&, const std::list< Element* >::const_iterator& ); 
+       
     };
-
+    
     // this class is the differentiator of document types: it will create
     // Element objects with an optimize() method suitable for the document type
     class ElementFactory
@@ -293,15 +293,15 @@ namespace pdfi
     public:
         ElementFactory() {}
         virtual ~ElementFactory();
-
+        
         virtual HyperlinkElement* createHyperlinkElement( Element* pParent, const rtl::OUString& rURI )
         { return new HyperlinkElement( pParent, rURI ); }
-
+        
         virtual TextElement* createTextElement( Element* pParent, sal_Int32 nGCId, sal_Int32 nFontId )
         { return new TextElement( pParent, nGCId, nFontId ); }
         virtual ParagraphElement* createParagraphElement( Element* pParent )
         { return new ParagraphElement( pParent ); }
-
+        
         virtual FrameElement* createFrameElement( Element* pParent, sal_Int32 nGCId )
         { return new FrameElement( pParent, nGCId ); }
         virtual PolyPolyElement*
@@ -312,13 +312,13 @@ namespace pdfi
         { return new PolyPolyElement( pParent, nGCId, rPolyPoly, nAction ); }
         virtual ImageElement* createImageElement( Element* pParent, sal_Int32 nGCId, ImageId nImage )
         { return new ImageElement( pParent, nGCId, nImage ); }
-
+        
         virtual PageElement* createPageElement( Element* pParent,
                                                 sal_Int32 nPageNr )
         { return new PageElement( pParent, nPageNr ); }
         virtual DocumentElement* createDocumentElement()
         { return new DocumentElement(); }
-    };
+    };    
 }
 
 #endif
diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx
index 308e89ae3314..9329ed2f5d4e 100644
--- a/sdext/source/pdfimport/tree/imagecontainer.cxx
+++ b/sdext/source/pdfimport/tree/imagecontainer.cxx
@@ -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
diff --git a/sdext/source/pdfimport/tree/imagecontainer.hxx b/sdext/source/pdfimport/tree/imagecontainer.hxx
index c22b7ace6034..30b869d388d1 100644
--- a/sdext/source/pdfimport/tree/imagecontainer.hxx
+++ b/sdext/source/pdfimport/tree/imagecontainer.hxx
@@ -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
@@ -42,7 +42,7 @@
 namespace pdfi
 {
     struct EmitContext;
-
+    
     class ImageContainer
     {
     private:
@@ -51,11 +51,11 @@ namespace pdfi
 
     public:
         ImageContainer();
-
+        
         ImageId addImage( const ::com::sun::star::uno::Sequence<
                                 ::com::sun::star::beans::PropertyValue>& xBitmap );
         void writeBase64EncodedStream( ImageId nImageId, EmitContext& rContext );
-    };
+    };    
 }
 
 #endif
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 8db28d929184..cd94b97094d0 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -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
@@ -63,9 +63,9 @@ namespace pdfi
 {
 
  PDFIProcessor::PDFIProcessor( const uno::Reference< task::XStatusIndicator >& xStat ,
-            com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >  xContext) :
+            com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >  xContext) : 
 
-    m_xContext(xContext),
+    m_xContext(xContext), 
     fYPrevTextPosition(-10000.0),
     fPrevTextHeight(0.0),
     fXPrevTextPosition(0.0),
@@ -457,32 +457,32 @@ void PDFIProcessor::drawGlyphLine( const rtl::OUString&             rGlyphs,
     {
         processGlyphLine();
     }
-
+   
     CharGlyph aGlyph;
-
+    
     aGlyph.setGlyph ( rGlyphs );
     aGlyph.setRect  ( rRect );
     aGlyph.setFontMatrix ( rFontMatrix );
     aGlyph.setGraphicsContext ( getCurrentContext() );
     getGCId(getCurrentContext());
     aGlyph.setCurElement( m_pCurElement );
-
+    
     aGlyph.setYPrevGlyphPosition( fYPrevTextPosition );
     aGlyph.setXPrevGlyphPosition( fXPrevTextPosition );
     aGlyph.setPrevGlyphHeight  ( fPrevTextHeight );
     aGlyph.setPrevGlyphWidth   ( fPrevTextWidth );
-
+    
     m_GlyphsList.push_back( aGlyph );
-
+    
     fYPrevTextPosition  = rRect.Y1;
     fXPrevTextPosition  = rRect.X2;
     fPrevTextHeight     = rRect.Y2-rRect.Y1;
     fPrevTextWidth      = rRect.X2-rRect.X1;
-
+    
     if( !m_bIsWhiteSpaceInLine )
     {
         static rtl::OUString tempWhiteSpaceStr( 0x20 );
-        static rtl::OUString tempWhiteSpaceNonBreakingStr( 0xa0 );
+        static rtl::OUString tempWhiteSpaceNonBreakingStr( 0xa0 ); 
         m_bIsWhiteSpaceInLine=(rGlyphs.equals( tempWhiteSpaceStr ) || rGlyphs.equals( tempWhiteSpaceNonBreakingStr ));
     }
 }
@@ -579,7 +579,7 @@ void PDFIProcessor::setupImage(ImageId nImage)
     // TODDO(F4): correcting rotation when fShearX != 0 ?
     if( fRotate != 0.0 )
     {
-
+        
         // try to create a Transformation that corrects for the wrong rotation
         aTrans.identity();
         aTrans.scale( aScale.getX(), aScale.getY() );
@@ -587,7 +587,7 @@ void PDFIProcessor::setupImage(ImageId nImage)
 
         basegfx::B2DRange aRect( 0, 0, 1, 1 );
         aRect.transform( aTrans );
-
+        
         // TODO(F3) treat translation correctly
         // the corrections below work for multiples of 90 degree
         // which is a common case (landscape/portrait/seascape)
@@ -609,7 +609,7 @@ void PDFIProcessor::setupImage(ImageId nImage)
         aTrans.translate( aTranslation.getX(),
                           aTranslation.getY() );
     }
-
+    
     bool bMirrorVertical = aScale.getY() > 0;
 
     // transform unit rect to determine view box
@@ -625,7 +625,7 @@ void PDFIProcessor::setupImage(ImageId nImage)
     pFrame->w = pImageElement->w = aRect.getWidth();
     pFrame->h = pImageElement->h = aRect.getHeight();
     pFrame->ZOrder = m_nNextZOrder++;
-
+    
     if( bMirrorVertical )
     {
         pFrame->MirrorVertical = pImageElement->MirrorVertical = true;
@@ -802,7 +802,7 @@ void PDFIProcessor::startPage( const geometry::RealSize2D& rSize )
 {
     // initial clip is to page bounds
     getCurrentContext().Clip = basegfx::B2DPolyPolygon(
-        basegfx::tools::createPolygonFromRect(
+        basegfx::tools::createPolygonFromRect( 
             basegfx::B2DRange( 0, 0, rSize.Width, rSize.Height )));
 
     sal_Int32 nNextPageNr = m_pCurPage ? m_pCurPage->PageNumber+1 : 1;
@@ -815,10 +815,10 @@ void PDFIProcessor::startPage( const geometry::RealSize2D& rSize )
     m_pCurPage = m_pElFactory->createPageElement(m_pDocument.get(), nNextPageNr);
     m_pCurElement = m_pCurPage;
     m_pCurPage->w = rSize.Width;
-    m_pCurPage->h = rSize.Height;
+    m_pCurPage->h = rSize.Height;    
     m_nNextZOrder = 1;
 
-
+    
 }
 
 void PDFIProcessor::emit( XmlEmitter&               rEmitter,
@@ -833,7 +833,7 @@ void PDFIProcessor::emit( XmlEmitter&               rEmitter,
     // FIXME: localization
     startIndicator( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) ) );
     m_pDocument->visitedBy( *optimizingVisitor, std::list<Element*>::iterator());
-
+   
 #if OSL_DEBUG_LEVEL > 1
     m_pDocument->emitStructure( 0 );
 #endif
@@ -843,13 +843,13 @@ void PDFIProcessor::emit( XmlEmitter&               rEmitter,
     ElementTreeVisitorSharedPtr finalizingVisitor(
         rVisitorFactory.createStyleCollectingVisitor(aStyles,*this));
     // FIXME: localization
-
+   
     m_pDocument->visitedBy( *finalizingVisitor, std::list<Element*>::iterator() );
-
+   
     EmitContext aContext( rEmitter, aStyles, m_aImages, *this, m_xStatusIndicator, m_xContext );
     ElementTreeVisitorSharedPtr aEmittingVisitor(
         rVisitorFactory.createEmittingVisitor(aContext));
-
+ 
     PropertyMap aProps;
     // document prolog
     #define OASIS_STR "urn:oasis:names:tc:opendocument:xmlns:"
@@ -878,7 +878,7 @@ void PDFIProcessor::emit( XmlEmitter&               rEmitter,
 
     // emit style list
     aStyles.emit( aContext, *aEmittingVisitor );
-
+    
     m_pDocument->visitedBy( *aEmittingVisitor, std::list<Element*>::iterator() );
     aContext.rEmitter.endTag( "office:document" );
     endIndicator();
@@ -957,7 +957,7 @@ static bool lr_tb_sort( Element* pLeft, Element* pRight )
     // then left is definitely not smaller
     if( pRight->x+pRight->w < pLeft->x )
         return false;
-
+    
     // here we have established vertical and horizontal overlap
     // so sort left first, top second
     if( pLeft->x < pRight->x )
@@ -966,7 +966,7 @@ static bool lr_tb_sort( Element* pLeft, Element* pRight )
         return false;
     if( pLeft->y < pRight->y )
         return true;
-
+    
     return false;
 }
 
@@ -974,7 +974,7 @@ void PDFIProcessor::sortElements( Element* pEle, bool bDeep )
 {
     if( pEle->Children.empty() )
         return;
-
+    
     if( bDeep )
     {
         for( std::list< Element* >::iterator it = pEle->Children.begin();
@@ -1009,9 +1009,9 @@ void PDFIProcessor::sortElements( Element* pEle, bool bDeep )
 }
 
 
-::basegfx::B2DRange& PDFIProcessor::calcTransformedRectBounds( ::basegfx::B2DRange&         outRect,
-                                                        const ::basegfx::B2DRange&      inRect,
-                                                        const ::basegfx::B2DHomMatrix&  transformation )
+::basegfx::B2DRange& PDFIProcessor::calcTransformedRectBounds( ::basegfx::B2DRange&			outRect,
+                                                        const ::basegfx::B2DRange&		inRect,
+                                                        const ::basegfx::B2DHomMatrix& 	transformation )
         {
             outRect.reset();
 
@@ -1020,7 +1020,7 @@ void PDFIProcessor::sortElements( Element* pEle, bool bDeep )
 
             // transform all four extremal points of the rectangle,
             // take bounding rect of those.
-
+            
             // transform left-top point
             outRect.expand( transformation * inRect.getMinimum() );
 
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index 16d60cd5a8bf..55a5f66cafcd 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -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
@@ -73,7 +73,7 @@ namespace pdfi
     class PDFIProcessor : public ContentSink
     {
     public:
-        com::sun::star::uno::Reference<
+        com::sun::star::uno::Reference< 
             com::sun::star::uno::XComponentContext >  m_xContext;
         double fYPrevTextPosition;
         double fPrevTextHeight;
@@ -205,17 +205,17 @@ namespace pdfi
 
         typedef std::hash_map<sal_Int32,FontAttributes> IdToFontMap;
         typedef std::hash_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap;
-
+        
         typedef std::hash_map<sal_Int32,GraphicsContext> IdToGCMap;
         typedef std::hash_map<GraphicsContext,sal_Int32,GraphicsContextHash> GCToIdMap;
 
         typedef std::vector<GraphicsContext> GraphicsContextStack;
 
-        ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange&            outRect,
-                                                        const ::basegfx::B2DRange&      inRect,
-                                                        const ::basegfx::B2DHomMatrix&  transformation );
+        ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange&			outRect,
+                                                        const ::basegfx::B2DRange&		inRect,
+                                                        const ::basegfx::B2DHomMatrix& 	transformation );
         std::vector<CharGlyph>             m_GlyphsList;
-
+        
         boost::shared_ptr<ElementFactory>  m_pElFactory;
         boost::shared_ptr<DocumentElement> m_pDocument;
         PageElement*                       m_pCurPage;
@@ -223,22 +223,22 @@ namespace pdfi
         sal_Int32                          m_nNextFontId;
         IdToFontMap                        m_aIdToFont;
         FontToIdMap                        m_aFontToId;
-
+        
         GraphicsContextStack               m_aGCStack;
         GraphicsContext                    m_prev_aGC;
         sal_Int32                          m_nNextGCId;
         IdToGCMap                          m_aIdToGC;
         GCToIdMap                          m_aGCToId;
-
+        
         ImageContainer                     m_aImages;
-
+        
         DocumentTextDirecion               m_eTextDirection;
 
-        sal_Int32                          m_nPages;
+        sal_Int32                          m_nPages;        
         sal_Int32                          m_nNextZOrder;
         double                             m_fWordSpace;
         bool                               m_bIsWhiteSpaceInLine;
-        com::sun::star::uno::Reference<
+        com::sun::star::uno::Reference< 
             com::sun::star::task::XStatusIndicator >
                                            m_xStatusIndicator;
 
@@ -249,33 +249,33 @@ namespace pdfi
         public:
             CharGlyph(){};
             virtual ~CharGlyph(){};
-            rtl::OUString& getGlyph(){ return m_rGlyphs; }
-            com::sun::star::geometry::RealRectangle2D& getRect(){ return m_rRect; }
-            com::sun::star::geometry::Matrix2D&  getFontMatrix(){ return m_rFontMatrix; }
-            GraphicsContext&  getGC(){ return m_rCurrentContext; }
-            Element*  getCurElement(){ return m_pCurElement; }
-
-            void  setGlyph (const rtl::OUString& rGlyphs ){ m_rGlyphs=rGlyphs; }
-            void  setRect  (const ::com::sun::star::geometry::RealRectangle2D& rRect ){ m_rRect=rRect; }
-            void  setFontMatrix (const ::com::sun::star::geometry::Matrix2D& rFontMatrix ){ m_rFontMatrix= rFontMatrix; }
-            void  setGraphicsContext (GraphicsContext&  rCurrentContext ){ m_rCurrentContext= rCurrentContext; }
-            void  setCurElement( Element* pCurElement ){ m_pCurElement= pCurElement; }
-
-            double getYPrevGlyphPosition(){ return m_fYPrevGlyphPosition; }
-            double getXPrevGlyphPosition(){ return m_fXPrevGlyphPosition; }
-            double getPrevGlyphHeight(){ return m_fPrevGlyphHeight; }
-            double getPrevGlyphWidth (){ return m_fPrevGlyphWidth; }
+            rtl::OUString& getGlyph(){ return m_rGlyphs; } 
+            com::sun::star::geometry::RealRectangle2D& getRect(){ return m_rRect; } 
+            com::sun::star::geometry::Matrix2D&  getFontMatrix(){ return m_rFontMatrix; } 
+            GraphicsContext&  getGC(){ return m_rCurrentContext; } 
+            Element*  getCurElement(){ return m_pCurElement; } 
+
+            void  setGlyph (const rtl::OUString& rGlyphs ){ m_rGlyphs=rGlyphs; } 
+            void  setRect  (const ::com::sun::star::geometry::RealRectangle2D& rRect ){ m_rRect=rRect; } 
+            void  setFontMatrix (const ::com::sun::star::geometry::Matrix2D& rFontMatrix ){ m_rFontMatrix= rFontMatrix; } 
+            void  setGraphicsContext (GraphicsContext&  rCurrentContext ){ m_rCurrentContext= rCurrentContext; } 
+            void  setCurElement( Element* pCurElement ){ m_pCurElement= pCurElement; } 
+        
+            double getYPrevGlyphPosition(){ return m_fYPrevGlyphPosition; } 
+            double getXPrevGlyphPosition(){ return m_fXPrevGlyphPosition; } 
+            double getPrevGlyphHeight(){ return m_fPrevGlyphHeight; } 
+            double getPrevGlyphWidth (){ return m_fPrevGlyphWidth; } 
             double getPrevGlyphsSpace() { if( (m_rRect.X1-m_fXPrevGlyphPosition)<0 )
                                                 return 0;
                                            else
                                             return m_rRect.X1-m_fXPrevGlyphPosition;
                                          }
 
-            void setYPrevGlyphPosition( double fYPrevTextPosition ){ m_fYPrevGlyphPosition= fYPrevTextPosition; }
-            void setXPrevGlyphPosition( double fXPrevTextPosition ){ m_fXPrevGlyphPosition= fXPrevTextPosition; }
-            void setPrevGlyphHeight   ( double fPrevTextHeight ){ m_fPrevGlyphHeight= fPrevTextHeight; }
-            void setPrevGlyphWidth    ( double fPrevTextWidth ){ m_fPrevGlyphWidth= fPrevTextWidth; }
-
+            void setYPrevGlyphPosition( double fYPrevTextPosition ){ m_fYPrevGlyphPosition= fYPrevTextPosition; } 
+            void setXPrevGlyphPosition( double fXPrevTextPosition ){ m_fXPrevGlyphPosition= fXPrevTextPosition; } 
+            void setPrevGlyphHeight   ( double fPrevTextHeight ){ m_fPrevGlyphHeight= fPrevTextHeight; } 
+            void setPrevGlyphWidth    ( double fPrevTextWidth ){ m_fPrevGlyphWidth= fPrevTextWidth; } 
+        
         private:
 
             double                      m_fYPrevGlyphPosition ;
diff --git a/sdext/source/pdfimport/tree/style.cxx b/sdext/source/pdfimport/tree/style.cxx
index 01585029049a..1a2f43ca0fc5 100644
--- a/sdext/source/pdfimport/tree/style.cxx
+++ b/sdext/source/pdfimport/tree/style.cxx
@@ -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
@@ -50,7 +50,7 @@ StyleContainer::StyleContainer() :
 sal_Int32 StyleContainer::impl_getStyleId( const Style& rStyle, bool bSubStyle )
 {
     sal_Int32 nRet = -1;
-
+    
     // construct HashedStyle to find or insert
     HashedStyle aSearchStyle;
     aSearchStyle.Name                   = rStyle.Name;
@@ -59,10 +59,10 @@ sal_Int32 StyleContainer::impl_getStyleId( const Style& rStyle, bool bSubStyle )
     aSearchStyle.ContainedElement       = rStyle.ContainedElement;
     for( unsigned int n = 0; n < rStyle.SubStyles.size(); ++n )
         aSearchStyle.SubStyles.push_back( impl_getStyleId( *rStyle.SubStyles[n], true ) );
-
+         
     std::hash_map< HashedStyle, sal_Int32, StyleHash >::iterator it =
         m_aStyleToId.find( aSearchStyle );
-
+    
     if( it != m_aStyleToId.end() )
     {
         nRet = it->second;
@@ -132,7 +132,7 @@ sal_Int32 StyleContainer::setProperties( sal_Int32 nStyleId, const PropertyMap&
             aSearchStyle.ContainedElement       = it->second.ContainedElement;
             aSearchStyle.SubStyles              = it->second.SubStyles;
             aSearchStyle.IsSubStyle             = it->second.IsSubStyle;
-
+            
             // find out whether this new style already exists
             std::hash_map< HashedStyle, sal_Int32, StyleHash >::iterator new_it =
                 m_aStyleToId.find( aSearchStyle );
@@ -159,13 +159,13 @@ sal_Int32 StyleContainer::setProperties( sal_Int32 nStyleId, const PropertyMap&
 OUString StyleContainer::getStyleName( sal_Int32 nStyle ) const
 {
     OUStringBuffer aRet( 64 );
-
+    
     std::hash_map< sal_Int32, HashedStyle >::const_iterator style_it =
         m_aIdToStyle.find( nStyle );
     if( style_it != m_aIdToStyle.end() )
     {
         const HashedStyle& rStyle = style_it->second;
-
+        
         PropertyMap::const_iterator name_it = rStyle.Properties.find( USTR("style:name") );
         if( name_it != rStyle.Properties.end() )
             aRet.append( name_it->second );
@@ -193,8 +193,8 @@ OUString StyleContainer::getStyleName( sal_Int32 nStyle ) const
     return aRet.makeStringAndClear();
 }
 
-void StyleContainer::impl_emitStyle( sal_Int32           nStyleId,
-                                     EmitContext&        rContext,
+void StyleContainer::impl_emitStyle( sal_Int32           nStyleId, 
+                                     EmitContext&        rContext, 
                                      ElementTreeVisitor& rContainedElemVisitor )
 {
     std::hash_map< sal_Int32, HashedStyle >::const_iterator it = m_aIdToStyle.find( nStyleId );
@@ -211,7 +211,7 @@ void StyleContainer::impl_emitStyle( sal_Int32           nStyleId,
         if( rStyle.Contents )
             rContext.rEmitter.write( rStyle.Contents );
         if( rStyle.ContainedElement )
-            rStyle.ContainedElement->visitedBy( rContainedElemVisitor,
+            rStyle.ContainedElement->visitedBy( rContainedElemVisitor, 
                                                 std::list<Element*>::iterator() );
         rContext.rEmitter.endTag( rStyle.Name.getStr() );
     }
@@ -234,14 +234,14 @@ void StyleContainer::emit( EmitContext&        rContext,
                 aAutomaticStyleSection.push_back( it->first );
         }
     }
-
+    
     if( ! aMasterPageSection.empty() )
         std::stable_sort( aMasterPageSection.begin(), aMasterPageSection.end(), StyleIdNameSort(&m_aIdToStyle) );
     if( ! aAutomaticStyleSection.empty() )
         std::stable_sort( aAutomaticStyleSection.begin(), aAutomaticStyleSection.end(), StyleIdNameSort(&m_aIdToStyle) );
     if( ! aOfficeStyleSection.empty() )
         std::stable_sort( aOfficeStyleSection.begin(), aOfficeStyleSection.end(), StyleIdNameSort(&m_aIdToStyle) );
-
+    
     int n = 0, nElements = 0;
     rContext.rEmitter.beginTag( "office:styles", PropertyMap() );
     for( n = 0, nElements = aOfficeStyleSection.size(); n < nElements; n++ )
diff --git a/sdext/source/pdfimport/tree/style.hxx b/sdext/source/pdfimport/tree/style.hxx
index 8b79bfaa89ce..94571cafc0b1 100644
--- a/sdext/source/pdfimport/tree/style.hxx
+++ b/sdext/source/pdfimport/tree/style.hxx
@@ -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
@@ -41,7 +41,7 @@ namespace pdfi
     struct Element;
     struct EmitContext;
     struct ElementTreeVisitable;
-
+    
     class StyleContainer
     {
     public:
@@ -52,7 +52,7 @@ namespace pdfi
             rtl::OUString            Contents;
             Element*                 ContainedElement;
             std::vector< Style* >    SubStyles;
-
+            
             Style() : ContainedElement( NULL )  {}
             Style( const rtl::OString& rName, const PropertyMap& rProps ) :
                 Name( rName ),
@@ -60,7 +60,7 @@ namespace pdfi
                 ContainedElement( NULL )
             {}
         };
-
+    
     private:
         struct HashedStyle
         {
@@ -69,12 +69,12 @@ namespace pdfi
             rtl::OUString           Contents;
             Element*                ContainedElement;
             std::vector<sal_Int32>  SubStyles;
-
+            
             bool                    IsSubStyle;
             sal_Int32               RefCount;
-
+            
             HashedStyle() : ContainedElement( NULL ), IsSubStyle( true ), RefCount( 0 ) {}
-
+            
             HashedStyle( const HashedStyle& rRight ) :
                 Name( rRight.Name ),
                 Properties( rRight.Properties ),
@@ -100,7 +100,7 @@ namespace pdfi
                      nRet ^= size_t(SubStyles[n]);
                 return nRet;
             }
-
+            
             bool operator==(const HashedStyle& rRight) const
             {
                 if( Name != rRight.Name                 ||
@@ -128,13 +128,13 @@ namespace pdfi
                 return rStyle.hashCode();
             }
         };
-
+        
         struct StyleIdNameSort;
         friend struct StyleIdNameSort;
         struct StyleIdNameSort
         {
             const std::hash_map< sal_Int32, HashedStyle >* m_pMap;
-
+            
             StyleIdNameSort( const std::hash_map< sal_Int32, HashedStyle >* pMap ) :
                 m_pMap(pMap)
             {}
@@ -152,15 +152,15 @@ namespace pdfi
                     return left_it->second.Name < right_it->second.Name;
             }
         };
-
+   
         sal_Int32                                               m_nNextId;
         std::hash_map< sal_Int32, HashedStyle >                 m_aIdToStyle;
         std::hash_map< HashedStyle, sal_Int32, StyleHash >      m_aStyleToId;
-
-        void impl_emitStyle( sal_Int32           nStyleId,
+        
+        void impl_emitStyle( sal_Int32           nStyleId, 
                              EmitContext&        rContext,
                              ElementTreeVisitor& rContainedElemVisitor );
-
+        
     public:
         StyleContainer();
 
@@ -171,7 +171,7 @@ namespace pdfi
         sal_Int32 getStyleId( const Style& rStyle )
         { return impl_getStyleId( rStyle, false ); }
         sal_Int32 getStandardStyleId( const rtl::OString& rFamily );
-
+        
         // returns NULL for an invalid style id
         const PropertyMap* getProperties( sal_Int32 nStyleId ) const;
         sal_Int32 setProperties( sal_Int32 nStyleId, const PropertyMap &rNewProps );
diff --git a/sdext/source/pdfimport/tree/treevisiting.hxx b/sdext/source/pdfimport/tree/treevisiting.hxx
index b62340a7b9f8..8bd4926a126e 100644
--- a/sdext/source/pdfimport/tree/treevisiting.hxx
+++ b/sdext/source/pdfimport/tree/treevisiting.hxx
@@ -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
@@ -47,7 +47,7 @@ namespace pdfi
     struct DocumentElement;
     struct EmitContext;
     struct Element;
-
+   
     /** To be visited by all tree element types
 
         Visitor interface from the "visitor pattern". Implementor gets
diff --git a/sdext/source/pdfimport/tree/treevisitorfactory.cxx b/sdext/source/pdfimport/tree/treevisitorfactory.cxx
index 58cc091c707d..02f7896a7ac2 100644
--- a/sdext/source/pdfimport/tree/treevisitorfactory.cxx
+++ b/sdext/source/pdfimport/tree/treevisitorfactory.cxx
@@ -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
@@ -45,7 +45,7 @@ namespace pdfi
         }
 
         virtual boost::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor(
-            StyleContainer& rStyles,
+            StyleContainer& rStyles, 
             PDFIProcessor&  rProc ) const
         {
             return boost::shared_ptr<ElementTreeVisitor>(new WriterXmlFinalizer(rStyles,rProc));
@@ -67,7 +67,7 @@ namespace pdfi
         }
 
         virtual boost::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor(
-            StyleContainer& rStyles,
+            StyleContainer& rStyles, 
             PDFIProcessor&  rProc ) const
         {
             return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlFinalizer(rStyles,rProc));
@@ -90,7 +90,7 @@ namespace pdfi
         }
 
         virtual boost::shared_ptr<ElementTreeVisitor> createStyleCollectingVisitor(
-            StyleContainer& rStyles,
+            StyleContainer& rStyles, 
             PDFIProcessor&  rProc ) const
         {
             return boost::shared_ptr<ElementTreeVisitor>(new DrawXmlFinalizer(rStyles,rProc));
@@ -103,16 +103,16 @@ namespace pdfi
         }
     };
 
-    TreeVisitorFactorySharedPtr createWriterTreeVisitorFactory()
-    {
+    TreeVisitorFactorySharedPtr createWriterTreeVisitorFactory() 
+    { 
         return TreeVisitorFactorySharedPtr(new WriterTreeVisitorFactory());
     }
     TreeVisitorFactorySharedPtr createImpressTreeVisitorFactory()
-    {
+    { 
         return TreeVisitorFactorySharedPtr(new ImpressTreeVisitorFactory());
     }
     TreeVisitorFactorySharedPtr createDrawTreeVisitorFactory()
-    {
+    { 
         return TreeVisitorFactorySharedPtr(new DrawTreeVisitorFactory());
     }
 }
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index 12f9d02a8607..6db1f0e171f0 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -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
@@ -44,19 +44,19 @@
 namespace pdfi
 {
 
-void WriterXmlEmitter::visit( HyperlinkElement& elem, const std::list< Element* >::const_iterator&   )
-{
+void WriterXmlEmitter::visit( HyperlinkElement& elem, const std::list< Element* >::const_iterator&   ) 
+{ 
     if( elem.Children.empty() )
         return;
-
+    
     const char* pType = dynamic_cast<DrawElement*>(elem.Children.front()) ? "draw:a" : "text:a";
-
+    
     PropertyMap aProps;
     aProps[ USTR( "xlink:type" ) ] = USTR( "simple" );
     aProps[ USTR( "xlink:href" ) ] = elem.URI;
     aProps[ USTR( "office:target-frame-name" ) ] = USTR( "_blank" );
     aProps[ USTR( "xlink:show" ) ] = USTR( "new" );
-
+    
     m_rEmitContext.rEmitter.beginTag( pType, aProps );
     std::list< Element* >::iterator this_it =  elem.Children.begin();
     while( this_it !=elem.Children.end() && *this_it != &elem )
@@ -67,18 +67,18 @@ void WriterXmlEmitter::visit( HyperlinkElement& elem, const std::list< Element*
     m_rEmitContext.rEmitter.endTag( pType );
 }
 
-void WriterXmlEmitter::visit( TextElement& elem, const std::list< Element* >::const_iterator&   )
+void WriterXmlEmitter::visit( TextElement& elem, const std::list< Element* >::const_iterator&   ) 
 {
     if( ! elem.Text.getLength() )
         return;
-
+    
     PropertyMap aProps;
     if( elem.StyleId != -1 )
     {
-        aProps[ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text:style-name" ) ) ] =
+        aProps[ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text:style-name" ) ) ] = 
             m_rEmitContext.rStyles.getStyleName( elem.StyleId );
     }
-
+    
     m_rEmitContext.rEmitter.beginTag( "text:span", aProps );
     m_rEmitContext.rEmitter.write( elem.Text.makeStringAndClear() );
     std::list< Element* >::iterator this_it =  elem.Children.begin();
@@ -87,7 +87,7 @@ void WriterXmlEmitter::visit( TextElement& elem, const std::list< Element* >::co
         (*this_it)->visitedBy( *this, this_it );
         this_it++;
     }
-
+    
     m_rEmitContext.rEmitter.endTag( "text:span" );
 }
 
@@ -102,23 +102,23 @@ void WriterXmlEmitter::visit( ParagraphElement& elem, const std::list< Element*
     if( elem.Type == elem.Headline )
         pTagType = "text:h";
     m_rEmitContext.rEmitter.beginTag( pTagType, aProps );
-
+    
     std::list< Element* >::iterator this_it =  elem.Children.begin();
     while( this_it !=elem.Children.end() && *this_it != &elem )
     {
         (*this_it)->visitedBy( *this, this_it );
         this_it++;
     }
-
+    
     m_rEmitContext.rEmitter.endTag( pTagType );
 }
 
-void WriterXmlEmitter::fillFrameProps( DrawElement&       rElem,
-                                       PropertyMap&       rProps,
+void WriterXmlEmitter::fillFrameProps( DrawElement&       rElem, 
+                                       PropertyMap&       rProps, 
                                        const EmitContext& rEmitContext )
 {
     double rel_x = rElem.x, rel_y = rElem.y;
-
+  
     // find anchor type by recursing though parents
     Element* pAnchor = rElem.Parent;
     while( pAnchor &&
@@ -148,7 +148,7 @@ void WriterXmlEmitter::fillFrameProps( DrawElement&       rElem,
     rProps[ USTR( "draw:style-name" )] = rEmitContext.rStyles.getStyleName( rElem.StyleId );
     rProps[ USTR( "svg:width" ) ]   = convertPixelToUnitString( rElem.w );
     rProps[ USTR( "svg:height" ) ]  = convertPixelToUnitString( rElem.h );
-
+    
     const GraphicsContext& rGC =
         rEmitContext.rProcessor.getGraphicsContext( rElem.GCId );
     if( rGC.Transformation.isIdentity() )
@@ -163,12 +163,12 @@ void WriterXmlEmitter::fillFrameProps( DrawElement&       rElem,
     {
         basegfx::B2DTuple aScale, aTranslation;
         double fRotate, fShearX;
-
+        
         rGC.Transformation.decompose( aScale, aTranslation, fRotate, fShearX );
-
+        
         rtl::OUStringBuffer aBuf( 256 );
 
-        // TODO(F2): general transformation case missing; if implemented, note
+        // TODO(F2): general transformation case missing; if implemented, note 
         // that ODF rotation is oriented the other way
 
         // build transformation string
@@ -197,36 +197,36 @@ void WriterXmlEmitter::fillFrameProps( DrawElement&       rElem,
             aBuf.append( convertPixelToUnitString( rel_y ) );
             aBuf.appendAscii( " )" );
          }
-
+     
         rProps[ USTR( "draw:transform" ) ] = aBuf.makeStringAndClear();
     }
 }
 
-void WriterXmlEmitter::visit( FrameElement& elem, const std::list< Element* >::const_iterator&   )
-{
+void WriterXmlEmitter::visit( FrameElement& elem, const std::list< Element* >::const_iterator&   ) 
+{      
     if( elem.Children.empty() )
         return;
-
+    
     bool bTextBox = (dynamic_cast<ParagraphElement*>(elem.Children.front()) != NULL);
     PropertyMap aFrameProps;
     fillFrameProps( elem, aFrameProps, m_rEmitContext );
     m_rEmitContext.rEmitter.beginTag( "draw:frame", aFrameProps );
     if( bTextBox )
         m_rEmitContext.rEmitter.beginTag( "draw:text-box", PropertyMap() );
-
+    
     std::list< Element* >::iterator this_it =  elem.Children.begin();
     while( this_it !=elem.Children.end() && *this_it != &elem )
     {
         (*this_it)->visitedBy( *this, this_it );
         this_it++;
     }
-
+    
     if( bTextBox )
         m_rEmitContext.rEmitter.endTag( "draw:text-box" );
     m_rEmitContext.rEmitter.endTag( "draw:frame" );
 }
 
-void WriterXmlEmitter::visit( PolyPolyElement& elem, const std::list< Element* >::const_iterator& )
+void WriterXmlEmitter::visit( PolyPolyElement& elem, const std::list< Element* >::const_iterator& ) 
 {
     elem.updateGeometry();
     /* note:
@@ -240,44 +240,44 @@ void WriterXmlEmitter::visit( PolyPolyElement& elem, const std::list< Element* >
     {
         basegfx::B2DPolygon b2dPolygon;
         b2dPolygon =  elem.PolyPoly.getB2DPolygon( i );
-
+        
         for ( sal_uInt32 j = 0; j< b2dPolygon.count(); j++ )
         {
             basegfx::B2DPoint point;
             basegfx::B2DPoint nextPoint;
             point = b2dPolygon.getB2DPoint( j );
-
+            
             basegfx::B2DPoint prevPoint;
             prevPoint = b2dPolygon.getPrevControlPoint( j ) ;
-
-            point.setX( convPx2mmPrec2( point.getX() )*100.0 );
+            
+            point.setX( convPx2mmPrec2( point.getX() )*100.0 ); 
             point.setY( convPx2mmPrec2( point.getY() )*100.0 );
-
+            
             if ( b2dPolygon.isPrevControlPointUsed( j ) )
             {
-                prevPoint.setX( convPx2mmPrec2( prevPoint.getX() )*100.0 );
+                prevPoint.setX( convPx2mmPrec2( prevPoint.getX() )*100.0 ); 
                 prevPoint.setY( convPx2mmPrec2( prevPoint.getY() )*100.0 );
             }
-
+            
             if ( b2dPolygon.isNextControlPointUsed( j ) )
             {
                 nextPoint = b2dPolygon.getNextControlPoint( j ) ;
-                nextPoint.setX( convPx2mmPrec2( nextPoint.getX() )*100.0 );
+                nextPoint.setX( convPx2mmPrec2( nextPoint.getX() )*100.0 ); 
                 nextPoint.setY( convPx2mmPrec2( nextPoint.getY() )*100.0 );
-            }
-
+            } 
+            
             b2dPolygon.setB2DPoint( j, point );
-
+            
             if ( b2dPolygon.isPrevControlPointUsed( j ) )
                 b2dPolygon.setPrevControlPoint( j , prevPoint ) ;
-
+            
             if ( b2dPolygon.isNextControlPointUsed( j ) )
                 b2dPolygon.setNextControlPoint( j , nextPoint ) ;
         }
-
+        
         elem.PolyPoly.setB2DPolygon( i, b2dPolygon );
     }
-
+    
     PropertyMap aProps;
     fillFrameProps( elem, aProps, m_rEmitContext );
     rtl::OUStringBuffer aBuf( 64 );
@@ -287,14 +287,14 @@ void WriterXmlEmitter::visit( PolyPolyElement& elem, const std::list< Element* >
     aBuf.append( convPx2mmPrec2(elem.h)*100.0 );
     aProps[ USTR( "svg:viewBox" ) ] = aBuf.makeStringAndClear();
     aProps[ USTR( "svg:d" ) ]       = basegfx::tools::exportToSvgD( elem.PolyPoly );
-
+    
     m_rEmitContext.rEmitter.beginTag( "draw:path", aProps );
     m_rEmitContext.rEmitter.endTag( "draw:path" );
 }
 
-void WriterXmlEmitter::visit( ImageElement& elem, const std::list< Element* >::const_iterator& )
+void WriterXmlEmitter::visit( ImageElement& elem, const std::list< Element* >::const_iterator& ) 
 {
-    PropertyMap aImageProps;
+    PropertyMap aImageProps;    
     m_rEmitContext.rEmitter.beginTag( "draw:image", aImageProps );
     m_rEmitContext.rEmitter.beginTag( "office:binary-data", PropertyMap() );
     m_rEmitContext.rImages.writeBase64EncodedStream( elem.Image, m_rEmitContext);
@@ -314,12 +314,12 @@ void WriterXmlEmitter::visit( PageElement& elem, const std::list< Element* >::co
         this_it++;
     }
 }
-
+    
 void WriterXmlEmitter::visit( DocumentElement& elem, const std::list< Element* >::const_iterator&)
 {
     m_rEmitContext.rEmitter.beginTag( "office:body", PropertyMap() );
     m_rEmitContext.rEmitter.beginTag( "office:text", PropertyMap() );
-
+    
     for( std::list< Element* >::iterator it = elem.Children.begin(); it != elem.Children.end(); ++it )
     {
         PageElement* pPage = dynamic_cast<PageElement*>(*it);
@@ -343,7 +343,7 @@ void WriterXmlEmitter::visit( DocumentElement& elem, const std::list< Element* >
         if( dynamic_cast<DrawElement*>(*it) == NULL )
             (*it)->visitedBy( *this, it );
     }
-
+    
     m_rEmitContext.rEmitter.endTag( "office:text" );
     m_rEmitContext.rEmitter.endTag( "office:body" );
 }
@@ -374,12 +374,12 @@ void WriterXmlOptimizer::visit( PolyPolyElement& elem, const std::list< Element*
      *     the other is a fill
      */
     if( elem.Parent )
-    {
-        // find following PolyPolyElement in parent's children list
+    {    
+        // find following PolyPolyElement in parent's children list 
         std::list< Element* >::iterator this_it = elem.Parent->Children.begin();
         while( this_it != elem.Parent->Children.end() && *this_it != &elem )
             ++this_it;
-
+        
         if( this_it != elem.Parent->Children.end() )
         {
             std::list< Element* >::iterator next_it = this_it;
@@ -426,7 +426,7 @@ void WriterXmlOptimizer::visit( ParagraphElement& elem, const std::list< Element
     optimizeTextElements( elem );
 
     elem.applyToChildren(*this);
-
+    
     if( elem.Parent && rParentIt != elem.Parent->Children.end() )
     {
         // find if there is a previous paragraph that might be a heading for this one
@@ -483,15 +483,15 @@ void WriterXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::
     if( m_rProcessor.getStatusIndicator().is() )
         m_rProcessor.getStatusIndicator()->setValue( elem.PageNumber );
 
-    // resolve hyperlinks
+    // resolve hyperlinks   
     elem.resolveHyperlinks();
-
+    
     elem.resolveFontStyles( m_rProcessor ); // underlines and such
-
+    
     // FIXME: until hyperlinks and font effects are adjusted for
-    // geometrical search handle them before sorting
+    // geometrical search handle them before sorting    
     m_rProcessor.sortElements( &elem );
-
+    
     // find paragraphs in text
     ParagraphElement* pCurPara = NULL;
     std::list< Element* >::iterator page_element, next_page_element;
@@ -520,7 +520,7 @@ void WriterXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::
                     fCurLineHeight = (fCurLineHeight*double(nCurLineElements) + pTestText->h)/double(nCurLineElements+1);
                     nCurLineElements++;
                 }
-            }
+            } 
             continue;
         }
 
@@ -531,7 +531,7 @@ void WriterXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::
         if( pDraw )
         {
             // insert small drawing objects as character, else leave them page bound
-
+            
             bool bInsertToParagraph = false;
             // first check if this is either inside the paragraph
             if( pCurPara && pDraw->y < pCurPara->y + pCurPara->h )
@@ -574,14 +574,14 @@ void WriterXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::
                     pDraw->isCharacter = true;
                 }
             }
-
+            
             if( ! bInsertToParagraph )
             {
                 pCurPara = NULL;
                 continue;
             }
         }
-
+        
         TextElement* pText = dynamic_cast<TextElement*>(*page_element);
         if( ! pText && pLink && ! pLink->Children.empty() )
             pText = dynamic_cast<TextElement*>(pLink->Children.front());
@@ -662,12 +662,12 @@ void WriterXmlOptimizer::checkHeaderAndFooter( PageElement& rElem )
     /* indicators for a header:
      *  - single line paragrah at top of page (  inside 15% page height)
      *  - at least linheight above the next paragr   aph
-     *
-     *  indicators for a footer likewise:
-     *  - single line paragraph at bottom of page (inside 15% page height)
-     *  - at least lineheight below the previous paragraph
+     *   
+     *  indicators for a footer likewise:    
+     *  - single line paragraph at bottom of page (inside 15% page height)   
+     *  - at least lineheight below the previous paragraph   
      */
-
+    
     // detect header
     // Note: the following assumes that the pages' chiuldren have been
     // sorted geometrically
@@ -696,7 +696,7 @@ void WriterXmlOptimizer::checkHeaderAndFooter( PageElement& rElem )
         }
         ++it;
     }
-
+    
     // detect footer
     std::list< Element* >::reverse_iterator rit = rElem.Children.rbegin();
     while( rit != rElem.Children.rend() )
@@ -732,7 +732,7 @@ void WriterXmlOptimizer::optimizeTextElements(Element& rParent)
         OSL_ENSURE( 0, "empty paragraph optimized" );
         return;
     }
-
+    
     // concatenate child elements with same font id
     std::list< Element* >::iterator next = rParent.Children.begin();
     std::list< Element* >::iterator it = next++;
@@ -755,9 +755,9 @@ void WriterXmlOptimizer::optimizeTextElements(Element& rParent)
             {
                 const GraphicsContext& rCurGC = m_rProcessor.getGraphicsContext( pCur->GCId );
                 const GraphicsContext& rNextGC = m_rProcessor.getGraphicsContext( pNext->GCId );
-
+                
                 // line and space optimization; works only in strictly horizontal mode
-
+                
                 if( !bRotatedFrame
                     && ! rCurGC.isRotatedOrSkewed()
                     && ! rNextGC.isRotatedOrSkewed()
@@ -850,7 +850,7 @@ void WriterXmlFinalizer::visit( PolyPolyElement& elem, const std::list< Element*
     const GraphicsContext& rGC = m_rProcessor.getGraphicsContext(elem.GCId );
     PropertyMap aProps;
     aProps[ USTR( "style:family" ) ] = USTR( "graphic" );
-
+    
     PropertyMap aGCProps;
 
     // TODO(F3): proper dash emulation
@@ -888,7 +888,7 @@ void WriterXmlFinalizer::visit( PolyPolyElement& elem, const std::list< Element*
     StyleContainer::Style aStyle( "style:style", aProps );
     StyleContainer::Style aSubStyle( "style:graphic-properties", aGCProps );
     aStyle.SubStyles.push_back( &aSubStyle );
-
+    
     elem.StyleId = m_rStyleContainer.getStyleId( aStyle );
 }
 
@@ -897,13 +897,13 @@ void WriterXmlFinalizer::visit( HyperlinkElement&, const std::list< Element* >::
 }
 
 void WriterXmlFinalizer::visit( TextElement& elem, const std::list< Element* >::const_iterator& )
-{
+{    
     const FontAttributes& rFont = m_rProcessor.getFont( elem.FontId );
     PropertyMap aProps;
     aProps[ USTR( "style:family" ) ] = USTR( "text" );
 
     PropertyMap aFontProps;
-
+    
     // family name
     aFontProps[ USTR( "fo:font-family" ) ] = rFont.familyName;
     // bold
@@ -943,7 +943,7 @@ void WriterXmlFinalizer::visit( TextElement& elem, const std::list< Element* >::
     // color
     const GraphicsContext& rGC = m_rProcessor.getGraphicsContext( elem.GCId );
     aFontProps[ USTR( "fo:color" ) ]                 =  getColorString( rFont.isOutline ? rGC.LineColor : rGC.FillColor );
-
+    
     StyleContainer::Style aStyle( "style:style", aProps );
     StyleContainer::Style aSubStyle( "style:text-properties", aFontProps );
     aStyle.SubStyles.push_back( &aSubStyle );
@@ -951,9 +951,9 @@ void WriterXmlFinalizer::visit( TextElement& elem, const std::list< Element* >::
 }
 
 void WriterXmlFinalizer::visit( ParagraphElement& elem, const std::list< Element* >::const_iterator& rParentIt )
-{
+{    
     PropertyMap aParaProps;
-
+    
     if( elem.Parent )
     {
         // check for center alignement
@@ -962,7 +962,7 @@ void WriterXmlFinalizer::visit( ParagraphElement& elem, const std::list< Element
         double p_y = elem.Parent->y;
         double p_w = elem.Parent->w;
         double p_h = elem.Parent->h;
-
+        
         PageElement* pPage = dynamic_cast<PageElement*>(elem.Parent);
         if( pPage )
         {
@@ -994,7 +994,7 @@ void WriterXmlFinalizer::visit( ParagraphElement& elem, const std::list< Element
             aBuf.appendAscii( "mm" );
             aParaProps[ USTR( "fo:margin-left" ) ] = aBuf.makeStringAndClear();
         }
-
+        
         // check whether to leave some space to next paragraph
         // find wether there is a next paragraph
         std::list< Element* >::const_iterator it = rParentIt;
@@ -1012,7 +1012,7 @@ void WriterXmlFinalizer::visit( ParagraphElement& elem, const std::list< Element
             }
         }
     }
-
+    
     if( ! aParaProps.empty() )
     {
         PropertyMap aProps;
@@ -1030,16 +1030,16 @@ void WriterXmlFinalizer::visit( FrameElement& elem, const std::list< Element* >:
 {
     PropertyMap aProps;
     aProps[ USTR( "style:family" ) ] = USTR( "graphic" );
-
+    
     PropertyMap aGCProps;
 
     aGCProps[ USTR("draw:stroke") ] = USTR("none");
     aGCProps[ USTR("draw:fill") ] = USTR("none");
-
+    
     StyleContainer::Style aStyle( "style:style", aProps );
     StyleContainer::Style aSubStyle( "style:graphic-properties", aGCProps );
     aStyle.SubStyles.push_back( &aSubStyle );
-
+    
     elem.StyleId = m_rStyleContainer.getStyleId( aStyle );
     elem.applyToChildren(*this);
 }
@@ -1049,7 +1049,7 @@ void WriterXmlFinalizer::visit( ImageElement&, const std::list< Element* >::cons
 }
 
 void WriterXmlFinalizer::setFirstOnPage( ParagraphElement&    rElem,
-                                         StyleContainer&      rStyles,
+                                         StyleContainer&      rStyles, 
                                          const rtl::OUString& rMasterPageName )
 {
     PropertyMap aProps;
@@ -1062,7 +1062,7 @@ void WriterXmlFinalizer::setFirstOnPage( ParagraphElement&    rElem,
 
     aProps[ USTR( "style:family" ) ] = USTR( "paragraph" );
     aProps[ USTR( "style:master-page-name" ) ] = rMasterPageName;
-
+    
     if( rElem.StyleId != -1 )
         rElem.StyleId = rStyles.setProperties( rElem.StyleId, aProps );
     else
@@ -1076,10 +1076,10 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::
 {
     if( m_rProcessor.getStatusIndicator().is() )
         m_rProcessor.getStatusIndicator()->setValue( elem.PageNumber );
-
+    
     // transform from pixel to mm
     double page_width = convPx2mm( elem.w ), page_height = convPx2mm( elem.h );
-
+    
     // calculate page margins out of the relevant children (paragraphs)
     elem.TopMargin = elem.h, elem.BottomMargin = 0, elem.LeftMargin = elem.w, elem.RightMargin = 0;
     // first element should be a paragraphy
@@ -1104,7 +1104,7 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::
         elem.TopMargin = elem.HeaderElement->y;
     if( elem.FooterElement && elem.FooterElement->y+elem.FooterElement->h > elem.h - elem.BottomMargin )
         elem.BottomMargin = elem.h - (elem.FooterElement->y + elem.FooterElement->h);
-
+    
     // transform margins to mm
     double left_margin     = convPx2mm( elem.LeftMargin );
     double right_margin    = convPx2mm( elem.RightMargin );
@@ -1118,14 +1118,14 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::
         top_margin      = 10;
         bottom_margin   = 10;
     }
-
+    
     // round left/top margin to nearest mm
     left_margin     = rtl_math_round( left_margin, 0, rtl_math_RoundingMode_Floor );
     top_margin      = rtl_math_round( top_margin, 0, rtl_math_RoundingMode_Floor );
     // round (fuzzy) right/bottom margin to nearest cm
     right_margin    = rtl_math_round( right_margin, right_margin >= 10 ? -1 : 0, rtl_math_RoundingMode_Floor );
-    bottom_margin   = rtl_math_round( bottom_margin, bottom_margin >= 10 ? -1 : 0, rtl_math_RoundingMode_Floor );
-
+    bottom_margin   = rtl_math_round( bottom_margin, bottom_margin >= 10 ? -1 : 0, rtl_math_RoundingMode_Floor );    
+    
     // set reasonable default in case of way too large margins
     // e.g. no paragraph case
     if( left_margin > page_width/2.0 - 10 )
@@ -1136,7 +1136,7 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::
         top_margin = 10;
     if( bottom_margin > page_height/2.0 - 10 )
         bottom_margin = 10;
-
+    
     // catch the weird cases
     if( left_margin < 0 )
         left_margin = 0;
@@ -1146,16 +1146,16 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::
         top_margin = 0;
     if( bottom_margin < 0 )
         bottom_margin = 0;
-
+    
     // widely differing margins are unlikely to be correct
     if( right_margin > left_margin*1.5 )
         right_margin = left_margin;
-
+    
     elem.LeftMargin      = convmm2Px( left_margin );
     elem.RightMargin     = convmm2Px( right_margin );
     elem.TopMargin       = convmm2Px( top_margin );
     elem.BottomMargin    = convmm2Px( bottom_margin );
-
+    
     // get styles for paragraphs
     PropertyMap aPageProps;
     PropertyMap aPageLayoutProps;
@@ -1169,9 +1169,9 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::
     aPageLayoutProps[ USTR( "fo:margin-left" ) ]    = unitMMString( left_margin );
     aPageLayoutProps[ USTR( "fo:margin-right" ) ]   = unitMMString( right_margin );
     aPageLayoutProps[ USTR( "style:writing-mode" ) ]= USTR( "lr-tb" );
-
-    StyleContainer::Style aStyle( "style:page-layout", aPageProps);
-    StyleContainer::Style aSubStyle( "style:page-layout-properties", aPageLayoutProps);
+    
+    StyleContainer::Style aStyle( "style:page-layout", aPageProps);   
+    StyleContainer::Style aSubStyle( "style:page-layout-properties", aPageLayoutProps); 
     aStyle.SubStyles.push_back(&aSubStyle);
     sal_Int32 nPageStyle = m_rStyleContainer.impl_getStyleId( aStyle, false );
 
@@ -1195,12 +1195,12 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::
     }
     elem.StyleId = m_rStyleContainer.impl_getStyleId( aMPStyle,false );
 
-
+    
     rtl::OUString aMasterPageName = m_rStyleContainer.getStyleName( elem.StyleId );
 
     // create styles for children
     elem.applyToChildren(*this);
-
+    
     // no paragraph or other elements before the first paragraph
     if( ! pFirstPara )
     {
@@ -1212,7 +1212,7 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::
 }
 
 void WriterXmlFinalizer::visit( DocumentElement& elem, const std::list< Element* >::const_iterator& )
-{
+{    
     elem.applyToChildren(*this);
 }
 
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.hxx b/sdext/source/pdfimport/tree/writertreevisiting.hxx
index b280b6aa011a..2c9e875f4b4f 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.hxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.hxx
@@ -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
@@ -46,7 +46,7 @@ namespace pdfi
         explicit WriterXmlOptimizer(PDFIProcessor& rProcessor) :
             m_rProcessor(rProcessor)
         {}
-        virtual ~WriterXmlOptimizer()
+        virtual ~WriterXmlOptimizer() 
         {}
 
         virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& );
@@ -58,7 +58,7 @@ namespace pdfi
         virtual void visit( PageElement&, const std::list< Element* >::const_iterator&  );
         virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator&  );
     };
-
+   
     class WriterXmlFinalizer : public ElementTreeVisitor
     {
     private:
@@ -66,7 +66,7 @@ namespace pdfi
         PDFIProcessor&  m_rProcessor;
 
         void setFirstOnPage( ParagraphElement&    rElem,
-                             StyleContainer&      rStyles,
+                             StyleContainer&      rStyles, 
                              const rtl::OUString& rMasterPageName );
 
     public:
@@ -75,7 +75,7 @@ namespace pdfi
             m_rStyleContainer(rStyleContainer),
             m_rProcessor(rProcessor)
         {}
-        virtual ~WriterXmlFinalizer()
+        virtual ~WriterXmlFinalizer() 
         {}
 
         virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& );
@@ -87,20 +87,20 @@ namespace pdfi
         virtual void visit( PageElement&, const std::list< Element* >::const_iterator&  );
         virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator&  );
     };
-
+   
     class WriterXmlEmitter : public ElementTreeVisitor
     {
     private:
         EmitContext& m_rEmitContext ;
-        void fillFrameProps( DrawElement&       rElem,
-                             PropertyMap&       rProps,
+        void fillFrameProps( DrawElement&       rElem, 
+                             PropertyMap&       rProps, 
                              const EmitContext& rEmitContext );
 
     public:
         explicit WriterXmlEmitter(EmitContext& rEmitContext) :
             m_rEmitContext(rEmitContext)
         {}
-        virtual ~WriterXmlEmitter()
+        virtual ~WriterXmlEmitter() 
         {}
 
         virtual void visit( HyperlinkElement&, const std::list< Element* >::const_iterator& );
@@ -111,7 +111,7 @@ namespace pdfi
         virtual void visit( ImageElement&, const std::list< Element* >::const_iterator&  );
         virtual void visit( PageElement&, const std::list< Element* >::const_iterator&  );
         virtual void visit( DocumentElement&, const std::list< Element* >::const_iterator&  );
-    };
+    };   
 }
 
 #endif
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index dcc9dd01daf3..cf07a7121b8d 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -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
@@ -185,9 +185,9 @@ class Parser
     void                 readLink();
     void                 readMaskedImage();
     void                 readSoftMaskedImage();
-    int          parseFontCheckForString( const sal_Unicode* pCopy, const char* str, sal_Int32& nLen,
+    int 		 parseFontCheckForString( const sal_Unicode* pCopy, const char* str, sal_Int32& nLen, 
                     FontAttributes& aResult, bool bItalic, bool bBold);
-    int          parseFontRemoveSuffix( const sal_Unicode* pCopy, const char* s, sal_Int32& nLen);
+    int 		 parseFontRemoveSuffix( const sal_Unicode* pCopy, const char* s, sal_Int32& nLen);
 
 
 public:
@@ -464,7 +464,7 @@ rendering::ARGBColor Parser::readColor()
     return aRes;
 }
 
-int Parser::parseFontCheckForString( const sal_Unicode* pCopy, const char* s, sal_Int32& nLen,
+int Parser::parseFontCheckForString( const sal_Unicode* pCopy, const char* s, sal_Int32& nLen, 
         FontAttributes& aResult, bool bItalic, bool bBold)
 {
     int l = strlen(s);
@@ -484,7 +484,7 @@ int Parser::parseFontCheckForString( const sal_Unicode* pCopy, const char* s, sa
 int Parser::parseFontRemoveSuffix( const sal_Unicode* pCopy, const char* s, sal_Int32& nLen)
 {
     int l = strlen(s);
-    if (nLen < l)
+    if (nLen < l) 
         return 0;
     for (int i = 0; i < l; i++)
         if ( pCopy[nLen - l + i] != s[i] )
@@ -510,7 +510,7 @@ void Parser::parseFontFamilyName( FontAttributes& aResult )
     {
     if (parseFontRemoveSuffix( pCopy, "PSMT", nLen)) {}
     else if (parseFontRemoveSuffix( pCopy, "MT", nLen)) {}
-
+    
     if (parseFontCheckForString( pCopy, "Italic", nLen, aResult, true, false)) {}
     else if (parseFontCheckForString( pCopy, "-Bold", nLen, aResult, false, true)) {}
     else if (parseFontCheckForString( pCopy, "Bold", nLen, aResult, false, true)) {}
@@ -630,13 +630,13 @@ uno::Sequence<beans::PropertyValue> Parser::readImageImpl()
     static const rtl::OString aPbmMarker(  "PBM" );
     static const rtl::OString aPpmMarker(  "PPM" );
     static const rtl::OString aPngMarker(  "PNG" );
-    static const rtl::OUString aJpegFile(
+    static const rtl::OUString aJpegFile(  
         RTL_CONSTASCII_USTRINGPARAM( "DUMMY.JPEG" ));
     static const rtl::OUString aPbmFile(
         RTL_CONSTASCII_USTRINGPARAM( "DUMMY.PBM" ));
     static const rtl::OUString aPpmFile(
         RTL_CONSTASCII_USTRINGPARAM( "DUMMY.PPM" ));
-    static const rtl::OUString aPngFile(
+    static const rtl::OUString aPngFile(   
         RTL_CONSTASCII_USTRINGPARAM( "DUMMY.PNG" ));
 
     rtl::OString aToken = readNextToken();
@@ -776,7 +776,7 @@ void Parser::parseLine( const ::rtl::OString& rLine )
     OSL_PRECOND( m_pSink,         "Invalid sink" );
     OSL_PRECOND( m_pErr,          "Invalid filehandle" );
     OSL_PRECOND( m_xContext.is(), "Invalid service factory" );
-
+    
     m_nNextToken = 0; m_nCharIndex = 0; m_aLine = rLine;
     uno::Reference<rendering::XPolyPolygon2D> xPoly;
     const ::rtl::OString& rCmd = readNextToken();
@@ -869,23 +869,23 @@ oslFileError readLine( oslFileHandle pFile, ::rtl::OStringBuffer& line )
     oslFileError nRes;
 
     // skip garbage \r \n at start of line
-    while( osl_File_E_None == (nRes=osl_readFile(pFile, &aChar, 1, &nBytesRead)) &&
-           nBytesRead == 1 &&
+    while( osl_File_E_None == (nRes=osl_readFile(pFile, &aChar, 1, &nBytesRead)) && 
+           nBytesRead == 1 && 
            (aChar == '\n' || aChar == '\r') ) ;
 
     if( aChar != '\n' && aChar != '\r' )
         line.append( aChar );
 
-    while( osl_File_E_None == (nRes=osl_readFile(pFile, &aChar, 1, &nBytesRead)) &&
+    while( osl_File_E_None == (nRes=osl_readFile(pFile, &aChar, 1, &nBytesRead)) && 
            nBytesRead == 1 && aChar != '\n' && aChar != '\r' )
     {
         line.append( aChar );
     }
-
+    
     return nRes;
 }
 
-} // namespace
+} // namespace 
 
 static bool checkEncryption( const rtl::OUString&                               i_rPath,
                              const uno::Reference< task::XInteractionHandler >& i_xIHdl,
@@ -897,7 +897,7 @@ static bool checkEncryption( const rtl::OUString&
     bool bSuccess = false;
     rtl::OString aPDFFile;
     aPDFFile = rtl::OUStringToOString( i_rPath, osl_getThreadTextEncoding() );
-
+    
     pdfparse::PDFReader aParser;
     boost::scoped_ptr<pdfparse::PDFEntry> pEntry( aParser.read( aPDFFile.getStr() ));
     if( pEntry )
@@ -911,7 +911,7 @@ static bool checkEncryption( const rtl::OUString&
                 bool bAuthenticated = false;
                 if( io_rPwd.getLength() )
                 {
-                    rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd,
+                    rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, 
                                                                    RTL_TEXTENCODING_ISO_8859_1 );
                     bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() );
                 }
@@ -925,12 +925,12 @@ static bool checkEncryption( const rtl::OUString&
                         do
                         {
                             bEntered = getPassword( i_xIHdl, io_rPwd, ! bEntered, i_rDocName );
-                            rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd,
+                            rtl::OString aIsoPwd = rtl::OUStringToOString( io_rPwd, 
                                                                            RTL_TEXTENCODING_ISO_8859_1 );
                             bAuthenticated = pPDFFile->setupDecryptionData( aIsoPwd.getStr() );
                         } while( bEntered && ! bAuthenticated );
                     }
-
+        
                     OSL_TRACE( "password: %s\n", bAuthenticated ? "matches" : "does not match" );
                     bSuccess = bAuthenticated;
                 }
@@ -954,7 +954,7 @@ bool xpdf_ImportFromFile( const ::rtl::OUString&                             rUR
     if( osl_getSystemPathFromFileURL( rURL.pData, &aSysUPath.pData ) != osl_File_E_None )
         return false;
     rtl::OUString aDocName( rURL.copy( rURL.lastIndexOf( sal_Unicode('/') )+1 ) );
-
+    
     // check for encryption, if necessary get password
     rtl::OUString aPwd( rPwd );
     bool bIsEncrypted = false;
@@ -965,19 +965,19 @@ bool xpdf_ImportFromFile( const ::rtl::OUString&                             rUR
 
     // retrieve package location url (xpdfimport executable is located there)
     // ---------------------------------------------------
-    uno::Reference<deployment::XPackageInformationProvider> xProvider(
-        xContext->getValueByName(
+    uno::Reference<deployment::XPackageInformationProvider> xProvider( 
+        xContext->getValueByName( 
             rtl::OUString::createFromAscii("/singletons/com.sun.star.deployment.PackageInformationProvider" )),
         uno::UNO_QUERY);
     if( xProvider.is() )
     {
         converterURL.insert(
-            0,
+            0, 
             rtl::OUString::createFromAscii("/"));
         converterURL.insert(
-            0,
-            xProvider->getPackageLocation(
-                rtl::OUString::createFromAscii(
+            0, 
+            xProvider->getPackageLocation( 
+                rtl::OUString::createFromAscii( 
                     BOOST_PP_STRINGIZE(PDFI_IMPL_IDENTIFIER))));
     }
 
@@ -1001,18 +1001,18 @@ bool xpdf_ImportFromFile( const ::rtl::OUString&                             rUR
 
     rtl_uString*  args[] = { aSysUPath.pData };
     sal_Int32 nArgs = 1;
-
+    
     oslProcess    aProcess;
     oslFileHandle pIn  = NULL;
     oslFileHandle pOut = NULL;
     oslFileHandle pErr = NULL;
-    const oslProcessError eErr =
-        osl_executeProcess_WithRedirectedIO(converterURL.makeStringAndClear().pData,
-                                            args,
-                                            nArgs,
-                                            osl_Process_SEARCHPATH|osl_Process_HIDDEN,
-                                            osl_getCurrentSecurity(),
-                                            0, ppEnv, nEnv,
+    const oslProcessError eErr = 
+        osl_executeProcess_WithRedirectedIO(converterURL.makeStringAndClear().pData, 
+                                            args, 
+                                            nArgs, 
+                                            osl_Process_SEARCHPATH|osl_Process_HIDDEN, 
+                                            osl_getCurrentSecurity(), 
+                                            0, ppEnv, nEnv, 
                                             &aProcess, &pIn, &pOut, &pErr);
 
     bool bRet=true;
@@ -1020,18 +1020,18 @@ bool xpdf_ImportFromFile( const ::rtl::OUString&                             rUR
     {
         if( eErr!=osl_Process_E_None )
             return false;
-
+        
         if( pIn )
         {
             rtl::OStringBuffer aBuf(256);
             if( bIsEncrypted )
                 aBuf.append( rtl::OUStringToOString( aPwd, RTL_TEXTENCODING_ISO_8859_1 ) );
             aBuf.append( '\n' );
-
+            
             sal_uInt64 nWritten = 0;
             osl_writeFile( pIn, aBuf.getStr(), sal_uInt64(aBuf.getLength()), &nWritten );
         }
-
+ 
         if( pOut && pErr )
         {
             // read results of PDF parser. One line - one call to
@@ -1041,7 +1041,7 @@ bool xpdf_ImportFromFile( const ::rtl::OUString&                             rUR
             ::rtl::OStringBuffer line;
             while( osl_File_E_None == readLine(pOut, line) && line.getLength() )
                 aParser.parseLine(line.makeStringAndClear());
-        }
+        }               
     }
     catch( uno::Exception& )
     {
@@ -1049,7 +1049,7 @@ bool xpdf_ImportFromFile( const ::rtl::OUString&                             rUR
         bRet = false;
     }
 
-    if( pIn )
+    if( pIn ) 
         osl_closeFile(pIn);
     if( pOut )
         osl_closeFile(pOut);
@@ -1066,7 +1066,7 @@ bool xpdf_ImportFromStream( const uno::Reference< io::XInputStream >&         xI
                             const rtl::OUString&                              rPwd,
                             const uno::Reference< uno::XComponentContext >&   xContext )
 {
-    OSL_ASSERT(xInput.is());
+    OSL_ASSERT(xInput.is());    
     OSL_ASSERT(rSink);
 
     // convert XInputStream to local temp file
@@ -1101,7 +1101,7 @@ bool xpdf_ImportFromStream( const uno::Reference< io::XInputStream >&         xI
                 break;
             }
         }
-    }
+    } 
     while( nBytes == nBufSize );
 
     osl_closeFile( aFile );
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 829ada5c155d..4280ce1cf601 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -16,12 +16,12 @@
  *    modify it under the terms of the GNU General Public License as
  *    published by the Free Software Foundation; either version 2 of
  *    the License, or (at your option) any later version.
- *
+ *    
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *    GNU General Public License for more details.
- *
+ *    
  *    You should have received a copy of the GNU General Public
  *    License along with this program; if not, write to the Free
  *    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
@@ -39,7 +39,7 @@
 #include <vector>
 
 #include <boost/shared_array.hpp>
-
+ 
 #if defined __SUNPRO_CC
 #pragma disable_warn
 #elif defined _MSC_VER
@@ -59,7 +59,7 @@
 #endif
 
 
-/* SYNC STREAMS
+/* SYNC STREAMS 
    ============
 
    We stream human-readble tokens to stdout, and binary data (fonts,
@@ -90,7 +90,7 @@ boost::shared_array<char> lcl_escapeLineFeeds(const char* const i_pStr)
 {
     size_t nLength(strlen(i_pStr));
     char* pBuffer = new char[2*nLength+1];
-
+    
     const char* pRead = i_pStr;
     char* pWrite = pBuffer;
     while( nLength-- )
@@ -139,7 +139,7 @@ void writeBinaryBuffer( const OutputBuffer& rBuffer )
 
     // put buffer to stderr
     if( !rBuffer.empty() )
-        if( fwrite(&rBuffer[0], sizeof(char),
+        if( fwrite(&rBuffer[0], sizeof(char), 
                    rBuffer.size(), g_binary_out) != (size_t)rBuffer.size() )
             exit(1); // error
 
@@ -195,12 +195,12 @@ void writePbm_(OutputBuffer& o_rOutputBuf, Stream* str, int width, int height, b
     // copy the raw stream
     if( bInvert )
     {
-        for( int i=0; i<size; ++i)
+        for( int i=0; i<size; ++i) 
             o_rOutputBuf.push_back(static_cast<char>(str->getChar() ^ 0xff));
     }
     else
     {
-        for( int i=0; i<size; ++i)
+        for( int i=0; i<size; ++i) 
             o_rOutputBuf.push_back(static_cast<char>(str->getChar()));
     }
 
@@ -213,7 +213,7 @@ void writePpm_( OutputBuffer&     o_rOutputBuf,
                 int               height,
                 GfxImageColorMap* colorMap,
                 bool              bWithLinefeed )
-{
+{ 
     // write as PPM (char by char, to avoid stdlib lineend messing)
     o_rOutputBuf.clear();
     o_rOutputBuf.resize(WRITE_BUFFER_SIZE);
@@ -244,28 +244,28 @@ void writePpm_( OutputBuffer&     o_rOutputBuf,
     Guchar *p;
     GfxRGB rgb;
     ImageStream* imgStr =
-        new ImageStream(str,
-                        width,
+        new ImageStream(str, 
+                        width, 
                         colorMap->getNumPixelComps(),
                         colorMap->getBits());
     imgStr->reset();
 
-    for( int y=0; y<height; ++y)
+    for( int y=0; y<height; ++y) 
     {
         p = imgStr->getLine();
-        for( int x=0; x<width; ++x)
+        for( int x=0; x<width; ++x) 
         {
             colorMap->getRGB(p, &rgb);
             o_rOutputBuf.push_back(colToByte(rgb.r));
             o_rOutputBuf.push_back(colToByte(rgb.g));
             o_rOutputBuf.push_back(colToByte(rgb.b));
-
+       
             p +=colorMap->getNumPixelComps();
         }
     }
 
     delete imgStr;
-
+    
 }
 
 // call this only for 1 bit image streams !
@@ -277,11 +277,11 @@ void writePng_( OutputBuffer&     o_rOutputBuf,
                 GfxRGB&           oneColor,
                 bool              bIsMask,
                 bool              bWithLinefeed )
-{
+{ 
     o_rOutputBuf.clear();
-
+    
     // get png image
-    PngHelper::createPng( o_rOutputBuf, str, width, height, zeroColor, oneColor, bIsMask );
+    PngHelper::createPng( o_rOutputBuf, str, width, height, zeroColor, oneColor, bIsMask ); 
 
     printf( " PNG %d", (int)o_rOutputBuf.size() );
     if( bWithLinefeed )
@@ -294,11 +294,11 @@ void writePng_( OutputBuffer& o_rOutputBuf,
                 Stream* maskStr,
                 int maskWidth, int maskHeight, GfxImageColorMap* maskColorMap,
                 bool bWithLinefeed )
-{
+{ 
     o_rOutputBuf.clear();
-
+    
     // get png image
-    PngHelper::createPng( o_rOutputBuf, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskColorMap );
+    PngHelper::createPng( o_rOutputBuf, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskColorMap ); 
 
     printf( " PNG %d", (int)o_rOutputBuf.size() );
     if( bWithLinefeed )
@@ -311,11 +311,11 @@ void writePng_( OutputBuffer& o_rOutputBuf,
                 Stream* maskStr,
                 int maskWidth, int maskHeight, bool maskInvert,
                 bool bWithLinefeed )
-{
+{ 
     o_rOutputBuf.clear();
-
+    
     // get png image
-    PngHelper::createPng( o_rOutputBuf, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskInvert );
+    PngHelper::createPng( o_rOutputBuf, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskInvert ); 
 
     printf( " PNG %d", (int)o_rOutputBuf.size() );
     if( bWithLinefeed )
@@ -327,7 +327,7 @@ void writeMask_( OutputBuffer& o_rOutputBuf, Stream* str, int width, int height,
 {
     if( str->getKind() == strDCT )
         writeJpeg_(o_rOutputBuf, str, bWithLinefeed);
-    else
+    else 
         writePbm_(o_rOutputBuf, str, width, height, bWithLinefeed, bInvert );
 }
 
@@ -336,17 +336,17 @@ void writeImage_( OutputBuffer&     o_rOutputBuf,
                   int               width,
                   int               height,
                   GfxImageColorMap* colorMap,
-                  bool              bWithLinefeed )
+                  bool              bWithLinefeed ) 
 {
     // dump JPEG file
     if( str->getKind() == strDCT &&
         (colorMap->getNumPixelComps() == 1 ||
-         colorMap->getNumPixelComps() == 3) )
+         colorMap->getNumPixelComps() == 3) ) 
     {
         writeJpeg_(o_rOutputBuf, str, bWithLinefeed);
-    }
+    } 
     else if (colorMap->getNumPixelComps() == 1 &&
-             colorMap->getBits() == 1)
+             colorMap->getBits() == 1) 
     {
         // this is a two color bitmap, write a png
         // provide default colors
@@ -360,7 +360,7 @@ void writeImage_( OutputBuffer&     o_rOutputBuf,
             colorMap->getRGB( &nIndex, &oneColor );
         }
         writePng_( o_rOutputBuf, str, width, height, zeroColor, oneColor, false, bWithLinefeed );
-    }
+    } 
     else
         writePpm_( o_rOutputBuf, str, width, height, colorMap, bWithLinefeed );
 }
@@ -443,12 +443,12 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const
     fflush(stdout);
 
     if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != (size_t)nSize )
-        exit(1); // error
+        exit(1); // error   
 
-    // ---sync point--- see SYNC STREAMS above
+    // ---sync point--- see SYNC STREAMS above  
     fflush(g_binary_out);
 }
-
+ 
 void PDFOutDev::printPath( GfxPath* pPath ) const
 {
     int nSubPaths = pPath ? pPath->getNumSubpaths() : 0;
@@ -456,13 +456,13 @@ void PDFOutDev::printPath( GfxPath* pPath ) const
     {
         GfxSubpath* pSub  = pPath->getSubpath( i );
         const int nPoints = pSub->getNumPoints();
-
+        
         printf( " subpath %d", pSub->isClosed() );
 
         for( int n=0; n<nPoints; ++n )
         {
-            printf( " %f %f %d",
-                    normalize(pSub->getX(n)),
+            printf( " %f %f %d", 
+                    normalize(pSub->getX(n)), 
                     normalize(pSub->getY(n)),
                     pSub->getCurve(n) );
         }
@@ -480,7 +480,7 @@ void PDFOutDev::startPage(int /*pageNum*/, GfxState* state)
 {
     assert(state);
     printf("startPage %f %f\n",
-           normalize(state->getPageWidth()),
+           normalize(state->getPageWidth()), 
            normalize(state->getPageHeight()));
 }
 
@@ -500,13 +500,13 @@ void PDFOutDev::processLink(Link* link, Catalog*)
     if( pAction->getKind() == actionURI )
     {
         const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
-
+        
         boost::shared_array<char> pEsc( lcl_escapeLineFeeds(pURI) );
 
-        printf( "drawLink %f %f %f %f %s\n",
-                normalize(x1),
-                normalize(y1),
-                normalize(x2),
+        printf( "drawLink %f %f %f %f %s\n", 
+                normalize(x1), 
+                normalize(y1), 
+                normalize(x2), 
                 normalize(y2),
                 pEsc.get() );
     }
@@ -537,9 +537,9 @@ void PDFOutDev::setDefaultCTM(double *pMat)
             normalize(pMat[5]) );
 }
 
-void PDFOutDev::updateCTM(GfxState* state,
-                          double, double,
+void PDFOutDev::updateCTM(GfxState* state, 
                           double, double,
+                          double, double, 
                           double, double)
 {
     assert(state);
@@ -575,13 +575,13 @@ void PDFOutDev::updateLineDash(GfxState *state)
 
 void PDFOutDev::updateFlatness(GfxState *state)
 {
-    assert(state);
+    assert(state);    
     printf( "updateFlatness %d\n", state->getFlatness() );
 }
 
 void PDFOutDev::updateLineJoin(GfxState *state)
 {
-    assert(state);
+    assert(state);    
     printf( "updateLineJoin %d\n", state->getLineJoin() );
 }
 
@@ -611,8 +611,8 @@ void PDFOutDev::updateFillColor(GfxState *state)
     state->getFillRGB( &aRGB );
 
     printf( "updateFillColor %f %f %f %f\n",
-            normalize(colToDbl(aRGB.r)),
-            normalize(colToDbl(aRGB.g)),
+            normalize(colToDbl(aRGB.r)), 
+            normalize(colToDbl(aRGB.g)), 
             normalize(colToDbl(aRGB.b)),
             normalize(state->getFillOpacity()) );
 }
@@ -623,10 +623,10 @@ void PDFOutDev::updateStrokeColor(GfxState *state)
 
     GfxRGB aRGB;
     state->getStrokeRGB( &aRGB );
-
+    
     printf( "updateStrokeColor %f %f %f %f\n",
-            normalize(colToDbl(aRGB.r)),
-            normalize(colToDbl(aRGB.g)),
+            normalize(colToDbl(aRGB.r)), 
+            normalize(colToDbl(aRGB.g)), 
             normalize(colToDbl(aRGB.b)),
             normalize(state->getFillOpacity()) );
 }
@@ -673,14 +673,14 @@ void PDFOutDev::updateFont(GfxState *state)
             printf( " %lld", fontID );
 
             aFont = it->second;
-
+            
             boost::shared_array<char> pEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) );
             printf( " %d %d %d %d %f %d %s",
                     aFont.isEmbedded,
-                    aFont.isBold,
-                    aFont.isItalic,
-                    aFont.isUnderline,
-                    normalize(state->getTransformedFontSize()),
+                    aFont.isBold, 
+                    aFont.isItalic, 
+                    aFont.isUnderline, 
+                    normalize(state->getTransformedFontSize()), 
                     nEmbedSize,
                     pEsc.get() );
         }
@@ -694,7 +694,7 @@ void PDFOutDev::updateFont(GfxState *state)
 void PDFOutDev::updateRender(GfxState *state)
 {
     assert(state);
-
+    
     printf( "setTextRenderMode %d\n", state->getRender() );
 }
 
@@ -742,7 +742,7 @@ void PDFOutDev::eoClip(GfxState *state)
     printPath( state->getPath() );
     printf( "\n" );
 }
-
+        
 /** Output one glyph
 
 
@@ -771,44 +771,44 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y,
 
     if( u == NULL )
         return;
-
+        
     // normalize coordinates: correct from baseline-relative to upper
     // left corner of glyphs
-    double x2(0.0), y2(0.0);
-    state->textTransformDelta( 0.0,
-                               state->getFont()->getAscent(),
+    double x2(0.0), y2(0.0); 
+    state->textTransformDelta( 0.0, 
+                               state->getFont()->getAscent(), 
                                &x2, &y2 );
     const double fFontSize(state->getFontSize());
     x += x2*fFontSize;
     y += y2*fFontSize;
-
+    
     const double aPositionX(x-originX);
     const double aPositionY(y-originY);
     // TODO(F2): use leading here, when set
     const double nWidth(dx != 0.0 ? dx : fFontSize);
     const double nHeight(dy != 0.0 ? dy : fFontSize);
-
+    
     const double* pTextMat=state->getTextMat();
     printf( "drawChar %f %f %f %f %f %f %f %f ",
-            normalize(aPositionX),
+            normalize(aPositionX), 
             normalize(aPositionY),
-            normalize(aPositionX+nWidth),
+            normalize(aPositionX+nWidth), 
             normalize(aPositionY-nHeight),
-            normalize(pTextMat[0]),
-            normalize(pTextMat[2]),
-            normalize(pTextMat[1]),
+            normalize(pTextMat[0]), 
+            normalize(pTextMat[2]), 
+            normalize(pTextMat[1]), 
             normalize(pTextMat[3]) );
 
     // silence spurious warning
     (void)&mapUCS2;
 
     char buf[9];
-    for( int i=0; i<uLen; ++i )
+    for( int i=0; i<uLen; ++i ) 
     {
         buf[ m_pUtf8Map->mapUnicode(u[i], buf, sizeof(buf)-1) ] = 0;
         boost::shared_array<char> pEsc( lcl_escapeLineFeeds(buf) );
         printf( "%s", pEsc.get() );
-    }
+    } 
 
     printf( "\n" );
 }
@@ -822,7 +822,7 @@ void PDFOutDev::endTextObject(GfxState*)
 {
     printf( "endTextObject\n" );
 }
-
+        
 void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
                               int width, int height, GBool invert,
                               GBool /*inlineImg*/ )
@@ -870,13 +870,13 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
         else
         {
             GfxRGB aMinRGB;
-            colorMap->getColorSpace()->getRGB(
-                (GfxColor*)maskColors,
+            colorMap->getColorSpace()->getRGB( 
+                (GfxColor*)maskColors, 
                 &aMinRGB );
 
             GfxRGB aMaxRGB;
-            colorMap->getColorSpace()->getRGB(
-                (GfxColor*)maskColors+gfxColorMaxComps,
+            colorMap->getColorSpace()->getRGB( 
+                (GfxColor*)maskColors+gfxColorMaxComps, 
                 &aMaxRGB );
 
             aMaskBuf.push_back( colToByte(aMinRGB.r) );
@@ -897,7 +897,7 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
 void PDFOutDev::drawMaskedImage(GfxState*, Object*, Stream* str,
                                 int width, int height,
                                 GfxImageColorMap* colorMap,
-                                Stream* maskStr,
+                                Stream* maskStr, 
                                 int maskWidth, int maskHeight,
                                 GBool maskInvert)
 {
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 79c9f1b4d163..8ab3c9aa6788 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -16,12 +16,12 @@
  *    modify it under the terms of the GNU General Public License as
  *    published by the Free Software Foundation; either version 2 of
  *    the License, or (at your option) any later version.
- *
+ *    
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *    GNU General Public License for more details.
- *
+ *    
  *    You should have received a copy of the GNU General Public
  *    License along with this program; if not, write to the Free
  *    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
@@ -140,14 +140,14 @@ namespace pdfi
         bool        isBold;
         bool        isItalic;
         bool        isUnderline;
-        double      size;
+        double      size;            
     };
 
     class PDFOutDev : public OutputDev
     {
         // not owned by this class
         PDFDoc*                                 m_pDoc;
-        mutable std::hash_map< long long,
+        mutable std::hash_map< long long, 
                                FontAttributes > m_aFontMap;
         UnicodeMap*                             m_pUtf8Map;
 
@@ -157,50 +157,50 @@ namespace pdfi
 
     public:
         explicit PDFOutDev( PDFDoc* pDoc );
-
+        
         //----- get info about output device
-
+        
         // Does this device use upside-down coordinates?
         // (Upside-down means (0,0) is the top left corner of the page.)
         virtual GBool upsideDown() { return gTrue; }
-
+        
         // Does this device use drawChar() or drawString()?
         virtual GBool useDrawChar() { return gTrue; }
-
+        
         // Does this device use beginType3Char/endType3Char?  Otherwise,
         // text in Type 3 fonts will be drawn with drawChar/drawString.
         virtual GBool interpretType3Chars() { return gFalse; }
-
+        
         // Does this device need non-text content?
         virtual GBool needNonText() { return gTrue; }
-
+        
         //----- initialization and control
-
+        
         // Set default transform matrix.
         virtual void setDefaultCTM(double *ctm);
-
+        
         // Start a page.
         virtual void startPage(int pageNum, GfxState *state);
-
+        
         // End a page.
         virtual void endPage();
-
+        
         // Dump page contents to display.
         // virtual void dump() {}
-
+        
         //----- coordinate conversion
-
+        
         // Convert between device and user coordinates.
         // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
         // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
-
+        
         //----- link borders
         virtual void processLink(Link *link, Catalog *catalog);
-
+        
         //----- save/restore graphics state
         virtual void saveState(GfxState *state);
         virtual void restoreState(GfxState *state);
-
+        
         //----- update graphics state
         // virtual void updateAll(GfxState *state);
         virtual void updateCTM(GfxState *state, double m11, double m12,
@@ -216,7 +216,7 @@ namespace pdfi
         virtual void updateFillOpacity(GfxState *state);
         virtual void updateStrokeOpacity(GfxState *state);
         virtual void updateBlendMode(GfxState *state);
-
+        
         //----- update text state
         virtual void updateFont(GfxState *state);
         // virtual void updateTextMat(GfxState *state);
@@ -227,16 +227,16 @@ namespace pdfi
         // virtual void updateHorizScaling(GfxState *state) {}
         // virtual void updateTextPos(GfxState *state) {}
         // virtual void updateTextShift(GfxState *state, double shift) {}
-
+        
         //----- path painting
         virtual void stroke(GfxState *state);
         virtual void fill(GfxState *state);
         virtual void eoFill(GfxState *state);
-
+        
         //----- path clipping
         virtual void clip(GfxState *state);
         virtual void eoClip(GfxState *state);
-
+        
         //----- text drawing
         virtual void drawChar(GfxState *state, double x, double y,
                               double dx, double dy,
@@ -244,7 +244,7 @@ namespace pdfi
                               CharCode code, int nBytes, Unicode *u, int uLen);
         virtual void drawString(GfxState *state, GooString *s);
         virtual void endTextObject(GfxState *state);
-
+        
         //----- image drawing
         virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
                                    int width, int height, GBool invert,
@@ -263,18 +263,18 @@ namespace pdfi
                                          Stream *maskStr,
                                          int maskWidth, int maskHeight,
                                          GfxImageColorMap *maskColorMap);
-
+        
         //----- OPI functions
         // virtual void opiBegin(GfxState *state, Dict *opiDict);
         // virtual void opiEnd(GfxState *state, Dict *opiDict);
-
+        
         //----- Type 3 font operators
         // virtual void type3D0(GfxState *state, double wx, double wy) {}
         // virtual void type3D1(GfxState *state, double wx, double wy,
         //                      double llx, double lly, double urx, double ury) {}
-
+        
         //----- PostScript XObjects
-        // virtual void psXObject(Stream *psStream, Stream *level1Stream) {}
+        // virtual void psXObject(Stream *psStream, Stream *level1Stream) {}        
 
         void setPageNum( int nNumPages );
     };
diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
index a28a676bcf79..8bf3952eb8d0 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
@@ -16,12 +16,12 @@
  *    modify it under the terms of the GNU General Public License as
  *    published by the Free Software Foundation; either version 2 of
  *    the License, or (at your option) any later version.
- *
+ *    
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *    GNU General Public License for more details.
- *
+ *    
  *    You should have received a copy of the GNU General Public
  *    License along with this program; if not, write to the Free
  *    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
@@ -44,10 +44,10 @@ using namespace pdfi;
 
 /* Table of CRCs of all 8-bit messages. */
 sal_uInt32 PngHelper::crc_table[256];
-
+   
 /* Flag: has the table been computed? Initially false. */
 bool PngHelper::bCRCTableInit = true;
-
+   
 /* Make the table for a fast CRC. */
 void PngHelper::initCRCTable()
 {
@@ -65,7 +65,7 @@ void PngHelper::initCRCTable()
     }
     bCRCTableInit = false;
 }
-
+   
 /* Update a running CRC with the bytes buf[0..len-1]--the CRC
   should be initialized to all 1's, and the transmitted value
   is the 1's complement of the final running CRC (see the
@@ -75,7 +75,7 @@ void PngHelper::updateCRC( sal_uInt32& io_rCRC, const sal_uInt8* i_pBuf, size_t
 {
     if( bCRCTableInit )
         initCRCTable();
-
+    
     sal_uInt32 nCRC = io_rCRC;
     for( size_t n = 0; n < i_nLen; n++ )
         nCRC = crc_table[(nCRC ^ i_pBuf[n]) & 0xff] ^ (nCRC >> 8);
@@ -92,7 +92,7 @@ sal_uInt32 PngHelper::getCRC( const sal_uInt8* i_pBuf, size_t i_nLen )
 sal_uInt32 PngHelper::deflateBuffer( const Output_t* i_pBuf, size_t i_nLen, OutputBuffer& o_rOut )
 {
     size_t nOrigSize = o_rOut.size();
-
+    
     // prepare z stream
     z_stream aStream;
     aStream.zalloc  = Z_NULL;
@@ -101,7 +101,7 @@ sal_uInt32 PngHelper::deflateBuffer( const Output_t* i_pBuf, size_t i_nLen, Outp
     deflateInit( &aStream, Z_BEST_COMPRESSION );
     aStream.avail_in = uInt(i_nLen);
     aStream.next_in = (Bytef*)i_pBuf;
-
+    
     sal_uInt8 aOutBuf[ 32768 ];
     do
     {
@@ -115,17 +115,17 @@ sal_uInt32 PngHelper::deflateBuffer( const Output_t* i_pBuf, size_t i_nLen, Outp
             o_rOut.resize( nOrigSize );
             return 0;
         }
-
+        
         // append compressed bytes
         sal_uInt32 nCompressedBytes = sizeof( aOutBuf ) - aStream.avail_out;
         if( nCompressedBytes )
             o_rOut.insert( o_rOut.end(), aOutBuf, aOutBuf+nCompressedBytes );
 
     } while( aStream.avail_out == 0 );
-
+    
     // cleanup
     deflateEnd( &aStream );
-
+    
     return sal_uInt32( o_rOut.size() - nOrigSize );
 }
 
@@ -159,12 +159,12 @@ void PngHelper::endChunk( size_t nStart, OutputBuffer& o_rOutputBuf )
 {
     if( nStart+8 > o_rOutputBuf.size() )
         return; // something broken is going on
-
+    
     // update chunk length
     size_t nLen = o_rOutputBuf.size() - nStart;
     sal_uInt32 nDataLen = sal_uInt32(nLen)-8;
     set( nDataLen, o_rOutputBuf, nStart );
-
+    
     // append chunk crc
     sal_uInt32 nChunkCRC = getCRC( (sal_uInt8*)&o_rOutputBuf[nStart+4], nLen-4 );
     append( nChunkCRC, o_rOutputBuf );
@@ -186,7 +186,7 @@ void PngHelper::appendIHDR( OutputBuffer& o_rOutputBuf, int width, int height, i
 void PngHelper::appendIEND( OutputBuffer& o_rOutputBuf )
 {
     size_t nStart = startChunk( "IEND", o_rOutputBuf );
-    endChunk( nStart, o_rOutputBuf );
+    endChunk( nStart, o_rOutputBuf );    
 }
 
 void PngHelper::createPng( OutputBuffer&     o_rOutputBuf,
@@ -200,8 +200,8 @@ void PngHelper::createPng( OutputBuffer&     o_rOutputBuf,
 {
     appendFileHeader( o_rOutputBuf );
     appendIHDR( o_rOutputBuf, width, height, 1, 3 );
-
-    // write palette
+    
+    // write palette 
     size_t nIdx = startChunk( "PLTE", o_rOutputBuf );
     // write colors 0 and 1
     o_rOutputBuf.push_back(colToByte(zeroColor.r));
@@ -212,7 +212,7 @@ void PngHelper::createPng( OutputBuffer&     o_rOutputBuf,
     o_rOutputBuf.push_back(colToByte(oneColor.b));
     // end PLTE chunk
     endChunk( nIdx, o_rOutputBuf );
-
+    
     if( bIsMask )
     {
         // write tRNS chunk
@@ -236,14 +236,14 @@ void PngHelper::createPng( OutputBuffer&     o_rOutputBuf,
         for( int x = 0; x < nLineSize; x++ )
             aScanlines.push_back( str->getChar() );
     }
-
+    
     // begin IDAT chunk for scanline data
     nIdx = startChunk( "IDAT", o_rOutputBuf );
     // compress scanlines
-    deflateBuffer( &aScanlines[0], aScanlines.size(), o_rOutputBuf );
+    deflateBuffer( &aScanlines[0], aScanlines.size(), o_rOutputBuf );    
     // end IDAT chunk
     endChunk( nIdx, o_rOutputBuf );
-
+    
     // output IEND
     appendIEND( o_rOutputBuf );
 }
@@ -256,14 +256,14 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
 {
     appendFileHeader( o_rOutputBuf );
     appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image
-
+    
     // initialize stream
     Guchar *p, *pm;
     GfxRGB rgb;
     GfxGray alpha;
     ImageStream* imgStr =
-        new ImageStream(str,
-                        width,
+        new ImageStream(str, 
+                        width, 
                         colorMap->getNumPixelComps(),
                         colorMap->getBits());
     imgStr->reset();
@@ -272,34 +272,34 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
     OutputBuffer aScanlines;
     aScanlines.reserve( width*height*4 + height );
 
-    for( int y=0; y<height; ++y)
+    for( int y=0; y<height; ++y) 
     {
         aScanlines.push_back( 0 );
         p = imgStr->getLine();
-        for( int x=0; x<width; ++x)
+        for( int x=0; x<width; ++x) 
         {
             colorMap->getRGB(p, &rgb);
             aScanlines.push_back(colToByte(rgb.r));
             aScanlines.push_back(colToByte(rgb.g));
             aScanlines.push_back(colToByte(rgb.b));
             aScanlines.push_back( 0xff );
-
+       
             p +=colorMap->getNumPixelComps();
         }
     }
 
 
     // now fill in the mask data
-
+    
     // CAUTION: originally this was done in one single loop
     // it caused merry chaos; the reason is that maskStr and str are
     // not independent streams, it happens that reading one advances
     // the other, too. Hence the two passes are imperative !
-
+    
     // initialize mask stream
     ImageStream* imgStrMask =
-        new ImageStream(maskStr,
-                        maskWidth,
+        new ImageStream(maskStr, 
+                        maskWidth, 
                         maskColorMap->getNumPixelComps(),
                         maskColorMap->getBits());
 
@@ -320,7 +320,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
 
     delete imgStr;
     delete imgStrMask;
-
+    
     // begind IDAT chunk for scanline data
     size_t nIdx = startChunk( "IDAT", o_rOutputBuf );
     // compress scanlines
@@ -342,13 +342,13 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
 {
     appendFileHeader( o_rOutputBuf );
     appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image
-
+    
     // initialize stream
     Guchar *p;
     GfxRGB rgb;
     ImageStream* imgStr =
-        new ImageStream(str,
-                        width,
+        new ImageStream(str, 
+                        width, 
                         colorMap->getNumPixelComps(),
                         colorMap->getBits());
     imgStr->reset();
@@ -357,30 +357,30 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
     OutputBuffer aScanlines;
     aScanlines.reserve( width*height*4 + height );
 
-    for( int y=0; y<height; ++y)
+    for( int y=0; y<height; ++y) 
     {
         aScanlines.push_back( 0 );
         p = imgStr->getLine();
-        for( int x=0; x<width; ++x)
+        for( int x=0; x<width; ++x) 
         {
             colorMap->getRGB(p, &rgb);
             aScanlines.push_back(colToByte(rgb.r));
             aScanlines.push_back(colToByte(rgb.g));
             aScanlines.push_back(colToByte(rgb.b));
             aScanlines.push_back( 0xff );
-
+       
             p +=colorMap->getNumPixelComps();
         }
     }
 
 
     // now fill in the mask data
-
+    
     // CAUTION: originally this was done in one single loop
     // it caused merry chaos; the reason is that maskStr and str are
     // not independent streams, it happens that reading one advances
     // the other, too. Hence the two passes are imperative !
-
+    
     // initialize mask stream
     ImageStream* imgStrMask =
         new ImageStream(maskStr, maskWidth, 1, 1);
@@ -404,7 +404,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
 
     delete imgStr;
     delete imgStrMask;
-
+    
     // begind IDAT chunk for scanline data
     size_t nIdx = startChunk( "IDAT", o_rOutputBuf );
     // compress scanlines
diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx
index c7b050869554..07b70ede7c4a 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.hxx
@@ -16,12 +16,12 @@
  *    modify it under the terms of the GNU General Public License as
  *    published by the Free Software Foundation; either version 2 of
  *    the License, or (at your option) any later version.
- *
+ *    
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *    GNU General Public License for more details.
- *
+ *    
  *    You should have received a copy of the GNU General Public
  *    License along with this program; if not, write to the Free
  *    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
@@ -41,12 +41,12 @@ namespace pdfi
     {
         static sal_uInt32 crc_table[ 256 ];
         static bool bCRCTableInit;
-
+        
         static void initCRCTable();
         static void appendFileHeader( OutputBuffer& o_rOutputBuf );
         static size_t startChunk( const char* pChunkName, OutputBuffer& o_rOut );
         static void endChunk( size_t nStart, OutputBuffer& o_rOut );
-
+     
         static void set( sal_uInt32 i_nValue, OutputBuffer& o_rOutputBuf, size_t i_nIndex );
         static void append( sal_uInt32 i_nValue, OutputBuffer& o_rOutputBuf )
         {
@@ -54,18 +54,18 @@ namespace pdfi
             o_rOutputBuf.insert( o_rOutputBuf.end(), 4, (Output_t)0 );
             set( i_nValue, o_rOutputBuf, nCur );
         }
-
+        
         static void appendIHDR( OutputBuffer& o_rOutputBuf, int width, int height, int depth, int colortype );
         static void appendIEND( OutputBuffer& o_rOutputBuf );
-
+        
     public:
         static void updateCRC( sal_uInt32& io_rCRC, const sal_uInt8* i_pBuf, size_t i_nLen );
         static sal_uInt32 getCRC( const sal_uInt8* i_pBuf, size_t i_nLen );
-
+        
         // deflates the passed buff i_pBuf and appends it to the output vector
         // returns the number of bytes added to the output
         static sal_uInt32 deflateBuffer( const Output_t* i_pBuf, size_t i_nLen, OutputBuffer& o_rOut );
-
+        
         static void createPng( OutputBuffer&     o_rOutputBuf,
                                Stream*           str,
                                int               width,
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
index 26011cc08c64..fd75becc8a12 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -16,12 +16,12 @@
  *    modify it under the terms of the GNU General Public License as
  *    published by the Free Software Foundation; either version 2 of
  *    the License, or (at your option) any later version.
- *
+ *    
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *    GNU General Public License for more details.
- *
+ *    
  *    You should have received a copy of the GNU General Public
  *    License along with this program; if not, write to the Free
  *    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
@@ -123,15 +123,15 @@ int main(int argc, char **argv)
             }
         }
     }
-
+        
     // PDFDoc takes over ownership for all strings below
     GooString* pFileName    = new GooString(argv[1]);
     GooString* pTempErrFileName     = new GooString("_err.pdf");
     GooString* pTempErrFileNamePath = new GooString(argv[0]);
 
     GooString* pErrFileName = new GooString(pTempErrFileNamePath,pTempErrFileName);
-
-
+   
+        
     // check for password string(s)
     GooString* pOwnerPasswordStr( ownerPassword[0] != '\001'
                                   ? new GooString(ownerPassword)
@@ -153,12 +153,12 @@ int main(int argc, char **argv)
     PDFDoc aDoc( pFileName,
                  pOwnerPasswordStr,
                  pUserPasswordStr );
-
+  
     PDFDoc aErrDoc( pErrFileName,
                  pOwnerPasswordStr,
                  pUserPasswordStr );
-
-
+   
+    
    // Check various permissions.
    if ( !aDoc.isOk() )
    {
@@ -175,17 +175,17 @@ int main(int argc, char **argv)
        // do the conversion
        for( int i=1; i<=nPages; ++i )
        {
-          aErrDoc.displayPage( pOutDev,
-                            i,
-                            PDFI_OUTDEV_RESOLUTION,
+          aErrDoc.displayPage( pOutDev, 
+                            i, 
+                            PDFI_OUTDEV_RESOLUTION, 
                             PDFI_OUTDEV_RESOLUTION,
                             0, gTrue, gTrue, gTrue );
           aErrDoc.processLinks( pOutDev, i );
        }
    }
    else
-   {
-
+   {  
+      
       pdfi::PDFOutDev* pOutDev( new pdfi::PDFOutDev(&aDoc) );
 
       // tell receiver early - needed for proper progress calculation
@@ -198,9 +198,9 @@ int main(int argc, char **argv)
       const int nPages = aDoc.getNumPages();
       for( int i=1; i<=nPages; ++i )
       {
-        aDoc.displayPage( pOutDev,
-                          i,
-                          PDFI_OUTDEV_RESOLUTION,
+        aDoc.displayPage( pOutDev, 
+                          i, 
+                          PDFI_OUTDEV_RESOLUTION, 
                           PDFI_OUTDEV_RESOLUTION,
                           0, gTrue, gTrue, gTrue );
         aDoc.processLinks( pOutDev, i );
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 02bd3c6b46b1..60791edc3583 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -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
@@ -109,14 +109,14 @@ public:
         const sal_Int16 nEventId,
         const cssu::Any& rOldValue,
         const cssu::Any& rNewValue);
-
+    
     void UpdateStateSet (void);
 
-
+    
     //----- XAccessible -------------------------------------------------------
 
     virtual cssu::Reference<cssa::XAccessibleContext> SAL_CALL
-        getAccessibleContext (void)
+        getAccessibleContext (void) 
         throw (cssu::RuntimeException);
 
 
@@ -132,7 +132,7 @@ public:
     virtual cssu::Reference< cssa::XAccessible> SAL_CALL getAccessibleParent (void)
         throw (cssu::RuntimeException);
 
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void)
+    virtual	sal_Int32 SAL_CALL getAccessibleIndexInParent (void)
         throw (cssu::RuntimeException);
 
     virtual sal_Int16 SAL_CALL getAccessibleRole (void)
@@ -156,48 +156,48 @@ public:
         throw (cssu::RuntimeException,
             cssa::IllegalAccessibleComponentStateException);
 
-
+    
     //-----  XAccessibleComponent  --------------------------------------------
 
     virtual sal_Bool SAL_CALL containsPoint (
-        const css::awt::Point& aPoint)
+        const css::awt::Point& aPoint) 
         throw (cssu::RuntimeException);
 
-    virtual cssu::Reference<cssa::XAccessible> SAL_CALL
+    virtual cssu::Reference<cssa::XAccessible> SAL_CALL 
         getAccessibleAtPoint (
-            const css::awt::Point& aPoint)
+            const css::awt::Point& aPoint) 
         throw (cssu::RuntimeException);
 
     virtual css::awt::Rectangle SAL_CALL getBounds (void)
         throw (cssu::RuntimeException);
 
-    virtual css::awt::Point SAL_CALL getLocation (void)
+    virtual css::awt::Point SAL_CALL getLocation (void) 
         throw (cssu::RuntimeException);
 
-    virtual css::awt::Point SAL_CALL getLocationOnScreen (void)
+    virtual css::awt::Point SAL_CALL getLocationOnScreen (void) 
         throw (cssu::RuntimeException);
 
-    virtual css::awt::Size SAL_CALL getSize (void)
+    virtual css::awt::Size SAL_CALL getSize (void) 
         throw (cssu::RuntimeException);
 
-    virtual void SAL_CALL grabFocus (void)
+    virtual void SAL_CALL grabFocus (void) 
         throw (cssu::RuntimeException);
 
-    virtual sal_Int32 SAL_CALL getForeground (void)
+    virtual sal_Int32 SAL_CALL getForeground (void) 
         throw (cssu::RuntimeException);
 
-    virtual sal_Int32 SAL_CALL getBackground (void)
+    virtual sal_Int32 SAL_CALL getBackground (void) 
         throw (cssu::RuntimeException);
 
 
     //-----  XAccessibleEventBroadcaster --------------------------------------
 
     virtual void SAL_CALL addEventListener (
-            const cssu::Reference<cssa::XAccessibleEventListener>& rxListener)
+            const cssu::Reference<cssa::XAccessibleEventListener>& rxListener) 
         throw (cssu::RuntimeException);
 
-    virtual void SAL_CALL removeEventListener (
-            const cssu::Reference<cssa::XAccessibleEventListener>& rxListener)
+    virtual void SAL_CALL removeEventListener ( 
+            const cssu::Reference<cssa::XAccessibleEventListener>& rxListener) 
         throw (cssu::RuntimeException);
 
     using PresenterAccessibleObjectInterfaceBase::addEventListener;
@@ -234,14 +234,14 @@ protected:
     bool mbIsFocused;
     cssu::Reference<cssa::XAccessible> mxParentAccessible;
     ::std::vector<rtl::Reference<AccessibleObject> > maChildren;
-    ::std::vector<Reference<XAccessibleEventListener> > maListeners;
+    ::std::vector<Reference<XAccessibleEventListener> > maListeners; 
 
     virtual awt::Point GetRelativeLocation (void);
     virtual awt::Size GetSize (void);
     virtual awt::Point GetAbsoluteParentLocation (void);
 
     virtual bool GetWindowState (const sal_Int16 nType) const;
-
+    
     void UpdateState (const sal_Int16 aState, const bool bValue);
 
     sal_Bool IsDisposed (void) const;
@@ -369,74 +369,74 @@ public:
         getAccessibleRelationSet (void)
         throw (cssu::RuntimeException);
 
-
+    
     //----- XAccessibleText ---------------------------------------------------
-
+    
     virtual sal_Int32 SAL_CALL getCaretPosition (void)
         throw (cssu::RuntimeException);
-
+    
     virtual sal_Bool SAL_CALL setCaretPosition (sal_Int32 nIndex)
         throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException);
-
+    
     virtual sal_Unicode SAL_CALL getCharacter (sal_Int32 nIndex)
         throw (::com::sun::star::lang::IndexOutOfBoundsException, cssu::RuntimeException);
-
+    
     virtual cssu::Sequence<css::beans::PropertyValue> SAL_CALL
         getCharacterAttributes (
             ::sal_Int32 nIndex,
             const cssu::Sequence<rtl::OUString>& rRequestedAttributes)
         throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException);
-
+    
     virtual css::awt::Rectangle SAL_CALL getCharacterBounds (sal_Int32 nIndex)
         throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException);
-
+    
     virtual sal_Int32 SAL_CALL getCharacterCount (void)
         throw (cssu::RuntimeException);
-
+    
     virtual sal_Int32 SAL_CALL getIndexAtPoint (const css::awt::Point& rPoint)
         throw (cssu::RuntimeException);
-
+    
     virtual ::rtl::OUString SAL_CALL getSelectedText (void)
         throw (cssu::RuntimeException);
-
+    
     virtual sal_Int32 SAL_CALL getSelectionStart (void)
         throw (cssu::RuntimeException);
 
     virtual sal_Int32 SAL_CALL getSelectionEnd (void)
         throw (cssu::RuntimeException);
-
+    
     virtual sal_Bool SAL_CALL setSelection (sal_Int32 nStartIndex, sal_Int32 nEndIndex)
         throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException);
 
     virtual ::rtl::OUString SAL_CALL getText (void)
         throw (cssu::RuntimeException);
-
+    
     virtual ::rtl::OUString SAL_CALL getTextRange (
         sal_Int32 nStartIndex,
         sal_Int32 nEndIndex)
         throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException);
-
+    
     virtual cssa::TextSegment SAL_CALL getTextAtIndex (
         sal_Int32 nIndex,
         sal_Int16 nTextType)
         throw (css::lang::IndexOutOfBoundsException,
             css::lang::IllegalArgumentException,
             cssu::RuntimeException);
-
+    
     virtual cssa::TextSegment SAL_CALL getTextBeforeIndex (
         sal_Int32 nIndex,
         sal_Int16 nTextType)
         throw (css::lang::IndexOutOfBoundsException,
             css::lang::IllegalArgumentException,
             cssu::RuntimeException);
-
+    
     virtual cssa::TextSegment SAL_CALL getTextBehindIndex (
         sal_Int32 nIndex,
         sal_Int16 nTextType)
         throw (css::lang::IndexOutOfBoundsException,
             css::lang::IllegalArgumentException,
             cssu::RuntimeException);
-
+    
     virtual ::sal_Bool SAL_CALL copyText (sal_Int32 nStartIndex, sal_Int32 nEndIndex)
         throw (css::lang::IndexOutOfBoundsException, cssu::RuntimeException);
 
@@ -505,7 +505,7 @@ public:
             aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Preview/String"))
                 >>= sName;
         }
-
+        
         rtl::Reference<PresenterAccessible::AccessibleObject> pObject (
             new PresenterAccessible::AccessibleObject(
                 aLocale,
@@ -531,7 +531,7 @@ public:
         const css::lang::Locale aLocale,
         const sal_Int16 nRole,
         const ::rtl::OUString& rsName);
-
+    
 
     static rtl::Reference<PresenterAccessible::AccessibleObject> Create (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
@@ -539,7 +539,7 @@ public:
         const Reference<awt::XWindow>& rxContentWindow,
         const Reference<awt::XWindow>& rxBorderWindow,
         const ::boost::shared_ptr<PresenterTextView>& rpTextView);
-
+    
     void SetTextView (const ::boost::shared_ptr<PresenterTextView>& rpTextView);
 
     virtual void SetWindow (
@@ -626,11 +626,11 @@ PresenterPaneContainer::SharedPaneDescriptor PresenterAccessible::GetPreviewPane
 
     if ( ! mpPresenterController.is())
         return pPreviewPane;
-
+    
     rtl::Reference<PresenterPaneContainer> pContainer (mpPresenterController->GetPaneContainer());
     if ( ! pContainer.is())
         return pPreviewPane;
-
+    
     pPreviewPane = pContainer->FindPaneURL(PresenterPaneFactory::msCurrentSlidePreviewPaneURL);
     Reference<drawing::framework::XPane> xPreviewPane;
     if (pPreviewPane)
@@ -669,7 +669,7 @@ void PresenterAccessible::UpdateAccessibilityHierarchy (void)
     Reference<drawing::framework::XPane> xPreviewPane;
     if (pPreviewPane)
         xPreviewPane = pPreviewPane->mxPane.get();
-
+    
     // Get the notes pane.
     PresenterPaneContainer::SharedPaneDescriptor pNotesPane(
         pPaneContainer->FindPaneURL(PresenterPaneFactory::msNotesPaneURL));
@@ -809,7 +809,7 @@ void SAL_CALL PresenterAccessible::disposing (void)
         if (mxMainPane.is())
             mxMainPane->setAccessible(NULL);
     }
-
+    
     mpAccessiblePreview = NULL;
     mpAccessibleNotes = NULL;
     mpAccessibleConsole = NULL;
@@ -820,7 +820,7 @@ void SAL_CALL PresenterAccessible::disposing (void)
 
 //----- XAccessible -----------------------------------------------------------
 
-Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext (void)
+Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext (void) 
     throw (cssu::RuntimeException)
 {
     if ( ! mpAccessibleConsole.is())
@@ -857,7 +857,7 @@ void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent& rEve
     OSL_TRACE("PresenterAccessible::focusGained at %x and window %x\r", this,
         mxMainWindow.get());
 #endif
-
+    
     AccessibleFocusManager::Instance()->FocusObject(mpAccessibleConsole);
 }
 
@@ -872,7 +872,7 @@ void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent& rEvent
 #ifdef VERBOSE
     OSL_TRACE("PresenterAccessible::focusLost at %x\r", this);
 #endif
-
+    
     AccessibleFocusManager::Instance()->FocusObject(NULL);
 }
 
@@ -957,7 +957,7 @@ void PresenterAccessible::AccessibleObject::SetWindow (
         {
             mxContentWindow->removeWindowListener(this);
         }
-
+        
         mxContentWindow = xContentWindow;
         mxBorderWindow = Reference<awt::XWindow2>(rxBorderWindow, UNO_QUERY);
 
@@ -994,7 +994,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::disposing (void)
 //----- XAccessible -------------------------------------------------------
 
 Reference<XAccessibleContext> SAL_CALL
-    PresenterAccessible::AccessibleObject::getAccessibleContext (void)
+    PresenterAccessible::AccessibleObject::getAccessibleContext (void) 
     throw (RuntimeException)
 {
     ThrowIfDisposed();
@@ -1013,7 +1013,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCoun
     ThrowIfDisposed();
 
     const sal_Int32 nChildCount (maChildren.size());
-
+    
     return nChildCount;
 }
 
@@ -1065,7 +1065,7 @@ sal_Int32 SAL_CALL
                 return nIndex;
         }
     }
-
+    
     return 0;
 }
 
@@ -1154,7 +1154,7 @@ lang::Locale SAL_CALL
 //-----  XAccessibleComponent  ------------------------------------------------
 
 sal_Bool SAL_CALL PresenterAccessible::AccessibleObject::containsPoint (
-    const awt::Point& rPoint)
+    const awt::Point& rPoint) 
     throw (RuntimeException)
 {
     ThrowIfDisposed();
@@ -1174,7 +1174,7 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleObject::containsPoint (
 
 
 
-Reference<XAccessible> SAL_CALL
+Reference<XAccessible> SAL_CALL 
     PresenterAccessible::AccessibleObject::getAccessibleAtPoint (const awt::Point& rPoint)
     throw (RuntimeException)
 {
@@ -1196,14 +1196,14 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds (void)
 
     const awt::Point aLocation (GetRelativeLocation());
     const awt::Size aSize (GetSize());
-
+    
     return awt::Rectangle (aLocation.X, aLocation.Y, aSize.Width, aSize.Height);
 }
 
 
 
 
-awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation (void)
+awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation (void) 
     throw (RuntimeException)
 {
     ThrowIfDisposed();
@@ -1216,7 +1216,7 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation (void)
 
 
 
-awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen (void)
+awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen (void) 
     throw (RuntimeException)
 {
     ThrowIfDisposed();
@@ -1226,13 +1226,13 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen (
 
     return awt::Point(
         aRelativeLocation.X + aParentLocationOnScreen.X,
-        aRelativeLocation.Y + aParentLocationOnScreen.Y);
+        aRelativeLocation.Y + aParentLocationOnScreen.Y);        
 }
 
 
 
 
-awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize (void)
+awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize (void) 
     throw (RuntimeException)
 {
     ThrowIfDisposed();
@@ -1245,7 +1245,7 @@ awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize (void)
 
 
 
-void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus (void)
+void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus (void) 
     throw (RuntimeException)
 {
     ThrowIfDisposed();
@@ -1258,7 +1258,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus (void)
 
 
 
-sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground (void)
+sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground (void) 
     throw (RuntimeException)
 {
     ThrowIfDisposed();
@@ -1269,11 +1269,11 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground (void)
 
 
 
-sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground (void)
+sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground (void) 
     throw (RuntimeException)
 {
     ThrowIfDisposed();
-
+    
     return 0x00000000;
 }
 
@@ -1283,7 +1283,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground (void)
 //----- XAccessibleEventBroadcaster -------------------------------------------
 
 void SAL_CALL PresenterAccessible::AccessibleObject::addEventListener (
-    const Reference<XAccessibleEventListener>& rxListener)
+    const Reference<XAccessibleEventListener>& rxListener) 
     throw (RuntimeException)
 {
     if (rxListener.is())
@@ -1305,8 +1305,8 @@ void SAL_CALL PresenterAccessible::AccessibleObject::addEventListener (
 
 
 
-void SAL_CALL PresenterAccessible::AccessibleObject::removeEventListener (
-    const Reference<XAccessibleEventListener>& rxListener)
+void SAL_CALL PresenterAccessible::AccessibleObject::removeEventListener ( 
+    const Reference<XAccessibleEventListener>& rxListener) 
     throw (RuntimeException)
 {
     ThrowIfDisposed();
@@ -1399,7 +1399,7 @@ bool PresenterAccessible::AccessibleObject::GetWindowState (const sal_Int16 nTyp
 
         case AccessibleStateType::FOCUSABLE:
             return true;
-
+            
         case AccessibleStateType::FOCUSED:
             return mbIsFocused;
 
@@ -1797,7 +1797,7 @@ AccessibleRelation SAL_CALL AccessibleRelationSet::getRelationByType (sal_Int16
 
 
 //===== PresenterAccessible::AccessibleParagraph ==============================
-
+    
 PresenterAccessible::AccessibleParagraph::AccessibleParagraph (
     const lang::Locale aLocale,
     const sal_Int16 nRole,
@@ -1839,7 +1839,7 @@ Reference<XAccessibleRelationSet> SAL_CALL
                 pSet->AddRelation(
                     AccessibleRelationType::CONTENT_FLOWS_FROM,
                     xParentContext->getAccessibleChild(mnParagraphIndex-1));
-
+            
             if (mnParagraphIndex<xParentContext->getAccessibleChildCount()-1)
                 pSet->AddRelation(
                     AccessibleRelationType::CONTENT_FLOWS_TO,
@@ -1966,7 +1966,7 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterBo
 
     return aCharacterBox;
 }
-
+    
 
 
 
@@ -1981,7 +1981,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount (
 
     return nCount;
 }
-
+    
 
 
 
@@ -1997,7 +1997,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint (
 
     return nIndex;
 }
-
+    
 
 
 
@@ -2008,7 +2008,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint (
 
     return getTextRange(getSelectionStart(), getSelectionEnd());
 }
-
+    
 
 
 
@@ -2030,7 +2030,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd (vo
 
     return getCaretPosition();
 }
-
+    
 
 
 
@@ -2056,7 +2056,7 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection (
     ::rtl::OUString sText;
     if (mpParagraph)
         sText = mpParagraph->GetText();
-
+    
     return sText;
 }
 
@@ -2218,7 +2218,7 @@ bool PresenterAccessible::AccessibleParagraph::GetWindowState (const sal_Int16 n
 
         case AccessibleStateType::ACTIVE:
             return true;
-
+            
         default:
             return AccessibleObject::GetWindowState(nType);
     }
@@ -2239,7 +2239,7 @@ AccessibleNotes::AccessibleNotes (
       mpTextView()
 {
 }
-
+    
 
 
 
@@ -2275,7 +2275,7 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create (
 
 
 
-
+    
 void AccessibleNotes::SetTextView (
     const ::boost::shared_ptr<PresenterTextView>& rpTextView)
 {
@@ -2289,7 +2289,7 @@ void AccessibleNotes::SetTextView (
         mpTextView->SetTextChangeBroadcaster(
             ::boost::function<void(void)>());
     }
-
+    
     mpTextView = rpTextView;
 
     if (mpTextView)
@@ -2371,7 +2371,7 @@ void AccessibleNotes::NotifyCaretChange (
     AccessibleFocusManager::Instance()->FocusObject(
         nNewParagraphIndex >= 0
             ? maChildren[nNewParagraphIndex]
-            : this);
+            : this);  
 
     if (nOldParagraphIndex != nNewParagraphIndex)
     {
diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx
index 16e19abc1695..f6f2aafafd61 100644
--- a/sdext/source/presenter/PresenterAccessibility.hxx
+++ b/sdext/source/presenter/PresenterAccessibility.hxx
@@ -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
@@ -80,7 +80,7 @@ public:
     void SetAccessibleParent (const cssu::Reference<cssa::XAccessible>& rxAccessibleParent);
 
     void UpdateAccessibilityHierarchy (void);
-
+        
     void NotifyCurrentSlideChange (
         const sal_Int32 nCurrentSlideIndex,
         const sal_Int32 nSlideCount);
@@ -96,7 +96,7 @@ public:
     //----- XAccessible -------------------------------------------------------
 
     virtual cssu::Reference<cssa::XAccessibleContext> SAL_CALL
-        getAccessibleContext (void)
+        getAccessibleContext (void) 
         throw (cssu::RuntimeException);
 
 
@@ -108,7 +108,7 @@ public:
     virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent)
         throw (cssu::RuntimeException);
 
-
+    
     //----- XEventListener ----------------------------------------------------
 
     virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
@@ -120,7 +120,7 @@ public:
     virtual void SAL_CALL initialize (const cssu::Sequence<cssu::Any>& rArguments)
         throw (cssu::RuntimeException);
 
-
+    
     class AccessibleObject;
     class AccessibleParagraph;
 
diff --git a/sdext/source/presenter/PresenterAnimation.cxx b/sdext/source/presenter/PresenterAnimation.cxx
index 0be27e813b38..2fcf0a75d901 100644
--- a/sdext/source/presenter/PresenterAnimation.cxx
+++ b/sdext/source/presenter/PresenterAnimation.cxx
@@ -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
diff --git a/sdext/source/presenter/PresenterAnimation.hxx b/sdext/source/presenter/PresenterAnimation.hxx
index 76d102a20758..36c0cb0e02d3 100644
--- a/sdext/source/presenter/PresenterAnimation.hxx
+++ b/sdext/source/presenter/PresenterAnimation.hxx
@@ -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
diff --git a/sdext/source/presenter/PresenterAnimator.cxx b/sdext/source/presenter/PresenterAnimator.cxx
index d16528f658e3..557fbf671afd 100644
--- a/sdext/source/presenter/PresenterAnimator.cxx
+++ b/sdext/source/presenter/PresenterAnimator.cxx
@@ -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
@@ -80,11 +80,11 @@ void PresenterAnimator::Process (void)
     ::osl::MutexGuard aGuard (m_aMutex);
 
     mnNextTime = 0;
-
+    
     const sal_uInt64 nCurrentTime (GetCurrentTime());
 
     ActivateAnimations(nCurrentTime);
-
+    
     while ( ! maActiveAnimations.empty())
     {
         sal_uInt64 nRequestedTime (maActiveAnimations.begin()->first);
@@ -92,9 +92,9 @@ void PresenterAnimator::Process (void)
 
         if (nRequestedTime > nCurrentTime)
             break;
-
+        
         maActiveAnimations.erase(maActiveAnimations.begin());
-
+        
         const double nTotalDuration (double(pAnimation->GetEndTime() - pAnimation->GetStartTime()));
         double nProgress (nTotalDuration > 0 ? (nCurrentTime - pAnimation->GetStartTime()) / nTotalDuration : 1);
         if (nProgress <= 0)
@@ -105,7 +105,7 @@ void PresenterAnimator::Process (void)
         OSL_TRACE("running animation step at %f (requested was %f) %f\n",
             nCurrentTime/1e6, nRequestedTime/1e6, nProgress);
         pAnimation->Run(nProgress, nCurrentTime);
-
+        
         if (nCurrentTime < pAnimation->GetEndTime())
             maActiveAnimations.insert(
                 AnimationList::value_type(
diff --git a/sdext/source/presenter/PresenterAnimator.hxx b/sdext/source/presenter/PresenterAnimator.hxx
index 073592b69947..7c14256f55a2 100644
--- a/sdext/source/presenter/PresenterAnimator.hxx
+++ b/sdext/source/presenter/PresenterAnimator.hxx
@@ -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
diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx
index 1422ac3509dc..ed452c7df904 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.cxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.cxx
@@ -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
@@ -83,7 +83,7 @@ PresenterBitmapContainer::PresenterBitmapContainer (
       mxPresenterHelper(rxPresenterHelper)
 {
     Initialize(rxComponentContext);
-
+    
     // Get access to the configuration.
     PresenterConfigurationAccess aConfiguration (
         rxComponentContext,
@@ -174,7 +174,7 @@ void PresenterBitmapContainer::LoadBitmaps (
 
     if ( ! rxBitmapList.is())
         return;
-
+    
     try
     {
         // Load all button bitmaps.
@@ -370,7 +370,7 @@ PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor (void)
       mxMaskBitmap()
 {
 }
-
+        
 
 
 
@@ -430,19 +430,19 @@ css::uno::Reference<css::rendering::XBitmap>
         case Normal:
         default:
             return mxNormalBitmap;
-
+            
         case MouseOver:
             if (mxMouseOverBitmap.is())
                 return mxMouseOverBitmap;
             else if (bMissingDefaultsToNormal)
                 return mxNormalBitmap;
-
+            
         case ButtonDown:
             if (mxButtonDownBitmap.is())
                 return mxButtonDownBitmap;
             else if (bMissingDefaultsToNormal)
                 return mxNormalBitmap;
-
+            
         case Disabled:
             if (mxDisabledBitmap.is())
                 return mxDisabledBitmap;
diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx
index 500899992605..ca2c1666ef35 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.hxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.hxx
@@ -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
@@ -65,7 +65,7 @@ public:
     public:
         BitmapDescriptor (void);
         BitmapDescriptor (const ::boost::shared_ptr<BitmapDescriptor>& rpDefault);
-
+        
         enum Mode {Normal, MouseOver, ButtonDown, Disabled, Mask};
         css::uno::Reference<css::rendering::XBitmap> GetNormalBitmap (void) const;
         css::uno::Reference<css::rendering::XBitmap> GetBitmap (
diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx
index 055689e7d550..3f56aa3eee38 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -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
@@ -212,7 +212,7 @@ void PresenterButton::SetCenter (const css::geometry::RealPoint2D& rLocation)
             maButtonSize.Width,
             maButtonSize.Height,
             awt::PosSize::POSSIZE);
-
+        
         Invalidate();
     }
     else
@@ -267,7 +267,7 @@ css::geometry::IntegerSize2D PresenterButton::GetSize (void)
 
 
 //----- XWindowListener -------------------------------------------------------
-
+    
 void SAL_CALL PresenterButton::windowResized (const css::awt::WindowEvent& rEvent)
     throw (css::uno::RuntimeException)
 {
@@ -278,7 +278,7 @@ void SAL_CALL PresenterButton::windowResized (const css::awt::WindowEvent& rEven
 
 
 
-
+   
 void SAL_CALL PresenterButton::windowMoved (const css::awt::WindowEvent& rEvent)
     throw (css::uno::RuntimeException)
 {
@@ -324,7 +324,7 @@ void SAL_CALL PresenterButton::windowPaint (const css::awt::PaintEvent& rEvent)
             xBitmap = mxNormalBitmap;
         if ( ! xBitmap.is())
             return;
-
+        
         rendering::ViewState aViewState(
             geometry::AffineMatrix2D(1,0,0, 0,1,0),
             NULL);
@@ -344,7 +344,7 @@ void SAL_CALL PresenterButton::windowPaint (const css::awt::PaintEvent& rEvent)
 
 
 
-
+    
 //----- XMouseListener --------------------------------------------------------
 
 void SAL_CALL PresenterButton::mousePressed (const css::awt::MouseEvent& rEvent)
@@ -404,7 +404,7 @@ void SAL_CALL PresenterButton::mouseExited (const css::awt::MouseEvent& rEvent)
 
 
 //----- XMouseMotionListener --------------------------------------------------
-
+    
 void SAL_CALL PresenterButton::mouseMoved (const css::awt::MouseEvent& rEvent)
     throw (css::uno::RuntimeException)
 {
@@ -491,7 +491,7 @@ void PresenterButton::RenderButton (
     PresenterCanvasHelper::SetDeviceColor(aRenderState, rpFont->mnColor);
     aRenderState.AffineTransform.m02 = (rSize.Width - aTextBBox.X2 + aTextBBox.X1)/2;
     aRenderState.AffineTransform.m12 = (rSize.Height - aTextBBox.Y2 + aTextBBox.Y1)/2 - aTextBBox.Y1;
-
+    
     rxCanvas->drawText(
         aContext,
         rpFont->mxFont,
diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx
index b952a9bfa77c..b421b729802b 100644
--- a/sdext/source/presenter/PresenterButton.hxx
+++ b/sdext/source/presenter/PresenterButton.hxx
@@ -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
@@ -86,10 +86,10 @@ public:
     css::geometry::IntegerSize2D GetSize (void);
 
     // XWindowListener
-
+    
     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
         throw (css::uno::RuntimeException);
 
@@ -105,7 +105,7 @@ public:
     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
         throw (css::uno::RuntimeException);
 
-
+    
     // XMouseListener
 
     virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
@@ -122,10 +122,10 @@ public:
 
 
     // XMouseMotionListener
-
+    
     virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
 
@@ -176,7 +176,7 @@ private:
     static css::uno::Reference<css::beans::XPropertySet> GetConfigurationProperties (
         const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
         const ::rtl::OUString& rsConfgurationName);
-
+    
     void ThrowIfDisposed (void) const
         throw (::com::sun::star::lang::DisposedException);
 };
diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx
index f783b381a6e4..8060cc291053 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.cxx
+++ b/sdext/source/presenter/PresenterCanvasHelper.cxx
@@ -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
@@ -92,7 +92,7 @@ void PresenterCanvasHelper::PaintRectangle (
 
     if ( ! rxCanvas.is() || ! rxCanvas->getDevice().is())
         return;
-
+    
     // Create a clip polypolygon that has the content box as hole.
     ::std::vector<awt::Rectangle> aRectangles;
     aRectangles.reserve(2);
@@ -184,7 +184,7 @@ void PresenterCanvasHelper::PaintTiledBitmap (
         / aBitmapSize.Width) * aBitmapSize.Width;
     const sal_Int32 nBottom = ((rRepaintBox.Y + rRepaintBox.Height - 1 + aBitmapSize.Height - 1)
         / aBitmapSize.Height) * aBitmapSize.Height;
-
+    
     for (sal_Int32 nY=nTop; nY<=nBottom; nY+=aBitmapSize.Height)
         for (sal_Int32 nX=nLeft; nX<=nRight; nX+=aBitmapSize.Width)
         {
@@ -234,7 +234,7 @@ void PresenterCanvasHelper::PaintBitmap (
     rendering::RenderState aRenderState (rDefaultRenderState);
     aRenderState.AffineTransform = geometry::AffineMatrix2D(1,0, rLocation.X, 0,1,rLocation.Y);
     aRenderState.Clip = rxPolygon;
-
+    
     rxCanvas->drawBitmap(
         rxBitmap,
         aViewState,
@@ -266,7 +266,7 @@ void PresenterCanvasHelper::PaintColor (
     // Setup the rendering state to use the given color.
     rendering::RenderState aRenderState (rDefaultRenderState);
     SetDeviceColor(aRenderState, nColor);
-
+    
     rxCanvas->fillPolyPolygon(
         rxPolygon,
         aViewState,
@@ -281,7 +281,7 @@ void PresenterCanvasHelper::SetDeviceColor(
     const util::Color aColor)
 {
     // Other component counts then 4 (RGBA) are not accepted (anymore).
-
+    
     OSL_ASSERT(rRenderState.DeviceColor.getLength() == 4);
     if (rRenderState.DeviceColor.getLength() == 4)
     {
diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx b/sdext/source/presenter/PresenterCanvasHelper.hxx
index 58dde30788e6..b1d39e222fc7 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.hxx
+++ b/sdext/source/presenter/PresenterCanvasHelper.hxx
@@ -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
@@ -53,7 +53,7 @@ class PresenterCanvasHelper
 public:
     PresenterCanvasHelper (void);
     ~PresenterCanvasHelper (void);
-
+    
     void Paint (
         const SharedBitmapDescriptor& rpBitmap,
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
diff --git a/sdext/source/presenter/PresenterClock.cxx b/sdext/source/presenter/PresenterClock.cxx
index d220941843b4..8fdb852f69fb 100644
--- a/sdext/source/presenter/PresenterClock.cxx
+++ b/sdext/source/presenter/PresenterClock.cxx
@@ -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
@@ -153,7 +153,7 @@ namespace {
         static const double mnRelativeSecondHandLength;
         static const double mnRelativeSecondHandLength2;
         static const double mnRelativeSecondHandWidth;
-
+        
         void PaintAngledLine (
             const double nAngle,
             const double nInnerRadius,
@@ -296,7 +296,7 @@ PresenterClock::PresenterClock (
       mbIsShowSeconds(true)
 {
     SetMode(mnMode);
-
+    
     maViewState.AffineTransform = geometry::AffineMatrix2D(1,0,0, 0,1,0);
     maRenderState.AffineTransform = geometry::AffineMatrix2D(1,0,0, 0,1,0);
     maRenderState.DeviceColor = Sequence<double>(4);
@@ -487,7 +487,7 @@ void SAL_CALL PresenterClock::mouseReleased (const css::awt::MouseEvent& rEvent)
 {
     (void)rEvent;
 }
-
+    
 
 
 
@@ -496,7 +496,7 @@ void SAL_CALL PresenterClock::mouseEntered (const css::awt::MouseEvent& rEvent)
 {
     (void)rEvent;
 }
-
+    
 
 
 
@@ -565,10 +565,10 @@ void PresenterClock::Paint (const awt::Rectangle& rUpdateBox)
     {
         if (mbIsResizePending)
             Resize();
-
+        
         Reference<rendering::XPolyPolygon2D> xUpdatePolygon (
             PresenterGeometryHelper::CreatePolygon(rUpdateBox, mxCanvas->getDevice()));
-
+                
         Clear(xUpdatePolygon);
 
         if (mpClockPainter.get() != NULL)
@@ -580,7 +580,7 @@ void PresenterClock::Paint (const awt::Rectangle& rUpdateBox)
                 mnMinute,
                 mnSecond,
                 mbIsShowSeconds);
-
+        
         if (mpClockPainter2.get() != NULL)
             mpClockPainter2->Paint(
                 mxCanvas,
@@ -596,7 +596,7 @@ void PresenterClock::Paint (const awt::Rectangle& rUpdateBox)
     {
         (void)e;
     }
-
+        
     // Make the back buffer visible.
     Reference<rendering::XSpriteCanvas> xSpriteCanvas (mxCanvas, UNO_QUERY);
     if (xSpriteCanvas.is())
@@ -947,7 +947,7 @@ void AnalogBitmapPainter::Paint (
     (void)rBackgroundColor;
     (void)nSecond;
     (void)bShowSeconds;
-
+    
     if ( ! rxCanvas.is())
         return;
 
@@ -1123,7 +1123,7 @@ void AnalogBitmapPainter::LoadBitmaps (
     const Reference<rendering::XCanvas>& rxCanvas)
 {
     (void)rConfiguration;
-
+    
     // Get base path to bitmaps.
     Reference<deployment::XPackageInformationProvider> xInformationProvider (
         mxComponentContext->getValueByName(OUString::createFromAscii(
@@ -1150,7 +1150,7 @@ void AnalogBitmapPainter::LoadBitmaps (
     if ( ! xBitmapLoader.is())
         return;
 
-
+    
     // Iterate over all entries in the bitmap list and load the bitmaps.
     Reference<container::XNameAccess> xBitmaps (
         rxClockTheme->getByName(OUString::createFromAscii("Bitmaps")),
@@ -1188,14 +1188,14 @@ void AnalogBitmapPainter::LoadBitmap (
             pDescriptor = &maHourHand;
         else if (rsKey == OUString::createFromAscii("MinuteHand"))
             pDescriptor = &maMinuteHand;
-
+        
         if (pDescriptor == NULL)
             return;
-
+        
         OUString sFileName;
         if ( ! (rValues[0] >>= sFileName))
             return;
-
+        
         rValues[1] >>= pDescriptor->maOffset.X;
         rValues[2] >>= pDescriptor->maOffset.Y;
 
@@ -1277,12 +1277,12 @@ void DigitalDefaultPainter::Paint (
 {
     (void)rBackgroundColor;
     (void)rRenderState;
-
+    
     if ( ! mxFont.is())
         CreateFont(rxCanvas,bIsShowSeconds);
     if ( ! mxFont.is())
         return;
-
+    
     OUString sText;
 
     if (mbIs24HourFormat)
@@ -1322,7 +1322,7 @@ void DigitalDefaultPainter::Paint (
                 return;
         }
     }
-
+    
     rendering::StringContext aContext (
         sText,
         0,
@@ -1400,7 +1400,7 @@ void DigitalDefaultPainter::CreateFont (
             sTimeTemplate,
             0,
             sTimeTemplate.getLength());
-
+        
         // When the font size is adapted to the window size (as large as
         // possible without overlapping) then that is done in a four step
         // process:
@@ -1428,7 +1428,7 @@ void DigitalDefaultPainter::CreateFont (
                     aContext,
                     rendering::TextDirection::WEAK_LEFT_TO_RIGHT,
                     0));
-
+                
                 if ( ! xLayout.is())
                     break;
 
diff --git a/sdext/source/presenter/PresenterClock.hxx b/sdext/source/presenter/PresenterClock.hxx
index 352663309b75..169f4cf11ecb 100644
--- a/sdext/source/presenter/PresenterClock.hxx
+++ b/sdext/source/presenter/PresenterClock.hxx
@@ -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
@@ -93,7 +93,7 @@ public:
 
     // lang::XEventListener
 
-    virtual void SAL_CALL
+    virtual void SAL_CALL 
         disposing (const css::lang::EventObject& rEventObject)
         throw (css::uno::RuntimeException);
 
@@ -105,7 +105,7 @@ public:
 
 
     // XWindowListener
-
+    
     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
         throw (css::uno::RuntimeException);
 
@@ -126,13 +126,13 @@ public:
 
     virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
 
     // XResourceId
 
@@ -158,7 +158,7 @@ private:
     class Timer;
     Timer* mpTimer;
     ::boost::scoped_ptr<Painter> mpClockPainter;
-    /**
+    /** 
         This is used for debugging to show one clock atop another to compare
         the output of the painters.
     */
diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx
index 6fd91438d64e..b4dc2d909025 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -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
@@ -84,7 +84,7 @@ static OUString gsBasePath;
             }
         }
     }
-
+    
     return gsBasePath;
 }
 
@@ -98,13 +98,13 @@ static struct ImplementationEntry gServiceEntries[] =
         PresenterProtocolHandler::Create,
         PresenterProtocolHandler::getImplementationName_static,
         PresenterProtocolHandler::getSupportedServiceNames_static,
-        createSingleComponentFactory, &g_moduleCount.modCnt, 0
+        createSingleComponentFactory, &g_moduleCount.modCnt, 0 
     },
     {
         PresenterScreenJob::Create,
         PresenterScreenJob::getImplementationName_static,
         PresenterScreenJob::getSupportedServiceNames_static,
-        createSingleComponentFactory, 0, 0
+        createSingleComponentFactory, 0, 0 
     },
     { 0, 0, 0, 0, 0, 0 }
 };
diff --git a/sdext/source/presenter/PresenterComponent.hxx b/sdext/source/presenter/PresenterComponent.hxx
index 4334d53f081d..518465976399 100644
--- a/sdext/source/presenter/PresenterComponent.hxx
+++ b/sdext/source/presenter/PresenterComponent.hxx
@@ -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
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index acba65b233a9..005a4888e95e 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -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
@@ -62,20 +62,20 @@ PresenterConfigurationAccess::PresenterConfigurationAccess (
             Sequence<Any> aCreationArguments(3);
             aCreationArguments[0] = makeAny(beans::PropertyValue(
                 A2S("nodepath"),
-                0,
-                makeAny(rsRootName),
+                0, 
+                makeAny(rsRootName), 
                 beans::PropertyState_DIRECT_VALUE));
             aCreationArguments[1] = makeAny(beans::PropertyValue(
                 A2S("depth"),
-                0,
+                0, 
                 makeAny((sal_Int32)-1),
                 beans::PropertyState_DIRECT_VALUE));
             aCreationArguments[2] = makeAny(beans::PropertyValue(
                 A2S("lazywrite"),
-                0,
+                0, 
                 makeAny(true),
                 beans::PropertyState_DIRECT_VALUE));
-
+            
             OUString sAccessService;
             if (eMode == READ_ONLY)
                 sAccessService = A2S("com.sun.star.configuration.ConfigurationAccess");
@@ -165,11 +165,11 @@ bool PresenterConfigurationAccess::GoToChild (const Predicate& rPredicate)
 {
     if ( ! IsValid())
         return false;
-
+    
     maNode = Find(Reference<container::XNameAccess>(maNode,UNO_QUERY), rPredicate);
     if (Reference<XInterface>(maNode, UNO_QUERY).is())
         return true;
-
+    
     mxRoot = NULL;
     return false;
 }
@@ -214,7 +214,7 @@ Any PresenterConfigurationAccess::GetConfigurationNode (
             ::rtl::OUStringToOString(sPathToNode, RTL_TEXTENCODING_UTF8).getStr(),
             ::rtl::OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr());
     }
-
+    
     return Any();
 }
 
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx
index 81f1130e696b..3a8d872777d4 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.hxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx
@@ -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
@@ -143,7 +143,7 @@ public:
         const ::rtl::OUString&,
         const ::css::uno::Reference<css::beans::XPropertySet>&) > PropertySetProcessor;
 
-    /** Execute a functor for all elements of the given container.
+    /** Execute a functor for all elements of the given container. 
         @param rxContainer
             The container is a XNameAccess to a list of the configuration.
             This can be a node returned by GetConfigurationNode().
@@ -187,7 +187,7 @@ public:
         const ::rtl::OUString& rsValue,
         const ::rtl::OUString& rsPropertyName,
         const css::uno::Reference<css::beans::XPropertySet>& rxNode);
-
+    
     /** This method wraps a call to getPropertyValue() and returns an empty
         Any instead of throwing an exception when the property does not
         exist.
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index 2dbe9cde966f..f11dba1300b0 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -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
@@ -225,7 +225,7 @@ PresenterController::~PresenterController (void)
 void PresenterController::disposing (void)
 {
     maInstances.erase(mxController->getFrame());
-
+ 
     if (mxMainWindow.is())
     {
         mxMainWindow->removeKeyListener(this);
@@ -242,7 +242,7 @@ void PresenterController::disposing (void)
     mpWindowManager = NULL;
     if (xWindowManagerComponent.is())
         xWindowManagerComponent->dispose();
-
+    
     if (mxController.is())
     {
         Reference<frame::XFrame> xFrame (mxController->getFrame());
@@ -294,7 +294,7 @@ void PresenterController::UpdateCurrentSlide (const sal_Int32 nOffset)
     GetSlides(nOffset);
     UpdatePaneTitles();
     UpdateViews();
-
+    
     // Update the accessibility object.
     if (IsAccessibilityActive())
     {
@@ -409,7 +409,7 @@ void PresenterController::UpdatePaneTitles (void)
     for (iPane=mpPaneContainer->maPanes.begin(); iPane!=mpPaneContainer->maPanes.end(); ++iPane)
     {
         OSL_ASSERT((*iPane).get() != NULL);
-
+        
         OUString sTemplate (IsAccessibilityActive()
             ? (*iPane)->msAccessibleTitleTemplate
             : (*iPane)->msTitleTemplate);
@@ -652,7 +652,7 @@ void PresenterController::DispatchUnoCommand (const OUString& rsCommand) const
 
     util::URL aURL;
     aURL.Complete = rsCommand;
-    mxUrlTransformer->parseStrict(aURL);
+    mxUrlTransformer->parseStrict(aURL); 
 
     Reference<frame::XDispatch> xDispatch (GetDispatch(aURL));
     if ( ! xDispatch.is())
@@ -668,7 +668,7 @@ Reference<css::frame::XDispatch> PresenterController::GetDispatch (const util::U
 {
     if ( ! mxController.is())
         return NULL;
-
+    
     Reference<frame::XDispatchProvider> xDispatchProvider (mxController->getFrame(), UNO_QUERY);
     if ( ! xDispatchProvider.is())
         return NULL;
@@ -824,7 +824,7 @@ void SAL_CALL PresenterController::notifyConfigurationChange (
     sal_Int32 nType (0);
     if ( ! (rEvent.UserData >>= nType))
         return;
-
+    
     switch (nType)
     {
         case ResourceActivationEventType:
@@ -841,7 +841,7 @@ void SAL_CALL PresenterController::notifyConfigurationChange (
                 {
                     PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
                         mpPaneContainer->FindPaneId(xPane->getResourceId()));
-
+                                
                     // When there is a call out anchor location set then tell the
                     // window about it.
                     if (pDescriptor->mbHasCalloutAnchor)
@@ -1195,7 +1195,7 @@ void SAL_CALL PresenterController::mouseReleased (const css::awt::MouseEvent& rE
 {
     (void)rEvent;
 }
-
+    
 
 
 
@@ -1204,7 +1204,7 @@ void SAL_CALL PresenterController::mouseEntered (const css::awt::MouseEvent& rEv
 {
     (void)rEvent;
 }
-
+    
 
 
 
@@ -1218,7 +1218,7 @@ void SAL_CALL PresenterController::mouseExited (const css::awt::MouseEvent& rEve
 
 
 //----- XMouseMotionListener --------------------------------------------------
-
+    
 void SAL_CALL PresenterController::mouseMoved (const css::awt::MouseEvent& rEvent)
     throw (css::uno::RuntimeException)
 {
@@ -1298,7 +1298,7 @@ void PresenterController::LoadTheme (const Reference<XPane>& rxPane)
 double PresenterController::GetSlideAspectRatio (void) const
 {
     double nSlideAspectRatio (28.0/21.0);
-
+    
     try
     {
         if (mxController.is())
diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx
index b0fe117a47b0..06795bc9f64b 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sdext/source/presenter/PresenterController.hxx
@@ -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
@@ -169,7 +169,7 @@ public:
         const css::frame::FrameActionEvent& rEvent)
         throw (com::sun::star::uno::RuntimeException);
 
-
+    
     // XKeyListener
 
     virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent)
@@ -193,16 +193,16 @@ public:
 
     virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
 
 
     // XMouseMotionListener
-
+    
     virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
 
@@ -238,7 +238,7 @@ private:
     css::uno::Reference<css::util::XURLTransformer> mxUrlTransformer;
     ::rtl::Reference<PresenterAccessible> mpAccessibleObject;
     bool mbIsAccessibilityActive;
-
+    
     void InitializePresenterScreen (void);
     void InitializeSlideShowView (const css::uno::Reference<css::uno::XInterface>& rxView);
     void GetSlides (const sal_Int32 nOffset);
@@ -258,7 +258,7 @@ private:
             The modifier bit field as provided by the key up event.
     */
     void HandleNumericKeyPress (const sal_Int32 nKey, const sal_Int32 nModifiers);
-
+    
     void ThrowIfDisposed (void) const throw (::com::sun::star::lang::DisposedException);
 };
 
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
index 90e55b219390..c471fa223ab3 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
@@ -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
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
index fc9a5fe18b7a..94c4cf3085c2 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
@@ -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
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx
index 3142d7606fb2..0e6819d288c3 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.cxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx
@@ -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
@@ -55,7 +55,7 @@ PresenterFrameworkObserver::PresenterFrameworkObserver (
 {
     if ( ! mxConfigurationController.is())
         throw lang::IllegalArgumentException();
-
+    
     if (mxConfigurationController->hasPendingRequests())
     {
         if (rsEventName.getLength() > 0)
@@ -171,7 +171,7 @@ void SAL_CALL PresenterFrameworkObserver::disposing (const lang::EventObject& rE
 {
     if ( ! rEvent.Source.is())
         return;
-
+    
     if (rEvent.Source == mxConfigurationController)
     {
         mxConfigurationController = NULL;
@@ -188,7 +188,7 @@ void SAL_CALL PresenterFrameworkObserver::notifyConfigurationChange (
     throw (RuntimeException)
 {
     bool bDispose(false);
-
+    
     Action aAction (maAction);
     Predicate aPredicate (maPredicate);
     if (rEvent.Type.equals(A2S("ConfigurationUpdateEnd")))
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx
index 422055830d6e..3c59a800e3f6 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.hxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx
@@ -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
@@ -75,7 +75,7 @@ public:
     static void RunOnUpdateEnd (
         const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController,
         const Action& rAction);
-
+    
     virtual void SAL_CALL disposing (void);
     virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
         throw (css::uno::RuntimeException);
@@ -108,7 +108,7 @@ private:
     virtual ~PresenterFrameworkObserver (void);
 
     void Shutdown (void);
-
+    
     /** Predicate that returns true when the specified resource is active
         with respect to the given configuration controller.
     */
diff --git a/sdext/source/presenter/PresenterGeometryHelper.cxx b/sdext/source/presenter/PresenterGeometryHelper.cxx
index 2fdc0ea004ea..4d00b9cd14ab 100644
--- a/sdext/source/presenter/PresenterGeometryHelper.cxx
+++ b/sdext/source/presenter/PresenterGeometryHelper.cxx
@@ -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
@@ -128,7 +128,7 @@ geometry::RealRectangle2D PresenterGeometryHelper::ConvertRectangle (
 
 
 
-
+    
 awt::Rectangle PresenterGeometryHelper::TranslateRectangle (
     const css::awt::Rectangle& rBox,
     const sal_Int32 nXOffset,
@@ -136,7 +136,7 @@ awt::Rectangle PresenterGeometryHelper::TranslateRectangle (
 {
     return awt::Rectangle(rBox.X + nXOffset, rBox.Y + nYOffset, rBox.Width, rBox.Height);
 }
-
+    
 
 
 
@@ -208,7 +208,7 @@ awt::Rectangle PresenterGeometryHelper::Union (
         return rBox2;
     else if (rBox2.Width<=0 || rBox2.Height<=0)
         return rBox1;
-
+        
     const sal_Int32 nLeft (::std::min(rBox1.X, rBox2.X));
     const sal_Int32 nTop (::std::min(rBox1.Y, rBox2.Y));
     const sal_Int32 nRight (::std::max(Right(rBox1), Right(rBox2)));
@@ -320,7 +320,7 @@ Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon(
         aPoints[nIndex][2] = geometry::RealPoint2D(rBox.X+rBox.Width, rBox.Y+rBox.Height);
         aPoints[nIndex][3] = geometry::RealPoint2D(rBox.X+rBox.Width, rBox.Y);
     }
-
+    
     Reference<rendering::XLinePolyPolygon2D> xPolygon (
         rxDevice->createCompatibleLinePolyPolygon(aPoints));
     Reference<rendering::XPolyPolygon2D> xRectangle (xPolygon, UNO_QUERY);
diff --git a/sdext/source/presenter/PresenterGeometryHelper.hxx b/sdext/source/presenter/PresenterGeometryHelper.hxx
index b5901a68fd8d..3ed7c6f6b1d5 100644
--- a/sdext/source/presenter/PresenterGeometryHelper.hxx
+++ b/sdext/source/presenter/PresenterGeometryHelper.hxx
@@ -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
@@ -69,12 +69,12 @@ public:
 
     //    static css::awt::Size ConvertSize (
     //        const css::geometry::RealSize2D& rSize);
-
+    
     static css::awt::Rectangle TranslateRectangle (
         const css::awt::Rectangle& rBox,
         const sal_Int32 nXOffset,
         const sal_Int32 nYOffset);
-
+    
     static css::awt::Rectangle Intersection (
         const css::awt::Rectangle& rBox1,
         const css::awt::Rectangle& rBox2);
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index efab952846b7..8b9c84807caf 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -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
@@ -161,7 +161,7 @@ PresenterHelpView::PresenterHelpView (
 
         mxWindow = mxPane->getWindow();
         ProvideCanvas();
-
+        
         mxWindow->addWindowListener(this);
         mxWindow->addPaintListener(this);
         Reference<awt::XWindowPeer> xPeer (mxWindow, UNO_QUERY);
@@ -251,7 +251,7 @@ void SAL_CALL PresenterHelpView::disposing (const lang::EventObject& rEventObjec
 
 
 //----- XWindowListener -------------------------------------------------------
-
+    
 void SAL_CALL PresenterHelpView::windowResized (const awt::WindowEvent& rEvent)
     throw (uno::RuntimeException)
 {
@@ -332,7 +332,7 @@ void PresenterHelpView::Paint (const awt::Rectangle& rUpdateBox)
         Sequence<double>(4),
         rendering::CompositeOperation::SOURCE);
     PresenterCanvasHelper::SetDeviceColor(aRenderState, mpFont->mnColor);
-
+    
     mxCanvas->drawLine(
         geometry::RealPoint2D(aWindowBox.Width/2, gnVerticalBorder),
         geometry::RealPoint2D(aWindowBox.Width/2, mnSeparatorY - gnVerticalBorder),
@@ -427,7 +427,7 @@ void PresenterHelpView::CheckFontSize (void)
 {
     if (mpFont.get() == NULL)
         return;
-
+    
     const awt::Rectangle aWindowBox (mxWindow->getPosSize());
     if (aWindowBox.Width<=0 || aWindowBox.Height<=0)
         return;
@@ -454,7 +454,7 @@ void PresenterHelpView::CheckFontSize (void)
             // too much space below the help text.
             return;
         }
-
+        
         // Font is too large.  Make it smaller.
 
         // Use a simple linear transformation to calculate initial guess of
@@ -469,7 +469,7 @@ void PresenterHelpView::CheckFontSize (void)
         mpFont->mnSize = nFontSizeGuess;
         mpFont->mxFont = NULL;
         mpFont->PrepareFont(mxCanvas);
-
+            
         // Reformat blocks.
         for (iBlock=mpTextContainer->begin(); iBlock!=iBlockEnd; ++iBlock)
             (*iBlock)->Update(mpFont->mxFont, mnMaximalWidth);
@@ -480,7 +480,7 @@ void PresenterHelpView::CheckFontSize (void)
         mpFont->mnSize = nBestSize;
         mpFont->mxFont = NULL;
         mpFont->PrepareFont(mxCanvas);
-
+            
         // Reformat blocks.
         for (TextContainer::iterator
                  iBlock (mpTextContainer->begin()),
@@ -556,7 +556,7 @@ void PresenterHelpView::Resize (void)
         CheckFontSize();
     }
 }
-
+    
 
 
 
@@ -653,7 +653,7 @@ double LineDescriptorList::Paint(
 {
     if ( ! rxCanvas.is())
         return 0;
-
+   
     double nY (rBBox.Y1);
     vector<LineDescriptor>::const_iterator iLine (mpLineDescriptors->begin());
     vector<LineDescriptor>::const_iterator iEnd (mpLineDescriptors->end());
diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx
index 2d5e0efdcfc2..dca6ded59049 100644
--- a/sdext/source/presenter/PresenterHelpView.hxx
+++ b/sdext/source/presenter/PresenterHelpView.hxx
@@ -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
@@ -42,7 +42,7 @@
 namespace css = ::com::sun::star;
 
 namespace {
-    typedef cppu::WeakComponentImplHelper3<
+    typedef cppu::WeakComponentImplHelper3< 
         css::drawing::framework::XView,
         css::awt::XWindowListener,
         css::awt::XPaintListener
@@ -71,13 +71,13 @@ public:
 
     // lang::XEventListener
 
-    virtual void SAL_CALL
+    virtual void SAL_CALL 
         disposing (const css::lang::EventObject& rEventObject)
         throw (css::uno::RuntimeException);
 
 
     // XWindowListener
-
+    
     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
         throw (css::uno::RuntimeException);
 
@@ -131,7 +131,7 @@ private:
         time.
     */
     void CheckFontSize (void);
-
+    
     /** This method throws a DisposedException when the object has already been
         disposed.
     */
diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx
index 9e7001de426d..5f005c6b01a2 100644
--- a/sdext/source/presenter/PresenterHelper.cxx
+++ b/sdext/source/presenter/PresenterHelper.cxx
@@ -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
@@ -72,7 +72,7 @@ Reference<presentation::XSlideShowController> PresenterHelper::GetSlideShowContr
     const Reference<frame::XController>& rxController)
 {
     Reference<presentation::XSlideShowController> xSlideShowController;
-
+    
     if( rxController.is() ) try
     {
         Reference<XPresentationSupplier> xPS ( rxController->getModel(), UNO_QUERY_THROW);
diff --git a/sdext/source/presenter/PresenterHelper.hxx b/sdext/source/presenter/PresenterHelper.hxx
index 75f4cbdd9f0c..54c6d7b8db54 100644
--- a/sdext/source/presenter/PresenterHelper.hxx
+++ b/sdext/source/presenter/PresenterHelper.hxx
@@ -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
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index 9cbf93543ef5..a7cbc5e8e607 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -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
@@ -108,7 +108,7 @@ PresenterNotesView::PresenterNotesView (
             rxComponentContext,
             mxCanvas,
             mpPresenterController->GetPaintManager()->GetInvalidator(mxParentWindow)));
-
+        
         const OUString sResourceURL (mxViewId->getResourceURL());
         mpFont.reset(new PresenterTheme::FontDescriptor(
             rpPresenterController->GetViewFont(sResourceURL)));
@@ -199,7 +199,7 @@ void SAL_CALL PresenterNotesView::disposing (void)
         if (xComponent.is())
             xComponent->dispose();
     }
-
+    
     // Create the tool bar.
 
     mpScrollBar = NULL;
@@ -221,7 +221,7 @@ void PresenterNotesView::CreateToolBar (
         rpPresenterController->GetPresenterHelper());
     if ( ! xPresenterHelper.is())
         return;
-
+            
     // Create a new window as container of the tool bar.
     mxToolBarWindow = xPresenterHelper->createWindow(
         mxParentWindow,
@@ -266,7 +266,7 @@ void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesP
         sal_Int32 nCount (xIndexAccess->getCount());
         for (sal_Int32 nIndex=0; nIndex<nCount; ++nIndex)
         {
-
+            
             Reference<lang::XServiceName> xServiceName (
                 xIndexAccess->getByIndex(nIndex), UNO_QUERY);
             if (xServiceName.is()
@@ -306,7 +306,7 @@ void PresenterNotesView::SetSlide (const Reference<drawing::XDrawPage>& rxNotesP
             mpScrollBar->SetThumbPosition(0, false);
             UpdateScrollBar();
         }
-
+        
         Invalidate();
     }
 }
@@ -327,7 +327,7 @@ void SAL_CALL PresenterNotesView::disposing (const lang::EventObject& rEventObje
 
 
 //----- XWindowListener -------------------------------------------------------
-
+    
 void SAL_CALL PresenterNotesView::windowResized (const awt::WindowEvent& rEvent)
     throw (RuntimeException)
 {
@@ -374,7 +374,7 @@ void SAL_CALL PresenterNotesView::windowPaint (const awt::PaintEvent& rEvent)
 
     if ( ! mbIsPresenterViewActive)
         return;
-
+    
     ::osl::MutexGuard aSolarGuard (::osl::Mutex::getGlobalMutex());
     Paint(rEvent.UpdateRect);
 }
@@ -496,7 +496,7 @@ void PresenterNotesView::Layout (void)
 {
     if ( ! mxParentWindow.is())
         return;
-
+    
     awt::Rectangle aWindowBox (mxParentWindow->getPosSize());
     geometry::RealRectangle2D aNewTextBoundingBox (0,0,aWindowBox.Width, aWindowBox.Height);
 
@@ -549,7 +549,7 @@ void PresenterNotesView::Layout (void)
                 aNewTextBoundingBox.Y2));
         if ( ! bShowVerticalScrollbar)
             mpScrollBar->SetThumbPosition(0, false);
-
+        
         UpdateScrollBar();
     }
 
@@ -605,7 +605,7 @@ void PresenterNotesView::Paint (const awt::Rectangle& rUpdateBox)
 void PresenterNotesView::PaintToolBar (const awt::Rectangle& rUpdateBox)
 {
     awt::Rectangle aWindowBox (mxParentWindow->getPosSize());
-
+    
     rendering::ViewState aViewState (
         geometry::AffineMatrix2D(1,0,0, 0,1,0),
         NULL);
@@ -625,7 +625,7 @@ void PresenterNotesView::PaintToolBar (const awt::Rectangle& rUpdateBox)
             awt::Rectangle(0,sal_Int32(maTextBoundingBox.Y2),aWindowBox.Width,aWindowBox.Height),
             awt::Rectangle());
     }
-
+    
     // Paint the horizontal separator.
     OSL_ASSERT(mxViewId.is());
     PresenterCanvasHelper::SetDeviceColor(aRenderState, maSeparatorColor);
@@ -647,7 +647,7 @@ void PresenterNotesView::PaintText (const awt::Rectangle& rUpdateBox)
 
     if (aBox.Width <= 0 || aBox.Height <= 0)
         return;
-
+    
     rendering::ViewState aViewState (
         geometry::AffineMatrix2D(1,0,0, 0,1,0),
         PresenterGeometryHelper::CreatePolygon(aBox, mxCanvas->getDevice()));
diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx
index 282f86465dc6..b0c313ffc9bb 100644
--- a/sdext/source/presenter/PresenterNotesView.hxx
+++ b/sdext/source/presenter/PresenterNotesView.hxx
@@ -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
@@ -51,7 +51,7 @@
 namespace css = ::com::sun::star;
 
 namespace {
-    typedef cppu::WeakComponentImplHelper5<
+    typedef cppu::WeakComponentImplHelper5< 
         css::awt::XWindowListener,
         css::awt::XPaintListener,
         css::drawing::framework::XView,
@@ -99,16 +99,16 @@ public:
 
     ::boost::shared_ptr<PresenterTextView> GetTextView (void) const;
 
-
+    
     // lang::XEventListener
 
-    virtual void SAL_CALL
+    virtual void SAL_CALL 
         disposing (const css::lang::EventObject& rEventObject)
         throw (css::uno::RuntimeException);
 
 
     // XWindowListener
-
+    
     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
         throw (css::uno::RuntimeException);
 
@@ -127,7 +127,7 @@ public:
     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
         throw (css::uno::RuntimeException);
 
-
+    
     // XResourceId
 
     virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void)
@@ -136,7 +136,7 @@ public:
     virtual sal_Bool SAL_CALL isAnchorOnly (void)
         throw (com::sun::star::uno::RuntimeException);
 
-
+    
     // XDrawView
 
     virtual void SAL_CALL setCurrentPage (
@@ -146,7 +146,7 @@ public:
     virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void)
         throw (css::uno::RuntimeException);
 
-
+    
     // XKeyListener
 
     virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent)
@@ -172,7 +172,7 @@ private:
     double mnTop;
     PresenterTheme::SharedFontDescriptor mpFont;
     ::boost::shared_ptr<PresenterTextView> mpTextView;
-
+    
     void CreateToolBar (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
         const ::rtl::Reference<PresenterController>& rpPresenterController);
diff --git a/sdext/source/presenter/PresenterPaintManager.cxx b/sdext/source/presenter/PresenterPaintManager.cxx
index e934130d9ec2..643db9fa6559 100644
--- a/sdext/source/presenter/PresenterPaintManager.cxx
+++ b/sdext/source/presenter/PresenterPaintManager.cxx
@@ -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
@@ -81,7 +81,7 @@ void PresenterPaintManager::Invalidate (
     sal_Int16 nInvalidateMode (awt::InvalidateStyle::CHILDREN);
     if (bSynchronous)
         nInvalidateMode |= awt::InvalidateStyle::UPDATE;
-
+    
     PresenterPaneContainer::SharedPaneDescriptor pDescriptor(
         mpPaneContainer->FindContentWindow(rxWindow));
     if (pDescriptor.get()==NULL || ! pDescriptor->mbIsOpaque)
@@ -129,7 +129,7 @@ void PresenterPaintManager::Invalidate (
     sal_Int16 nInvalidateMode (awt::InvalidateStyle::CHILDREN);
     if (bSynchronous)
         nInvalidateMode |= awt::InvalidateStyle::UPDATE;
-
+    
     PresenterPaneContainer::SharedPaneDescriptor pDescriptor(
         mpPaneContainer->FindContentWindow(rxWindow));
     if (pDescriptor.get()==NULL || ! pDescriptor->mbIsOpaque)
diff --git a/sdext/source/presenter/PresenterPaintManager.hxx b/sdext/source/presenter/PresenterPaintManager.hxx
index 421edbeb171b..379788847d2d 100644
--- a/sdext/source/presenter/PresenterPaintManager.hxx
+++ b/sdext/source/presenter/PresenterPaintManager.hxx
@@ -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
diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx
index 65380f40b790..c47ee2fce5dd 100644
--- a/sdext/source/presenter/PresenterPane.cxx
+++ b/sdext/source/presenter/PresenterPane.cxx
@@ -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
@@ -103,7 +103,7 @@ void SAL_CALL PresenterPane::windowResized (const awt::WindowEvent& rEvent)
     PresenterPaneBase::windowResized(rEvent);
 
     Invalidate(maBoundingBox);
-
+    
     LayoutContextWindow();
     ToTop();
 
@@ -193,7 +193,7 @@ void PresenterPane::CreateCanvases (
         return;
     if ( ! rxParentCanvas.is())
         return;
-
+    
     mxBorderCanvas = mxPresenterHelper->createSharedCanvas(
         rxParentCanvas,
         rxParentWindow,
diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx
index 303bb0c6f5ed..456ead7c2ce5 100644
--- a/sdext/source/presenter/PresenterPane.hxx
+++ b/sdext/source/presenter/PresenterPane.hxx
@@ -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
@@ -68,7 +68,7 @@ public:
         const css::uno::Reference<css::uno::XComponentContext>& rxContext)
         SAL_THROW((css::uno::Exception));
 
-
+    
     // XPane
 
     css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow (void)
@@ -77,9 +77,9 @@ public:
     css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas (void)
         throw (css::uno::RuntimeException);
 
-
+    
     // XWindowListener
-
+    
     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
         throw (css::uno::RuntimeException);
 
@@ -98,7 +98,7 @@ public:
     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
         throw (css::uno::RuntimeException);
 
-
+        
 private:
     /** Store the bounding box so that when the window is resized or moved
         we still know the old position and size.
diff --git a/sdext/source/presenter/PresenterPaneAnimator.cxx b/sdext/source/presenter/PresenterPaneAnimator.cxx
index ecf7989bf5b2..fe4ad2046552 100644
--- a/sdext/source/presenter/PresenterPaneAnimator.cxx
+++ b/sdext/source/presenter/PresenterPaneAnimator.cxx
@@ -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
@@ -82,7 +82,7 @@ namespace {
             const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId);
         void RestoreFrozenWindows (void);
         void FreezePanes (const Reference<rendering::XSpriteCanvas>& rxCanvas);
-
+        
     protected:
         ::rtl::Reference<PresenterController> mpPresenterController;
         ::rtl::Reference<PresenterPaneContainer> mpPaneContainer;
@@ -92,7 +92,7 @@ namespace {
         bool mbDoAnimation;
         EndActions maShowEndActions;
         EndActions maHideEndActions;
-
+    
         void DeactivatePanes (void);
         void ResizePane (
             const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId,
@@ -111,9 +111,9 @@ namespace {
             const bool bAnimate,
             const EndActions& rShowEndActions,
             const EndActions& rEndEndActions);
-
+        
         virtual ~UnfoldInCenterAnimator (void);
-
+        
         virtual void ShowPane (void);
 
         virtual void HidePane (void);
@@ -137,10 +137,10 @@ namespace {
             const EndActions& rShowEndActions,
             const EndActions& rEndEndActions);
         virtual ~MoveInFromBottomAnimator (void);
-
+        
         virtual void ShowPane (void);
         virtual void HidePane (void);
-
+        
     private:
         ::boost::shared_ptr<PresenterSprite> maNewPaneSprite;
         geometry::RealRectangle2D maCenterPaneBox;
@@ -165,10 +165,10 @@ namespace {
             const EndActions& rShowEndActions,
             const EndActions& rEndEndActions);
         virtual ~TransparentOverlayAnimator (void);
-
+        
         virtual void ShowPane (void);
         virtual void HidePane (void);
-
+        
     private:
         PresenterSprite maBackgroundSprite;
         void CreateBackgroundSprite (void);
@@ -227,7 +227,7 @@ namespace {
         awt::Rectangle maOriginalBoundingBox;
         css::geometry::RealRectangle2D maCurrentBoundingBox;
         ::boost::shared_ptr<PresenterSprite> mpSubstitution;
-
+        
     };
     typedef ::boost::shared_ptr<PaneGroup> SharedPaneGroup;
 
@@ -388,7 +388,7 @@ void PresenterPaneAnimatorBase::DeactivatePanes (void)
         (*iGroup)->DeactivatePanes();
         (*iGroup)->HidePanes();
     }
-
+    
     mpWindowManager->Update();
 }
 
@@ -512,9 +512,9 @@ void UnfoldInCenterAnimator::ShowPane (void)
     // Create two pane groups that will be moved together.  One contains the
     // notes view, the other group contains all other panes.
     SetupPaneGroups();
-
+    
     // Setup the places where the two pane groups are moved to.
-    maCenterPaneBox
+    maCenterPaneBox 
         = MovePanesAway(geometry::RealRectangle2D(0,200,aWindowBox.Width, aWindowBox.Height-200));
 
     // Setup the final size of the new pane so that it fits into the space
@@ -583,7 +583,7 @@ void UnfoldInCenterAnimator::ShowPane (void)
             nY0,
             maCenterPaneBox.Y1,
             _1));
-
+    
     // Call updateScreen after each animation step.
     if (xCanvas.is())
         pMultiAnimation->AddAnimation(
@@ -610,14 +610,14 @@ void UnfoldInCenterAnimator::ShowPane (void)
 void UnfoldInCenterAnimator::HidePane (void)
 {
     OSL_ASSERT(mpWindowManager.get()!=NULL);
-
+    
     Reference<awt::XWindow> xParentWindow (mpWindowManager->GetParentWindow(), UNO_QUERY);
     if ( ! xParentWindow.is())
         return;
 
     DeactivatePanes();
     DeactivatePane(mxCenterPaneId);
-
+    
     ::boost::shared_ptr<PresenterAnimator> pAnimator (mpPresenterController->GetAnimator());
     const awt::Rectangle aWindowBox (xParentWindow->getPosSize());
     const rendering::ViewState aViewState (
@@ -628,7 +628,7 @@ void UnfoldInCenterAnimator::HidePane (void)
         NULL,
         Sequence<double>(4),
         rendering::CompositeOperation::SOURCE);
-
+    
     // Animate the uppder and lower window bitmaps.
     Reference<rendering::XSpriteCanvas> xSpriteCanvas (mpWindowManager->GetParentCanvas(), UNO_QUERY);
     ::boost::shared_ptr<MultiAnimation> pMultiAnimation (new MultiAnimation(mbDoAnimation ? 500 : 1));
@@ -645,7 +645,7 @@ void UnfoldInCenterAnimator::HidePane (void)
                 GetLocation((*iGroup)->GetCurrentBoundingBox()),
                 GetLocation((*iGroup)->GetOriginalBoundingBox())));
     }
-
+    
     // Animate the new center pane to collapse.
     const double nY0 ((maPaneGroups[0]->GetOriginalBoundingBox().Y2
             + maPaneGroups[1]->GetOriginalBoundingBox().Y1) / 2);
@@ -672,7 +672,7 @@ void UnfoldInCenterAnimator::HidePane (void)
     EndActions::const_iterator iAction;
     for (iAction=maHideEndActions.begin(); iAction!=maHideEndActions.end(); ++iAction)
         pMultiAnimation->AddEndCallback(*iAction);
-
+    
     pAnimator->AddAnimation(SharedPresenterAnimation(pMultiAnimation));
 }
 
@@ -710,7 +710,7 @@ geometry::RealRectangle2D UnfoldInCenterAnimator::MovePanesAway (
 {
     SharedPaneGroup aUpperPanes = maPaneGroups[0];
     SharedPaneGroup aLowerPanes = maPaneGroups[1];
-
+    
     // Move upper pane group out of the way.
     const double nTop (rFreeCenterArea.Y1);
     const double nUpperVerticalOffset (nTop - aUpperPanes->GetOriginalBoundingBox().Y2);
@@ -797,7 +797,7 @@ void MoveInFromBottomAnimator::ShowPane (void)
 
     geometry::RealPoint2D aStartLocation (maCenterPaneBox.X1, aWindowBox.Height);
     geometry::RealPoint2D aEndLocation (maCenterPaneBox.X1, maCenterPaneBox.Y1);
-
+        
     // Get the sprite of the new pane, make it visible and move it to the
     // start location.
     PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
@@ -806,7 +806,7 @@ void MoveInFromBottomAnimator::ShowPane (void)
     {
         if (pDescriptor->mxBorderWindow.is())
             pDescriptor->mxBorderWindow->setVisible(sal_True);
-
+        
         maNewPaneSprite = pDescriptor->maSpriteProvider();
         if (maNewPaneSprite.get() != NULL)
         {
@@ -833,7 +833,7 @@ void MoveInFromBottomAnimator::ShowPane (void)
 void MoveInFromBottomAnimator::HidePane (void)
 {
     OSL_ASSERT(mpWindowManager.get()!=NULL);
-
+    
     Reference<awt::XWindow> xParentWindow (mpWindowManager->GetParentWindow(), UNO_QUERY);
     if ( ! xParentWindow.is())
         return;
@@ -846,13 +846,13 @@ void MoveInFromBottomAnimator::HidePane (void)
     DeactivatePane(mxCenterPaneId);
 
     SharedPaneGroup aPanes (maPaneGroups[0]);
-
+    
     aPanes->ShowPanes();
 
     ::boost::shared_ptr<MultiAnimation> pMultiAnimation (
         new MultiAnimation(mbDoAnimation ? 500 : 0));
     awt::Rectangle aWindowBox (xParentWindow->getPosSize());
-
+    
     // Animate the new center pane to collapse.
     pMultiAnimation->AddAnimation(
         ::boost::bind(
@@ -872,7 +872,7 @@ void MoveInFromBottomAnimator::HidePane (void)
     EndActions::const_iterator iAction;
     for (iAction=maHideEndActions.begin(); iAction!=maHideEndActions.end(); ++iAction)
         pMultiAnimation->AddEndCallback(*iAction);
-
+    
     ::boost::shared_ptr<PresenterAnimator> pAnimator (mpPresenterController->GetAnimator());
     pAnimator->AddAnimation(SharedPresenterAnimation(pMultiAnimation));
 }
@@ -979,7 +979,7 @@ void TransparentOverlayAnimator::ShowPane (void)
         pAllPanes->DeactivatePanes();
         mpWindowManager->Update();
     }
-
+        
     PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
         mpPaneContainer->FindPaneId(mxCenterPaneId));
     if (pDescriptor.get() != NULL)
@@ -1039,7 +1039,7 @@ void TransparentOverlayAnimator::CreateBackgroundSprite (void)
                 Sequence<double>(4),
                 rendering::CompositeOperation::SOURCE);
             PresenterCanvasHelper::SetDeviceColor(aRenderState, util::Color(0x80808080));
-
+    
             Reference<rendering::XPolyPolygon2D> xPolygon (
                 PresenterGeometryHelper::CreatePolygon(aWindowBox, xCanvas->getDevice()));
             if (xPolygon.is())
@@ -1113,7 +1113,7 @@ void PaneGroup::CreateSubstitution (const Reference<rendering::XSpriteCanvas>& r
         NULL,
         Sequence<double>(4),
         rendering::CompositeOperation::SOURCE);
-
+    
     Reference<rendering::XCanvas> xSpriteCanvas (mpSubstitution->GetCanvas());
     if (xSpriteCanvas.is())
         xSpriteCanvas->drawBitmap(xBackgroundBitmap, aViewState, aRenderState);
@@ -1324,7 +1324,7 @@ template<typename T>
         const T aFinalValue)
 {
     const double nQ (1 - nP);
-
+    
     rSetter(T(nQ * aInitialValue + nP * aFinalValue));
 }
 
@@ -1343,7 +1343,7 @@ void SpriteTransform(
     const double nP)
 {
     OSL_ASSERT(rpPaintManager.get()!=NULL);
-
+    
     PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
         rpPaneContainer->FindPaneId(rxPaneId));
     if (pDescriptor.get() != NULL
@@ -1364,7 +1364,7 @@ void SpriteTransform(
                     sal::static_int_cast<sal_Int32>(pSprite->GetLocation().Y),
                     sal::static_int_cast<sal_Int32>(pSprite->GetSize().Width),
                     sal::static_int_cast<sal_Int32>(pSprite->GetSize().Height)));
-
+            
             const double nYScale (bAppear ? nP : 1-nP);
             pSprite->Transform(geometry::AffineMatrix2D(
                 1, 0, 0,
diff --git a/sdext/source/presenter/PresenterPaneAnimator.hxx b/sdext/source/presenter/PresenterPaneAnimator.hxx
index 1e044b4a647b..9ab5dc6d69a2 100644
--- a/sdext/source/presenter/PresenterPaneAnimator.hxx
+++ b/sdext/source/presenter/PresenterPaneAnimator.hxx
@@ -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
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx
index 4003c79e4bb9..1b22381fd6b7 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sdext/source/presenter/PresenterPaneBase.cxx
@@ -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
@@ -131,10 +131,10 @@ void PresenterPaneBase::disposing (void)
 void PresenterPaneBase::SetTitle (const OUString& rsTitle)
 {
     msTitle = rsTitle;
-
+    
     OSL_ASSERT(mpPresenterController.get()!=NULL);
     OSL_ASSERT(mpPresenterController->GetPaintManager().get()!=NULL);
-
+    
     mpPresenterController->GetPaintManager()->Invalidate(mxBorderWindow);
 }
 
@@ -254,7 +254,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments)
                     static_cast<XWeak*>(this),
                     2);
             }
-
+            
             if ( ! (rArguments[3] >>= msTitle))
             {
                 throw lang::IllegalArgumentException(
@@ -281,13 +281,13 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments)
             }
 
             CreateWindows(mxParentWindow, bIsWindowVisibleOnCreation);
-
+    
             if (mxBorderWindow.is())
             {
                 mxBorderWindow->addWindowListener(this);
                 mxBorderWindow->addPaintListener(this);
             }
-
+            
             CreateCanvases(mxParentWindow, xParentCanvas);
 
             // Raise new windows.
@@ -398,7 +398,7 @@ void PresenterPaneBase::CreateWindows (
 {
     if (mxPresenterHelper.is() && rxParentWindow.is())
     {
-
+        
         mxBorderWindow = mxPresenterHelper->createWindow(
             rxParentWindow,
             sal_False,
@@ -483,7 +483,7 @@ void PresenterPaneBase::PaintBorder (const awt::Rectangle& rUpdateBox)
         awt::Rectangle aLocalBorderBox (0,0, aBorderBox.Width, aBorderBox.Height);
 
         PaintBorderBackground(aLocalBorderBox, rUpdateBox);
-
+        
         if (mbHasCallout)
             mxBorderPainter->paintBorderWithCallout(
                 mxPaneId->getResourceURL(),
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
index 16ea4e515299..1b64eae2a747 100644
--- a/sdext/source/presenter/PresenterPaneBase.hxx
+++ b/sdext/source/presenter/PresenterPaneBase.hxx
@@ -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
@@ -96,11 +96,11 @@ public:
     ::boost::shared_ptr<PresenterTextView> GetTextViewForTitle (void);
 
     // XInitialization
-
+    
     virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments)
         throw (css::uno::Exception, css::uno::RuntimeException);
 
-
+    
     // XResourceId
 
     virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void)
@@ -109,9 +109,9 @@ public:
     virtual sal_Bool SAL_CALL isAnchorOnly (void)
         throw (com::sun::star::uno::RuntimeException);
 
-
+    
     // XWindowListener
-
+    
     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
         throw (css::uno::RuntimeException);
 
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx
index 8b8be6fb072c..af3e124c2a64 100644
--- a/sdext/source/presenter/PresenterPaneBorderManager.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx
@@ -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
@@ -220,25 +220,25 @@ PresenterPaneBorderManager::BorderElement
 
         case mnTop | mnLeft:
             return TopLeft;
-
+            
         case mnTop | mnRight:
             return TopRight;
-
+            
         case mnTop | mnHorizontalCenter:
             return Top;
-
+            
         case mnBottom | mnLeft:
             return BottomLeft;
-
+            
         case mnBottom | mnRight:
             return BottomRight;
-
+            
         case mnBottom | mnHorizontalCenter:
             return Bottom;
-
+            
         case mnVerticalCenter | mnLeft:
             return Left;
-
+            
         case mnVerticalCenter | mnRight:
             return Right;
     }
@@ -360,12 +360,12 @@ void SAL_CALL PresenterPaneBorderManager::mouseExited (const css::awt::MouseEven
     mxOuterDragWindow = NULL;
     mxInnerDragWindow = NULL;
 }
-
+    
 
 
 
 //----- XMouseMotionListener --------------------------------------------------
-
+    
 void SAL_CALL PresenterPaneBorderManager::mouseMoved (const css::awt::MouseEvent& rEvent)
     throw (css::uno::RuntimeException)
 {
@@ -408,7 +408,7 @@ void SAL_CALL PresenterPaneBorderManager::mouseMoved (const css::awt::MouseEvent
             case PresenterPaneBorderManager::Bottom:
                 mnPointerType = awt::SystemPointer::WINDOW_SSIZE;
                 break;
-
+                
             case PresenterPaneBorderManager::Content:
             case PresenterPaneBorderManager::Outside:
             default:
@@ -451,7 +451,7 @@ void SAL_CALL PresenterPaneBorderManager::mouseDragged (const css::awt::MouseEve
 
     const sal_Int32 nOldRight = aOldBox.X + aOldBox.Width;
     const sal_Int32 nOldBottom = aOldBox.Y + aOldBox.Height;
-
+        
     awt::Rectangle aBox (aOldBox);
     sal_Int32 nRight = aBox.X + aBox.Width;
     sal_Int32 nBottom = aBox.Y + aBox.Height;
@@ -487,7 +487,7 @@ void SAL_CALL PresenterPaneBorderManager::mouseDragged (const css::awt::MouseEve
             break;
         default: break;
     }
-
+    
     aBox.Width = nRight - aBox.X;
     aBox.Height = nBottom - aBox.Y;
     if (aBox.Width > 20
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.hxx b/sdext/source/presenter/PresenterPaneBorderManager.hxx
index b9b25f330cfa..cb73ebee39d6 100644
--- a/sdext/source/presenter/PresenterPaneBorderManager.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderManager.hxx
@@ -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
@@ -94,11 +94,11 @@ public:
 
 
     // XInitialization
-
+    
     virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments)
         throw (css::uno::Exception, css::uno::RuntimeException);
 
-
+    
     // XMouseListener
 
     virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
@@ -106,28 +106,28 @@ public:
 
     virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
 
     // XMouseMotionListener
-
+    
     virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
 
-
+    
     // lang::XEventListener
     virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
         throw (css::uno::RuntimeException);
 
-
+    
 private:
     enum BorderElement { Top, TopLeft, TopRight, Left, Right, BottomLeft, BottomRight, Bottom,
                          Content, Outside };
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index 0765ffef4c97..0f36a42d3ce6 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -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
@@ -87,7 +87,7 @@ namespace {
             drawing::framework::BorderType eBorderType) const;
         const Reference<rendering::XCanvasFont> GetFont (
             const Reference<rendering::XCanvas>& rxCanvas) const;
-
+        
         SharedBitmapDescriptor mpTopLeft;
         SharedBitmapDescriptor mpTop;
         SharedBitmapDescriptor mpTopRight;
@@ -125,7 +125,7 @@ public:
         const Reference<XComponentContext>& rxContext,
         const ::boost::shared_ptr<PresenterTheme>& rpTheme);
     ~Renderer (void);
-
+        
     void SetCanvas (const Reference<rendering::XCanvas>& rxCanvas);
     void PaintBorder (
         const OUString& rsTitle,
@@ -146,7 +146,7 @@ public:
     ::boost::shared_ptr<RendererPaneStyle> GetRendererPaneStyle (const OUString& rsResourceURL);
     void SetCalloutAnchor (
         const awt::Point& rCalloutAnchor);
-
+        
 private:
     ::boost::shared_ptr<PresenterTheme> mpTheme;
     typedef ::std::map<OUString, ::boost::shared_ptr<RendererPaneStyle> > RendererPaneStyleContainer;
@@ -157,7 +157,7 @@ private:
     Reference<rendering::XPolyPolygon2D> mxViewStateClip;
     bool mbHasCallout;
     awt::Point maCalloutAnchor;
-
+    
     void PaintBitmap(
         const awt::Rectangle& rBox,
         const awt::Rectangle& rUpdateBox,
@@ -174,7 +174,7 @@ private:
 
 
 // ===== PresenterPaneBorderPainter ===========================================
-
+    
 PresenterPaneBorderPainter::PresenterPaneBorderPainter (
     const Reference<XComponentContext>& rxContext)
     : PresenterPaneBorderPainterInterfaceBase(m_aMutex),
@@ -203,7 +203,7 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::addBorder (
     throw(css::uno::RuntimeException)
 {
     ThrowIfDisposed();
-
+    
     ProvideTheme();
 
     return AddBorder(rsPaneBorderStyleName, rRectangle, eBorderType);
@@ -219,7 +219,7 @@ awt::Rectangle SAL_CALL PresenterPaneBorderPainter::removeBorder (
     throw(css::uno::RuntimeException)
 {
     ThrowIfDisposed();
-
+    
     ProvideTheme();
 
     return RemoveBorder(rsPaneBorderStyleName, rRectangle, eBorderType);
@@ -247,7 +247,7 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorder (
         return;
     }
     ProvideTheme(rxCanvas);
-
+    
     if (mpRenderer.get() != NULL)
     {
         mpRenderer->SetCanvas(rxCanvas);
@@ -286,7 +286,7 @@ void SAL_CALL PresenterPaneBorderPainter::paintBorderWithCallout (
         return;
     }
     ProvideTheme(rxCanvas);
-
+    
     if (mpRenderer.get() != NULL)
     {
         mpRenderer->SetCanvas(rxCanvas);
@@ -337,7 +337,7 @@ awt::Point SAL_CALL PresenterPaneBorderPainter::getCalloutOffset (
 bool PresenterPaneBorderPainter::ProvideTheme (const Reference<rendering::XCanvas>& rxCanvas)
 {
     bool bModified (false);
-
+    
     if ( ! mxContext.is())
         return false;
 
@@ -512,12 +512,12 @@ void PresenterPaneBorderPainter::Renderer::PaintBorder (
 {
     if ( ! mxCanvas.is())
         return;
-
+    
     // Create the outer and inner border of the, ahm, border.
     ::boost::shared_ptr<RendererPaneStyle> pStyle (GetRendererPaneStyle(rsPaneURL));
     if (pStyle.get() == NULL)
         return;
-
+    
     awt::Rectangle aOuterBox (rBBox);
     awt::Rectangle aCenterBox (
         pStyle->RemoveBorder(aOuterBox, drawing::framework::BorderType_OUTER_BORDER));
@@ -594,14 +594,14 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle (
 {
     if ( ! mxCanvas.is())
         return;
-
+    
     if (rsTitle.getLength() == 0)
         return;
 
     Reference<rendering::XCanvasFont> xFont (rpStyle->GetFont(mxCanvas));
     if ( ! xFont.is())
         return;
-
+    
     rendering::StringContext aContext (
         rsTitle,
         0,
@@ -636,7 +636,7 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle (
     }
     nX += rpStyle->mnFontXOffset;
     nY += rpStyle->mnFontYOffset;
-
+        
     if (rUpdateBox.X >= nX+nTextWidth
         || rUpdateBox.Y >= nY+nTextHeight
         || rUpdateBox.X+rUpdateBox.Width <= nX
@@ -644,13 +644,13 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle (
     {
         return;
     }
-
+                
     rendering::RenderState aRenderState(
         geometry::AffineMatrix2D(1,0,nX, 0,1,nY),
         NULL,
         Sequence<double>(4),
         rendering::CompositeOperation::SOURCE);
-
+        
     if (bPaintBackground)
     {
         PresenterCanvasHelper::SetDeviceColor(aRenderState, util::Color(0x00ffffff));
@@ -700,7 +700,7 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle (
         const OUString sStyleName (mpTheme->GetStyleName(rsResourceURL));
         if (sStyleName.getLength() > 0)
             sPaneStyleName = sStyleName;
-
+        
         // Create a new pane style object and initialize it with bitmaps.
         ::boost::shared_ptr<RendererPaneStyle> pStyle (
             new RendererPaneStyle(mpTheme,sPaneStyleName));
@@ -738,7 +738,7 @@ void PresenterPaneBorderPainter::Renderer::PaintBitmap(
     const SharedBitmapDescriptor& rpBackgroundBitmap)
 {
     (void)rpBackgroundBitmap;
-
+    
     bool bUseCanvas (mxCanvas.is());
     if ( ! bUseCanvas)
         return;
@@ -870,7 +870,7 @@ void PresenterPaneBorderPainter::Renderer::SetupClipping (
             mxViewStateClip->setFillRule(rendering::FillRule_EVEN_ODD);
     }
     maViewState.Clip = mxViewStateClip;
-}
+}    
 
 
 
@@ -951,7 +951,7 @@ RendererPaneStyle::RendererPaneStyle (
         mpBottomRight = GetBitmap(rpTheme, rsStyleName,  A2S("BottomRight"));
         mpBottomCallout = GetBitmap(rpTheme, rsStyleName,  A2S("BottomCallout"));
         mpBackground = GetBitmap(rpTheme, OUString(), A2S("Background"));
-
+            
         // Get font description.
         mpFont = rpTheme->GetFont(rsStyleName);
 
@@ -993,7 +993,7 @@ RendererPaneStyle::RendererPaneStyle (
         {
             OSL_ASSERT(false);
         }
-
+        
         UpdateBorderSizes();
     }
 }
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
index 0084d567e478..14286546ac62 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
@@ -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
@@ -106,7 +106,7 @@ public:
     class Renderer;
 
     // XPaneBorderPainter
-
+    
     virtual css::awt::Rectangle SAL_CALL addBorder (
         const rtl::OUString& rsPaneBorderStyleName,
         const css::awt::Rectangle& rRectangle,
@@ -126,7 +126,7 @@ public:
         const css::awt::Rectangle& rRepaintArea,
         const rtl::OUString& rsTitle)
         throw(css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL paintBorderWithCallout (
         const rtl::OUString& rsPaneBorderStyleName,
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx
index e9b5cbb95622..98e95d7f560e 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -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
@@ -160,7 +160,7 @@ PresenterPaneContainer::SharedPaneDescriptor
             pDescriptor->mxPaneId = xPaneId;
             pDescriptor->mxPane = rxPane;
             pDescriptor->mxPane->SetTitle(pDescriptor->msTitle);
-
+            
             // When there is a call out anchor location set then tell the
             // window about it.
             if (pDescriptor->mbHasCalloutAnchor)
@@ -187,7 +187,7 @@ PresenterPaneContainer::SharedPaneDescriptor
     OUString sPaneURL;
     if (rxPaneId.is())
         sPaneURL = rxPaneId->getResourceURL();
-
+    
     SharedPaneDescriptor pDescriptor (FindPaneURL(sPaneURL));
     if (pDescriptor.get() != NULL)
     {
@@ -207,7 +207,7 @@ PresenterPaneContainer::SharedPaneDescriptor
         const SharedBitmapDescriptor& rpViewBackground)
 {
     SharedPaneDescriptor pDescriptor;
-
+    
     if (rxView.is())
     {
         OUString sPaneURL;
@@ -229,7 +229,7 @@ PresenterPaneContainer::SharedPaneDescriptor
             {
                 if ( ! pDescriptor->maViewInitialization.empty())
                     pDescriptor->maViewInitialization(rxView);
-
+                
                 // Activate or deactivate the pane/view.
                 if ( ! pDescriptor->maActivator.empty())
                     pDescriptor->maActivator(pDescriptor->mbIsActive);
@@ -272,7 +272,7 @@ PresenterPaneContainer::SharedPaneDescriptor
     PresenterPaneContainer::RemoveView (const Reference<XView>& rxView)
 {
     SharedPaneDescriptor pDescriptor;
-
+    
     if (rxView.is())
     {
         OUString sPaneURL;
@@ -407,7 +407,7 @@ void PresenterPaneContainer::ToTop (const SharedPaneDescriptor& rpDescriptor)
         OSL_ASSERT(iPane!=iEnd);
         if (iPane == iEnd)
             return;
-
+        
         if (mxPresenterHelper.is())
             mxPresenterHelper->toTop(rpDescriptor->mxBorderWindow);
 
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx
index 3c837ffc8a9b..c016b390c1bb 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
@@ -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
@@ -75,7 +75,7 @@ public:
     virtual ~PresenterPaneContainer (void);
 
     virtual void SAL_CALL disposing (void);
-
+    
     typedef ::boost::function1<void, const css::uno::Reference<css::drawing::framework::XView>&>
         ViewInitializationFunction;
 
@@ -140,7 +140,7 @@ public:
     SharedPaneDescriptor StoreBorderWindow(
         const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId,
         const css::uno::Reference<css::awt::XWindow>& rxBorderWindow);
-
+    
     SharedPaneDescriptor StoreView (
         const css::uno::Reference<css::drawing::framework::XView>& rxView,
         const SharedBitmapDescriptor& rpViewBackground);
@@ -150,7 +150,7 @@ public:
 
     SharedPaneDescriptor RemoveView (
         const css::uno::Reference<css::drawing::framework::XView>& rxView);
-
+    
     void CreateBorderWindow (PaneDescriptor& rDescriptor);
 
     /** Find the pane whose border window is identical to the given border
@@ -179,7 +179,7 @@ public:
     ::rtl::OUString GetPaneURLForViewURL (const ::rtl::OUString& rsViewURL);
 
     void ToTop (const SharedPaneDescriptor& rpDescriptor);
-
+    
 
     // XEventListener
 
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx
index 4763893698df..bd6c7c4e0894 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
@@ -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
@@ -149,7 +149,7 @@ void SAL_CALL PresenterPaneFactory::disposing (void)
     if (xCC.is())
         xCC->removeResourceFactoryForReference(this);
     mxConfigurationControllerWeak = WeakReference<XConfigurationController>();
-
+        
     // Dispose the panes in the cache.
     if (mpResourceCache.get() != NULL)
     {
@@ -169,7 +169,7 @@ void SAL_CALL PresenterPaneFactory::disposing (void)
 
 
 //----- XPaneFactory ----------------------------------------------------------
-
+    
 Reference<XResource> SAL_CALL PresenterPaneFactory::createResource (
     const Reference<XResourceId>& rxPaneId)
     throw (RuntimeException, IllegalArgumentException, WrappedTargetException)
@@ -260,11 +260,11 @@ Reference<XResource> PresenterPaneFactory::CreatePane (
 {
     if ( ! rxPaneId.is())
         return NULL;
-
+        
     Reference<XConfigurationController> xCC (mxConfigurationControllerWeak);
     if ( ! xCC.is())
         return NULL;
-
+    
     Reference<XComponentContext> xContext (mxComponentContextWeak);
     if ( ! xContext.is())
         return NULL;
@@ -329,7 +329,7 @@ Reference<XResource> PresenterPaneFactory::CreatePane (
         UNO_QUERY);
     aArguments[5] <<= bIsSpritePane ? false : true;
     xPane->initialize(aArguments);
-
+        
     // Store pane and canvases and windows in container.
     ::rtl::Reference<PresenterPaneContainer> pContainer (
         mpPresenterController->GetPaneContainer());
diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx
index 136d47ec645b..6e381fd6c106 100644
--- a/sdext/source/presenter/PresenterPaneFactory.hxx
+++ b/sdext/source/presenter/PresenterPaneFactory.hxx
@@ -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
@@ -56,7 +56,7 @@ namespace {
 
 
 /** The PresenerPaneFactory provides a fixed set of panes.
-
+    
     In order to make the presener screen more easily extendable in the
     future the set of supported panes could be made extendable on demand.
 */
@@ -95,7 +95,7 @@ public:
         throw (css::uno::RuntimeException);
 
     // XResourceFactory
-
+    
     virtual css::uno::Reference<css::drawing::framework::XResource>
         SAL_CALL createResource (
             const ::com::sun::star::uno::Reference<
@@ -122,7 +122,7 @@ private:
         const ::rtl::Reference<PresenterController>& rpPresenterController);
 
     void Register (const css::uno::Reference<css::frame::XController>& rxController);
-
+    
     css::uno::Reference<css::drawing::framework::XResource> CreatePane (
         const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId,
         const ::rtl::OUString& rsTitle);
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index 7c4829ac81fd..0b87adfec200 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -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
@@ -174,7 +174,7 @@ namespace {
     };
 
 } // end of anonymous namespace
-
+    
 
 namespace {
     typedef ::cppu::WeakComponentImplHelper2 <
@@ -213,24 +213,24 @@ public:
         const css::uno::Reference<css::frame::XStatusListener>& rxListener,
         const css::util::URL& rURL)
         throw(css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL removeStatusListener (
         const css::uno::Reference<css::frame::XStatusListener>& rxListener,
         const css::util::URL& rURL)
         throw(css::uno::RuntimeException);
 
-
+    
     // document::XEventListener
 
     virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent)
         throw(css::uno::RuntimeException);
 
-
+    
     // lang::XEventListener
 
     virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
         throw(css::uno::RuntimeException);
-
+    
 private:
     OUString msURLPath;
     ::boost::scoped_ptr<Command> mpCommand;
@@ -243,7 +243,7 @@ private:
         const OUString& rsURLPath,
         const ::rtl::Reference<PresenterController>& rpPresenterController);
     virtual ~Dispatch (void);
-
+    
     void ThrowIfDisposed (void) const throw (css::lang::DisposedException);
 };
 
@@ -384,7 +384,7 @@ void PresenterProtocolHandler::ThrowIfDisposed (void) const
 
 
 
-
+    
 //===== PresenterProtocolHandler::Dispatch ====================================
 
 Reference<frame::XDispatch> PresenterProtocolHandler::Dispatch::Create (
@@ -476,12 +476,12 @@ Command* PresenterProtocolHandler::Dispatch::CreateCommand (
                     if (rsURLPath == A2S("ShowNotes"))
                         return new SetNotesViewCommand(true, rpPresenterController);
                     break;
-
+                    
                 case sal_Char('S'):
                     if (rsURLPath == A2S("ShowSlideSorter"))
                         return new SetSlideSorterCommand(true, rpPresenterController);
                     break;
-
+                    
                 case sal_Char('H'):
                     if (rsURLPath == A2S("ShowHelp"))
                         return new SetHelpViewCommand(true, rpPresenterController);
@@ -572,7 +572,7 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::addStatusListener(
     else
         throw RuntimeException();
 }
-
+    
 
 
 
@@ -614,7 +614,7 @@ void PresenterProtocolHandler::Dispatch::ThrowIfDisposed (void) const
 
 
 
-
+    
 //----- document::XEventListener ----------------------------------------------
 
 void SAL_CALL PresenterProtocolHandler::Dispatch::notifyEvent (
@@ -962,7 +962,7 @@ NotesFontSizeCommand::NotesFontSizeCommand(
 {
     if (mpPresenterController.get() == NULL)
         return NULL;
-
+    
     PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
         mpPresenterController->GetPaneContainer()->FindViewURL(
             PresenterViewFactory::msNotesViewURL));
diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx
index b4b35c8fe666..4ddb244c4994 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.hxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.hxx
@@ -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
@@ -71,12 +71,12 @@ public:
 
 
     // XInitialization
-
+    
     virtual void SAL_CALL initialize(
         const css::uno::Sequence<css::uno::Any>& aArguments)
         throw (css::uno::Exception, css::uno::RuntimeException);
 
-
+    
     // XDispatchProvider
 
     virtual css::uno::Reference<css::frame::XDispatch > SAL_CALL
@@ -91,7 +91,7 @@ public:
             const css::uno::Sequence< css::frame::DispatchDescriptor>& rDescriptors)
         throw(css::uno::RuntimeException);
 
-
+    
 private:
     class Dispatch;
     ::rtl::Reference<PresenterController> mpPresenterController;
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 951c4610b8be..89f8fd3a3da6 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -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
@@ -88,11 +88,11 @@ namespace {
         virtual void SAL_CALL disposing (void);
 
         // document::XEventListener
-
+        
         virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException);
 
         // XEventListener
-
+    
         virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException);
 
     private:
@@ -251,7 +251,7 @@ void SAL_CALL PresenterScreenListener::disposing (void)
         xDocBroadcaster->removeEventListener(
             Reference<document::XEventListener>(
                 static_cast<document::XEventListener*>(this), UNO_QUERY));
-
+    
     if (mpPresenterScreen.is())
     {
         mpPresenterScreen->RequestShutdownPresenterScreen();
@@ -263,7 +263,7 @@ void SAL_CALL PresenterScreenListener::disposing (void)
 
 
 // document::XEventListener
-
+        
 void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException)
 {
     ThrowIfDisposed();
@@ -287,12 +287,12 @@ void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventOb
 
 
 // XEventListener
-
+    
 void SAL_CALL PresenterScreenListener::disposing (const css::lang::EventObject& rEvent)
     throw (css::uno::RuntimeException)
 {
     (void)rEvent;
-
+    
     if (mpPresenterScreen.is())
     {
         mpPresenterScreen->RequestShutdownPresenterScreen();
@@ -510,7 +510,7 @@ sal_Int32 PresenterScreen::GetScreenNumber (
             UNO_QUERY);
         if  ( ! xDisplayProperties.is())
             return -1;
-
+        
         if (nDisplayNumber > 0)
         {
             nScreenNumber = nDisplayNumber - 1;
@@ -523,7 +523,7 @@ sal_Int32 PresenterScreen::GetScreenNumber (
             if (nDisplayNumber <= 0 && xDisplayProperties.is())
                 xDisplayProperties->getPropertyValue(A2S("DefaultDisplay")) >>= nScreenNumber;
         }
-
+        
         // We still have to determine the number of screens to decide
         // whether the presenter screen may be shown at all.
         Reference<container::XIndexAccess> xIndexAccess (xDisplayProperties, UNO_QUERY);
@@ -572,7 +572,7 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId (
     const sal_Int32 nScreenNumber(GetScreenNumber(rxPresentation));
     if (nScreenNumber < 0)
         return NULL;
-
+    
     // Setup the resource id of the full screen background pane so that
     // it is displayed on another screen than the presentation.
     sal_Int32 nPresenterScreenNumber (1);
@@ -585,7 +585,7 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId (
         case 1:
             nPresenterScreenNumber = 0;
             break;
-
+            
         default:
             // When the full screen presentation is displayed on a screen
             // other than 0 or 1 then place the presenter on the first
@@ -593,7 +593,7 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId (
             nPresenterScreenNumber = 0;
             break;
     }
-
+    
     return ResourceId::create(
         Reference<XComponentContext>(mxContextWeak),
         PresenterHelper::msFullScreenPaneURL
@@ -639,7 +639,7 @@ void PresenterScreen::ShutdownPresenterScreen (void)
     if (xViewFactoryComponent.is())
         xViewFactoryComponent->dispose();
     mxViewFactory = NULL;
-
+    
     Reference<lang::XComponent> xPaneFactoryComponent (mxPaneFactory, UNO_QUERY);
     if (xPaneFactoryComponent.is())
         xPaneFactoryComponent->dispose();
@@ -713,7 +713,7 @@ void PresenterScreen::SetupConfiguration (
     }
     catch (RuntimeException&)
     {
-    }
+    }    
 }
 
 
@@ -770,7 +770,7 @@ void PresenterScreen::ProcessLayout (
     }
     catch (RuntimeException&)
     {
-    }
+    }    
 }
 
 
@@ -799,7 +799,7 @@ void PresenterScreen::ProcessViewDescriptions (
     catch (RuntimeException&)
     {
         OSL_ASSERT(false);
-    }
+    }    
 }
 
 
diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx
index 7096c9f72fe6..457a2ba2b51e 100644
--- a/sdext/source/presenter/PresenterScreen.hxx
+++ b/sdext/source/presenter/PresenterScreen.hxx
@@ -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
@@ -86,13 +86,13 @@ public:
     virtual void SAL_CALL disposing (void);
 
     // XJob
-
+    
     virtual css::uno::Any SAL_CALL execute(
         const css::uno::Sequence<css::beans::NamedValue >& Arguments)
         throw (css::lang::IllegalArgumentException,
             css::uno::Exception,
             css::uno::RuntimeException);
-
+    
 private:
     PresenterScreenJob (const css::uno::Reference<css::uno::XComponentContext>& rxContext);
     virtual ~PresenterScreenJob (void);
@@ -139,9 +139,9 @@ public:
 
 
     // XEventListener
-
+    
     virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException);
-
+    
 private:
     css::uno::Reference<css::frame::XModel2 > mxModel;
     css::uno::Reference<css::frame::XController> mxController;
@@ -210,7 +210,7 @@ private:
     */
     void ProcessViewDescriptions (
         PresenterConfigurationAccess& rConfiguration);
-
+        
     /** Called by ProcessViewDescriptions for a single entry.
     */
     void ProcessViewDescription (
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx
index 5786ccba2a2f..95361d0f6ed3 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -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
@@ -171,14 +171,14 @@ PresenterScrollBar::~PresenterScrollBar (void)
 void SAL_CALL PresenterScrollBar::disposing (void)
 {
     mpMousePressRepeater->Dispose();
-
+    
     if (mxWindow.is())
     {
         mxWindow->removeWindowListener(this);
         mxWindow->removePaintListener(this);
         mxWindow->removeMouseListener(this);
         mxWindow->removeMouseMotionListener(this);
-
+        
         Reference<lang::XComponent> xComponent (mxWindow, UNO_QUERY);
         mxWindow = NULL;
         if (xComponent.is())
@@ -323,7 +323,7 @@ void PresenterScrollBar::SetCanvas (const Reference<css::rendering::XCanvas>& rx
     {
         mxCanvas = rxCanvas;
         if (mxCanvas.is())
-        {
+        {            
             if (mpBitmaps.get()==NULL)
             {
                 if (mpSharedBitmaps.expired())
@@ -422,7 +422,7 @@ void PresenterScrollBar::Paint (
 
 
 //----- XWindowListener -------------------------------------------------------
-
+    
 void SAL_CALL PresenterScrollBar::windowResized (const css::awt::WindowEvent& rEvent)
     throw (css::uno::RuntimeException)
 {
@@ -432,7 +432,7 @@ void SAL_CALL PresenterScrollBar::windowResized (const css::awt::WindowEvent& rE
 
 
 
-
+   
 void SAL_CALL PresenterScrollBar::windowMoved (const css::awt::WindowEvent& rEvent)
     throw (css::uno::RuntimeException)
 {
@@ -481,7 +481,7 @@ void SAL_CALL PresenterScrollBar::windowPaint (const css::awt::PaintEvent& rEven
 
 
 
-
+    
 //----- XMouseListener --------------------------------------------------------
 
 void SAL_CALL PresenterScrollBar::mousePressed (const css::awt::MouseEvent& rEvent)
@@ -541,7 +541,7 @@ void SAL_CALL PresenterScrollBar::mouseExited (const css::awt::MouseEvent& rEven
 
 
 //----- XMouseMotionListener --------------------------------------------------
-
+    
 void SAL_CALL PresenterScrollBar::mouseMoved (const css::awt::MouseEvent& rEvent)
     throw (css::uno::RuntimeException)
 {
@@ -568,7 +568,7 @@ void SAL_CALL PresenterScrollBar::mouseDragged (const css::awt::MouseEvent& rEve
         return;
 
     mpMousePressRepeater->Stop();
-
+    
     if (mxPresenterHelper.is())
         mxPresenterHelper->captureMouse(mxWindow);
 
@@ -653,7 +653,7 @@ void PresenterScrollBar::PaintBitmap(
     aBox.Y2 += aWindowBox.Y;
 
     Reference<rendering::XBitmap> xBitmap (GetBitmap(eArea,rpBitmaps));
-
+    
     if (xBitmap.is())
     {
         Reference<rendering::XPolyPolygon2D> xClipPolygon (
@@ -661,11 +661,11 @@ void PresenterScrollBar::PaintBitmap(
                 PresenterGeometryHelper::Intersection(rUpdateBox,
                     PresenterGeometryHelper::ConvertRectangle(aBox)),
                 mxCanvas->getDevice()));
-
+        
         const rendering::ViewState aViewState (
             geometry::AffineMatrix2D(1,0,0, 0,1,0),
             xClipPolygon);
-
+        
         const geometry::IntegerSize2D aBitmapSize (xBitmap->getSize());
         rendering::RenderState aRenderState (
             geometry::AffineMatrix2D(
@@ -698,7 +698,7 @@ void PresenterScrollBar::NotifyThumbPositionChange (void)
         catch (Exception&)
         {
         }
-
+        
         mbIsNotificationActive = false;
     }
 }
@@ -709,7 +709,7 @@ void PresenterScrollBar::NotifyThumbPositionChange (void)
 PresenterScrollBar::Area PresenterScrollBar::GetArea (const double nX, const double nY) const
 {
     const geometry::RealPoint2D aPoint(nX, nY);
-
+    
     if (PresenterGeometryHelper::IsInside(GetRectangle(Pager), aPoint))
     {
         if (PresenterGeometryHelper::IsInside(GetRectangle(Thumb), aPoint))
@@ -883,7 +883,7 @@ void PresenterVerticalScrollBar::UpdateBorders (void)
 {
     const awt::Rectangle aWindowBox (mxWindow->getPosSize());
     double nBottom = aWindowBox.Height;
-
+    
     if (mpNextButtonDescriptor.get() != NULL)
     {
         Reference<rendering::XBitmap> xBitmap (mpNextButtonDescriptor->GetNormalBitmap());
@@ -912,7 +912,7 @@ void PresenterVerticalScrollBar::UpdateBorders (void)
     if (mnTotalSize < 1)
     {
         maBox[Thumb] = maBox[Pager];
-
+        
         // Set up the enabled/disabled states.
         maEnabledState[PrevButton] = false;
         maEnabledState[PagerUp] = false;
@@ -926,7 +926,7 @@ void PresenterVerticalScrollBar::UpdateBorders (void)
         const double nThumbPosition = ::std::min(::std::max(0.0,mnThumbPosition), mnTotalSize - nThumbSize);
         maBox[Thumb] = geometry::RealRectangle2D(
             0, nThumbPosition / mnTotalSize * nPagerHeight,
-            aWindowBox.Width,
+            aWindowBox.Width, 
                 (nThumbPosition+nThumbSize) / mnTotalSize * nPagerHeight);
 
         // Set up the enabled/disabled states.
@@ -1106,7 +1106,7 @@ void PresenterHorizontalScrollBar::UpdateBorders (void)
     const awt::Rectangle aWindowBox (mxWindow->getPosSize());
     double nRight = aWindowBox.Width;
     const double nGap (2);
-
+    
     if (mpNextButtonDescriptor.get() != NULL)
     {
         Reference<rendering::XBitmap> xBitmap (mpNextButtonDescriptor->GetNormalBitmap());
@@ -1129,14 +1129,14 @@ void PresenterHorizontalScrollBar::UpdateBorders (void)
             nRight -= aSize.Width + nGap;
         }
     }
-
+    
     const double nPagerWidth (nRight);
     maBox[Pager] = geometry::RealRectangle2D(
         0,0, nRight, aWindowBox.Height);
     if (mnTotalSize == 0)
     {
         maBox[Thumb] = maBox[Pager];
-
+        
         // Set up the enabled/disabled states.
         maEnabledState[PrevButton] = false;
         maEnabledState[PagerUp] = false;
@@ -1302,7 +1302,7 @@ void PresenterScrollBar::MousePressRepeater::SetMouseArea(const PresenterScrollB
 void PresenterScrollBar::MousePressRepeater::Callback (const TimeValue& rCurrentTime)
 {
     (void)rCurrentTime;
-
+    
     if (mpScrollBar.get() == NULL)
     {
         Stop();
@@ -1323,7 +1323,7 @@ void PresenterScrollBar::MousePressRepeater::Execute (void)
         case PrevButton:
             mpScrollBar->SetThumbPosition(nThumbPosition - mpScrollBar->GetLineHeight(), true);
             break;
-
+            
         case NextButton:
             mpScrollBar->SetThumbPosition(nThumbPosition + mpScrollBar->GetLineHeight(), true);
             break;
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx
index bd2462387078..b0b0567efab3 100644
--- a/sdext/source/presenter/PresenterScrollBar.hxx
+++ b/sdext/source/presenter/PresenterScrollBar.hxx
@@ -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
@@ -113,21 +113,21 @@ public:
         move the thumb to a valid position.
     */
     void CheckValues (void);
-
+        
     /** On some occasions it is necessary to trigger the painting of a
         scrollbar from the outside.
     */
     virtual void Paint (
         const css::awt::Rectangle& rUpdateBox,
         bool bNoClip = false);
-
+    
     virtual sal_Int32 GetSize (void) const = 0;
 
     // XWindowListener
-
+    
     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
         throw (css::uno::RuntimeException);
 
@@ -143,7 +143,7 @@ public:
     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
         throw (css::uno::RuntimeException);
 
-
+    
     // XMouseListener
 
     virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
@@ -160,10 +160,10 @@ public:
 
 
     // XMouseMotionListener
-
+    
     virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
 
@@ -172,7 +172,7 @@ public:
     virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
         throw (css::uno::RuntimeException);
 
-
+    
     enum Area { Total, Pager, Thumb, PagerUp, PagerDown, PrevButton, NextButton, None,
                 __AreaCount__ = None };
 
@@ -204,7 +204,7 @@ protected:
     SharedBitmapDescriptor mpThumbCenterDescriptor;
     SharedBitmapDescriptor mpThumbEndDescriptor;
     bool maEnabledState[__AreaCount__];
-
+    
     virtual css::geometry::RealRectangle2D GetRectangle (const Area eArea) const;
     virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const = 0;
     virtual void UpdateDragAnchor (const double nDragDistance) = 0;
diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx
index 3954a5ff1ed8..5556324ab48a 100644
--- a/sdext/source/presenter/PresenterSlidePreview.cxx
+++ b/sdext/source/presenter/PresenterSlidePreview.cxx
@@ -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
@@ -95,10 +95,10 @@ PresenterSlidePreview::PresenterSlidePreview (
         Reference<awt::XWindowPeer> xPeer (mxWindow, UNO_QUERY);
         if (xPeer.is())
             xPeer->setBackground(util::Color(0xff000000));
-
+        
         mxWindow->setVisible(sal_True);
     }
-
+    
     if (mpPresenterController.get() != NULL)
         mnSlideAspectRatio = mpPresenterController->GetSlideAspectRatio();
 
@@ -393,7 +393,7 @@ void PresenterSlidePreview::Resize (void)
     {
         const awt::Rectangle aWindowBox (mxWindow->getPosSize());
         const awt::Size aNewPreviewSize (mxPreviewRenderer->calculatePreviewSize(
-            mnSlideAspectRatio,
+            mnSlideAspectRatio, 
                 awt::Size(aWindowBox.Width, aWindowBox.Height)));
         const geometry::IntegerSize2D aPreviewSize (mxPreview->getSize());
         if (aNewPreviewSize.Width==aPreviewSize.Width
diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx
index 57b9f9794b95..f38f2e7a5ee2 100644
--- a/sdext/source/presenter/PresenterSlidePreview.hxx
+++ b/sdext/source/presenter/PresenterSlidePreview.hxx
@@ -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
@@ -91,7 +91,7 @@ public:
         throw (com::sun::star::uno::RuntimeException);
 
     // XWindowListener
-
+    
     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
         throw (css::uno::RuntimeException);
 
@@ -110,7 +110,7 @@ public:
     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
         throw (css::uno::RuntimeException);
 
-
+        
     // lang::XEventListener
     virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
         throw (css::uno::RuntimeException);
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index e63f22b5a84a..643978957a38 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -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
@@ -50,7 +50,7 @@
 #include <com/sun/star/rendering/TextDirection.hpp>
 #include <com/sun/star/rendering/TexturingMode.hpp>
 #include <osl/mutex.hxx>
-
+    
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
@@ -139,7 +139,7 @@ void PresenterSlideShowView::LateInit (void)
             mxWindow->addPaintListener(this);
             mxWindow->addWindowListener(this);
         }
-
+                
         // The window does not have to paint a background.  We do
         // that ourself.
         Reference<awt::XWindowPeer> xPeer (mxWindow, UNO_QUERY);
@@ -152,7 +152,7 @@ void PresenterSlideShowView::LateInit (void)
     mxViewWindow = CreateViewWindow(mxWindow);
 
     mxViewCanvas = CreateViewCanvas(mxViewWindow);
-
+            
     if (mxViewWindow.is())
     {
         // Register listeners at window.
@@ -214,12 +214,12 @@ void PresenterSlideShowView::disposing (void)
     // Tell all listeners that we are disposed.
     lang::EventObject aEvent;
     aEvent.Source = static_cast<XWeak*>(this);
-
+    
     ::cppu::OInterfaceContainerHelper* pIterator
           = maBroadcaster.getContainer(getCppuType((Reference<lang::XEventListener>*)NULL));
     if (pIterator != NULL)
         pIterator->disposeAndClear(aEvent);
-
+    
     // Do this for
     // XPaintListener, XModifyListener,XMouseListener,XMouseMotionListener,XWindowListener?
 
@@ -687,7 +687,7 @@ void SAL_CALL PresenterSlideShowView::mouseExited (const awt::MouseEvent& rEvent
 
 
 //----- XMouseMotionListener --------------------------------------------------
-
+    
 void SAL_CALL PresenterSlideShowView::mouseDragged (const awt::MouseEvent& rEvent)
     throw (RuntimeException)
 {
@@ -768,7 +768,7 @@ void SAL_CALL PresenterSlideShowView::windowHidden (const lang::EventObject& rEv
 
 
 //----- XView -----------------------------------------------------------------
-
+    
 Reference<XResourceId> SAL_CALL PresenterSlideShowView::getResourceId (void)
     throw(RuntimeException)
 {
@@ -1069,7 +1069,7 @@ void PresenterSlideShowView::Resize (void)
     {
         pIterator->notifyEach(&util::XModifyListener::modified, aEvent);
     }
-
+    
     // Due to constant aspect ratio resizing may lead a preview that changes
     // its position but not its size.  This invalidates the back buffer and
     // we have to enforce a complete repaint.
diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx
index bb91fb5e136c..494c76cf5c4c 100644
--- a/sdext/source/presenter/PresenterSlideShowView.hxx
+++ b/sdext/source/presenter/PresenterSlideShowView.hxx
@@ -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
@@ -55,7 +55,7 @@ namespace css = ::com::sun::star;
 namespace sdext { namespace presenter {
 
 namespace {
-    typedef cppu::WeakComponentImplHelper7<
+    typedef cppu::WeakComponentImplHelper7< 
         css::presentation::XSlideShowView,
         css::awt::XPaintListener,
         css::awt::XMouseListener,
@@ -89,101 +89,101 @@ public:
     // CachablePresenterView
 
     virtual void ReleaseView (void);
-
-
+    
+    
     // XSlideShowView
-
+    
     virtual css::uno::Reference<
         css::rendering::XSpriteCanvas > SAL_CALL getCanvas (void)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL clear (void)
         throw (css::uno::RuntimeException);
-
+    
     virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation (void)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL addTransformationChangedListener(
         const css::uno::Reference<
             css::util::XModifyListener >& xListener)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL removeTransformationChangedListener(
         const css::uno::Reference<
             css::util::XModifyListener >& xListener)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL addPaintListener(
         const css::uno::Reference<
             css::awt::XPaintListener >& xListener)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL removePaintListener(
         const css::uno::Reference<
             css::awt::XPaintListener >& xListener)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL addMouseListener(
         const css::uno::Reference<
             css::awt::XMouseListener >& xListener)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL removeMouseListener(
         const css::uno::Reference<
             css::awt::XMouseListener >& xListener)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL addMouseMotionListener(
         const css::uno::Reference<
             css::awt::XMouseMotionListener >& xListener)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL removeMouseMotionListener(
         const css::uno::Reference<
             css::awt::XMouseMotionListener >& xListener)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL setMouseCursor(::sal_Int16 nPointerShape)
         throw (css::uno::RuntimeException);
 
     virtual ::com::sun::star::awt::Rectangle SAL_CALL getCanvasArea(  )
     throw (::com::sun::star::uno::RuntimeException);
-
+    
     // lang::XEventListener
     virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
         throw (css::uno::RuntimeException);
 
-
+    
     // XPaintListener
     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
         throw (css::uno::RuntimeException);
 
-
+    
     // XMouseListener
     virtual void SAL_CALL mousePressed (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
 
     virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
 
     // XMouseMotionListener
-
+    
     virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
 
     virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
 
-
+    
     // XWindowListener
-
+    
     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
         throw (css::uno::RuntimeException);
 
@@ -198,7 +198,7 @@ public:
 
 
     // XView
-
+    
     virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL
         getResourceId (void)
         throw(css::uno::RuntimeException);
@@ -216,11 +216,11 @@ public:
     virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void)
         throw (css::uno::RuntimeException);
 
-
+    
     // CachablePresenterView
-
+    
     virtual void ActivatePresenterView (void);
-
+    
     virtual void DeactivatePresenterView (void);
 
 private:
@@ -275,7 +275,7 @@ private:
     void PaintOuterWindow (const css::awt::Rectangle& rRepaintBox);
     void PaintInnerWindow (const css::awt::PaintEvent& rEvent);
     void PaintEndSlide (const css::awt::Rectangle& rRepaintBox);
-
+    
     /** The slide show relies on the back buffer of the canvas not being
         modified.  With a shared canvas there are times when that can not be
         guaranteed.
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 0f65c9331a1c..44a9a2ef6305 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -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
@@ -144,7 +144,7 @@ public:
     sal_Int32 mnLastVisibleColumn;
     sal_Int32 mnFirstVisibleRow;
     sal_Int32 mnLastVisibleRow;
-
+    
 private:
     Orientation meOrientation;
     ::rtl::Reference<PresenterScrollBar> mpHorizontalScrollBar;
@@ -334,7 +334,7 @@ PresenterSlideSorter::PresenterSlideSorter (
 
         // Set the orientation.
         const bool bIsVertical (true);
-
+        
         // Create the scroll bar.
         if (bIsVertical)
             mpVerticalScrollBar = ::rtl::Reference<PresenterScrollBar>(
@@ -371,7 +371,7 @@ PresenterSlideSorter::PresenterSlideSorter (
             Layout::Vertical,
             mpHorizontalScrollBar,
             mpVerticalScrollBar));
-
+        
         // Create the preview cache.
         mxPreviewCache = Reference<drawing::XSlidePreviewCache>(
             xFactory->createInstanceWithContext(
@@ -392,7 +392,7 @@ PresenterSlideSorter::PresenterSlideSorter (
             mpPresenterController->GetTheme(),
             mxWindow,
             mpPresenterController->GetPaintManager()));
-
+        
         // Listen for changes of the current slide.
         Reference<beans::XPropertySet> xControllerProperties (rxController, UNO_QUERY_THROW);
         xControllerProperties->addPropertyChangeListener(
@@ -467,7 +467,7 @@ void SAL_CALL PresenterSlideSorter::disposing (void)
     if (mxPreviewCache.is())
     {
         mxPreviewCache->removePreviewCreationNotifyListener(this);
-
+        
         Reference<XComponent> xComponent (mxPreviewCache, UNO_QUERY);
         mxPreviewCache = NULL;
         if (xComponent.is())
@@ -525,7 +525,7 @@ void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventOb
 
 
 //----- XWindowListener -------------------------------------------------------
-
+    
 void SAL_CALL PresenterSlideSorter::windowResized (const awt::WindowEvent& rEvent)
     throw (uno::RuntimeException)
 {
@@ -653,7 +653,7 @@ void SAL_CALL PresenterSlideSorter::mouseExited (const css::awt::MouseEvent& rEv
 
 
 //----- XMouseMotionListener --------------------------------------------------
-
+    
 void SAL_CALL PresenterSlideSorter::mouseMoved (const css::awt::MouseEvent& rEvent)
     throw (css::uno::RuntimeException)
 {
@@ -724,13 +724,13 @@ void SAL_CALL PresenterSlideSorter::propertyChange (
 
 
 //----- XSlidePreviewCacheListener --------------------------------------------
-
+    
 void SAL_CALL PresenterSlideSorter::notifyPreviewCreation (
     sal_Int32 nSlideIndex)
     throw(css::uno::RuntimeException)
 {
     OSL_ASSERT(mpLayout.get()!=NULL);
-
+    
     awt::Rectangle aBBox (mpLayout->GetBoundingBox(nSlideIndex));
     mpPresenterController->GetPaintManager()->Invalidate(mxWindow, aBBox, true);
 }
@@ -744,7 +744,7 @@ void SAL_CALL PresenterSlideSorter::setCurrentPage (const Reference<drawing::XDr
     throw (RuntimeException)
 {
     (void)rxSlide;
-
+    
     ThrowIfDisposed();
     ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex());
 
@@ -860,7 +860,7 @@ geometry::RealRectangle2D PresenterSlideSorter::PlaceScrollBars (
     Reference<container::XIndexAccess> xSlides (mxSlideShowController, UNO_QUERY_THROW);
     if (xSlides.is())
         bIsScrollBarNeeded = mpLayout->IsScrollBarNeeded(xSlides->getCount());
-
+    
     if (mpLayout->GetOrientation() == Layout::Vertical)
     {
         if (mpVerticalScrollBar.get() != NULL)
@@ -900,7 +900,7 @@ geometry::RealRectangle2D PresenterSlideSorter::PlaceScrollBars (
                     rUpperBox.X2,
                     rUpperBox.Y2));
                 mpHorizontalScrollBar->SetVisible(true);
-
+                
                 // Reduce area covered by the scroll bar from the available
                 // space.
                 return geometry::RealRectangle2D(
@@ -974,7 +974,7 @@ void PresenterSlideSorter::ClearBackground (
 double PresenterSlideSorter::GetSlideAspectRatio (void) const
 {
     double nSlideAspectRatio (28.0/21.0);
-
+    
     try
     {
         Reference<container::XIndexAccess> xSlides(mxSlideShowController, UNO_QUERY_THROW);
@@ -1152,7 +1152,7 @@ void PresenterSlideSorter::Paint (const awt::Rectangle& rUpdateBox)
         geometry::RealPoint2D(mxWindow->getPosSize().Width, mnSeparatorY),
         rendering::ViewState(geometry::AffineMatrix2D(1,0,0, 0,1,0), NULL),
         aRenderState);
-
+        
     // Paint the slides.
     if ( ! PresenterGeometryHelper::AreRectanglesDisjoint(
         rUpdateBox,
@@ -1286,7 +1286,7 @@ void PresenterSlideSorter::Layout::Update (
     const double nSlideAspectRatio)
 {
     maBoundingBox = rBoundingBox;
-
+    
     mnHorizontalBorder = gnHorizontalBorder;
     mnVerticalBorder = gnVerticalBorder;
 
@@ -1296,7 +1296,7 @@ void PresenterSlideSorter::Layout::Update (
         return;
 
     double nPreviewWidth;
-
+    
     // Determine column count, preview width, and horizontal gap (borders
     // are half the gap).  Try to use the preferred values.  Try more to
     // stay in the valid intervalls.  This last constraint may be not
@@ -1404,7 +1404,7 @@ void PresenterSlideSorter::Layout::SetupVisibleArea (void)
         mnFirstVisibleColumn = 0;
         mnFirstVisibleRow = ::std::max(sal_Int32(0), GetRow(aPoint));
     }
-
+    
     aPoint = GetLocalPosition(geometry::RealPoint2D( maBoundingBox.X2, maBoundingBox.Y2));
     if (meOrientation == Horizontal)
     {
@@ -1527,7 +1527,7 @@ geometry::RealPoint2D PresenterSlideSorter::Layout::GetPoint (
 {
     sal_Int32 nColumn (GetColumn(nSlideIndex));
     sal_Int32 nRow (GetRow(nSlideIndex));
-
+        
     geometry::RealPoint2D aPosition (
         mnHorizontalBorder + nColumn*(maPreviewSize.Width+mnHorizontalGap),
         mnVerticalBorder + nRow*(maPreviewSize.Height+mnVerticalGap));
@@ -1657,7 +1657,7 @@ void PresenterSlideSorter::Layout::UpdateScrollBars (void)
         nTotalColumnCount = mnColumnCount;
         nTotalRowCount = sal_Int32(ceil(double(mnSlideCount) / double(mnColumnCount)));
     }
-
+    
     if (mpHorizontalScrollBar.get() != NULL)
     {
         mpHorizontalScrollBar->SetTotalSize(
@@ -1679,7 +1679,7 @@ void PresenterSlideSorter::Layout::UpdateScrollBars (void)
         mpVerticalScrollBar->SetLineHeight(maPreviewSize.Height);
     }
 
-
+    
 
     // No place yet for the vertical scroll bar.
 }
@@ -1771,7 +1771,7 @@ void PresenterSlideSorter::MouseOverManager::Paint (
 {
     if (nSlideIndex != mnSlideIndex)
         return;
-
+    
     if (mxCanvas != rxCanvas)
         SetCanvas(rxCanvas);
     if (rxCanvas != NULL)
@@ -1825,7 +1825,7 @@ void PresenterSlideSorter::MouseOverManager::SetSlide (
 
     maSlideBoundingBox = rBox;
     mnSlideIndex = nSlideIndex;
-
+    
     if (nSlideIndex >= 0)
     {
         if (mxSlides.get() != NULL)
@@ -1871,18 +1871,18 @@ Reference<rendering::XBitmap> PresenterSlideSorter::MouseOverManager::CreateBitm
     // bitmaps that are used to paints its background.  The width is defined
     // by the text.
     geometry::IntegerSize2D aLabelSize (CalculateLabelSize(sText));
-
+    
     // Create a new bitmap that will contain the complete label.
     Reference<rendering::XBitmap> xBitmap (
         mxCanvas->getDevice()->createCompatibleAlphaBitmap(aLabelSize));
 
     if ( ! xBitmap.is())
         return NULL;
-
+    
     Reference<rendering::XBitmapCanvas> xBitmapCanvas (xBitmap, UNO_QUERY);
     if ( ! xBitmapCanvas.is())
         return NULL;
-
+    
     // Paint the background.
     PaintButtonBackground(xBitmapCanvas, aLabelSize);
 
@@ -1902,7 +1902,7 @@ Reference<rendering::XBitmap> PresenterSlideSorter::MouseOverManager::CreateBitm
         const rendering::ViewState aViewState(
             geometry::AffineMatrix2D(1,0,0, 0,1,0),
             NULL);
-
+                
         rendering::RenderState aRenderState (
             geometry::AffineMatrix2D(1,0,nXOffset, 0,1,nYOffset),
             NULL,
@@ -1999,7 +1999,7 @@ geometry::IntegerSize2D PresenterSlideSorter::MouseOverManager::CalculateLabelSi
     // Width is specified by text width and maximal width.
     const geometry::RealSize2D aTextSize (
         PresenterCanvasHelper::GetTextSize(mpFont->mxFont, rsText));
-
+    
     const sal_Int32 nWidth (round(aTextSize.Width + 2*gnHorizontalLabelPadding));
 
     return geometry::IntegerSize2D(nWidth, nHeight);
@@ -2016,11 +2016,11 @@ void PresenterSlideSorter::MouseOverManager::PaintButtonBackground (
     Reference<rendering::XBitmap> xLeftLabelBitmap;
     if (mpLeftLabelBitmap.get() != NULL)
         xLeftLabelBitmap = mpLeftLabelBitmap->GetNormalBitmap();
-
+            
     Reference<rendering::XBitmap> xCenterLabelBitmap;
     if (mpCenterLabelBitmap.get() != NULL)
         xCenterLabelBitmap = mpCenterLabelBitmap->GetNormalBitmap();
-
+            
     Reference<rendering::XBitmap> xRightLabelBitmap;
     if (mpRightLabelBitmap.get() != NULL)
         xRightLabelBitmap = mpRightLabelBitmap->GetNormalBitmap();
diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx
index e3e6ebe8c031..01a28eb3a362 100644
--- a/sdext/source/presenter/PresenterSlideSorter.hxx
+++ b/sdext/source/presenter/PresenterSlideSorter.hxx
@@ -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
@@ -87,16 +87,16 @@ public:
 
     void SetActiveState (const bool bIsActive);
 
-
+    
     // lang::XEventListener
 
-    virtual void SAL_CALL
+    virtual void SAL_CALL 
         disposing (const css::lang::EventObject& rEventObject)
         throw (css::uno::RuntimeException);
 
 
     // XWindowListener
-
+    
     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
         throw (css::uno::RuntimeException);
 
@@ -132,10 +132,10 @@ public:
 
 
     // XMouseMotionListener
-
+    
     virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL mouseDragged (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
 
@@ -155,9 +155,9 @@ public:
         const css::beans::PropertyChangeEvent& rEvent)
         throw(css::uno::RuntimeException);
 
-
+    
     // XSlidePreviewCacheListener
-
+    
     virtual void SAL_CALL notifyPreviewCreation (
         sal_Int32 nSlideIndex)
         throw(css::uno::RuntimeException);
diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx
index 467fb5830dd5..09d5cb018285 100644
--- a/sdext/source/presenter/PresenterSprite.cxx
+++ b/sdext/source/presenter/PresenterSprite.cxx
@@ -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
diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sdext/source/presenter/PresenterSprite.hxx
index e6be8e46ebad..cc266e9682c8 100644
--- a/sdext/source/presenter/PresenterSprite.hxx
+++ b/sdext/source/presenter/PresenterSprite.hxx
@@ -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
@@ -57,7 +57,7 @@ public:
     */
     void SetFactory (
         const ::css::uno::Reference<css::rendering::XSpriteCanvas>& rxSpriteFactory);
-
+    
     ::css::uno::Reference<css::rendering::XCanvas> GetCanvas (void);
 
     void Show (void);
@@ -66,19 +66,19 @@ public:
 
     void SetPriority (const double nPriority);
     double GetPriority (void) const;
-
+    
     void Resize (const css::geometry::RealSize2D& rSize);
     css::geometry::RealSize2D GetSize (void) const;
-
+    
     void MoveTo (const css::geometry::RealPoint2D& rLocation);
     css::geometry::RealPoint2D GetLocation (void) const;
-
+    
     void Transform (const css::geometry::AffineMatrix2D& rTransform);
     css::geometry::AffineMatrix2D GetTransform (void) const;
 
     void SetAlpha (const double nAlpha);
     double GetAlpha (void) const;
-
+    
     void Update (void);
 
 private:
diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx
index 1f8ebdbbc35e..6f9216c6c529 100644
--- a/sdext/source/presenter/PresenterSpritePane.cxx
+++ b/sdext/source/presenter/PresenterSpritePane.cxx
@@ -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
@@ -251,7 +251,7 @@ void PresenterSpritePane::CreateCanvases (
         const awt::Rectangle aBorderBox (mxBorderWindow->getPosSize());
         mpSprite->Resize(geometry::RealSize2D(aBorderBox.Width, aBorderBox.Height));
     }
-
+            
     UpdateCanvases();
 }
 
diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx
index 468f531f5e87..4056928daa65 100644
--- a/sdext/source/presenter/PresenterSpritePane.hxx
+++ b/sdext/source/presenter/PresenterSpritePane.hxx
@@ -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
@@ -72,7 +72,7 @@ public:
     using css::lang::XEventListener::disposing;
 
     ::boost::shared_ptr<PresenterSprite> GetSprite (void);
-
+ 
     static ::rtl::OUString getImplementationName_static (void);
     static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static (void);
     static css::uno::Reference<css::uno::XInterface> Create(
@@ -80,7 +80,7 @@ public:
         SAL_THROW((css::uno::Exception));
 
     void ShowTransparentBorder (void);
-
+    
     // XPane
 
     virtual css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow (void)
@@ -89,9 +89,9 @@ public:
     virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas (void)
         throw (css::uno::RuntimeException);
 
-
+    
     // XWindowListener
-
+    
     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
         throw (css::uno::RuntimeException);
 
@@ -110,7 +110,7 @@ public:
     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
         throw (css::uno::RuntimeException);
 
-
+        
 private:
     css::uno::Reference<css::awt::XWindow> mxParentWindow;
     css::uno::Reference<css::rendering::XSpriteCanvas> mxParentCanvas;
diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
index bf2de798a72e..7b177bd266b6 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -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
@@ -173,7 +173,7 @@ void PresenterTextView::SetText (const Reference<text::XText>& rxText)
     Reference<container::XEnumerationAccess> xParagraphAccess (rxText, UNO_QUERY);
     if ( ! xParagraphAccess.is())
         return;
-
+    
     Reference<container::XEnumeration> xParagraphs (
         xParagraphAccess->createEnumeration() , UNO_QUERY);
     if ( ! xParagraphs.is())
@@ -248,7 +248,7 @@ void PresenterTextView::SetTextChangeBroadcaster (
 void PresenterTextView::SetLocation (const css::geometry::RealPoint2D& rLocation)
 {
     maLocation = rLocation;
-
+    
     for (::std::vector<SharedPresenterTextParagraph>::iterator
              iParagraph(maParagraphs.begin()),
              iEnd(maParagraphs.end());
@@ -344,7 +344,7 @@ void PresenterTextView::MoveCaret (
         case AccessibleTextType::CHARACTER:
             nCharacterIndex += nDistance;
             break;
-
+                    
         case AccessibleTextType::WORD:
         {
             sal_Int32 nRemainingDistance (nDistance);
@@ -376,7 +376,7 @@ void PresenterTextView::MoveCaret (
                         else
                         {
                             nRemainingDistance -= nDelta;
-
+                            
                             // Move caret one character to the end of
                             // the previous or the start of the next paragraph.
                             pParagraph = GetParagraph(nParagraphIndex);
@@ -778,7 +778,7 @@ void PresenterTextParagraph::Format (
     mnVerticalOffset = nY;
     maWordBoundaries.clear();
     maWordBoundaries.push_back(0);
-
+    
     const rendering::FontMetrics aMetrics (rpFont->mxFont->getFontMetrics());
     mnAscent = aMetrics.Ascent;
     mnDescent = aMetrics.Descent;
@@ -801,7 +801,7 @@ void PresenterTextParagraph::Format (
 
         if (aWordBoundary.endPos>aWordBoundary.startPos)
             AddWord(nWidth, aCurrentLine, aWordBoundary.endPos, rpFont);
-
+            
         if (aWordBoundary.startPos<0 || aWordBoundary.endPos<0)
             break;
         if (nPosition >= aWordBoundary.endPos)
@@ -831,7 +831,7 @@ sal_Int32 PresenterTextParagraph::GetWordBoundary(
         else
             return GetCharacterCount();
     }
-
+    
     sal_Int32 nIndex (0);
     for (sal_Int32 nCount (maWordBoundaries.size()); nIndex<nCount; ++nIndex)
     {
@@ -922,7 +922,7 @@ void PresenterTextParagraph::AddWord (
         nLineStart = rCurrentLine.startPos;
         nLineEnd = rCurrentLine.endPos;
     }
-
+    
     const ::rtl::OUString sLineCandidate (
         msParagraphText.copy(nLineStart, nWordBoundary-nLineStart));
 
@@ -1077,7 +1077,7 @@ TextSegment PresenterTextParagraph::GetTextSegment (
             if (mxBreakIterator.is())
                 return GetWordTextSegment(nOffset, nIndex);
             break;
-
+                
         case AccessibleTextType::LINE:
         {
             for (::std::vector<Line>::const_iterator
diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx
index d8bf260443c1..6805d4c96564 100644
--- a/sdext/source/presenter/PresenterTextView.hxx
+++ b/sdext/source/presenter/PresenterTextView.hxx
@@ -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
@@ -58,7 +58,7 @@ public:
         const ::boost::function<void(const css::awt::Rectangle&)>&
             rInvalidator);
     ~PresenterTextCaret (void);
-
+        
     void ShowCaret (void);
     void HideCaret (void);
 
@@ -67,7 +67,7 @@ public:
     void SetPosition (
         const sal_Int32 nParagraphIndex,
         const sal_Int32 nCharacterIndex);
-
+    
     bool IsVisible (void) const;
 
     /** Set a (possibly empty) functor that broadcasts changes of the caret
@@ -193,7 +193,7 @@ private:
         double mnBaseLine;
         double mnWidth;
         cssu::Sequence<css::geometry::RealRectangle2D> maCellBoxes;
-
+        
         sal_Int32 GetLength (void) const;
         void ProvideLayoutedLine (
             const ::rtl::OUString& rsParagraphText,
@@ -223,7 +223,7 @@ private:
     /// the whole text.
     sal_Int32 mnCharacterOffset;
     ::std::vector<Cell> maCells;
-
+    
     void AddWord (
         const double nWidth,
         css::i18n::Boundary& rCurrentLine,
@@ -259,11 +259,11 @@ public:
     void SetText (const css::uno::Reference<css::text::XText>& rxText);
     void SetText (const ::rtl::OUString& rsText);
     void SetTextChangeBroadcaster (const ::boost::function<void(void)>& rBroadcaster);
-
+    
     void SetLocation (const css::geometry::RealPoint2D& rLocation);
     void SetSize (const css::geometry::RealSize2D& rSize);
     double GetTotalTextHeight (void);
-
+    
     void SetFont (const PresenterTheme::SharedFontDescriptor& rpFont);
 
     void SetOffset (
@@ -281,7 +281,7 @@ public:
     void MoveCaret (
         const sal_Int32 nDistance,
         const sal_Int16 nTextType);
-
+        
     void Paint (const css::awt::Rectangle& rUpdateBox);
 
     SharedPresenterTextCaret GetCaret (void) const;
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 0777d147cff9..c052e8212cc5 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -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
@@ -61,12 +61,12 @@ class BorderSize
 {
 public:
     const static sal_Int32 mnInvalidValue = -10000;
-
+    
     BorderSize (void) : mnLeft(mnInvalidValue),
                         mnTop(mnInvalidValue),
                         mnRight(mnInvalidValue),
                         mnBottom(mnInvalidValue) {}
-
+    
     sal_Int32 mnLeft;
     sal_Int32 mnTop;
     sal_Int32 mnRight;
@@ -585,7 +585,7 @@ PresenterTheme::SharedFontDescriptor PresenterTheme::GetFont (
             Theme::FontContainer::const_iterator iFont (pTheme->maFontContainer.find(rsStyleName));
             if (iFont != pTheme->maFontContainer.end())
                 return iFont->second;
-
+            
             pTheme = pTheme->mpParentTheme;
         }
     }
@@ -649,7 +649,7 @@ bool PresenterTheme::FontDescriptor::PrepareFont (
 
     const double nCellSize (GetCellSizeForDesignSize(rxCanvas, mnSize));
     mxFont = CreateFont(rxCanvas, nCellSize);
-
+    
     return mxFont.is();
 }
 
@@ -767,7 +767,7 @@ void PresenterTheme::Theme::Read (
     {
         rReadContext.SetBitmapSourceExtension(PresenterComponent::gsExtensionIdentifier);
     }
-
+    
     // Background.
     mpBackground = PresenterBitmapContainer::LoadBitmap(
         mxThemeRoot,
@@ -782,7 +782,7 @@ void PresenterTheme::Theme::Read (
 
     // Pane styles.
     maPaneStyles.Read(rReadContext, mxThemeRoot);
-
+    
     // View styles.
     maViewStyles.Read(rReadContext, mxThemeRoot);
 
@@ -895,7 +895,7 @@ PresenterTheme::SharedFontDescriptor ReadContext::ReadFont (
 {
     if ( ! rxNode.is())
         return PresenterTheme::SharedFontDescriptor();
-
+    
     try
     {
         Reference<container::XHierarchicalNameAccess> xFont (
@@ -1080,7 +1080,7 @@ void PaneStyleContainer::ProcessPaneStyle(
         return;
 
     ::boost::shared_ptr<PaneStyle> pStyle (new PaneStyle());
-
+    
     rValues[0] >>= pStyle->msStyleName;
 
     OUString sParentStyleName;
@@ -1222,7 +1222,7 @@ void ViewStyleContainer::Read (
     const Reference<container::XHierarchicalNameAccess>& rxThemeRoot)
 {
     (void)rReadContext;
-
+    
     Reference<container::XNameAccess> xViewStyleList (
         PresenterConfigurationAccess::GetConfigurationNode(
             rxThemeRoot,
@@ -1245,7 +1245,7 @@ void ViewStyleContainer::ProcessViewStyle(
     const Reference<beans::XPropertySet>& rxProperties)
 {
     ::boost::shared_ptr<ViewStyle> pStyle (new ViewStyle());
-
+    
     PresenterConfigurationAccess::GetProperty(rxProperties, A2S("StyleName"))
         >>= pStyle->msStyleName;
 
@@ -1285,7 +1285,7 @@ void ViewStyleContainer::ProcessViewStyle(
         SharedBitmapDescriptor()));
     if (pBackground.get() != NULL && pBackground->GetNormalBitmap().is())
         pStyle->mpBackground = pBackground;
-
+    
     push_back(pStyle);
 }
 
diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx
index e76cabcf28d0..b2b6aad9cf10 100644
--- a/sdext/source/presenter/PresenterTheme.hxx
+++ b/sdext/source/presenter/PresenterTheme.hxx
@@ -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
@@ -64,7 +64,7 @@ namespace sdext { namespace presenter {
 
     For the offset of the bitmap you can call
     Point aOffset = getPropertyValue(sStyleName + "_TopLeftOffset");
-
+    
     This is work in progress.
 */
 class PresenterTheme
@@ -94,7 +94,7 @@ public:
     public:
         explicit FontDescriptor (void);
         explicit FontDescriptor (const ::boost::shared_ptr<FontDescriptor>& rpDescriptor);
-
+        
         ::rtl::OUString msFamilyName;
         ::rtl::OUString msStyleName;
         sal_Int32 mnSize;
@@ -121,7 +121,7 @@ public:
     SharedBitmapDescriptor GetBitmap (
         const ::rtl::OUString& rsStyleName,
         const ::rtl::OUString& rsBitmapName) const;
-
+    
     SharedBitmapDescriptor GetBitmap (
         const ::rtl::OUString& rsBitmapName) const;
 
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx
index 8841d8234bd4..646c751d4674 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -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
@@ -91,10 +91,10 @@ public:
         const PresenterTimer::Task& rTask,
         const TimeValue& rDueTime,
         const sal_Int64 nRepeatIntervall);
-
+    
     void ScheduleTask (const SharedTimerTask& rpTask);
     void CancelTask (const sal_Int32 nTaskId);
-
+    
     static bool GetCurrentTime (TimeValue& rCurrentTime);
     static sal_Int64 GetTimeDifference (
         const TimeValue& rTargetTime,
@@ -123,7 +123,7 @@ private:
     virtual ~TimerScheduler (void);
     class Deleter {public: void operator () (TimerScheduler* pScheduler) { delete pScheduler; } };
     friend class Deleter;
-
+    
     virtual void SAL_CALL run (void);
     virtual void SAL_CALL onTerminated (void);
 };
@@ -141,7 +141,7 @@ sal_Int32 PresenterTimer::ScheduleSingleTaskRelative (
     const Task& rTask,
     const sal_Int64 nDelay)
 {
-    return ScheduleRepeatedTask(rTask, nDelay, 0);
+    return ScheduleRepeatedTask(rTask, nDelay, 0); 
 }
 
 
@@ -267,7 +267,7 @@ void TimerScheduler::ScheduleTask (const SharedTimerTask& rpTask)
 
     osl::MutexGuard aGuard (maTaskContainerMutex);
     maScheduledTasks.insert(rpTask);
-
+    
     if ( ! mbIsRunning)
     {
         mbIsRunning = true;
@@ -337,7 +337,7 @@ void SAL_CALL TimerScheduler::run (void)
         sal_Int64 nDifference = 0;
         {
             ::osl::MutexGuard aGuard (maTaskContainerMutex);
-
+            
             // There are no more scheduled task.  Leave this loop, function and
             // live of the TimerScheduler.
             if (maScheduledTasks.empty())
@@ -352,7 +352,7 @@ void SAL_CALL TimerScheduler::run (void)
                 maScheduledTasks.erase(maScheduledTasks.begin());
             }
         }
-
+        
         // Acquire a reference to the current task.
         {
             ::osl::MutexGuard aGuard (maCurrentTaskMutex);
@@ -384,7 +384,7 @@ void SAL_CALL TimerScheduler::run (void)
                     ScheduleTask(mpCurrentTask);
                 }
             }
-
+            
         }
 
         // Release reference to the current task.
@@ -478,7 +478,7 @@ TimerTask::TimerTask (
     const css::uno::Reference<css::uno::XComponentContext>& rxContext)
 {
     ::osl::MutexGuard aSolarGuard (::osl::Mutex::getGlobalMutex());
-
+    
     ::rtl::Reference<PresenterClockTimer> pTimer;
     if (mpInstance.is())
     {
@@ -656,13 +656,13 @@ void SAL_CALL PresenterClockTimer::notify (const css::uno::Any& rUserData)
         osl::MutexGuard aGuard (maMutex);
 
         mbIsCallbackPending = false;
-
+    
         ::std::copy(
             maListeners.begin(),
             maListeners.end(),
             ::std::back_inserter(aListenerCopy));
     }
-
+    
     if (aListenerCopy.size() > 0)
     {
         ListenerContainer::const_iterator iListener;
diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx
index 19d9e0637258..c79760c74224 100644
--- a/sdext/source/presenter/PresenterTimer.hxx
+++ b/sdext/source/presenter/PresenterTimer.hxx
@@ -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
@@ -58,7 +58,7 @@ public:
     typedef ::boost::function<void(const TimeValue&)> Task;
 
     static const sal_Int32 NotAValidTaskId = 0;
-
+    
     static sal_Int32 ScheduleSingleTaskRelative (
         const Task& rTask,
         const sal_Int64 nDelay);
@@ -82,7 +82,7 @@ public:
 
 
 
-typedef cppu::WeakComponentImplHelper1<
+typedef cppu::WeakComponentImplHelper1< 
     css::awt::XCallback
     > PresenterClockTimerInterfaceBase;
 
@@ -98,7 +98,7 @@ public:
         virtual void TimeHasChanged (const oslDateTime& rCurrentTime) = 0;
     };
     typedef ::boost::shared_ptr<Listener> SharedListener;
-
+    
     static ::rtl::Reference<PresenterClockTimer> Instance (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext);
 
@@ -106,7 +106,7 @@ public:
     void RemoveListener (const SharedListener& rListener);
 
     static oslDateTime GetCurrentTime (void);
-
+    
     /** Return the difference between the two different times in
         nanoseconds.
     */
@@ -131,7 +131,7 @@ private:
     PresenterClockTimer (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext);
     ~PresenterClockTimer (void);
-
+    
     void CheckCurrentTime (const TimeValue& rCurrentTime);
 };
 
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index ad5d6161eca8..a20c2871d9b2 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -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
@@ -112,11 +112,11 @@ namespace {
     {
     public:
         ElementMode (void);
-
+        
         SharedBitmapDescriptor mpIcon;
         OUString msAction;
         Text maText;
-
+        
         void ReadElementMode (
             const Reference<beans::XPropertySet>& rxProperties,
             const ::rtl::OUString& rsModeName,
@@ -137,13 +137,13 @@ public:
     css::uno::Reference<css::rendering::XCanvas> mxCanvas;
 };
 
-
+    
 
 
 //===== PresenterToolBar::Element =============================================
 
 namespace {
-    typedef cppu::WeakComponentImplHelper2<
+    typedef cppu::WeakComponentImplHelper2< 
         css::document::XEventListener,
         css::frame::XStatusListener
         > ElementInterfaceBase;
@@ -185,7 +185,7 @@ namespace {
 
         virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
             throw(css::uno::RuntimeException);
-
+    
         // document::XEventListener
 
         virtual void SAL_CALL notifyEvent (const css::document::EventObject& rEvent)
@@ -208,7 +208,7 @@ namespace {
         bool mbIsOver;
         bool mbIsPressed;
         bool mbIsSelected;
-
+    
         virtual awt::Size CreateBoundingSize (
             const Reference<rendering::XCanvas>& rxCanvas) = 0;
 
@@ -251,11 +251,11 @@ namespace {
 
         virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
             throw(css::uno::RuntimeException);
-
+    
     protected:
         virtual awt::Size CreateBoundingSize (
             const Reference<rendering::XCanvas>& rxCanvas);
-
+    
     private:
         bool mbIsListenerRegistered;
 
@@ -277,7 +277,7 @@ namespace {
     {
     public:
         Label (const ::rtl::Reference<PresenterToolBar>& rpToolBar);
-
+        
         void SetText (const OUString& rsText);
         virtual void Paint (
             const Reference<rendering::XCanvas>& rxCanvas,
@@ -445,7 +445,7 @@ void PresenterToolBar::Initialize (
             Reference<awt::XWindowPeer> xPeer (mxWindow, UNO_QUERY);
             if (xPeer.is())
                 xPeer->setBackground(util::Color(0xff000000));
-
+            
             mxWindow->setVisible(sal_True);
         }
 
@@ -614,7 +614,7 @@ void SAL_CALL PresenterToolBar::disposing (const lang::EventObject& rEventObject
 
 
 //----- XWindowListener -------------------------------------------------------
-
+    
 void SAL_CALL PresenterToolBar::windowResized (const awt::WindowEvent& rEvent)
     throw (RuntimeException)
 {
@@ -670,7 +670,7 @@ void SAL_CALL PresenterToolBar::windowPaint (const css::awt::PaintEvent& rEvent)
 
     if (mbIsLayoutPending)
         Layout(mxCanvas);
-
+    
     Paint(rEvent.UpdateRect, aViewState);
 
     // Make the back buffer visible.
@@ -721,7 +721,7 @@ void SAL_CALL PresenterToolBar::mouseExited (const css::awt::MouseEvent& rEvent)
 
 
 //----- XMouseMotionListener --------------------------------------------------
-
+    
 void SAL_CALL PresenterToolBar::mouseMoved (const css::awt::MouseEvent& rEvent)
     throw (css::uno::RuntimeException)
 {
@@ -774,7 +774,7 @@ void PresenterToolBar::CreateControls (
 {
     if ( ! mxWindow.is())
         return;
-
+    
     // Expand the macro in the bitmap file names.
     PresenterConfigurationAccess aConfiguration (
         mxComponentContext,
@@ -890,7 +890,7 @@ void PresenterToolBar::Layout (
     for (iPart=maElementContainer.begin(),nIndex=0; iPart!=iEnd; ++iPart,++nIndex)
     {
         geometry::RealSize2D aSize (CalculatePartSize(rxCanvas, *iPart, bIsHorizontal));
-
+        
         // Remember the size of each part for later.
         aPartSizes[nIndex] = aSize;
 
@@ -900,7 +900,7 @@ void PresenterToolBar::Layout (
             nTotalHorizontalGap += ((*iPart)->size() - 1) * gnGapSize;
             nGapCount += (*iPart)->size()-1;
         }
-
+        
         // Orientation changes for each part.
         bIsHorizontal = !bIsHorizontal;
         // Width is accumulated.
@@ -941,12 +941,12 @@ void PresenterToolBar::Layout (
     // Place the parts.
     double nY ((aWindowBox.Height - aTotalSize.Height) / 2);
     bIsHorizontal = true;
-
+    
     maBoundingBox.X1 = nX;
     maBoundingBox.Y1 = nY;
     maBoundingBox.X2 = nX + aTotalSize.Width + nTotalHorizontalGap;
     maBoundingBox.Y2 = nY + aTotalSize.Height;
-
+    
     for (iPart=maElementContainer.begin(), nIndex=0; iPart!=iEnd; ++iPart,++nIndex)
     {
         geometry::RealRectangle2D aBoundingBox(
@@ -1130,7 +1130,7 @@ void PresenterToolBar::CheckMouseOver (
         {
             if (iElement->get() == NULL)
                 continue;
-
+        
             awt::Rectangle aBox ((*iElement)->GetBoundingBox());
             const bool bIsOver = bOverWindow
                 && aBox.X <= rEvent.X
@@ -1202,7 +1202,7 @@ PresenterToolBarView::PresenterToolBarView (
             Reference<awt::XWindowPeer> xPeer (mxWindow, UNO_QUERY);
             if (xPeer.is())
                 xPeer->setBackground(util::Color(0xff000000));
-
+            
             mxWindow->setVisible(sal_True);
         }
     }
@@ -1229,7 +1229,7 @@ void SAL_CALL PresenterToolBarView::disposing (void)
     mpToolBar = NULL;
     if (xComponent.is())
         xComponent->dispose();
-
+    
     if (mxWindow.is())
     {
         mxWindow->removePaintListener(this);
@@ -1449,7 +1449,7 @@ bool Element::SetState (
 {
     bool bModified (mbIsOver != bIsOver || mbIsPressed != bIsPressed);
     bool bClicked (mbIsPressed && bIsOver && ! bIsPressed);
-
+    
     mbIsOver = bIsOver;
     mbIsPressed = bIsPressed;
 
@@ -1472,7 +1472,7 @@ bool Element::SetState (
             {
                 if (mpMode->msAction.getLength() <= 0)
                     break;
-
+                
                 if (mpToolBar.get() == NULL)
                     break;
 
@@ -1573,7 +1573,7 @@ void SAL_CALL Element::disposing (const css::lang::EventObject& rEvent)
 {
     (void)rEvent;
 }
-
+    
 
 
 
@@ -1597,7 +1597,7 @@ void SAL_CALL Element::statusChanged (const css::frame::FeatureStateEvent& rEven
     bool bIsSelected (mbIsSelected);
     bool bIsEnabled (rEvent.IsEnabled);
     rEvent.State >>= bIsSelected;
-
+    
     if (bIsSelected != mbIsSelected || bIsEnabled != mbIsEnabled)
     {
         mbIsEnabled = bIsEnabled;
@@ -1758,13 +1758,13 @@ void Button::Paint (
 
     if (mpMode.get() == NULL)
         return;
-
+    
     if (mpMode->mpIcon.get() == NULL)
         return;
 
     geometry::RealRectangle2D aTextBBox (mpMode->maText.GetBoundingBox(rxCanvas));
     sal_Int32 nTextHeight (sal::static_int_cast<sal_Int32>(0.5 + aTextBBox.Y2 - aTextBBox.Y1));
-
+    
     PaintIcon(rxCanvas, nTextHeight, rViewState);
     awt::Point aOffset(0,0);
     if ( ! IsEnabled())
@@ -1814,7 +1814,7 @@ void Button::PaintIcon (
 {
     if (mpMode.get() == NULL)
         return;
-
+    
     Reference<rendering::XBitmap> xBitmap (mpMode->mpIcon->GetBitmap(GetMode()));
     if (xBitmap.is())
     {
@@ -1858,7 +1858,7 @@ void SAL_CALL Button::disposing (const css::lang::EventObject& rEvent)
     mbIsListenerRegistered = false;
     Element::disposing(rEvent);
 }
-
+    
 } // end of anonymous namespace
 
 
@@ -1881,13 +1881,13 @@ awt::Size Label::CreateBoundingSize (
 {
     if (mpMode.get() == NULL)
         return awt::Size(0,0);
-
+    
     geometry::RealRectangle2D aTextBBox (mpMode->maText.GetBoundingBox(rxCanvas));
     return awt::Size(
         sal::static_int_cast<sal_Int32>(0.5 + aTextBBox.X2 - aTextBBox.X1),
         sal::static_int_cast<sal_Int32>(0.5 + aTextBBox.Y2 - aTextBBox.Y1));
 }
-
+ 
 
 
 
@@ -1920,7 +1920,7 @@ void Label::Paint (
     OSL_ASSERT(rxCanvas.is());
     if (mpMode.get() == NULL)
         return;
-
+    
     mpMode->maText.Paint(rxCanvas, rViewState, GetBoundingBox(), awt::Point(0,0));
 }
 
@@ -2035,7 +2035,7 @@ void Text::Paint (
         Sequence<double>(4),
         rendering::CompositeOperation::SOURCE);
     PresenterCanvasHelper::SetDeviceColor(aRenderState, mpFont->mnColor);
-
+    
     rxCanvas->drawText(
         aContext,
         mpFont->mxFont,
@@ -2125,7 +2125,7 @@ OUString TimeFormatter::FormatTime (const oslDateTime& rTime)
     const sal_Int32 nHours (sal::static_int_cast<sal_Int32>(rTime.Hours));
     const sal_Int32 nMinutes (sal::static_int_cast<sal_Int32>(rTime.Minutes));
     const sal_Int32 nSeconds(sal::static_int_cast<sal_Int32>(rTime.Seconds));
-
+    
     // Hours
     if (mbIs24HourFormat)
         sText.append(OUString::valueOf(nHours));
@@ -2293,7 +2293,7 @@ void PresentationTimeLabel::TimeHasChanged (const oslDateTime& rCurrentTime)
                 maStartTimeValue.Seconds += 1;
             maStartTimeValue.Nanosec = 0;
         }
-
+        
         TimeValue aElapsedTimeValue;
         aElapsedTimeValue.Seconds = aCurrentTimeValue.Seconds - maStartTimeValue.Seconds;
         aElapsedTimeValue.Nanosec = aCurrentTimeValue.Nanosec - maStartTimeValue.Nanosec;
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
index d4dbf2ac1048..eb6a526397a7 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sdext/source/presenter/PresenterToolBar.hxx
@@ -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
@@ -60,7 +60,7 @@
 namespace css = ::com::sun::star;
 
 namespace {
-    typedef cppu::WeakComponentImplHelper5<
+    typedef cppu::WeakComponentImplHelper5< 
         css::awt::XWindowListener,
         css::awt::XPaintListener,
         css::awt::XMouseListener,
@@ -68,7 +68,7 @@ namespace {
         css::drawing::XDrawView
         > PresenterToolBarInterfaceBase;
 
-    typedef cppu::WeakComponentImplHelper3<
+    typedef cppu::WeakComponentImplHelper3< 
         css::awt::XPaintListener,
         css::drawing::framework::XView,
         css::drawing::XDrawView
@@ -92,7 +92,7 @@ public:
     typedef ::boost::function<void(void)> Action;
 
     enum Anchor { Left, Center, Right };
-
+    
     PresenterToolBar (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
         const css::uno::Reference<css::awt::XWindow>& rxWindow,
@@ -117,16 +117,16 @@ public:
     ::rtl::Reference<PresenterController> GetPresenterController (void) const;
     css::uno::Reference<css::awt::XWindow> GetWindow (void) const;
     css::uno::Reference<css::uno::XComponentContext> GetComponentContext (void) const;
-
+    
     // lang::XEventListener
 
-    virtual void SAL_CALL
+    virtual void SAL_CALL 
         disposing (const css::lang::EventObject& rEventObject)
         throw (css::uno::RuntimeException);
 
 
     // XWindowListener
-
+    
     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
         throw (css::uno::RuntimeException);
 
@@ -153,14 +153,14 @@ public:
 
     virtual void SAL_CALL mouseReleased (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL mouseEntered (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL mouseExited (const css::awt::MouseEvent& rEvent)
         throw (css::uno::RuntimeException);
 
-
+    
     // XMouseMotionListener
 
     virtual void SAL_CALL mouseMoved (const css::awt::MouseEvent& rEvent)
@@ -262,16 +262,16 @@ public:
 
     ::rtl::Reference<PresenterToolBar> GetPresenterToolBar (void) const;
 
-
+    
     // XPaintListener
 
     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
         throw (css::uno::RuntimeException);
 
-
+    
     // lang::XEventListener
 
-    virtual void SAL_CALL
+    virtual void SAL_CALL 
         disposing (const css::lang::EventObject& rEventObject)
         throw (css::uno::RuntimeException);
 
@@ -284,7 +284,7 @@ public:
     virtual sal_Bool SAL_CALL isAnchorOnly (void)
         throw (com::sun::star::uno::RuntimeException);
 
-
+    
     // XDrawView
 
     virtual void SAL_CALL setCurrentPage (
diff --git a/sdext/source/presenter/PresenterUIPainter.cxx b/sdext/source/presenter/PresenterUIPainter.cxx
index d5a5066989d8..0b5b90daa117 100644
--- a/sdext/source/presenter/PresenterUIPainter.cxx
+++ b/sdext/source/presenter/PresenterUIPainter.cxx
@@ -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
@@ -72,7 +72,7 @@ void PresenterUIPainter::PaintHorizontalBitmapComposite (
     rendering::ViewState aViewState (
         geometry::AffineMatrix2D(1,0,0, 0,1,0),
         NULL);
-
+        
     rendering::RenderState aRenderState (
         geometry::AffineMatrix2D(1,0,0, 0,1,0),
         NULL,
@@ -177,7 +177,7 @@ void PresenterUIPainter::PaintVerticalBitmapComposite (
     rendering::ViewState aViewState (
         geometry::AffineMatrix2D(1,0,0, 0,1,0),
         NULL);
-
+        
     rendering::RenderState aRenderState (
         geometry::AffineMatrix2D(1,0,0, 0,1,0),
         NULL,
diff --git a/sdext/source/presenter/PresenterUIPainter.hxx b/sdext/source/presenter/PresenterUIPainter.hxx
index 52cdd5d2f4ea..e640a35a9a0b 100644
--- a/sdext/source/presenter/PresenterUIPainter.hxx
+++ b/sdext/source/presenter/PresenterUIPainter.hxx
@@ -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
@@ -48,7 +48,7 @@ class PresenterUIPainter
 public:
     PresenterUIPainter (void);
     ~PresenterUIPainter (void);
-
+    
     static void PaintHorizontalBitmapComposite (
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
         const css::awt::Rectangle& rRepaintBox,
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index 2a33a4230254..44c06ad3a328 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -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
@@ -93,7 +93,7 @@ public:
 
     virtual Reference<XResourceId> SAL_CALL getResourceId (void) throw (RuntimeException)
     { return mxResourceId; };
-
+    
 private:
     Reference<XResourceId> mxResourceId;
 };
@@ -268,7 +268,7 @@ void SAL_CALL PresenterViewFactory::disposing (void)
 
 
 //----- XViewFactory ----------------------------------------------------------
-
+    
 Reference<XResource> SAL_CALL PresenterViewFactory::createResource (
     const Reference<XResourceId>& rxViewId)
     throw (RuntimeException)
@@ -276,7 +276,7 @@ Reference<XResource> SAL_CALL PresenterViewFactory::createResource (
     ThrowIfDisposed();
 
     Reference<XResource> xView;
-
+    
     if (rxViewId.is())
     {
         Reference<XPane> xAnchorPane (
@@ -292,7 +292,7 @@ Reference<XResource> SAL_CALL PresenterViewFactory::createResource (
         if (pDescriptor.get() != NULL)
             pDescriptor->SetActivationState(true);
     }
-
+    
     return xView;
 }
 
@@ -398,7 +398,7 @@ Reference<XResource> PresenterViewFactory::CreateView(
     const Reference<XPane>& rxAnchorPane)
 {
     Reference<XView> xView;
-
+    
     try
     {
         const OUString sResourceURL (rxViewId->getResourceURL());
@@ -427,7 +427,7 @@ Reference<XResource> PresenterViewFactory::CreateView(
         {
             xView = CreateHelpView(rxViewId);
         }
-
+        
         // Activate it.
         CachablePresenterView* pView = dynamic_cast<CachablePresenterView*>(xView.get());
         if (pView != NULL)
@@ -448,12 +448,12 @@ Reference<XView> PresenterViewFactory::CreateSlideShowView(
     const Reference<XResourceId>& rxViewId) const
 {
     Reference<XView> xView;
-
+     
     if ( ! mxConfigurationController.is())
         return xView;
     if ( ! mxComponentContext.is())
         return xView;
-
+    
     try
     {
         rtl::Reference<PresenterSlideShowView> pShowView (
@@ -481,12 +481,12 @@ Reference<XView> PresenterViewFactory::CreateSlidePreviewView(
     const Reference<XPane>& rxAnchorPane) const
 {
     Reference<XView> xView;
-
+    
     if ( ! mxConfigurationController.is())
         return xView;
     if ( ! mxComponentContext.is())
         return xView;
-
+    
     try
     {
         xView = Reference<XView>(
@@ -527,12 +527,12 @@ Reference<XView> PresenterViewFactory::CreateNotesView(
 {
     (void)rxAnchorPane;
     Reference<XView> xView;
-
+    
     if ( ! mxConfigurationController.is())
         return xView;
     if ( ! mxComponentContext.is())
         return xView;
-
+    
     try
     {
         xView = Reference<XView>(static_cast<XWeak*>(
@@ -558,12 +558,12 @@ Reference<XView> PresenterViewFactory::CreateSlideSorterView(
     const Reference<XResourceId>& rxViewId) const
 {
     Reference<XView> xView;
-
+    
     if ( ! mxConfigurationController.is())
         return xView;
     if ( ! mxComponentContext.is())
         return xView;
-
+    
     try
     {
         rtl::Reference<PresenterSlideSorter> pView (
diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx
index 5fab682dae8a..b38fbcae79d0 100644
--- a/sdext/source/presenter/PresenterViewFactory.hxx
+++ b/sdext/source/presenter/PresenterViewFactory.hxx
@@ -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
@@ -60,7 +60,7 @@ class CachablePresenterView
 {
 public:
     virtual void ActivatePresenterView (void);
-
+    
     /** Called when the view is put into a cache.  The view must not paint
         itself while being deactive.
     */
@@ -123,7 +123,7 @@ public:
 
 
     // XResourceFactory
-
+    
     virtual css::uno::Reference<css::drawing::framework::XResource>
         SAL_CALL createResource (
             const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId)
@@ -144,7 +144,7 @@ private:
         css::uno::Reference<css::drawing::framework::XPane> > ViewResourceDescriptor;
     typedef ::std::map<rtl::OUString, ViewResourceDescriptor> ResourceContainer;
     ::boost::scoped_ptr<ResourceContainer> mpResourceCache;
-
+    
     PresenterViewFactory (
         const css::uno::Reference<css::uno::XComponentContext>& rxContext,
         const css::uno::Reference<css::frame::XController>& rxController,
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 821e927dcb5b..72cb68c0628c 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -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
@@ -95,9 +95,9 @@ namespace {
             const ::boost::shared_ptr<PresenterAnimator>& rpAnimator);
         virtual ~ModeChangeAnimationStarter (void);
         virtual void SAL_CALL disposing (void);
-
+        
         // XConfigurationChangeListener
-
+        
         virtual void SAL_CALL notifyConfigurationChange (
             const com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent)
             throw (com::sun::star::uno::RuntimeException);
@@ -202,7 +202,7 @@ void PresenterWindowManager::SetParentPane (
     }
     mxParentWindow = NULL;
     mxParentCanvas = NULL;
-
+    
     if (rxPane.is())
     {
         mxParentWindow = rxPane->getWindow();
@@ -225,7 +225,7 @@ void PresenterWindowManager::SetParentPane (
         if (xPeer.is())
             xPeer->setBackground(util::Color(0xff000000));
     }
-}
+} 
 
 
 
@@ -235,7 +235,7 @@ void PresenterWindowManager::SetTheme (const ::boost::shared_ptr<PresenterTheme>
     mpTheme = rpTheme;
 
     // Get background bitmap or background color from the theme.
-
+    
     if (mpTheme.get() != NULL)
     {
         mpBackgroundBitmap = mpTheme->GetBitmap(OUString(), A2S("Background"));
@@ -266,7 +266,7 @@ void PresenterWindowManager::NotifyPaneCreation (
     if (xBorderWindow.is() && ! rpDescriptor->mbIsSprite)
     {
         Invalidate();
-
+        
         xBorderWindow->addWindowListener(this);
         xBorderWindow->addFocusListener(this);
 #ifndef ENABLE_PANE_RESIZING
@@ -289,7 +289,7 @@ void PresenterWindowManager::NotifyViewCreation (const Reference<XView>& rxView)
     if (pDescriptor.get() != NULL)
     {
         Layout();
-
+        
         mpPresenterController->GetPaintManager()->Invalidate(
             pDescriptor->mxContentWindow,
             (sal_Int16)(awt::InvalidateStyle::TRANSPARENT
@@ -365,7 +365,7 @@ void PresenterWindowManager::SetPaneBorderPainter (
 
 
 //----- XWindowListener -------------------------------------------------------
-
+    
 void SAL_CALL PresenterWindowManager::windowResized (const awt::WindowEvent& rEvent)
     throw (RuntimeException)
 {
@@ -426,7 +426,7 @@ void SAL_CALL PresenterWindowManager::windowHidden (const lang::EventObject& rEv
 
 
 //----- XPaintListener --------------------------------------------------------
-
+    
 void SAL_CALL PresenterWindowManager::windowPaint (const awt::PaintEvent& rEvent)
     throw (RuntimeException)
 {
@@ -555,7 +555,7 @@ void SAL_CALL PresenterWindowManager::disposing (const lang::EventObject& rEvent
 bool PresenterWindowManager::PaintChildren (const awt::PaintEvent& rEvent) const
 {
     bool bChildInvalidated (false);
-
+    
     // Call windowPaint on all children that lie in or touch the
     // update rectangle.
     PresenterPaneContainer::PaneList::const_iterator iPane;
@@ -614,7 +614,7 @@ bool PresenterWindowManager::PaintChildren (const awt::PaintEvent& rEvent) const
 void PresenterWindowManager::SetLayoutMode (const LayoutMode eMode)
 {
     OSL_ASSERT(mpPresenterController.get() != NULL);
-
+    
     if (meLayoutMode != eMode
         || mbIsSlideSorterActive
         || mbIsHelpViewActive)
@@ -763,15 +763,15 @@ void PresenterWindowManager::RestoreViewMode (void)
         case 0:
             SetViewMode(VM_Standard);
             break;
-
+            
         case 1:
             SetViewMode(VM_Notes);
             break;
-
+            
         case 2:
             SetViewMode(VM_SlideOverview);
             break;
-    }
+    }                               
 }
 
 
@@ -864,7 +864,7 @@ void PresenterWindowManager::Layout (void)
                     default:
                         LayoutStandardMode();
                         break;
-
+                    
                     case LM_Notes:
                         LayoutNotesMode();
                         break;
@@ -910,7 +910,7 @@ void PresenterWindowManager::LayoutStandardMode (void)
             aCurrentSlideOuterBox.Width,
             aCurrentSlideOuterBox.Height);
     }
-
+    
 
     // For the next slide view calculate the outer height from the outer
     // width.  This takes into acount the slide aspect ratio and thus has to
@@ -940,7 +940,7 @@ void PresenterWindowManager::LayoutNotesMode (void)
     awt::Rectangle aBox = mxParentWindow->getPosSize();
 
     const geometry::RealRectangle2D aToolBarBox (LayoutToolBar());
-
+    
     const double nGoldenRatio ((1 + sqrt(5.0)) / 2);
     const double nGap (20);
     const double nPrimaryWidth (aBox.Width / nGoldenRatio);
@@ -948,7 +948,7 @@ void PresenterWindowManager::LayoutNotesMode (void)
     const double nTertiaryWidth (nSecondaryWidth / nGoldenRatio);
     double nSlidePreviewTop (0);
     double nNotesViewBottom (aToolBarBox.Y1 - nGap);
-
+    
     // The notes view has no fixed aspect ratio.
     PresenterPaneContainer::SharedPaneDescriptor pPane (
         mpPaneContainer->FindPaneURL(PresenterPaneFactory::msNotesPaneURL));
@@ -967,7 +967,7 @@ void PresenterWindowManager::LayoutNotesMode (void)
             aNotesViewOuterSize.Height);
         nNotesViewBottom = nSlidePreviewTop + aNotesViewOuterSize.Height;
     }
-
+    
     // For the current slide view calculate the outer height from the outer
     // width.  This takes into acount the slide aspect ratio and thus has to
     // go over the inner pane size.
@@ -984,7 +984,7 @@ void PresenterWindowManager::LayoutNotesMode (void)
             aCurrentSlideOuterBox.Width,
             aCurrentSlideOuterBox.Height);
     }
-
+    
 
     // For the next slide view calculate the outer height from the outer
     // width.  This takes into acount the slide aspect ratio and thus has to
@@ -1153,7 +1153,7 @@ void PresenterWindowManager::NotifyLayoutModeChange (void)
             {
             }
         }
-    }
+    }    
 }
 
 
@@ -1183,7 +1183,7 @@ void PresenterWindowManager::NotifyDisposing (void)
             {
             }
         }
-    }
+    }    
 }
 
 
@@ -1192,7 +1192,7 @@ void PresenterWindowManager::NotifyDisposing (void)
 void PresenterWindowManager::LayoutUnknownMode (void)
 {
     awt::Rectangle aBox = mxParentWindow->getPosSize();
-
+        
     PresenterPaneContainer::PaneList::const_iterator iPane;
     PresenterPaneContainer::PaneList::const_iterator iEnd (mpPaneContainer->maPanes.end());
     for (iPane=mpPaneContainer->maPanes.begin(); iPane!=iEnd; ++iPane)
@@ -1261,7 +1261,7 @@ void PresenterWindowManager::PaintBackground (const awt::Rectangle& rUpdateBox)
     Reference<rendering::XGraphicDevice> xDevice (mxParentCanvas->getDevice());
     if ( ! xDevice.is())
         return;
-
+    
     // Create a polygon for the background and for clipping.
     Reference<rendering::XPolyPolygon2D> xBackgroundPolygon (
         PresenterGeometryHelper::CreatePolygon(mxParentWindow->getPosSize(), xDevice));
@@ -1282,7 +1282,7 @@ void PresenterWindowManager::PaintBackground (const awt::Rectangle& rUpdateBox)
     if (mpBackgroundBitmap.get() != NULL)
     {
         ProvideBackgroundBitmap();
-
+        
         if (mxScaledBackgroundBitmap.is())
         {
             Sequence<rendering::Texture> aTextures (1);
@@ -1411,7 +1411,7 @@ void PresenterWindowManager::UpdateWindowList (void)
         Reference<lang::XComponent> xComponent (mxPaneBorderManager, UNO_QUERY);
         if (xComponent.is())
             xComponent->dispose();
-
+        
         Reference<lang::XMultiComponentFactory> xFactory (mxComponentContext->getServiceManager());
         if (xFactory.is())
         {
@@ -1560,7 +1560,7 @@ ModeChangeAnimationStarter::ModeChangeAnimationStarter (
     mpSprite->SetFactory(rxCanvas);
     mpSprite->Resize(geometry::RealSize2D(aWindowSize.Width, aWindowSize.Height));
     mpSprite->SetPriority(10);
-
+    
     // Fill it with the background inside the bounding box.
     const rendering::ViewState aViewState (
         geometry::AffineMatrix2D(1,0,0, 0,1,0),
@@ -1612,7 +1612,7 @@ void SAL_CALL ModeChangeAnimationStarter::notifyConfigurationChange (
     throw (com::sun::star::uno::RuntimeException)
 {
     (void)rEvent;
-
+    
     // Start the actual animation.
     mpAnimator->AddAnimation(SharedPresenterAnimation(new ModeChangeAnimation(
         mpSprite,
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
index 997565bf0a8c..828b72b5f518 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -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
@@ -109,7 +109,7 @@ public:
     css::uno::Reference<css::rendering::XCanvas> GetParentCanvas (void) const;
     void Update (void);
     void Layout (void);
-
+    
     void SetSlideSorterState (bool bIsActive);
     void SetHelpViewState (bool bIsActive);
 
@@ -138,12 +138,12 @@ public:
         const css::uno::Reference<css::document::XEventListener>& rxListener);
     void RemoveLayoutListener (
         const css::uno::Reference<css::document::XEventListener>& rxListener);
-
+    
     // XWindowListener
-
+    
     virtual void SAL_CALL windowResized (const css::awt::WindowEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
     virtual void SAL_CALL windowMoved (const css::awt::WindowEvent& rEvent)
         throw (css::uno::RuntimeException);
 
@@ -155,7 +155,7 @@ public:
 
 
     // XPaintListener
-
+    
     virtual void SAL_CALL windowPaint (const css::awt::PaintEvent& rEvent)
         throw (css::uno::RuntimeException);
 
@@ -182,7 +182,7 @@ public:
 
     virtual void SAL_CALL focusLost (const css::awt::FocusEvent& rEvent)
         throw (css::uno::RuntimeException);
-
+    
 
     // XEventListener
 
diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu
index 22316392f807..d7400f55c52a 100644
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu
+++ b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu
@@ -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
@@ -61,7 +61,7 @@
               </node>
             </node>
           </node>
-          <node oor:name="b" oor:op="replace">
+          <node oor:name="b" oor:op="replace">		
             <prop oor:name="Name"><value>NextEffect</value></prop>
             <prop oor:name="Type"><value>Button</value></prop>
             <node oor:name="Normal">
@@ -91,7 +91,7 @@
               </node>
             </node>
           </node>
-          <node oor:name="c" oor:op="replace">
+          <node oor:name="c" oor:op="replace">		
             <prop oor:name="Name"><value>Notes</value></prop>
             <prop oor:name="Type"><value>Button</value></prop>
             <node oor:name="Normal">
@@ -199,7 +199,7 @@
               </node>
             </node>
           </node>
-          <node oor:name="i" oor:op="replace">
+          <node oor:name="i" oor:op="replace">		
             <prop oor:name="Type"><value>PresentationTimeLabel</value></prop>
             <node oor:name="Normal">
               <node oor:name="Font">
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
index cd51dc9d13d8..916abfbd8966 100644
--- a/swext/mediawiki/build.xml
+++ b/swext/mediawiki/build.xml
@@ -2,23 +2,23 @@
 <!--***********************************************************************
  *
   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
-
+ 
   This file is part of OpenOffice.org.
-
+ 
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
-
+ 
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
-
+ 
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
diff --git a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
index f91819c6bc2a..42cc7a8c6baf 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
@@ -1,7 +1,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
@@ -32,7 +32,7 @@ import javax.swing.text.MutableAttributeSet;
 
 public class EditPageParser extends HTMLEditorKit.ParserCallback
 {
-
+    
     protected String m_sEditTime = "";
     protected String m_sEditToken = "";
     protected String m_sLoginToken = "";
@@ -48,12 +48,12 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback
     protected int m_nHTMLArticleEnd = -1;
     protected int m_nNoArticleInd = -1;
     protected int m_nErrorInd = -1;
-
+    
     /** Creates a new instance of WikiHTMLParser */
     public EditPageParser()
     {
     }
-
+    
     public void handleComment( char[] data,int pos )
     {
         // insert code to handle comments
@@ -71,8 +71,8 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback
             {
                 m_nHTMLArticleStart = pos+6;
                 m_bHTMLStartFound = false;
-            }
-        }
+            }                
+        }    
         else if ( t == HTML.Tag.HEAD )
         {
             m_bInHead = false;
@@ -149,7 +149,7 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback
                 {
                     m_nWikiArticleHash = t.hashCode();
                     m_nWikiArticleStart = pos;
-                }
+                }                
             }
         }
         else if ( t == HTML.Tag.DIV )
@@ -161,7 +161,7 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback
                 if ( sId.equalsIgnoreCase( "contentSub" ) )
                 {
                     m_bHTMLStartFound = true;
-                }
+                }                
             }
             if ( sClass != null )
             {
@@ -171,7 +171,7 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback
                 }
                 else if ( sClass.equalsIgnoreCase( "noarticletext" ) )
                 {
-                    m_nNoArticleInd = pos;
+                    m_nNoArticleInd = pos;                    
                 }
                 else if ( sClass.equalsIgnoreCase( "errorbox" ) )
                 {
@@ -186,8 +186,8 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback
             {
                 m_nErrorInd = pos;
             }
-        }
+        }   
     }
 
-
+    
 }
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index 7ecd9ecb0e7c..a94dfc07554c 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
@@ -1,7 +1,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
@@ -78,7 +78,7 @@ import org.apache.commons.httpclient.URI;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.PostMethod;
 
-public class Helper
+public class Helper 
 {
     public final static int GENERALSEND_ERROR = 0;
     public final static int NOWIKIFILTER_ERROR = 1;
@@ -156,7 +156,7 @@ public class Helper
 
     private static final String sHTMLHeader = "<HTML><HEAD><meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /><TITLE></TITLE></HEAD><BODY>";
     private static final String sHTMLFooter = "</BODY></HTML>";
-
+    
     private static Random m_aRandom;
     private static MultiThreadedHttpConnectionManager m_aConnectionManager;
     private static HttpClient m_aClient;
@@ -226,7 +226,7 @@ public class Helper
     {
         return m_bAllowConnection;
     }
-
+    
     synchronized protected static boolean GetShowInBrowserByDefault( XComponentContext xContext )
     {
         if ( m_bShowInBrowser == null )
@@ -304,7 +304,7 @@ public class Helper
         return new Protocol( "https", new WikiProtocolSocketFactory(), ( ( nPort < 0 ) ? 443 : nPort ) );
     }
 
-    protected static String GetMainURL( String sWebPage, String sVURL )
+    protected static String GetMainURL( String sWebPage, String sVURL ) 
     {
         String sResultURL = "";
         try
@@ -312,11 +312,11 @@ public class Helper
             StringReader aReader = new StringReader( sWebPage );
             HTMLEditorKit.Parser aParser = GetHTMLParser();
             EditPageParser aCallback = new EditPageParser();
-
+            
             aParser.parse( aReader, aCallback, true );
             sResultURL = aCallback.m_sMainURL;
 
-            if ( !sResultURL.startsWith( "http" ) )
+            if ( !sResultURL.startsWith( "http" ) ) 
             {
                 //if the url is only relative then complete it
                 URL aURL = new URL( sVURL );
@@ -336,10 +336,10 @@ public class Helper
             if ( nIndex >= 0 )
                 sResultURL = sVURL.substring( 0, nIndex );
         }
-
+        
         return sResultURL;
     }
-
+   
     protected static String GetRedirectURL( String sWebPage, String sURL )
     {
         //scrape the HTML source and find the EditURL
@@ -347,7 +347,7 @@ public class Helper
 
         String sResultURL = "";
         int nInd = sWebPage.indexOf( "http-equiv=\"refresh\"" );
-        if ( nInd != -1 )
+        if ( nInd != -1 ) 
         {
             int nContent = sWebPage.indexOf( "content=", nInd );
             if ( nContent > 0 )
@@ -361,10 +361,10 @@ public class Helper
                 }
             }
 
-            try
+            try 
             {
                 URL aURL = new URL( sURL );
-                if ( !sResultURL.startsWith( aURL.getProtocol() ))
+                if ( !sResultURL.startsWith( aURL.getProtocol() )) 
                 {
                     //if the url is only relative then complete it
                     if ( sResultURL.startsWith( "/" ) )
@@ -373,16 +373,16 @@ public class Helper
                         sResultURL = aURL.getProtocol() + "://" + aURL.getHost() + aURL.getPath() + sResultURL;
                 }
             }
-            catch ( MalformedURLException ex )
+            catch ( MalformedURLException ex ) 
             {
                 ex.printStackTrace();
-            }
+            }            
         }
 
         return sResultURL;
-
+       
     }
-
+    
     protected static XInputStream SaveHTMLTemp( XComponentContext xContext, String sArticle )
     {
         XInputStream xResult = null;
@@ -390,7 +390,7 @@ public class Helper
         if ( xContext != null )
         {
             try
-            {
+            {            
                 Object oTempFile = xContext.getServiceManager().createInstanceWithContext( "com.sun.star.io.TempFile", xContext );
                 XStream xStream = ( XStream ) UnoRuntime.queryInterface( XStream.class, oTempFile );
                 XSeekable xSeekable = ( XSeekable ) UnoRuntime.queryInterface( XSeekable.class, oTempFile );
@@ -402,10 +402,10 @@ public class Helper
                     {
                         String sHTML = sHTMLHeader.concat( sArticle );
                         sHTML = sHTML.concat( sHTMLFooter );
-                        xOutputStream.writeBytes( sHTML.getBytes( "UTF-8" ) );
+                        xOutputStream.writeBytes( sHTML.getBytes( "UTF-8" ) );            
                         // xOutputStream.closeOutput();
-                        xSeekable.seek( 0 );
-
+                        xSeekable.seek( 0 );  
+                        
                         xResult = xInputStream;
                     }
                 }
@@ -418,12 +418,12 @@ public class Helper
 
         return xResult;
     }
-
-
-    protected static String CreateTempFile( XComponentContext xContext )
+    
+    
+    protected static String CreateTempFile( XComponentContext xContext ) 
     {
         String sURL = "";
-        try
+        try 
         {
             Object oTempFile = xContext.getServiceManager().createInstanceWithContext( "com.sun.star.io.TempFile", xContext );
             XPropertySet xPropertySet = ( XPropertySet ) UnoRuntime.queryInterface( XPropertySet.class, oTempFile );
@@ -434,27 +434,27 @@ public class Helper
             xInputStream.closeInput();
             XOutputStream xOutputStream = ( XOutputStream ) UnoRuntime.queryInterface( XOutputStream.class, oTempFile );
             xOutputStream.closeOutput();
-        } catch ( com.sun.star.uno.Exception ex )
+        } catch ( com.sun.star.uno.Exception ex ) 
         {
             ex.printStackTrace();
         }
-        return sURL;
+        return sURL;        
     }
-
-    protected static String EachLine( String sURL )
+    
+    protected static String EachLine( String sURL ) 
     {
         String sText = "";
-        try
+        try 
         {
             URL aURL = new URL( sURL );
-            File aFile = new File( aURL.getFile() );
+            File aFile = new File( aURL.getFile() );        
             InputStreamReader aInputReader = new InputStreamReader( new FileInputStream( aFile ), "UTF-8" );
             BufferedReader aBufReader = new BufferedReader( aInputReader );
 
             StringBuffer aBuf = new StringBuffer();
             String sEachLine = aBufReader.readLine();
 
-            while( sEachLine != null )
+            while( sEachLine != null ) 
             {
                 aBuf.append( sEachLine );
                 aBuf.append( "\n" );
@@ -462,28 +462,28 @@ public class Helper
                 sEachLine = aBufReader.readLine();
             }
             sText = aBuf.toString();
-        } catch ( Exception e )
+        } catch ( Exception e ) 
         {
             e.printStackTrace();
         }
         return sText;
     }
-
-    protected static String GetDocTitle( XModel xDoc )
+    
+    protected static String GetDocTitle( XModel xDoc ) 
     {
         String sTitle = "";
         XDocumentInfoSupplier xDocInfoSup = ( XDocumentInfoSupplier ) UnoRuntime.queryInterface( XDocumentInfoSupplier.class, xDoc );
         XPropertySet xPropSet = ( XPropertySet ) UnoRuntime.queryInterface( XPropertySet.class, xDocInfoSup.getDocumentInfo() );
-        try
+        try 
         {
             sTitle = ( String ) xPropSet.getPropertyValue( "Title" );
-        } catch ( Exception ex )
+        } catch ( Exception ex ) 
         {
             ex.printStackTrace();
-        }
+        } 
         return sTitle;
     }
-
+    
     protected static void SetDocTitle( XModel xDoc, String sTitle )
     {
         XDocumentInfoSupplier xDocInfoSup = ( XDocumentInfoSupplier ) UnoRuntime.queryInterface( XDocumentInfoSupplier.class, xDoc );
@@ -499,10 +499,10 @@ public class Helper
                 catch ( Exception ex )
                 {
                     ex.printStackTrace();
-                }
+                } 
             }
         }
-    }
+    }    
 
     protected static String GetDocServiceName( XComponentContext xContext, XModel xModel )
     {
@@ -514,7 +514,7 @@ public class Helper
                 XMultiComponentFactory xFactory = xContext.getServiceManager();
                 if ( xFactory == null )
                     throw new com.sun.star.uno.RuntimeException();
-
+                
                 Object oModuleManager = xFactory.createInstanceWithContext( "com.sun.star.frame.ModuleManager", xContext );
                 XModuleManager xModuleManager = ( XModuleManager ) UnoRuntime.queryInterface( XModuleManager.class, oModuleManager );
                 if ( xModuleManager != null )
@@ -528,7 +528,7 @@ public class Helper
 
         return aDocServiceName;
     }
-
+    
     protected static String GetFilterName( XComponentContext xContext, String aTypeName, String aDocServiceName )
     {
         String aFilterName = "";
@@ -544,7 +544,7 @@ public class Helper
                     NamedValue[] aRequest = new NamedValue[2];
                     aRequest[0] = new NamedValue( "Type", aTypeName );
                     aRequest[1] = new NamedValue( "DocumentService", aDocServiceName );
-
+                    
                     XEnumeration xSet = xQuery.createSubSetEnumerationByProperties( aRequest );
                     if ( xSet != null )
                     {
@@ -594,7 +594,7 @@ public class Helper
 
         if ( xConfigurationProvider == null )
             throw new com.sun.star.uno.RuntimeException();
-
+        
         return xConfigurationProvider;
     }
 
@@ -609,11 +609,11 @@ public class Helper
         aVal.Value = sNodepath;
         Object[] aArgs = new Object[1];
         aArgs[0] = aVal;
-
+        
         return GetConfigurationProvider( xContext ).createInstanceWithArguments(
                                     ( bWriteAccess ? "com.sun.star.configuration.ConfigurationUpdateAccess"
                                                    : "com.sun.star.configuration.ConfigurationAccess" ),
-                                    aArgs );
+                                    aArgs );        
     }
 
     protected static XPropertySet GetConfigProps( XComponentContext xContext, String sNodepath )
@@ -622,7 +622,7 @@ public class Helper
         XPropertySet xProps = ( XPropertySet ) UnoRuntime.queryInterface( XPropertySet.class, GetConfig( xContext, sNodepath, true ) );
         if ( xProps == null )
             throw new com.sun.star.uno.RuntimeException();
-
+        
         return xProps;
     }
 
@@ -633,7 +633,7 @@ public class Helper
         XNameContainer xContainer = ( XNameContainer ) UnoRuntime.queryInterface( XNameContainer.class, GetConfig( xContext, sNodepath, true ) );
         if ( xContainer == null )
             throw new com.sun.star.uno.RuntimeException();
-
+        
         return xContainer;
     }
 
@@ -643,7 +643,7 @@ public class Helper
         XNameAccess xNameAccess = ( XNameAccess ) UnoRuntime.queryInterface( XNameAccess.class, GetConfig( xContext, sNodepath, false ) );
         if ( xNameAccess == null )
             throw new com.sun.star.uno.RuntimeException();
-
+        
         return xNameAccess;
     }
 
@@ -651,7 +651,7 @@ public class Helper
     {
         if ( aHostConfig == null || xContext == null )
             return;
-
+    
         try
         {
             XNameAccess xNameAccess = GetConfigNameAccess( xContext, "org.openoffice.Inet/Settings" );
@@ -678,13 +678,13 @@ public class Helper
 
                     String aNoProxyList = AnyConverter.toString( xNameAccess.getByName( "ooInetNoProxy" ) );
                     String aProxyName = AnyConverter.toString( xNameAccess.getByName( aProxyNameProp ) );
-
+                                
                     int nProxyPort = 80;
 
                     Object aPortNo = xNameAccess.getByName( aProxyPortProp );
                     if ( !AnyConverter.isVoid( aPortNo ) )
                         nProxyPort = AnyConverter.toInt( aPortNo );
-
+                   
                     if ( nProxyPort == -1 )
                         nProxyPort = 80;
 
@@ -716,7 +716,7 @@ public class Helper
             }
         }
     }
-
+    
     protected static void ExecuteMethod( HttpMethodBase aMethod, HostConfiguration aHostConfig, URI aURI, XComponentContext xContext, boolean bSetHost )
         throws WikiCancelException, IOException, SSLException
     {
@@ -750,7 +750,7 @@ public class Helper
     static private class HTMLParse extends HTMLEditorKit
     {
 
-        public HTMLEditorKit.Parser getParser()
+        public HTMLEditorKit.Parser getParser() 
         {
             return super.getParser();
         }
@@ -760,7 +760,7 @@ public class Helper
     {
         return new HTMLParse().getParser();
     }
-
+    
     static protected boolean LoginReportsError( String sRespond )
     {
         boolean bResult = true;
@@ -771,7 +771,7 @@ public class Helper
                 StringReader aReader = new StringReader( sRespond );
                 HTMLEditorKit.Parser aParser = GetHTMLParser();
                 EditPageParser aCallback = new EditPageParser();
-
+                
                 aParser.parse( aReader, aCallback, true );
                 bResult = ( aCallback.m_nErrorInd >= 0 );
             }
@@ -780,7 +780,7 @@ public class Helper
                 e.printStackTrace();
             }
         }
-
+        
         return bResult;
     }
 
@@ -794,7 +794,7 @@ public class Helper
                 StringReader aReader = new StringReader( sLoginPage );
                 HTMLEditorKit.Parser aParser = Helper.GetHTMLParser();
                 EditPageParser aCallbacks = new EditPageParser();
-
+                
                 aParser.parse( aReader, aCallbacks, true );
                 sResult = aCallbacks.m_sLoginToken;
             }
@@ -807,7 +807,7 @@ public class Helper
         return sResult;
     }
 
-    static protected HostConfiguration Login( URI aMainURL, String sWikiUser, String sWikiPass, XComponentContext xContext )
+    static protected HostConfiguration Login( URI aMainURL, String sWikiUser, String sWikiPass, XComponentContext xContext ) 
         throws com.sun.star.uno.Exception, java.io.IOException, WikiCancelException
     {
         HostConfiguration aHostConfig = null;
@@ -841,7 +841,7 @@ public class Helper
                 aPost.addParameter( "wpPassword", sWikiPass );
                 if ( sLoginToken.length() > 0 )
                     aPost.addParameter( "wpLoginToken", sLoginToken );
-
+                
                 String[][] pArgs = GetSpecialArgs( xContext, aMainURL.getHost() );
                 if ( pArgs != null )
                     for ( int nArgInd = 0; nArgInd < pArgs.length; nArgInd++ )
@@ -849,7 +849,7 @@ public class Helper
                             aPost.addParameter( pArgs[nArgInd][0], pArgs[nArgInd][1] );
 
                 ExecuteMethod( aPost, aNewHostConfig, aPostURI, xContext, false );
-
+                
                 nResultCode = aPost.getStatusCode();
 
                 while( nResultCode >= 301 && nResultCode <= 303 || nResultCode == 307 )
@@ -864,14 +864,14 @@ public class Helper
 
                     nResultCode = aPost.getStatusCode();
                 }
-
+                
                 if ( nResultCode == 200 )
                 {
                     String sResult = aPost.getResponseBodyAsString();
                     if ( !LoginReportsError( sResult ) )
                         aHostConfig = aNewHostConfig;
                 }
-
+                
                 aPost.releaseConnection();
             }
         }
@@ -883,7 +883,7 @@ public class Helper
     {
         XControl xResult = null;
         XControlContainer xControlCont = (XControlContainer) UnoRuntime.queryInterface( XControlContainer.class, xDialog );
-
+                
         if ( xControlCont != null )
         {
             Object oControl = xControlCont.getControl( aControlName );
@@ -898,7 +898,7 @@ public class Helper
         XControl xControl = GetControlFromDialog( xDialog, aControlName );
         if ( xControl != null )
             return ( XPropertySet ) UnoRuntime.queryInterface( XPropertySet.class, xControl.getModel() );
-
+        
         return null;
     }
 
@@ -916,7 +916,7 @@ public class Helper
             {
                 e.printStackTrace();
             }
-        }
+        } 
     }
 
     protected static String[] GetPasswordsForURLAndUser( XComponentContext xContext, String sURL, String sUserName )
@@ -966,7 +966,7 @@ public class Helper
             xPeer = xControl.getPeer();
         ShowError( xContext, xPeer, nTitleID, nErrorID, sArg, bQuery );
     }
-
+    
     protected static boolean ShowError( XComponentContext xContext, XWindowPeer xParentPeer, int nTitleID, int nErrorID, String sArg, boolean bQuery )
     {
         boolean bResult = false;
@@ -977,7 +977,7 @@ public class Helper
 
             String sError = null;
             String sTitle = "";
-
+            
             try
             {
                 sError = GetLocalizedString( xContext, nErrorID );
@@ -1005,7 +1005,7 @@ public class Helper
                         xMBFactory = (XMessageBoxFactory)UnoRuntime.queryInterface(
                                      XMessageBoxFactory.class,
                                      xFactory.createInstanceWithContext( "com.sun.star.awt.Toolkit", xContext ) );
-
+                    
                     if ( xMBFactory != null )
                     {
                         if ( bQuery )
@@ -1092,7 +1092,7 @@ public class Helper
                                 XNameAccess xArgument = (XNameAccess)UnoRuntime.queryInterface( XNameAccess.class, xArgs.getByName( pNames[nInd] ) );
                                 if ( xArgument == null )
                                     throw new com.sun.star.uno.RuntimeException();
-
+                                
                                 pResult[nInd][0] = pNames[nInd];
                                 pResult[nInd][1] = AnyConverter.toString( xArgument.getByName( "Value" ) );
                             }
@@ -1129,7 +1129,7 @@ public class Helper
                 e.printStackTrace();
             }
         }
-
+        
         return false;
     }
 
diff --git a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
index dbf849fa4ef0..ddc7602f9cf0 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
@@ -1,7 +1,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
@@ -50,7 +50,7 @@ public class MainThreadDialogExecutor implements XCallback
         MainThreadDialogExecutor aExecutor = new MainThreadDialogExecutor( aWikiDialog );
         return GetCallback( xContext, aExecutor );
     }
-
+ 
     static public boolean Execute( XComponentContext xContext, XDialog xDialog )
     {
         MainThreadDialogExecutor aExecutor = new MainThreadDialogExecutor( xDialog );
@@ -86,7 +86,7 @@ public class MainThreadDialogExecutor implements XCallback
                     XMultiComponentFactory xFactory = xContext.getServiceManager();
                     if ( xFactory == null )
                         throw new com.sun.star.uno.RuntimeException();
-
+                    
                     XRequestCallback xRequest = (XRequestCallback)UnoRuntime.queryInterface(
                         XRequestCallback.class,
                         xFactory.createInstanceWithContext( "com.sun.star.awt.AsyncCallback", xContext ) );
@@ -114,7 +114,7 @@ public class MainThreadDialogExecutor implements XCallback
 
         return aExecutor.GetResult();
     }
-
+    
     private MainThreadDialogExecutor( WikiDialog aWikiDialog )
     {
         m_aWikiDialog = aWikiDialog;
@@ -141,7 +141,7 @@ public class MainThreadDialogExecutor implements XCallback
     {
         return m_bResult;
     }
-
+    
     public void notify( Object aData )
     {
         if ( m_aWikiDialog != null )
@@ -155,7 +155,7 @@ public class MainThreadDialogExecutor implements XCallback
                 try
                 {
                     m_xDialog.endExecute();
-                }
+                } 
                 catch( Exception e )
                 {
                     e.printStackTrace();
@@ -166,10 +166,10 @@ public class MainThreadDialogExecutor implements XCallback
         else if ( m_xMessageBox != null )
         {
             int nRes = m_xMessageBox.execute();
-            m_bResult = ( nRes == com.sun.star.awt.MessageBoxCommand.OK
+            m_bResult = ( nRes == com.sun.star.awt.MessageBoxCommand.OK 
                           || nRes == com.sun.star.awt.MessageBoxCommand.YES );
         }
-
+        
         m_bCalled = true;
     }
 };
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Settings.java b/swext/mediawiki/src/com/sun/star/wiki/Settings.java
index d14c4eae4b52..b4ba8cd4fe44 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Settings.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Settings.java
@@ -1,7 +1,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
@@ -42,25 +42,25 @@ import java.util.Vector;
 
 public class Settings
 {
-
+    
     private XComponentContext m_xContext;
     private int lastUsedWikiServer = 0;
-
-
+    
+    
     /* Singelton */
     private static Settings m_instance;
-
-
+    
+    
     private Vector m_WikiConnections = new Vector();
     private Vector m_aWikiDocs = new Vector();
-
+    
     private Settings( XComponentContext ctx )
     {
         m_xContext=ctx;
         loadConfiguration();
     }
-
-
+    
+    
     public static synchronized Settings getSettings( XComponentContext ctx )
     {
         if ( m_instance == null )
@@ -68,19 +68,19 @@ public class Settings
         // m_instance.loadSettings();
         return m_instance;
     }
-
-
+    
+    
     public void addWikiCon ( Hashtable wikiCon )
     {
         m_WikiConnections.add( wikiCon );
     }
-
-
+    
+    
     public Vector getWikiCons()
     {
         return m_WikiConnections;
     }
-
+    
     public String getWikiConUrlByNumber( int num )
     {
         String url = "";
@@ -91,8 +91,8 @@ public class Settings
         }
         return url;
     }
-
-
+    
+    
     public void addWikiDoc ( Hashtable aWikiDoc )
     {
         String sURL = ( String ) aWikiDoc.get( "CompleteUrl" );
@@ -111,13 +111,13 @@ public class Settings
 
         m_aWikiDocs.add( aWikiDoc );
     }
-
-
+    
+    
     public Vector getWikiDocs()
     {
         return m_aWikiDocs;
     }
-
+    
     public Object[] getWikiDocList( int serverid, int num )
     {
         String wikiserverurl = getWikiConUrlByNumber( serverid );
@@ -134,17 +134,17 @@ public class Settings
         }
         return theDocs.toArray( docs );
     }
-
+    
     public int getLastUsedWikiServer()
     {
         return lastUsedWikiServer;
     }
-
+    
     public void setLastUsedWikiServer( int l )
     {
         lastUsedWikiServer = l;
     }
-
+    
     public String[] getWikiURLs()
     {
         String [] WikiList = new String [m_WikiConnections.size()];
@@ -155,8 +155,8 @@ public class Settings
         }
         return WikiList;
     }
-
-
+    
+    
     public Hashtable getSettingByUrl( String sUrl )
     {
         Hashtable ht = null;
@@ -188,7 +188,7 @@ public class Settings
         }
         return ht;
     }
-
+    
     public Hashtable getDocByCompleteUrl( String curl )
     {
         Hashtable ht = null;
@@ -203,8 +203,8 @@ public class Settings
         }
         return ht;
     }
-
-
+    
+    
     public void removeSettingByUrl( String sUrl )
     {
         Hashtable ht = null;
@@ -218,8 +218,8 @@ public class Settings
             }
         }
     }
-
-
+    
+    
     public void storeConfiguration()
     {
         try
@@ -228,10 +228,10 @@ public class Settings
             XNameContainer xContainer = Helper.GetConfigNameContainer( m_xContext, "org.openoffice.Office.Custom.WikiExtension/ConnectionList" );
             String[] pNames = xContainer.getElementNames();
             for( int i=0; i<pNames.length; i++ )
-            {
+            { 
                 xContainer.removeByName( pNames[i] );
             }
-
+            
             // store all connections
             XSingleServiceFactory xConnectionFactory = ( XSingleServiceFactory ) UnoRuntime.queryInterface( XSingleServiceFactory.class, xContainer );
             for ( int i=0; i< m_WikiConnections.size(); i++ )
@@ -239,21 +239,21 @@ public class Settings
                 Object oNewConnection = xConnectionFactory.createInstance();
                 Hashtable ht = ( Hashtable ) m_WikiConnections.get( i );
                 XNameReplace xNewConn = ( XNameReplace ) UnoRuntime.queryInterface( XNameReplace.class, oNewConnection );
-
+                
                 if ( xNewConn != null )
                     xNewConn.replaceByName( "UserName", ht.get( "Username" ) );
-
+ 
                 xContainer.insertByName( (String)ht.get( "Url" ), xNewConn );
             }
             // commit changes
             XChangesBatch xBatch = ( XChangesBatch ) UnoRuntime.queryInterface( XChangesBatch.class, xContainer );
             xBatch.commitChanges();
-
+            
             // remove stored connection information
             XNameContainer xContainer2 = Helper.GetConfigNameContainer( m_xContext, "org.openoffice.Office.Custom.WikiExtension/RecentDocs" );
             String[] pNames2 = xContainer2.getElementNames();
             for( int i=0; i<pNames2.length; i++ )
-            {
+            { 
                 xContainer2.removeByName( pNames2[i] );
             }
             // store all Docs
@@ -261,30 +261,30 @@ public class Settings
             for ( int i=0; i< m_aWikiDocs.size(); i++ )
             {
                 Hashtable ht = ( Hashtable ) m_aWikiDocs.get( i );
-
+                
                 Object oNewDoc = xDocListFactory.createInstance();
                 XNameReplace xNewDoc = ( XNameReplace ) UnoRuntime.queryInterface( XNameReplace.class, oNewDoc );
-
+                
                 Enumeration e = ht.keys();
                 while ( e.hasMoreElements() )
                 {
                     String key = ( String ) e.nextElement();
                     xNewDoc.replaceByName( key, ht.get( key ) );
                 }
-
+                
                 xContainer2.insertByName( "d" + i, xNewDoc );
             }
             // commit changes
             XChangesBatch xBatch2 = ( XChangesBatch ) UnoRuntime.queryInterface( XChangesBatch.class, xContainer2 );
             xBatch2.commitChanges();
-
+            
         }
         catch ( Exception ex )
         {
             ex.printStackTrace();
-        }
+        }   
     }
-
+    
     public void loadConfiguration()
     {
         m_WikiConnections.clear();
@@ -293,7 +293,7 @@ public class Settings
             // get configuration service
             // connect to configmanager
             XNameAccess xAccess = Helper.GetConfigNameAccess( m_xContext, "org.openoffice.Office.Custom.WikiExtension" );
-
+            
             if ( xAccess != null )
             {
                 Object oList = xAccess.getByName( "ConnectionList" );
@@ -320,7 +320,7 @@ public class Settings
                     {
                         e.printStackTrace();
                     }
-
+                    
                     addWikiCon( ht );
                 }
 
@@ -342,6 +342,6 @@ public class Settings
         catch ( Exception ex )
         {
             ex.printStackTrace();
-        }
+        } 
     }
 }
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java b/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java
index 89025ed84513..1859ca5fd21a 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java
@@ -1,7 +1,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
@@ -37,27 +37,27 @@ import org.apache.commons.httpclient.*;
 import org.apache.commons.httpclient.methods.*;
 
 
-public class WikiArticle
+public class WikiArticle 
 {
     private XComponentContext m_xContext;
-
+    
     private String m_sEditTime = "";
     private String m_sEditToken = "";
-
+    
     protected String m_sHTMLCode;
     private boolean m_bNoArticle = true;
-
+    
     protected String m_sWikiUser;
     protected String m_sWikiPass;
-
+    
     protected String m_sTitle = "";
-
+    
     private URI m_aMainURI;
     private HostConfiguration m_aHostConfig;
-
-
+    
+   
     /** Creates a new instance of WikiArticle */
-    public WikiArticle( XComponentContext xContext, String sTitle, Hashtable wikiSettings, boolean bLogin, WikiPropDialog aPropDialog )
+    public WikiArticle( XComponentContext xContext, String sTitle, Hashtable wikiSettings, boolean bLogin, WikiPropDialog aPropDialog ) 
         throws java.net.MalformedURLException, com.sun.star.uno.Exception, java.io.IOException, WikiCancelException
     {
         m_xContext = xContext;
@@ -66,7 +66,7 @@ public class WikiArticle
         m_sWikiUser = (String) wikiSettings.get("Username");
         m_sWikiPass = (String) wikiSettings.get("Password");
         m_sTitle = sTitle;
-
+        
         m_aMainURI = new URI( sMainUrl );
 
 //         viewURL = sMainUrl + "index.php?title=" + m_sTitle;
@@ -92,7 +92,7 @@ public class WikiArticle
                     }
                     else
                         throw new WikiCancelException();
-
+                    
                     if ( aPropDialog != null )
                     {
                         aPropDialog.SetThrobberActive( true );
@@ -110,29 +110,29 @@ public class WikiArticle
         // in case of saving the contents should be checked whether they are empty
         InitArticleHTML();
 
-        // getArticleWiki();
+        // getArticleWiki();                                
     }
 
     public String GetMainURL()
     {
         return m_aMainURI.toString();
     }
-
+    
     public String GetTitle()
     {
         return m_sTitle;
     }
-
+        
     public String GetViewURL()
     {
         return m_aMainURI.toString() + "index.php?title=" + m_sTitle;
     }
-
-    private String getArticleWiki()
+    
+    private String getArticleWiki() 
         throws com.sun.star.uno.Exception, java.io.IOException, WikiCancelException
     {
         String sWikiCode = null;
-
+        
         if ( m_aHostConfig != null )
         {
             URI aURI = new URI( m_aMainURI.toString() + "index.php?title=" + m_sTitle + "&action=edit" );
@@ -144,7 +144,7 @@ public class WikiArticle
             String sWebPage = null;
             if ( nResultCode == 200 )
                 sWebPage = aRequest.getResponseBodyAsString();
-
+ 
             aRequest.releaseConnection();
 
             if ( sWebPage != null )
@@ -152,14 +152,14 @@ public class WikiArticle
                 StringReader r = new StringReader(sWebPage);
                 HTMLEditorKit.Parser parse = Helper.GetHTMLParser();
                 EditPageParser callback = new EditPageParser();
-
+                
                 parse.parse(r,callback,true);
                 m_sEditTime = callback.m_sEditTime;
                 m_sEditToken = callback.m_sEditToken;
-
+                    
                 int iPosStart = callback.m_nWikiArticleStart;
                 int iPosEnd = callback.m_nWikiArticleEnd;
-
+                
                 if ( iPosStart >= 0 && iPosEnd > 0 )
                 {
                     String sArticle = sWebPage.substring(iPosStart, iPosEnd);
@@ -168,11 +168,11 @@ public class WikiArticle
                 }
             }
         }
-
+        
         return sWikiCode;
     }
-
-    private void InitArticleHTML()
+    
+    private void InitArticleHTML() 
         throws com.sun.star.uno.Exception, java.io.IOException, WikiCancelException
     {
         if ( m_aHostConfig != null )
@@ -186,19 +186,19 @@ public class WikiArticle
             String sWebPage = null;
             if ( nResultCode == 200 )
                 sWebPage = aRequest.getResponseBodyAsString();
-
+            
             if ( sWebPage != null )
             {
                 StringReader r = new StringReader(sWebPage);
                 HTMLEditorKit.Parser parse = Helper.GetHTMLParser();
                 EditPageParser callback = new EditPageParser();
-
+                
                 parse.parse(r,callback,true);
-
+                    
                 int iPosStart = callback.m_nHTMLArticleStart;
                 int iPosEnd = callback.m_nHTMLArticleEnd;
                 int nPosNoArt = callback.m_nNoArticleInd;
-
+                
                 if ( iPosStart >= 0 && iPosEnd > 0 )
                 {
                     m_sHTMLCode = sWebPage.substring(iPosStart, iPosEnd);
@@ -207,8 +207,8 @@ public class WikiArticle
             }
         }
     }
-
-    protected boolean setArticle( String sWikiCode, String sWikiComment, boolean bMinorEdit )
+    
+    protected boolean setArticle( String sWikiCode, String sWikiComment, boolean bMinorEdit ) 
         throws com.sun.star.uno.Exception, java.io.IOException, WikiCancelException
     {
         boolean bResult = false;
@@ -231,7 +231,7 @@ public class WikiArticle
             aPost.addParameter( "wpSave", "Save page" );
             aPost.addParameter( "wpEditToken", m_sEditToken );
 
-            if ( bMinorEdit )
+            if ( bMinorEdit ) 
                 aPost.addParameter( "wpMinoredit", "1" );
 
             Helper.ExecuteMethod( aPost, m_aHostConfig, aURI, m_xContext, false );
@@ -248,47 +248,47 @@ public class WikiArticle
 
         return bResult;
     }
-
-    protected boolean Login()
+    
+    protected boolean Login() 
         throws com.sun.star.uno.Exception, java.io.IOException, WikiCancelException
     {
         m_aHostConfig = Helper.Login( m_aMainURI, m_sWikiUser, m_sWikiPass, m_xContext );
         return ( m_aHostConfig != null );
     }
-
-    protected void cleanHTML()
+    
+    protected void cleanHTML() 
     {
         if ( m_sHTMLCode != null )
         {
             //Welcome to regex hell ;)
-
+            
             //strip comments
             m_sHTMLCode = m_sHTMLCode.replaceAll("\\<![ \\r\\n\\t]*(--([^\\-]|[\\r\\n]|-[^\\-])*--[ \\r\\n\\t]*)\\>","");
-
+            
             //strip edit section links
             m_sHTMLCode = m_sHTMLCode.replaceAll("\\<div class=\"editsection\".*?\\</div\\>","");
-
+            
             //strip huge spaces
             m_sHTMLCode = m_sHTMLCode.replaceAll("\\<p\\>\\<br /\\>[ \r\n\t]*?\\</p\\>","");
-
+            
             //strip toc
             m_sHTMLCode = m_sHTMLCode.replaceAll("\\<table.*id=\"toc\"(.|[\r\n])*?\\</table\\>","");
 
             //strip jump-to-nav
             m_sHTMLCode = m_sHTMLCode.replaceAll("\\<div id=\"jump-to-nav\".*?\\</div\\>","");
-
+            
             //strip Javascript
             m_sHTMLCode = m_sHTMLCode.replaceAll("\\<script(.|[\r\n])*?\\</script\\>","");
         }
     }
-
-
+    
+    
     protected boolean NotExist()
     {
         boolean bResult = true;
         if ( m_sHTMLCode != null )
             bResult = m_bNoArticle;
-
+        
         return bResult;
     }
 
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java b/swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java
index 73369c997727..b76e004b65c8 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiCancelException.java
@@ -1,7 +1,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
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
index e91f053169e7..cd01675bae45 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
@@ -1,7 +1,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
@@ -46,14 +46,14 @@ import com.sun.star.lang.EventObject;
 import com.sun.star.lang.XMultiServiceFactory;
 
 public class WikiDialog implements XDialogEventHandler, XTopWindowListener
-{
+{    
     XComponentContext m_xContext;
     XControlContainer m_xControlContainer;
     XDialog m_xDialog;
     String[] m_aMethods;
     boolean m_bAction = false;
     Settings m_aSettings;
-
+    
     protected Thread m_aThread;
     protected boolean m_bThreadFinished = false;
 
@@ -69,7 +69,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
             Object obj;
             obj = xMCF.createInstanceWithContext("com.sun.star.awt.DialogProvider2", m_xContext );
             XDialogProvider2 xDialogProvider = (XDialogProvider2) UnoRuntime.queryInterface( XDialogProvider2.class, obj );
-
+            
             m_xDialog = xDialogProvider.createDialogWithHandler( DialogURL, this );
             m_xControlContainer = (XControlContainer)UnoRuntime.queryInterface( XControlContainer.class, m_xDialog );
             XTopWindow xTopWindow = (XTopWindow)UnoRuntime.queryInterface( XTopWindow.class, m_xDialog );
@@ -81,7 +81,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
             ex.printStackTrace();
         }
     }
-
+    
     public synchronized void ThreadStop( boolean bSelf )
     {
         if ( bSelf || m_aThread != null && !m_bThreadFinished )
@@ -100,38 +100,38 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
         m_bThreadFinished = true;
     }
 
-    protected void setMethods (String [] Methods)
+    protected void setMethods (String [] Methods) 
     {
         this.m_aMethods = Methods;
     }
-
-
-    public boolean show( )
+    
+    
+    public boolean show( ) 
     {
         m_bThreadFinished = false;
 
         if( m_xDialog != null ) m_xDialog.execute();
         return m_bAction;
     }
-
-
-    public String[] getSupportedMethodNames()
+    
+    
+    public String[] getSupportedMethodNames() 
     {
         return m_aMethods;
     }
-
-
+    
+    
     public boolean callHandlerMethod( XDialog xDialog, Object EventObject, String MethodName )
     {
         return true;
     }
-
+ 
     public void SetTitle( String sTitle )
         throws Exception
     {
         SetTitle( m_xDialog, sTitle );
     }
-
+    
     public static void SetTitle( XDialog xDialog, String sTitle )
         throws Exception
     {
@@ -146,7 +146,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
             }
         }
     }
-
+    
     protected XPropertySet GetPropSet(String sControl)
     {
         return GetPropSet( m_xControlContainer, sControl );
@@ -164,7 +164,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
 
         if ( xPS == null )
             throw new com.sun.star.uno.RuntimeException();
-
+        
         return xPS;
     }
 
@@ -178,7 +178,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
             {
                 Object oDialogProvider = xContext.getServiceManager().createInstanceWithContext("com.sun.star.awt.DialogProvider2", xContext );
                 XDialogProvider2 xDialogProvider = (XDialogProvider2) UnoRuntime.queryInterface( XDialogProvider2.class, oDialogProvider );
-
+                
                 if ( xDialogProvider != null )
                     xResult = xDialogProvider.createDialog( sURL );
 
@@ -197,11 +197,11 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
             {
                 ex.printStackTrace();
             }
-        }
+        } 
 
         return xResult;
     }
-
+ 
     protected void InsertThrobber( int X, int Y, int Width, int Height )
     {
         try
@@ -218,7 +218,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
                 XPropertySet xThrobberProps = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class, xThrobberModel );
                 if ( xThrobberProps != null )
                 {
-                    xThrobberProps.setPropertyValue( "Name", "WikiThrobber" );
+                    xThrobberProps.setPropertyValue( "Name", "WikiThrobber" ); 
                     xThrobberProps.setPropertyValue( "PositionX", new Integer( X ) );
                     xThrobberProps.setPropertyValue( "PositionY", new Integer( Y ) );
                     xThrobberProps.setPropertyValue( "Height", new Integer( Width ) );
@@ -264,7 +264,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
         if ( m_xControlContainer != null )
         {
             try
-            {
+            {        
                 XWindow xWindow = (XWindow)UnoRuntime.queryInterface( XWindow.class, m_xControlContainer.getControl( "WikiThrobber" ) );
                 if ( xWindow != null )
                     xWindow.setVisible( bVisible );
@@ -273,7 +273,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
             {
                 e.printStackTrace();
             }
-        }
+        }       
     }
 
     public void SetFocusTo( String aControl )
@@ -281,7 +281,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
         if ( m_xControlContainer != null )
         {
             try
-            {
+            {        
                 XWindow xWindow = (XWindow)UnoRuntime.queryInterface( XWindow.class, m_xControlContainer.getControl( aControl ) );
                 if ( xWindow != null )
                     xWindow.setFocus();
@@ -290,14 +290,14 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
             {
                 e.printStackTrace();
             }
-        }
+        }       
     }
 
     public void DisposeDialog()
     {
         Helper.Dispose( m_xDialog );
     }
-
+    
     public void windowOpened( EventObject e )
     {}
 
@@ -318,7 +318,7 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener
 
     public void windowDeactivated( EventObject e )
     {}
-
+    
     public void disposing( EventObject e )
     {}
 }
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
index 721b432779a1..44a75dc5ee13 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
@@ -1,7 +1,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,18 +40,18 @@ import javax.net.ssl.SSLException;
 import org.apache.commons.httpclient.*;
 import org.apache.commons.httpclient.methods.*;
 
-public class WikiEditSettingDialog extends WikiDialog
+public class WikiEditSettingDialog extends WikiDialog 
 {
-
+    
     private final String sOKMethod = "OK";
 
-    String[] Methods =
+    String[] Methods = 
     {sOKMethod };
     private Hashtable setting;
     private boolean addMode;
     private boolean m_bAllowURLChange = true;
 
-    public WikiEditSettingDialog( XComponentContext xContext, String DialogURL )
+    public WikiEditSettingDialog( XComponentContext xContext, String DialogURL ) 
     {
         super( xContext, DialogURL );
         super.setMethods( Methods );
@@ -60,21 +60,21 @@ public class WikiEditSettingDialog extends WikiDialog
 
         InsertThrobber( 184, 20, 10, 10 );
         InitStrings( xContext );
-        InitSaveCheckbox( xContext, false );
+        InitSaveCheckbox( xContext, false );        
     }
-
-    public WikiEditSettingDialog( XComponentContext xContext, String DialogURL, Hashtable ht, boolean bAllowURLChange )
+    
+    public WikiEditSettingDialog( XComponentContext xContext, String DialogURL, Hashtable ht, boolean bAllowURLChange ) 
     {
         super( xContext, DialogURL );
         super.setMethods( Methods );
         setting = ht;
-
+        
         boolean bInitSaveCheckBox = false;
-
-        try
+        
+        try 
         {
             XPropertySet xUrlField = GetPropSet( "UrlField" );
-
+            
             xUrlField.setPropertyValue( "Text", ht.get( "Url" ) );
 
             GetPropSet( "UsernameField" ).setPropertyValue( "Text", ht.get( "Username" ) );
@@ -88,20 +88,20 @@ public class WikiEditSettingDialog extends WikiDialog
             // the password should be entered by the user or the Cancel should be pressed
             // GetPropSet( "PasswordField" ).setPropertyValue( "Text", ht.get( "Password" ));
         }
-        catch ( Exception ex )
+        catch ( Exception ex ) 
         {
             ex.printStackTrace();
-        }
+        } 
 
-        addMode = false;
+        addMode = false;        
         m_bAllowURLChange = bAllowURLChange;
-
+ 
         InsertThrobber( 184, 20, 10, 10 );
         InitStrings( xContext );
         InitSaveCheckbox( xContext, bInitSaveCheckBox );
     }
 
-    public boolean show( )
+    public boolean show( ) 
     {
         SetThrobberVisible( false );
         EnableControls( true );
@@ -127,7 +127,7 @@ public class WikiEditSettingDialog extends WikiDialog
         {
             e.printStackTrace();
         }
-
+        
         return bResult;
     }
 
@@ -136,7 +136,7 @@ public class WikiEditSettingDialog extends WikiDialog
         if ( !bEnable )
             SetFocusTo( "CancelButton" );
 
-        try
+        try 
         {
             GetPropSet( "UsernameField" ).setPropertyValue( "Enabled", new Boolean( bEnable ) );
             GetPropSet( "PasswordField" ).setPropertyValue( "Enabled", new Boolean( bEnable ) );
@@ -158,10 +158,10 @@ public class WikiEditSettingDialog extends WikiDialog
                 GetPropSet( "SaveBox" ).setPropertyValue( "Enabled", Boolean.FALSE );
             }
         }
-        catch ( Exception ex )
+        catch ( Exception ex ) 
         {
             ex.printStackTrace();
-        }
+        }         
     }
 
     private void InitStrings( XComponentContext xContext )
@@ -194,9 +194,9 @@ public class WikiEditSettingDialog extends WikiDialog
         catch( Exception e )
         {
             e.printStackTrace();
-        }
+        }        
     }
-
+ 
     public void DoLogin( XDialog xDialog )
     {
         String sRedirectURL = "";
@@ -235,12 +235,12 @@ public class WikiEditSettingDialog extends WikiDialog
                         sRedirectURL = aRequest.getResponseHeader( "Location" ).getValue();
 
                     aRequest.releaseConnection();
-
+                    
                     if ( sWebPage != null && sWebPage.length() > 0 )
                     {
                         //the URL is valid
                         String sMainURL = Helper.GetMainURL( sWebPage, sURL );
-
+                        
                         if ( sMainURL.equals( "" ) )
                         {
                             // TODO:
@@ -285,7 +285,7 @@ public class WikiEditSettingDialog extends WikiDialog
                                     Settings.getSettings( m_xContext ).addWikiCon( setting );
                                     Settings.getSettings( m_xContext ).storeConfiguration();
                                 }
-
+                                
                                 m_bAction = true;
                             }
                         }
@@ -341,7 +341,7 @@ public class WikiEditSettingDialog extends WikiDialog
             }
             essl.printStackTrace();
         }
-        catch ( Exception ex )
+        catch ( Exception ex ) 
         {
             if ( Helper.IsConnectionAllowed() )
             {
@@ -353,9 +353,9 @@ public class WikiEditSettingDialog extends WikiDialog
                                   false );
             }
             ex.printStackTrace();
-        }
+        } 
     }
-
+    
     public boolean callHandlerMethod( XDialog xDialog, Object EventObject, String MethodName )
     {
         if ( MethodName.equals( sOKMethod ) )
@@ -369,7 +369,7 @@ public class WikiEditSettingDialog extends WikiDialog
                 final XDialog xDialogForThread = xDialog;
                 final XComponentContext xContext = m_xContext;
                 final WikiEditSettingDialog aThis = this;
-
+                
                 // the thread name is used to allow the error dialogs
                 m_bThreadFinished = false;
                 m_aThread = new Thread( "com.sun.star.thread.WikiEditorSendingThread" )
@@ -387,7 +387,7 @@ public class WikiEditSettingDialog extends WikiDialog
                         aThis.SetThrobberVisible( false );
 
                         ThreadStop( true );
-
+                        
                         if ( m_bAction )
                             MainThreadDialogExecutor.Close( xContext, xDialogForThread );
                     }
@@ -420,7 +420,7 @@ public class WikiEditSettingDialog extends WikiDialog
 
         return false;
     }
-
+    
     public void windowClosed( EventObject e )
     {
         ThreadStop( false );
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
index 0350e07fe8b6..e670e3ff4722 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
@@ -1,7 +1,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
@@ -65,23 +65,23 @@ import javax.net.ssl.SSLException;
 public final class WikiEditorImpl extends WeakBase
    implements com.sun.star.lang.XServiceInfo, XDispatchProvider, XDispatch, XInitialization
 {
-
+    
     private final XComponentContext m_xContext;
     private static final String m_implementationName = WikiEditorImpl.class.getName();
     private static final String[] m_serviceNames = {"com.sun.star.wiki.WikiEditor" };
-
-    // information needed for component registration
+    
+    // information needed for component registration 
     public static final String[] supportedServiceNames = {"com.sun.star.frame.ProtocolHandler"};
-    public static final Class implementationClass = WikiEditorImpl.class;
+    public static final Class implementationClass = WikiEditorImpl.class;    
     // protocol name that this protocol handler handles
     public static final String protocolName = "vnd.com.sun.star.wiki:";
 
     private Map m_statusListeners = new HashMap();
 
-
+    
     private XComponent xComp;
     private String sTempUrl;
-
+    
     private XFrame m_xFrame;
     private XModel m_xModel;
     private Settings m_aSettings;
@@ -95,7 +95,7 @@ public final class WikiEditorImpl extends WeakBase
         m_aSettings = Settings.getSettings( m_xContext );
     };
 
-    public static XSingleComponentFactory __getComponentFactory( String sImplementationName )
+    public static XSingleComponentFactory __getComponentFactory( String sImplementationName ) 
     {
         XSingleComponentFactory xFactory = null;
 
@@ -104,11 +104,11 @@ public final class WikiEditorImpl extends WeakBase
         else if ( sImplementationName.equals( WikiOptionsEventHandlerImpl.m_sImplementationName ) )
             xFactory = Factory.createComponentFactory( WikiOptionsEventHandlerImpl.class,
                                                        WikiOptionsEventHandlerImpl.m_pServiceNames );
-
+            
         return xFactory;
     }
 
-    public static boolean __writeRegistryServiceInfo( XRegistryKey xRegistryKey )
+    public static boolean __writeRegistryServiceInfo( XRegistryKey xRegistryKey ) 
     {
         boolean bResult = Factory.writeRegistryServiceInfo( m_implementationName,
                                                             m_serviceNames,
@@ -119,16 +119,16 @@ public final class WikiEditorImpl extends WeakBase
     }
 
     // com.sun.star.lang.XServiceInfo:
-    public String getImplementationName()
+    public String getImplementationName() 
     {
          return m_implementationName;
     }
 
-    public boolean supportsService( String sService )
+    public boolean supportsService( String sService ) 
     {
         int len = m_serviceNames.length;
 
-        for( int i=0; i < len; i++ )
+        for( int i=0; i < len; i++ ) 
         {
             if ( sService.equals( m_serviceNames[i] ))
                 return true;
@@ -136,22 +136,22 @@ public final class WikiEditorImpl extends WeakBase
         return false;
     }
 
-    public String[] getSupportedServiceNames()
+    public String[] getSupportedServiceNames() 
     {
         return m_serviceNames;
     }
 
-
+    
     private XSelectionSupplier m_sel;
     private XController m_ctrl;
     private boolean m_bInitialized;
-    public synchronized void initialize( Object[] args ) throws com.sun.star.uno.Exception
-    {
-        if ( m_bInitialized )
+    public synchronized void initialize( Object[] args ) throws com.sun.star.uno.Exception 
+    {        
+        if ( m_bInitialized ) 
         {
             //logger.log( Level.SEVERE, "Extension instance was initialized again" );
         }
-        if ( args.length > 0 )
+        if ( args.length > 0 ) 
         {
             m_bInitialized = true;
             m_xFrame = ( XFrame )UnoRuntime.queryInterface( XFrame.class, args[0] );
@@ -161,49 +161,49 @@ public final class WikiEditorImpl extends WeakBase
         }
     }
 
-
-
+    
+    
     public void dispatch(
-        final com.sun.star.util.URL aURL,
-        com.sun.star.beans.PropertyValue[] propertyValue )
+        final com.sun.star.util.URL aURL, 
+        com.sun.star.beans.PropertyValue[] propertyValue ) 
     {
         final com.sun.star.util.URL myURL = aURL;
         //logger.log( Level.INFO, "received dispatch request for: "+aURL.Complete );
-        if ( aURL.Protocol.compareTo( protocolName ) == 0 )
+        if ( aURL.Protocol.compareTo( protocolName ) == 0 ) 
         {
             /*
-            synchronized( this )
+            synchronized( this ) 
             {
                 if( m_bClosing ) return;
                 else m_bActive = true;
             }
              **/
-
-            try
+            
+            try 
             {
-                if ( myURL.Path.compareTo( "send" ) == 0 )
+                if ( myURL.Path.compareTo( "send" ) == 0 ) 
                 {
                     sendArticle();
                 }
-            } catch( java.lang.Throwable t )
+            } catch( java.lang.Throwable t ) 
             {
                 //logger.log( Level.WARNING, "exception while handeling dispatch", t );
             }
 
             /*
-            synchronized( this )
+            synchronized( this ) 
             {
                 m_bActive = false;
                 // if we became owner while we were active
                 // we are responsible for closing the m_xFrame now
                 if ( m_bOwner && m_xFrame != null )
                 {
-                    try
+                    try 
                     {
                         XCloseable xclose = ( XCloseable )UnoRuntime.queryInterface(
                             XCloseable.class, m_xFrame );
                         xclose.close( true );
-                    } catch ( CloseVetoException cve )
+                    } catch ( CloseVetoException cve ) 
                     {
                         logger.log( Level.SEVERE, "cannot close owned frame" );
                     }
@@ -212,50 +212,50 @@ public final class WikiEditorImpl extends WeakBase
                 }
             }
              */
-        }
+        }        
     }
 
-
+    
     public com.sun.star.frame.XDispatch queryDispatch(
-        com.sun.star.util.URL aURL,
-        String str,
-        int param )
+        com.sun.star.util.URL aURL, 
+        String str, 
+        int param ) 
     {
-            if ( aURL.Protocol.equals( protocolName ))
+            if ( aURL.Protocol.equals( protocolName )) 
             {
 
                 // by default, we are responsible
                 return this;
-            } else
+            } else 
             {
                 return null;
             }
     }
-
-    public XDispatch[] queryDispatches( DispatchDescriptor[] seqDescripts )
+    
+    public XDispatch[] queryDispatches( DispatchDescriptor[] seqDescripts ) 
     {
         int nCount = seqDescripts.length;
         XDispatch[] lDispatcher = new XDispatch[nCount];
 
         for( int i=0; i<nCount; ++i )
-            lDispatcher[i] = queryDispatch(
+            lDispatcher[i] = queryDispatch( 
                 seqDescripts[i].FeatureURL,
                 seqDescripts[i].FrameName,
                 seqDescripts[i].SearchFlags );
         return lDispatcher;
-   }
+   }        
 
 
     public void removeStatusListener(
-        com.sun.star.frame.XStatusListener xStatusListener,
-        com.sun.star.util.URL aURL )
+        com.sun.star.frame.XStatusListener xStatusListener, 
+        com.sun.star.util.URL aURL ) 
     {
     }
 
-
+    
     public void addStatusListener(
-        com.sun.star.frame.XStatusListener listener,
-        com.sun.star.util.URL url )
+        com.sun.star.frame.XStatusListener listener, 
+        com.sun.star.util.URL url ) 
     {
         String urlstring = url.Complete;
         m_statusListeners.put( urlstring, listener );
@@ -263,41 +263,41 @@ public final class WikiEditorImpl extends WeakBase
         callStatusListener( urlstring, listener );
     }
 
-    public void callStatusListeners()
+    public void callStatusListeners() 
     {
         Set entries = m_statusListeners.entrySet();
         Iterator iter = entries.iterator();
-        while ( iter.hasNext() )
+        while ( iter.hasNext() ) 
         {
             Map.Entry entry = ( Map.Entry ) iter.next();
             String uristring = ( String ) entry.getKey();
-            XStatusListener listener = ( XStatusListener ) entry.getValue();
-            callStatusListener( uristring, listener );
-        }
+            XStatusListener listener = ( XStatusListener ) entry.getValue();                                    
+            callStatusListener( uristring, listener ); 
+        }          
     }
-
-    public void callStatusListener( String uristring, XStatusListener listener )
+    
+    public void callStatusListener( String uristring, XStatusListener listener ) 
     {
-        try
+        try 
         {
-
+        
             URI uri = new URI( uristring );
 
             // check whether any blogs are live...
             setListenerState( listener, "command", false );
-        } catch ( URISyntaxException ex )
+        } catch ( URISyntaxException ex ) 
         {
             ex.printStackTrace();
         }
     }
 
-
-    private void setListenerState( XStatusListener listener, String urlstring, boolean state )
+        
+    private void setListenerState( XStatusListener listener, String urlstring, boolean state ) 
     {
         com.sun.star.util.URL url = new com.sun.star.util.URL();
         url.Complete = urlstring;
-        //listener.statusChanged( new FeatureStateEvent( this, url, "", state, false, null ));
-
+        //listener.statusChanged( new FeatureStateEvent( this, url, "", state, false, null ));       
+        
     }
 
     public void sendArticle()
@@ -305,7 +305,7 @@ public final class WikiEditorImpl extends WeakBase
         if ( m_xFrame != null )
         {
             WikiPropDialog aSendDialog = null;
-            try
+            try 
             {
                 if ( m_xModel == null )
                 {
@@ -318,8 +318,8 @@ public final class WikiEditorImpl extends WeakBase
                 {
                     // The related Wiki filter must be detected from the typename
                     String aServiceName = Helper.GetDocServiceName( m_xContext, m_xModel );
-                    m_aFilterName = Helper.GetFilterName( m_xContext, "MediaWiki", aServiceName );
-
+                    m_aFilterName = Helper.GetFilterName( m_xContext, "MediaWiki", aServiceName );                 
+                            
                     if ( m_aFilterName == null || m_aFilterName.length() == 0 )
                     {
                         Helper.ShowError( m_xContext,
@@ -351,7 +351,7 @@ public final class WikiEditorImpl extends WeakBase
             }
         }
     }
-
+    
     public boolean SendArticleImpl( WikiPropDialog aSendDialog, Hashtable aWikiSetting )
     {
         boolean bResult = false;
@@ -364,7 +364,7 @@ public final class WikiEditorImpl extends WeakBase
             {
                 // TODO: stop progress spinning
                 WikiArticle aArticle = new WikiArticle( m_xContext, aSendDialog.GetWikiTitle(), aWikiSetting, true, aSendDialog );
-
+                
                 boolean bAllowSending = true;
                 if ( !aArticle.NotExist() )
                 {
@@ -410,7 +410,7 @@ public final class WikiEditorImpl extends WeakBase
                         aDocInfo.put( "Url", aArticle.GetMainURL() );
                         aDocInfo.put( "CompleteUrl", aArticle.GetMainURL() + aArticle.GetTitle() );
                         m_aSettings.addWikiDoc( aDocInfo );
-                        m_aSettings.storeConfiguration();
+                        m_aSettings.storeConfiguration();    
                     }
                     else
                     {
@@ -469,8 +469,8 @@ public final class WikiEditorImpl extends WeakBase
                 }
             }
         }
-
+        
         return bResult;
     }
-
+    
 }
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
index 8b635d85c316..98fcb0ceb8d9 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java
@@ -1,7 +1,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
@@ -63,7 +63,7 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
     private XControlContainer m_xControlContainer;
 
     Settings m_aSettings;
-
+    
     public WikiOptionsEventHandlerImpl( XComponentContext xContext )
     {
         m_xContext = xContext;
@@ -96,7 +96,7 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
                 catch ( Exception ex )
                 {
                     ex.printStackTrace();
-                }
+                } 
             }
         }
     }
@@ -166,7 +166,7 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
         XPropertySet xListProps = GetPropSet("WikiList");
         if ( xListProps != null )
         {
-            try
+            try 
             {
                 short[] pSel = (short []) xListProps.getPropertyValue("SelectedItems");
                 String[] pItems = (String []) GetPropSet("WikiList").getPropertyValue("StringItemList");
@@ -200,16 +200,16 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
     }
 
     // com.sun.star.lang.XServiceInfo:
-    public String getImplementationName()
+    public String getImplementationName() 
     {
          return m_sImplementationName;
     }
 
-    public boolean supportsService( String sService )
+    public boolean supportsService( String sService ) 
     {
         int len = m_pServiceNames.length;
 
-        for( int i=0; i < len; i++ )
+        for( int i=0; i < len; i++ ) 
         {
             if ( sService.equals( m_pServiceNames[i] ))
                 return true;
@@ -217,7 +217,7 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
         return false;
     }
 
-    public String[] getSupportedServiceNames()
+    public String[] getSupportedServiceNames() 
     {
         return m_pServiceNames;
     }
@@ -246,12 +246,12 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
                             m_xControlContainer = (XControlContainer)UnoRuntime.queryInterface(
                                                             XControlContainer.class, m_xDialog );
                             m_aSettings = Settings.getSettings( m_xContext );
-                            m_aSettings.loadConfiguration(); // throw away all the noncommited changes
+                            m_aSettings.loadConfiguration(); // throw away all the noncommited changes 
                             InitStrings();
                         }
                         else if ( m_aSettings != null )
                             m_aSettings.loadConfiguration(); // throw away all the noncommited changes
-
+                            
                         RefreshView();
                         CheckButtonState();
                     }
@@ -283,7 +283,7 @@ public final class WikiOptionsEventHandlerImpl extends WeakBase
         {
             CheckButtonState();
         }
-
+        
         return true;
     }
 
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
index 317f35a3170b..0afad6af2c2c 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
@@ -1,7 +1,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
@@ -44,21 +44,21 @@ import com.sun.star.uno.XComponentContext;
 import java.util.Hashtable;
 
 public class WikiPropDialog extends WikiDialog{
-
+ 
     WikiEditorImpl m_aWikiEditor;
 
     private final String sSendMethod = "Send";
     private final String sWikiListMethod = "WikiListChange";
     private final String sArticleTextMethod = "ArticleTextChange";
     private final String sAddWikiMethod = "AddWiki";
-
+    
     String[] m_pMethods = {sSendMethod, sWikiListMethod, sArticleTextMethod, sAddWikiMethod};
-
+    
     private String m_sWikiTitle = "";
     protected String m_sWikiEngineURL = "";
     protected String m_sWikiComment = "";
     protected boolean m_bWikiMinorEdit = false;
-
+ 
     /** Creates a new instance of WikiPropDialog */
     public WikiPropDialog(XComponentContext xContext, String DialogURL, WikiEditorImpl aWikiEditorForThrobber )
     {
@@ -87,7 +87,7 @@ public class WikiPropDialog extends WikiDialog{
             e.printStackTrace();
         }
     }
-
+    
     private void InitStrings( XComponentContext xContext )
     {
         try
@@ -107,7 +107,7 @@ public class WikiPropDialog extends WikiDialog{
             e.printStackTrace();
         }
     }
-
+     
     private void InitShowBrowser( XComponentContext xContext )
     {
         try
@@ -126,7 +126,7 @@ public class WikiPropDialog extends WikiDialog{
         boolean bResult = super.show();
 
         if ( bResult && Helper.GetShowInBrowserByDefault( m_xContext ) )
-           Helper.ShowURLInBrowser( m_xContext, m_sWikiEngineURL + "index.php?title=" + m_sWikiTitle );
+           Helper.ShowURLInBrowser( m_xContext, m_sWikiEngineURL + "index.php?title=" + m_sWikiTitle ); 
 
         return bResult;
     }
@@ -149,7 +149,7 @@ public class WikiPropDialog extends WikiDialog{
     public void fillWikiList()
     {
         String [] WikiList = m_aSettings.getWikiURLs();
-
+        
         try
         {
             XPropertySet xPS = GetPropSet("WikiList");
@@ -161,9 +161,9 @@ public class WikiPropDialog extends WikiDialog{
         catch (Exception ex)
         {
             ex.printStackTrace();
-        }
+        } 
     }
-
+    
     public void fillDocList()
     {
         XPropertySet xPS = GetPropSet("ArticleText");
@@ -177,8 +177,8 @@ public class WikiPropDialog extends WikiDialog{
             ex.printStackTrace();
         }
     }
-
-
+    
+    
     public String GetWikiTitle()
     {
         return m_sWikiTitle;
@@ -195,9 +195,9 @@ public class WikiPropDialog extends WikiDialog{
         catch (Exception ex)
         {
             ex.printStackTrace();
-        }
+        } 
     }
-
+    
 
     public void switchSendButtonIfNecessary()
     {
@@ -256,7 +256,7 @@ public class WikiPropDialog extends WikiDialog{
             ex.printStackTrace();
         }
     }
-
+    
     public boolean callHandlerMethod( XDialog xDialog, Object EventObject, String MethodName )
     {
         if ( MethodName.equals( sSendMethod ) )
@@ -279,9 +279,9 @@ public class WikiPropDialog extends WikiDialog{
                 short minorState = ((Short) aMinorCheckProps.getPropertyValue("State")).shortValue();
                 if (minorState != 0)
                     m_bWikiMinorEdit = true;
-                else
+                else 
                     m_bWikiMinorEdit = false;
-
+                
                 short nBrowserState = ((Short) aBrowserCheckProps.getPropertyValue("State")).shortValue();
                 Helper.SetShowInBrowserByDefault( m_xContext, nBrowserState != 0 );
 
@@ -300,7 +300,7 @@ public class WikiPropDialog extends WikiDialog{
             // start spinning
             SetThrobberVisible( true );
             SetThrobberActive( true );
-
+            
             // the following method might show a dialog, should be used in main thread
             final Hashtable aWikiSettings = m_aSettings.getSettingByUrl( m_sWikiEngineURL );
             if ( Helper.AllowThreadUsage( m_xContext ) )
@@ -352,7 +352,7 @@ public class WikiPropDialog extends WikiDialog{
                         xDialogToClose.endExecute();
                 }
             }
-
+                       
             return true;
         }
         else if ( MethodName.equals( sWikiListMethod ) )
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java b/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
index 653eaca8466a..bba7d08cc08e 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
@@ -1,7 +1,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
@@ -61,7 +61,7 @@ class WikiProtocolSocketFactory implements SecureProtocolSocketFactory
             {
                 new X509TrustManager() {
                     private X509TrustManager m_aOrgTrustManager;
-
+                
                     private X509TrustManager GetOrgTrustManager()
                     {
                         if ( m_aOrgTrustManager == null )
@@ -79,20 +79,20 @@ class WikiProtocolSocketFactory implements SecureProtocolSocketFactory
                                 throw new RuntimeException( "No access to the default trust manager!" );
                             }
                         }
-
+                        
                         return m_aOrgTrustManager;
                     }
-
+                    
                     public X509Certificate[] getAcceptedIssuers()
                     {
                         return GetOrgTrustManager().getAcceptedIssuers();
                     }
-
+                    
                     public void checkClientTrusted(X509Certificate[] certs, String authType) throws CertificateException
                     {
                         GetOrgTrustManager().checkClientTrusted( certs, authType );
                     }
-
+                    
                     public void checkServerTrusted(X509Certificate[] certs, String authType) throws CertificateException
                     {
                         if ( certs == null || certs.length == 0 )
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu
index b8e96e1f1139..49f57cd1fa60 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu
@@ -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
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
index 8dbde907af37..bf89395cd064 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
@@ -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
@@ -38,14 +38,14 @@
                     </prop>
                 </node>
             </node>
-        </node>
-    </node>
+        </node>   
+    </node>   
 
     <node oor:name="ConnectionList">
-    </node>
+    </node>   
 
     <node oor:name="RecentDocs">
-    </node>
+    </node> 
 
     <node oor:name="Settings">
         <prop oor:name="PreselectShowBrowser">
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
index f6498c5faef3..a270c40655f1 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
@@ -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
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu
index e39bbc75471c..09c72ec9868b 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu
@@ -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
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu
index 501c0a42548c..bf523ce2d929 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu
@@ -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
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu
index d0ddad5b2a7c..75524ae28ceb 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu
@@ -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
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu
index 64031b844aaf..eca6e68d8862 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu
+++ b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu
@@ -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
diff --git a/swext/mediawiki/src/uno-extension-manifest.xml b/swext/mediawiki/src/uno-extension-manifest.xml
index f3d9a0e2399b..b884b2ee433c 100644
--- a/swext/mediawiki/src/uno-extension-manifest.xml
+++ b/swext/mediawiki/src/uno-extension-manifest.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--***********************************************************************
-
+ 
   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
-
+ 
   This file is part of OpenOffice.org.
-
+ 
   OpenOffice.org is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License version 3
   only, as published by the Free Software Foundation.
-
+ 
   OpenOffice.org is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License version 3 for more details
   (a copy is included in the LICENSE file that accompanied this code).
-
+ 
   You should have received a copy of the GNU Lesser General Public License
   version 3 along with OpenOffice.org.  If not, see
   <http://www.openoffice.org/license.html>
@@ -28,26 +28,26 @@
 <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Java"
                        manifest:full-path="mediawiki.jar"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                       manifest:full-path="Addons.xcu"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" 
+                       manifest:full-path="Addons.xcu"/> 
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" 
                        manifest:full-path="ProtocolHandler.xcu"/>
-  <manifest:file-entry manifest:full-path="WikiEditor/"
+  <manifest:file-entry manifest:full-path="WikiEditor/" 
                        manifest:media-type="application/vnd.sun.star.basic-library"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema" 
                        manifest:full-path="WikiExtension.xcs"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                       manifest:full-path="WikiExtension.xcu"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                       manifest:full-path="OptionsDialog.xcu"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                       manifest:full-path="Filter.xcu"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                       manifest:full-path="Types.xcu"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-                       manifest:full-path="Paths.xcu"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.help"
-                       manifest:full-path="help"/>
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" 
+                       manifest:full-path="WikiExtension.xcu"/> 
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" 
+                       manifest:full-path="OptionsDialog.xcu"/> 
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" 
+                       manifest:full-path="Filter.xcu"/> 
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" 
+                       manifest:full-path="Types.xcu"/> 
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data" 
+                       manifest:full-path="Paths.xcu"/> 
+  <manifest:file-entry manifest:media-type="application/vnd.sun.star.help" 
+                       manifest:full-path="help"/> 
   <manifest:file-entry manifest:media-type="application/vnd.sun.star.package-bundle-description"
                        manifest:full-path="help/component.txt"/>
 </manifest:manifest>
author	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:08:13 +0200
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-08-23 15:08:13 +0200
commit	3bb01d6eda13bf1b4a538a24707605153fe4e37e (patch)
tree	65089ad2a2c6268e4c4ffc753ae2374bd2169089
parent	1dd3ecc26716372f4e0aeb7578acfd997f125a61 (diff)