Merge remote branch 'stage/premerge/dev300_m98' into integration/dev300_m98integration/dev300_m98

Conflicts: autodoc/source/parser_i/inc/tokens/tkp2.hxx odk/source/unowinreg/win/makefile.mk odk/util/makefile.mk odk/util/makefile.pmk udm/source/unittest/makefile.mk udm/source/unittest/test.cxx
author: Michael Meeks <michael.meeks@novell.com> 2011-03-04 19:45:04 +0000
committer: Michael Meeks <michael.meeks@novell.com> 2011-03-04 19:45:04 +0000
commit: 3c94dd6761ae3882241a6a83854d7e5f840a6303 (patch)
tree: 993ab85eb3bcc8faf380a19432e4b15efa24deef
parent: 48beb485e05723815a3595de7be202f0cbff461a (diff)
parent: 60443dd0c88a7dee913027ced9830d811a676c8b (diff)
64 files changed, 1022 insertions, 947 deletions
diff --git a/autodoc/source/ary/cpp/makefile.mk b/autodoc/source/ary/cpp/makefile.mk
index 5c20a59b..98678746 100644
--- a/autodoc/source/ary/cpp/makefile.mk
+++ b/autodoc/source/ary/cpp/makefile.mk
@@ -45,30 +45,30 @@ PRJINC=$(PRJ)$/source
 
 
 OBJFILES= \
-    $(OBJ)$/c_builtintype.obj   \
-    $(OBJ)$/c_class.obj		    \
-    $(OBJ)$/c_de.obj	        \
-    $(OBJ)$/c_define.obj	    \
-    $(OBJ)$/c_enum.obj		    \
-    $(OBJ)$/c_enuval.obj	    \
-    $(OBJ)$/c_funct.obj		    \
-    $(OBJ)$/c_macro.obj	        \
-    $(OBJ)$/c_namesp.obj	    \
-    $(OBJ)$/c_osigna.obj	    \
-    $(OBJ)$/c_reposypart.obj	\
-    $(OBJ)$/c_slots.obj		    \
-    $(OBJ)$/c_traits.obj        \
-    $(OBJ)$/c_tydef.obj		    \
-    $(OBJ)$/c_vari.obj		    \
-    $(OBJ)$/ca_ce.obj           \
-    $(OBJ)$/ca_def.obj          \
-    $(OBJ)$/ca_type.obj         \
-    $(OBJ)$/cs_ce.obj           \
-    $(OBJ)$/cs_def.obj          \
-    $(OBJ)$/cs_type.obj         \
-    $(OBJ)$/namechain.obj	    \
-    $(OBJ)$/tplparam.obj	    \
-    $(OBJ)$/usedtype.obj
+	$(OBJ)$/c_builtintype.obj   \
+	$(OBJ)$/c_class.obj		    \
+	$(OBJ)$/c_de.obj	        \
+	$(OBJ)$/c_define.obj	    \
+	$(OBJ)$/c_enum.obj		    \
+	$(OBJ)$/c_enuval.obj	    \
+	$(OBJ)$/c_funct.obj		    \
+	$(OBJ)$/c_macro.obj	        \
+	$(OBJ)$/c_namesp.obj	    \
+	$(OBJ)$/c_osigna.obj	    \
+	$(OBJ)$/c_reposypart.obj	\
+	$(OBJ)$/c_slots.obj		    \
+	$(OBJ)$/c_traits.obj        \
+	$(OBJ)$/c_tydef.obj		    \
+	$(OBJ)$/c_vari.obj		    \
+	$(OBJ)$/ca_ce.obj           \
+	$(OBJ)$/ca_def.obj          \
+	$(OBJ)$/ca_type.obj         \
+	$(OBJ)$/cs_ce.obj           \
+	$(OBJ)$/cs_def.obj          \
+	$(OBJ)$/cs_type.obj         \
+	$(OBJ)$/namechain.obj	    \
+	$(OBJ)$/tplparam.obj	    \
+	$(OBJ)$/usedtype.obj
 
 
 
diff --git a/autodoc/source/ary/doc/makefile.mk b/autodoc/source/ary/doc/makefile.mk
index 21989dcc..ccdc1113 100644
--- a/autodoc/source/ary/doc/makefile.mk
+++ b/autodoc/source/ary/doc/makefile.mk
@@ -46,11 +46,11 @@ PRJINC=$(PRJ)$/source
 
 
 OBJFILES= \
-    $(OBJ)$/d_boolean.obj           \
-    $(OBJ)$/d_docu.obj              \
-    $(OBJ)$/d_node.obj              \
-    $(OBJ)$/d_oldcppdocu.obj        \
-    $(OBJ)$/d_oldidldocu.obj
+	$(OBJ)$/d_boolean.obj           \
+	$(OBJ)$/d_docu.obj              \
+	$(OBJ)$/d_node.obj              \
+	$(OBJ)$/d_oldcppdocu.obj        \
+	$(OBJ)$/d_oldidldocu.obj
 
 
 # --- Targets ------------------------------------------------------
diff --git a/autodoc/source/ary/info/makefile.mk b/autodoc/source/ary/info/makefile.mk
index 0c507ba3..e34108ea 100644
--- a/autodoc/source/ary/info/makefile.mk
+++ b/autodoc/source/ary/info/makefile.mk
@@ -46,10 +46,10 @@ PRJINC=$(PRJ)$/source
 
 
 OBJFILES= \
-    $(OBJ)$/all_dts.obj		\
-    $(OBJ)$/all_tags.obj	\
-    $(OBJ)$/ci_attag.obj	\
-    $(OBJ)$/ci_text.obj
+	$(OBJ)$/all_dts.obj		\
+	$(OBJ)$/all_tags.obj	\
+	$(OBJ)$/ci_attag.obj	\
+	$(OBJ)$/ci_text.obj
 
 
 # --- Targets ------------------------------------------------------
diff --git a/autodoc/source/ary/loc/makefile.mk b/autodoc/source/ary/loc/makefile.mk
index e4aa0e9b..d2d52ef8 100644
--- a/autodoc/source/ary/loc/makefile.mk
+++ b/autodoc/source/ary/loc/makefile.mk
@@ -46,13 +46,13 @@ PRJINC=$(PRJ)$/source
 
 
 OBJFILES= \
-    $(OBJ)$/loc_dir.obj         \
-    $(OBJ)$/loc_file.obj        \
-    $(OBJ)$/loc_filebase.obj    \
-    $(OBJ)$/loc_root.obj        \
-    $(OBJ)$/loc_traits.obj      \
-    $(OBJ)$/loca_le.obj         \
-    $(OBJ)$/locs_le.obj
+	$(OBJ)$/loc_dir.obj         \
+	$(OBJ)$/loc_file.obj        \
+	$(OBJ)$/loc_filebase.obj    \
+	$(OBJ)$/loc_root.obj        \
+	$(OBJ)$/loc_traits.obj      \
+	$(OBJ)$/loca_le.obj         \
+	$(OBJ)$/locs_le.obj
 
 
 
diff --git a/autodoc/source/ary_i/kernel/makefile.mk b/autodoc/source/ary_i/kernel/makefile.mk
index 79675bc0..61ff44ac 100644
--- a/autodoc/source/ary_i/kernel/makefile.mk
+++ b/autodoc/source/ary_i/kernel/makefile.mk
@@ -46,9 +46,9 @@ PRJINC=$(PRJ)$/source
 
 
 OBJFILES= \
-    $(OBJ)$/ci_atag2.obj	\
-    $(OBJ)$/ci_text2.obj	\
-    $(OBJ)$/d_token.obj
+	$(OBJ)$/ci_atag2.obj	\
+	$(OBJ)$/ci_text2.obj	\
+	$(OBJ)$/d_token.obj
 
 
 
diff --git a/autodoc/source/display/html/makefile.mk b/autodoc/source/display/html/makefile.mk
index 58046760..acd5bb26 100644
--- a/autodoc/source/display/html/makefile.mk
+++ b/autodoc/source/display/html/makefile.mk
@@ -43,31 +43,31 @@ PRJINC=$(PRJ)$/source
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
-    $(OBJ)$/aryattrs.obj    \
-    $(OBJ)$/cfrstd.obj	    \
-    $(OBJ)$/chd_udk2.obj	\
-    $(OBJ)$/cre_link.obj	\
-    $(OBJ)$/dsply_cl.obj	\
-    $(OBJ)$/dsply_da.obj    \
-    $(OBJ)$/dsply_op.obj	\
-    $(OBJ)$/easywri.obj	    \
-    $(OBJ)$/hd_chlst.obj  	\
-    $(OBJ)$/hd_docu.obj  	\
-    $(OBJ)$/hdimpl.obj  	\
-    $(OBJ)$/html_kit.obj  	\
-    $(OBJ)$/nav_main.obj  	\
-    $(OBJ)$/navibar.obj  	\
-    $(OBJ)$/outfile.obj     \
-    $(OBJ)$/opageenv.obj    \
-    $(OBJ)$/pagemake.obj    \
-    $(OBJ)$/pm_aldef.obj    \
-    $(OBJ)$/pm_base.obj     \
-    $(OBJ)$/pm_class.obj    \
-    $(OBJ)$/pm_help.obj     \
-    $(OBJ)$/pm_index.obj    \
-    $(OBJ)$/pm_namsp.obj    \
-    $(OBJ)$/pm_start.obj    \
-    $(OBJ)$/protarea.obj
+	$(OBJ)$/aryattrs.obj    \
+	$(OBJ)$/cfrstd.obj	    \
+	$(OBJ)$/chd_udk2.obj	\
+	$(OBJ)$/cre_link.obj	\
+	$(OBJ)$/dsply_cl.obj	\
+	$(OBJ)$/dsply_da.obj    \
+	$(OBJ)$/dsply_op.obj	\
+	$(OBJ)$/easywri.obj	    \
+	$(OBJ)$/hd_chlst.obj  	\
+	$(OBJ)$/hd_docu.obj  	\
+	$(OBJ)$/hdimpl.obj  	\
+	$(OBJ)$/html_kit.obj  	\
+	$(OBJ)$/nav_main.obj  	\
+	$(OBJ)$/navibar.obj  	\
+	$(OBJ)$/outfile.obj     \
+	$(OBJ)$/opageenv.obj    \
+	$(OBJ)$/pagemake.obj    \
+	$(OBJ)$/pm_aldef.obj    \
+	$(OBJ)$/pm_base.obj     \
+	$(OBJ)$/pm_class.obj    \
+	$(OBJ)$/pm_help.obj     \
+	$(OBJ)$/pm_index.obj    \
+	$(OBJ)$/pm_namsp.obj    \
+	$(OBJ)$/pm_start.obj    \
+	$(OBJ)$/protarea.obj
 
 
 # --- Targets ------------------------------------------------------
diff --git a/autodoc/source/display/kernel/makefile.mk b/autodoc/source/display/kernel/makefile.mk
index 992456dc..d1c7a6e9 100644
--- a/autodoc/source/display/kernel/makefile.mk
+++ b/autodoc/source/display/kernel/makefile.mk
@@ -44,7 +44,7 @@ PRJINC=$(PRJ)$/source
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
-    $(OBJ)$/displfct.obj	
+	$(OBJ)$/displfct.obj	
 
 
 # --- Targets ------------------------------------------------------
diff --git a/autodoc/source/exes/adc_uni/makefile.mk b/autodoc/source/exes/adc_uni/makefile.mk
index 8baea083..6ca5d9dc 100644
--- a/autodoc/source/exes/adc_uni/makefile.mk
+++ b/autodoc/source/exes/adc_uni/makefile.mk
@@ -45,12 +45,12 @@ LIBSALCPPRT=$(0)
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
-    $(OBJ)$/adc_cl.obj	        \
-    $(OBJ)$/adc_cmd_parse.obj	\
-    $(OBJ)$/adc_cmds.obj        \
-    $(OBJ)$/adc_msg.obj	        \
-    $(OBJ)$/cmd_run.obj         \
-    $(OBJ)$/cmd_sincedata.obj
+	$(OBJ)$/adc_cl.obj	        \
+	$(OBJ)$/adc_cmd_parse.obj	\
+	$(OBJ)$/adc_cmds.obj        \
+	$(OBJ)$/adc_msg.obj	        \
+	$(OBJ)$/cmd_run.obj         \
+	$(OBJ)$/cmd_sincedata.obj
 
 
 # --- Targets ------------------------------------------------------
@@ -58,13 +58,13 @@ OBJFILES= \
 LIB1TARGET=$(LB)$/atdoc.lib
 LIB1FILES= \
             $(LB)$/$(TARGET).lib $(LB)$/autodoc_tools.lib \
-            $(LB)$/ary_kernel.lib $(LB)$/ary_cpp.lib $(LB)$/ary_idl.lib  \
+			$(LB)$/ary_kernel.lib $(LB)$/ary_cpp.lib $(LB)$/ary_idl.lib  \
             $(LB)$/ary_info.lib $(LB)$/ary_loc.lib \
             $(LB)$/parser_kernel.lib $(LB)$/parser_tokens.lib $(LB)$/parser_semantic.lib \
-            $(LB)$/parser_cpp.lib $(LB)$/parser_adoc.lib \
+			$(LB)$/parser_cpp.lib $(LB)$/parser_adoc.lib \
             $(LB)$/display_kernel.lib $(LB)$/display_html.lib $(LB)$/display_idl.lib \
-            $(LB)$/display_toolkit.lib $(LB)$/parser2_tokens.lib  \
-            $(LB)$/parser2_s2_luidl.lib $(LB)$/parser2_s2_dsapi.lib \
+			$(LB)$/display_toolkit.lib $(LB)$/parser2_tokens.lib  \
+			$(LB)$/parser2_s2_luidl.lib $(LB)$/parser2_s2_dsapi.lib \
             $(LB)$/ary2_cinfo.lib $(LB)$/ary_doc.lib
 
 
@@ -91,13 +91,13 @@ APP1LIBS=$(LB)$/atdoc.lib
 DEPOBJFILES += $(APP1OBJS)
 
 APP1DEPN=   $(LB)$/$(TARGET).lib $(LB)$/autodoc_tools.lib \
-            $(LB)$/ary_kernel.lib $(LB)$/ary_cpp.lib $(LB)$/ary_idl.lib  \
+			$(LB)$/ary_kernel.lib $(LB)$/ary_cpp.lib $(LB)$/ary_idl.lib  \
             $(LB)$/ary_info.lib $(LB)$/ary_loc.lib \
             $(LB)$/parser_kernel.lib $(LB)$/parser_tokens.lib $(LB)$/parser_semantic.lib \
-            $(LB)$/parser_cpp.lib $(LB)$/parser_adoc.lib \
+			$(LB)$/parser_cpp.lib $(LB)$/parser_adoc.lib \
             $(LB)$/display_kernel.lib $(LB)$/display_html.lib $(LB)$/display_idl.lib \
-            $(LB)$/display_toolkit.lib $(LB)$/parser2_tokens.lib  \
-            $(LB)$/parser2_s2_luidl.lib $(LB)$/parser2_s2_dsapi.lib \
+			$(LB)$/display_toolkit.lib $(LB)$/parser2_tokens.lib  \
+			$(LB)$/parser2_s2_luidl.lib $(LB)$/parser2_s2_dsapi.lib \
             $(LB)$/ary2_cinfo.lib $(LB)$/ary_doc.lib
 
 
diff --git a/autodoc/source/parser/adoc/makefile.mk b/autodoc/source/parser/adoc/makefile.mk
index 48e4084e..3b1728de 100644
--- a/autodoc/source/parser/adoc/makefile.mk
+++ b/autodoc/source/parser/adoc/makefile.mk
@@ -43,14 +43,14 @@ PRJINC=$(PRJ)$/source
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
-    $(OBJ)$/adoc_tok.obj   	\
-    $(OBJ)$/a_rdocu.obj		\
-    $(OBJ)$/cx_a_std.obj	\
-    $(OBJ)$/cx_a_sub.obj	\
-    $(OBJ)$/docu_pe.obj		\
-    $(OBJ)$/prs_adoc.obj	\
-    $(OBJ)$/tk_attag.obj  	\
-    $(OBJ)$/tk_docw.obj
+	$(OBJ)$/adoc_tok.obj   	\
+	$(OBJ)$/a_rdocu.obj		\
+	$(OBJ)$/cx_a_std.obj	\
+	$(OBJ)$/cx_a_sub.obj	\
+	$(OBJ)$/docu_pe.obj		\
+	$(OBJ)$/prs_adoc.obj	\
+	$(OBJ)$/tk_attag.obj  	\
+	$(OBJ)$/tk_docw.obj
 
 
 
diff --git a/autodoc/source/parser/cpp/makefile.mk b/autodoc/source/parser/cpp/makefile.mk
index 9729ee2d..7f49f8ab 100644
--- a/autodoc/source/parser/cpp/makefile.mk
+++ b/autodoc/source/parser/cpp/makefile.mk
@@ -46,36 +46,36 @@ PRJINC=$(PRJ)$/source
 
 
 OBJFILES= \
-    $(OBJ)$/all_toks.obj	\
-    $(OBJ)$/c_dealer.obj	\
-    $(OBJ)$/c_rcode.obj		\
-    $(OBJ)$/cpp_pe.obj		\
-    $(OBJ)$/cx_base.obj	    \
-    $(OBJ)$/cx_c_pp.obj	    \
-    $(OBJ)$/cx_c_std.obj	\
-    $(OBJ)$/cx_c_sub.obj	\
-    $(OBJ)$/cxt2ary.obj	    \
-    $(OBJ)$/defdescr.obj	\
-    $(OBJ)$/icprivow.obj	\
-    $(OBJ)$/pe_base.obj		\
-    $(OBJ)$/pe_class.obj	\
-    $(OBJ)$/pe_defs.obj	    \
-    $(OBJ)$/pe_expr.obj	    \
-    $(OBJ)$/pe_enum.obj	    \
-    $(OBJ)$/pe_enval.obj    \
-    $(OBJ)$/pe_file.obj		\
-    $(OBJ)$/pe_funct.obj	\
-    $(OBJ)$/pe_ignor.obj	\
-    $(OBJ)$/pe_namsp.obj	\
-    $(OBJ)$/pe_param.obj	\
-    $(OBJ)$/pe_tpltp.obj    \
-    $(OBJ)$/pe_type.obj		\
-    $(OBJ)$/pe_tydef.obj	\
-    $(OBJ)$/pe_vafu.obj		\
-    $(OBJ)$/pe_vari.obj		\
-    $(OBJ)$/preproc.obj		\
-    $(OBJ)$/prs_cpp.obj		\
-    $(OBJ)$/tkp_cpp.obj
+	$(OBJ)$/all_toks.obj	\
+	$(OBJ)$/c_dealer.obj	\
+	$(OBJ)$/c_rcode.obj		\
+	$(OBJ)$/cpp_pe.obj		\
+	$(OBJ)$/cx_base.obj	    \
+	$(OBJ)$/cx_c_pp.obj	    \
+	$(OBJ)$/cx_c_std.obj	\
+	$(OBJ)$/cx_c_sub.obj	\
+	$(OBJ)$/cxt2ary.obj	    \
+	$(OBJ)$/defdescr.obj	\
+	$(OBJ)$/icprivow.obj	\
+	$(OBJ)$/pe_base.obj		\
+	$(OBJ)$/pe_class.obj	\
+	$(OBJ)$/pe_defs.obj	    \
+	$(OBJ)$/pe_expr.obj	    \
+	$(OBJ)$/pe_enum.obj	    \
+	$(OBJ)$/pe_enval.obj    \
+	$(OBJ)$/pe_file.obj		\
+	$(OBJ)$/pe_funct.obj	\
+	$(OBJ)$/pe_ignor.obj	\
+	$(OBJ)$/pe_namsp.obj	\
+	$(OBJ)$/pe_param.obj	\
+	$(OBJ)$/pe_tpltp.obj    \
+	$(OBJ)$/pe_type.obj		\
+	$(OBJ)$/pe_tydef.obj	\
+	$(OBJ)$/pe_vafu.obj		\
+	$(OBJ)$/pe_vari.obj		\
+	$(OBJ)$/preproc.obj		\
+	$(OBJ)$/prs_cpp.obj		\
+	$(OBJ)$/tkp_cpp.obj
 
 
 
diff --git a/autodoc/source/parser/kernel/makefile.mk b/autodoc/source/parser/kernel/makefile.mk
index 9baf8ab1..54474bdc 100644
--- a/autodoc/source/parser/kernel/makefile.mk
+++ b/autodoc/source/parser/kernel/makefile.mk
@@ -45,9 +45,9 @@ PRJINC=$(PRJ)$/source
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
-    $(OBJ)$/parsefct.obj    \
-    $(OBJ)$/x_docu.obj      \
-    $(OBJ)$/x_parse.obj
+	$(OBJ)$/parsefct.obj    \
+	$(OBJ)$/x_docu.obj      \
+	$(OBJ)$/x_parse.obj
 
 
 # --- Targets ------------------------------------------------------
diff --git a/autodoc/source/parser/semantic/makefile.mk b/autodoc/source/parser/semantic/makefile.mk
index da7e8f15..26fd39b3 100644
--- a/autodoc/source/parser/semantic/makefile.mk
+++ b/autodoc/source/parser/semantic/makefile.mk
@@ -45,7 +45,7 @@ PRJINC=$(PRJ)$/source
 
 
 OBJFILES= \
-    $(OBJ)$/parseenv.obj
+	$(OBJ)$/parseenv.obj
 
 
 
diff --git a/autodoc/source/parser/tokens/makefile.mk b/autodoc/source/parser/tokens/makefile.mk
index beb32071..90fc7f9b 100644
--- a/autodoc/source/parser/tokens/makefile.mk
+++ b/autodoc/source/parser/tokens/makefile.mk
@@ -45,13 +45,13 @@ PRJINC=$(PRJ)$/source
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
-    $(OBJ)$/stmstarr.obj	\
-    $(OBJ)$/stmstate.obj	\
-    $(OBJ)$/stmstfin.obj	\
-    $(OBJ)$/tkpstama.obj	\
-    $(OBJ)$/tkp.obj			\
-    $(OBJ)$/tkpcontx.obj	\
-    $(OBJ)$/tokdeal.obj		
+	$(OBJ)$/stmstarr.obj	\
+	$(OBJ)$/stmstate.obj	\
+	$(OBJ)$/stmstfin.obj	\
+	$(OBJ)$/tkpstama.obj	\
+	$(OBJ)$/tkp.obj			\
+	$(OBJ)$/tkpcontx.obj	\
+	$(OBJ)$/tokdeal.obj		
 
 
 # --- Targets ------------------------------------------------------
diff --git a/autodoc/source/parser_i/idl/makefile.mk b/autodoc/source/parser_i/idl/makefile.mk
index 74495487..cacaab95 100644
--- a/autodoc/source/parser_i/idl/makefile.mk
+++ b/autodoc/source/parser_i/idl/makefile.mk
@@ -45,34 +45,34 @@ PRJINC=$(PRJ)$/source
 
 
 OBJFILES= \
-    $(OBJ)$/cx_idlco.obj		\
-    $(OBJ)$/cx_sub.obj		    \
-    $(OBJ)$/distrib.obj		    \
-    $(OBJ)$/parsenv2.obj		\
-    $(OBJ)$/pe_attri.obj	    \
-    $(OBJ)$/pe_const.obj	    \
-    $(OBJ)$/pe_enum2.obj    	\
-    $(OBJ)$/pe_evalu.obj	    \
-    $(OBJ)$/pe_excp.obj		    \
-    $(OBJ)$/pe_file2.obj	    \
-    $(OBJ)$/pe_func2.obj	    \
-    $(OBJ)$/pe_iface.obj	    \
-    $(OBJ)$/pe_property.obj	    \
-    $(OBJ)$/pe_selem.obj	    \
-    $(OBJ)$/pe_servi.obj	    \
-    $(OBJ)$/pe_singl.obj	    \
-    $(OBJ)$/pe_struc.obj 	    \
-    $(OBJ)$/pe_tydf2.obj 	    \
-    $(OBJ)$/pe_type2.obj 	    \
-    $(OBJ)$/pe_vari2.obj 	    \
-    $(OBJ)$/pestate.obj 	    \
-    $(OBJ)$/semnode.obj		    \
-    $(OBJ)$/tk_const.obj		\
-    $(OBJ)$/tk_ident.obj		\
-    $(OBJ)$/tk_keyw.obj			\
-    $(OBJ)$/tk_punct.obj		\
-    $(OBJ)$/tkp_uidl.obj		\
-    $(OBJ)$/unoidl.obj
+	$(OBJ)$/cx_idlco.obj		\
+	$(OBJ)$/cx_sub.obj		    \
+	$(OBJ)$/distrib.obj		    \
+	$(OBJ)$/parsenv2.obj		\
+	$(OBJ)$/pe_attri.obj	    \
+	$(OBJ)$/pe_const.obj	    \
+	$(OBJ)$/pe_enum2.obj    	\
+	$(OBJ)$/pe_evalu.obj	    \
+	$(OBJ)$/pe_excp.obj		    \
+	$(OBJ)$/pe_file2.obj	    \
+	$(OBJ)$/pe_func2.obj	    \
+	$(OBJ)$/pe_iface.obj	    \
+	$(OBJ)$/pe_property.obj	    \
+	$(OBJ)$/pe_selem.obj	    \
+	$(OBJ)$/pe_servi.obj	    \
+	$(OBJ)$/pe_singl.obj	    \
+	$(OBJ)$/pe_struc.obj 	    \
+	$(OBJ)$/pe_tydf2.obj 	    \
+	$(OBJ)$/pe_type2.obj 	    \
+	$(OBJ)$/pe_vari2.obj 	    \
+	$(OBJ)$/pestate.obj 	    \
+	$(OBJ)$/semnode.obj		    \
+	$(OBJ)$/tk_const.obj		\
+	$(OBJ)$/tk_ident.obj		\
+	$(OBJ)$/tk_keyw.obj			\
+	$(OBJ)$/tk_punct.obj		\
+	$(OBJ)$/tkp_uidl.obj		\
+	$(OBJ)$/unoidl.obj
 
 
 
diff --git a/autodoc/source/parser_i/idoc/makefile.mk b/autodoc/source/parser_i/idoc/makefile.mk
index c4e760bd..2c0074b2 100644
--- a/autodoc/source/parser_i/idoc/makefile.mk
+++ b/autodoc/source/parser_i/idoc/makefile.mk
@@ -44,13 +44,13 @@ PRJINC=$(PRJ)$/source
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
-    $(OBJ)$/cx_docu2.obj	\
-    $(OBJ)$/cx_dsapi.obj	\
-    $(OBJ)$/docu_pe2.obj	\
-    $(OBJ)$/tk_atag2.obj  	\
-    $(OBJ)$/tk_docw2.obj   	\
-    $(OBJ)$/tk_html.obj   	\
-    $(OBJ)$/tk_xml.obj
+	$(OBJ)$/cx_docu2.obj	\
+	$(OBJ)$/cx_dsapi.obj	\
+	$(OBJ)$/docu_pe2.obj	\
+	$(OBJ)$/tk_atag2.obj  	\
+	$(OBJ)$/tk_docw2.obj   	\
+	$(OBJ)$/tk_html.obj   	\
+	$(OBJ)$/tk_xml.obj
 
 
 
diff --git a/autodoc/source/parser_i/tokens/makefile.mk b/autodoc/source/parser_i/tokens/makefile.mk
index 9674e668..3b1a566a 100644
--- a/autodoc/source/parser_i/tokens/makefile.mk
+++ b/autodoc/source/parser_i/tokens/makefile.mk
@@ -46,13 +46,13 @@ PRJINC=$(PRJ)$/source
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
-    $(OBJ)$/stmstar2.obj	\
-    $(OBJ)$/stmstat2.obj	\
-    $(OBJ)$/stmstfi2.obj	\
-    $(OBJ)$/tkpstam2.obj	\
-    $(OBJ)$/tkp2.obj  		\
-    $(OBJ)$/tkpcont2.obj	\
-    $(OBJ)$/x_parse2.obj
+	$(OBJ)$/stmstar2.obj	\
+	$(OBJ)$/stmstat2.obj	\
+	$(OBJ)$/stmstfi2.obj	\
+	$(OBJ)$/tkpstam2.obj	\
+	$(OBJ)$/tkp2.obj  		\
+	$(OBJ)$/tkpcont2.obj	\
+	$(OBJ)$/x_parse2.obj
 
 
 # --- Targets ------------------------------------------------------
diff --git a/autodoc/source/tools/makefile.mk b/autodoc/source/tools/makefile.mk
index 31d48edc..9ef29166 100644
--- a/autodoc/source/tools/makefile.mk
+++ b/autodoc/source/tools/makefile.mk
@@ -46,8 +46,8 @@ PRJINC=$(PRJ)$/source
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
-    $(OBJ)$/filecoll.obj	\
-    $(OBJ)$/tkpchars.obj 
+	$(OBJ)$/filecoll.obj	\
+	$(OBJ)$/tkpchars.obj 
 
 
 # --- Targets ------------------------------------------------------
diff --git a/cosv/source/comphelp/makefile.mk b/cosv/source/comphelp/makefile.mk
index 7c8fac8f..92237d94 100644
--- a/cosv/source/comphelp/makefile.mk
+++ b/cosv/source/comphelp/makefile.mk
@@ -42,7 +42,7 @@ ENABLE_EXCEPTIONS=true
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
-    $(OBJ)$/badcast.obj
+	$(OBJ)$/badcast.obj
 
 
 
diff --git a/cosv/source/service/makefile.mk b/cosv/source/service/makefile.mk
index fc44f35e..efc2d913 100644
--- a/cosv/source/service/makefile.mk
+++ b/cosv/source/service/makefile.mk
@@ -44,11 +44,11 @@ ENABLE_EXCEPTIONS=true
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
-    $(OBJ)$/comdline.obj 	\
-    $(OBJ)$/comfunc.obj 	\
-    $(OBJ)$/csv_ostream.obj \
-    $(OBJ)$/datetime.obj 	\
-    $(OBJ)$/std_outp.obj
+	$(OBJ)$/comdline.obj 	\
+	$(OBJ)$/comfunc.obj 	\
+	$(OBJ)$/csv_ostream.obj \
+	$(OBJ)$/datetime.obj 	\
+	$(OBJ)$/std_outp.obj
 
 
 # --- Targets ------------------------------------------------------
diff --git a/cosv/source/storage/makefile.mk b/cosv/source/storage/makefile.mk
index 84e396c4..a1a9dc07 100644
--- a/cosv/source/storage/makefile.mk
+++ b/cosv/source/storage/makefile.mk
@@ -46,13 +46,13 @@ ENABLE_EXCEPTIONS=true
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
-    $(OBJ)$/dirchain.obj 	\
-    $(OBJ)$/file.obj 		\
-    $(OBJ)$/mbstream.obj    \
-    $(OBJ)$/persist.obj	    \
-    $(OBJ)$/ploc.obj 	    \
-    $(OBJ)$/ploc_dir.obj    \
-    $(OBJ)$/plocroot.obj
+	$(OBJ)$/dirchain.obj 	\
+	$(OBJ)$/file.obj 		\
+	$(OBJ)$/mbstream.obj    \
+	$(OBJ)$/persist.obj	    \
+	$(OBJ)$/ploc.obj 	    \
+	$(OBJ)$/ploc_dir.obj    \
+	$(OBJ)$/plocroot.obj
 
 #SLOFILES= \
 #	$(SLO)$/file.obj 		\
diff --git a/cosv/source/strings/makefile.mk b/cosv/source/strings/makefile.mk
index 2bd9bab1..7f7875ca 100644
--- a/cosv/source/strings/makefile.mk
+++ b/cosv/source/strings/makefile.mk
@@ -44,9 +44,9 @@ ENABLE_EXCEPTIONS=true
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
-    $(OBJ)$/str_types.obj   \
-    $(OBJ)$/streamstr.obj   \
-    $(OBJ)$/string.obj      
+	$(OBJ)$/str_types.obj   \
+	$(OBJ)$/streamstr.obj   \
+	$(OBJ)$/string.obj      
 
 
 
diff --git a/cosv/source/unittest/makefile.mk b/cosv/source/unittest/makefile.mk
index 173ce8c9..9a0b3373 100644
--- a/cosv/source/unittest/makefile.mk
+++ b/cosv/source/unittest/makefile.mk
@@ -47,8 +47,8 @@ PRJINC=$(PRJ)$/source
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
-    $(OBJ)$/file_ut.obj             \
-    $(OBJ)$/simplestring_ut.obj
+	$(OBJ)$/file_ut.obj             \
+	$(OBJ)$/simplestring_ut.obj
 
 
 
diff --git a/cosv/util/makefile.mk b/cosv/util/makefile.mk
index 71788e66..d529877f 100644
--- a/cosv/util/makefile.mk
+++ b/cosv/util/makefile.mk
@@ -41,10 +41,10 @@ ENABLE_EXCEPTIONS=true
 # --- Files --------------------------------------------------------
 
 LIB1FILES= 	\
-        $(LB)$/cosv_service.lib		\
-        $(LB)$/cosv_storage.lib     	\
-        $(LB)$/cosv_strings.lib		\
-        $(LB)$/cosv_badcast_wnt.lib
+		$(LB)$/cosv_service.lib		\
+		$(LB)$/cosv_storage.lib     	\
+		$(LB)$/cosv_strings.lib		\
+		$(LB)$/cosv_badcast_wnt.lib
 
 
 # --- Targets ------------------------------------------------------
diff --git a/odk/examples/CLI/makefile.mk b/odk/examples/CLI/makefile.mk
index fb5344f9..452909f9 100644
--- a/odk/examples/CLI/makefile.mk
+++ b/odk/examples/CLI/makefile.mk
@@ -40,20 +40,20 @@ TARGET=cli
 #----------------------------------------------------
 
 CSHARP=\
-    $(DESTDIRCLIEXAMPLES)$/CSharp$/Spreadsheet$/GeneralTableSample.cs \
-    $(DESTDIRCLIEXAMPLES)$/CSharp$/Spreadsheet$/SpreadsheetDocHelper.cs \
-    $(DESTDIRCLIEXAMPLES)$/CSharp$/Spreadsheet$/SpreadsheetSample.cs \
-    $(DESTDIRCLIEXAMPLES)$/CSharp$/Spreadsheet$/ViewSample.cs \
-    $(DESTDIRCLIEXAMPLES)$/CSharp$/Spreadsheet$/Makefile
+	$(DESTDIRCLIEXAMPLES)$/CSharp$/Spreadsheet$/GeneralTableSample.cs \
+	$(DESTDIRCLIEXAMPLES)$/CSharp$/Spreadsheet$/SpreadsheetDocHelper.cs \
+	$(DESTDIRCLIEXAMPLES)$/CSharp$/Spreadsheet$/SpreadsheetSample.cs \
+	$(DESTDIRCLIEXAMPLES)$/CSharp$/Spreadsheet$/ViewSample.cs \
+	$(DESTDIRCLIEXAMPLES)$/CSharp$/Spreadsheet$/Makefile
 
 VBDOTNET=\
-    $(DESTDIRCLIEXAMPLES)$/VB.NET$/WriterDemo$/WriterDemo.vb \
-    $(DESTDIRCLIEXAMPLES)$/VB.NET$/WriterDemo$/Makefile
+	$(DESTDIRCLIEXAMPLES)$/VB.NET$/WriterDemo$/WriterDemo.vb \
+	$(DESTDIRCLIEXAMPLES)$/VB.NET$/WriterDemo$/Makefile
 
 
 DIR_FILE_LIST= \
-    $(CSHARP) \
-    $(VBDOTNET)
+	$(CSHARP) \
+	$(VBDOTNET)
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/ex_$(TARGET)_dirs_created.txt
@@ -63,7 +63,7 @@ DIR_FILE_FLAG=$(MISC)$/ex_$(TARGET)_files.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/DevelopersGuide/Accessibility/makefile.mk b/odk/examples/DevelopersGuide/Accessibility/makefile.mk
index 5efa8ee7..33cbe23c 100644
--- a/odk/examples/DevelopersGuide/Accessibility/makefile.mk
+++ b/odk/examples/DevelopersGuide/Accessibility/makefile.mk
@@ -40,20 +40,20 @@ TARGET=copying
 #----------------------------------------------------
 
 ACCESSIBILITY_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/ConnectionTask.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/EventHandler.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/EventListenerProxy.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/GraphicalDisplay.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/IAccessibleObjectDisplay.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/Makefile \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/MessageArea.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/NameProvider.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/RegistrationThread.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/SSR.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/TextualDisplay.java
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/ConnectionTask.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/EventHandler.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/EventListenerProxy.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/GraphicalDisplay.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/IAccessibleObjectDisplay.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/Makefile \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/MessageArea.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/NameProvider.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/RegistrationThread.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/SSR.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Accessibility$/TextualDisplay.java
 
 DIR_FILE_LIST= \
-    $(ACCESSIBILITY_FILES)
+	$(ACCESSIBILITY_FILES)
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/devguide_accessibility_dirs_created.txt
@@ -63,8 +63,8 @@ DIR_FILE_FLAG=$(MISC)$/devguide_accessibility.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/makefile.mk b/odk/examples/DevelopersGuide/BasicAndDialogs/makefile.mk
index 3dd72c26..e38d5181 100644
--- a/odk/examples/DevelopersGuide/BasicAndDialogs/makefile.mk
+++ b/odk/examples/DevelopersGuide/BasicAndDialogs/makefile.mk
@@ -40,31 +40,31 @@ TARGET=copying
 #----------------------------------------------------
 
 BASICANDDIALOGS_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/FirstStepsBasic.odt
+	$(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/FirstStepsBasic.odt
 
 CREATINGDIALOGS_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/CreatingDialogs$/SampleDialog.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/CreatingDialogs$/CreatingDialogs.odt \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/CreatingDialogs$/Makefile
+	$(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/CreatingDialogs$/SampleDialog.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/CreatingDialogs$/CreatingDialogs.odt \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/CreatingDialogs$/Makefile
 
 TOOLKITCONTROLS_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/Makefile \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls.odt \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/dialog.xlb \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/FileDialog.xba \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/FileDialogDlg.xdl \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/MultiPage.xba \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/MultiPageDlg.xdl \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/ProgressBar.xba \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/ProgressBarDlg.xdl \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/script.xlb \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/ScrollBar.xba \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/ScrollBarDlg.xdl
+	$(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/Makefile \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls.odt \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/dialog.xlb \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/FileDialog.xba \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/FileDialogDlg.xdl \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/MultiPage.xba \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/MultiPageDlg.xdl \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/ProgressBar.xba \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/ProgressBarDlg.xdl \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/script.xlb \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/ScrollBar.xba \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/BasicAndDialogs$/ToolkitControls$/ToolkitControls$/ScrollBarDlg.xdl
 
 DIR_FILE_LIST= \
-    $(BASICANDDIALOGS_FILES) \
-    $(CREATINGDIALOGS_FILES) \
-    $(TOOLKITCONTROLS_FILES)
+	$(BASICANDDIALOGS_FILES) \
+	$(CREATINGDIALOGS_FILES) \
+	$(TOOLKITCONTROLS_FILES)
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/devguide_basicanddialogs_dirs_created.txt
@@ -74,8 +74,8 @@ DIR_FILE_FLAG=$(MISC)$/devguide_basicanddialogs.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/DevelopersGuide/Charts/makefile.mk b/odk/examples/DevelopersGuide/Charts/makefile.mk
index 225d8d7e..2b12bca1 100644
--- a/odk/examples/DevelopersGuide/Charts/makefile.mk
+++ b/odk/examples/DevelopersGuide/Charts/makefile.mk
@@ -40,18 +40,18 @@ TARGET=copying
 #----------------------------------------------------
 
 CHARTS_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/AddInChart.ods \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/CalcHelper.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/ChartHelper.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/ChartInCalc.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/ChartInDraw.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/ChartInWriter.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/Helper.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/JavaSampleChartAddIn.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/ListenAtCalcRangeInDraw.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/SelectionChangeListener.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/bullet.gif \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/Makefile
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/AddInChart.ods \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/CalcHelper.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/ChartHelper.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/ChartInCalc.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/ChartInDraw.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/ChartInWriter.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/Helper.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/JavaSampleChartAddIn.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/ListenAtCalcRangeInDraw.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/SelectionChangeListener.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/bullet.gif \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Charts$/Makefile
 
 DIR_FILE_LIST= \
     $(CHARTS_FILES)
@@ -64,8 +64,8 @@ DIR_FILE_FLAG=$(MISC)$/devguide_charts.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/DevelopersGuide/Components/makefile.mk b/odk/examples/DevelopersGuide/Components/makefile.mk
index 7c399b33..eb888206 100644
--- a/odk/examples/DevelopersGuide/Components/makefile.mk
+++ b/odk/examples/DevelopersGuide/Components/makefile.mk
@@ -41,69 +41,69 @@ TARGET=copying
 
 DESTJOBSADDON=$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/Addons$/JobsAddon
 JOBSADDON_FILES=\
-    $(DESTJOBSADDON)$/Addons.xcu \
-    $(DESTJOBSADDON)$/AsyncJob.java \
-    $(DESTJOBSADDON)$/Jobs.xcu \
-    $(DESTJOBSADDON)$/Makefile
+	$(DESTJOBSADDON)$/Addons.xcu \
+	$(DESTJOBSADDON)$/AsyncJob.java \
+	$(DESTJOBSADDON)$/Jobs.xcu \
+	$(DESTJOBSADDON)$/Makefile
 
 DESTPROTOCOLHANDLERADDONCPP=$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/Addons$/ProtocolHandlerAddon_cpp
 PROTOCOLHANLDERADDONCPP_FILES=\
-    $(DESTPROTOCOLHANDLERADDONCPP)$/addon.cxx \
-    $(DESTPROTOCOLHANDLERADDONCPP)$/addon.hxx \
-    $(DESTPROTOCOLHANDLERADDONCPP)$/Addons.xcu \
-    $(DESTPROTOCOLHANDLERADDONCPP)$/component.cxx \
-    $(DESTPROTOCOLHANDLERADDONCPP)$/Makefile \
-    $(DESTPROTOCOLHANDLERADDONCPP)$/ProtocolHandler.xcu \
-    $(DESTPROTOCOLHANDLERADDONCPP)$/ProtocolHandlerAddon_cpp.uno.xml
+	$(DESTPROTOCOLHANDLERADDONCPP)$/addon.cxx \
+	$(DESTPROTOCOLHANDLERADDONCPP)$/addon.hxx \
+	$(DESTPROTOCOLHANDLERADDONCPP)$/Addons.xcu \
+	$(DESTPROTOCOLHANDLERADDONCPP)$/component.cxx \
+	$(DESTPROTOCOLHANDLERADDONCPP)$/Makefile \
+	$(DESTPROTOCOLHANDLERADDONCPP)$/ProtocolHandler.xcu \
+	$(DESTPROTOCOLHANDLERADDONCPP)$/ProtocolHandlerAddon_cpp.uno.xml
 
 DESTPROTOCOLHANDLERADDONJAVA=$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/Addons$/ProtocolHandlerAddon_java
 PROTOCOLHANLDERADDONJAVA_FILES=\
-    $(DESTPROTOCOLHANDLERADDONJAVA)$/Addons.xcu \
-    $(DESTPROTOCOLHANDLERADDONJAVA)$/Makefile \
-    $(DESTPROTOCOLHANDLERADDONJAVA)$/ProtocolHandler.xcu \
-    $(DESTPROTOCOLHANDLERADDONJAVA)$/ProtocolHandlerAddon.java \
-    $(DESTPROTOCOLHANDLERADDONJAVA)$/ProtocolHandlerAddon_java.uno.xml
+	$(DESTPROTOCOLHANDLERADDONJAVA)$/Addons.xcu \
+	$(DESTPROTOCOLHANDLERADDONJAVA)$/Makefile \
+	$(DESTPROTOCOLHANDLERADDONJAVA)$/ProtocolHandler.xcu \
+	$(DESTPROTOCOLHANDLERADDONJAVA)$/ProtocolHandlerAddon.java \
+	$(DESTPROTOCOLHANDLERADDONJAVA)$/ProtocolHandlerAddon_java.uno.xml
 
 CPPCOMPONENT_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Components$/CppComponent$/CppComponent.uno.xml \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Components$/CppComponent$/Makefile \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Components$/CppComponent$/service1_impl.cxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Components$/CppComponent$/service2_impl.cxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Components$/CppComponent$/TestCppComponent.cxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Components$/CppComponent$/SimpleComponent.odt \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Components$/CppComponent$/some.idl
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/CppComponent$/CppComponent.uno.xml \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/CppComponent$/Makefile \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/CppComponent$/service1_impl.cxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/CppComponent$/service2_impl.cxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/CppComponent$/TestCppComponent.cxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/CppComponent$/SimpleComponent.odt \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/CppComponent$/some.idl
 
 JAVACOMPONENT_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/Makefile \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/TestComponentA.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/TestComponentB.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/TestServiceProvider.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/TestJavaComponent.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/XSomethingA.idl \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/XSomethingB.idl \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/SomethingA.idl \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/SomethingB.idl
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/Makefile \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/TestComponentA.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/TestComponentB.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/TestServiceProvider.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/TestJavaComponent.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/XSomethingA.idl \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/XSomethingB.idl \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/SomethingA.idl \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/JavaComponent$/SomethingB.idl
 
 DESTTHUMBS=$(DESTDIRDEVGUIDEEXAMPLES)$/Components$/Thumbs
 THUMBS_FILES=\
-    $(DESTTHUMBS)$/org$/openoffice$/comp$/test$/ImageShrink.java \
-    $(DESTTHUMBS)$/org$/openoffice$/comp$/test$/Thumbs.java \
-    $(DESTTHUMBS)$/org$/openoffice$/comp$/test$/Makefile \
-    $(DESTTHUMBS)$/org$/openoffice$/test$/ImageShrink.idl \
-    $(DESTTHUMBS)$/org$/openoffice$/test$/XImageShrink.idl \
-    $(DESTTHUMBS)$/org$/openoffice$/test$/XImageShrinkFilter.idl \
-    $(DESTTHUMBS)$/org$/openoffice$/test$/Makefile \
-    $(DESTTHUMBS)$/thumbs.mk \
-    $(DESTTHUMBS)$/Makefile
+	$(DESTTHUMBS)$/org$/openoffice$/comp$/test$/ImageShrink.java \
+	$(DESTTHUMBS)$/org$/openoffice$/comp$/test$/Thumbs.java \
+	$(DESTTHUMBS)$/org$/openoffice$/comp$/test$/Makefile \
+	$(DESTTHUMBS)$/org$/openoffice$/test$/ImageShrink.idl \
+	$(DESTTHUMBS)$/org$/openoffice$/test$/XImageShrink.idl \
+	$(DESTTHUMBS)$/org$/openoffice$/test$/XImageShrinkFilter.idl \
+	$(DESTTHUMBS)$/org$/openoffice$/test$/Makefile \
+	$(DESTTHUMBS)$/thumbs.mk \
+	$(DESTTHUMBS)$/Makefile
 
 
 DIR_FILE_LIST= \
-    $(JOBSADDON_FILES) \
-    $(PROTOCOLHANLDERADDONCPP_FILES) \
-    $(PROTOCOLHANLDERADDONJAVA_FILES) \
-    $(CPPCOMPONENT_FILES) \
-    $(JAVACOMPONENT_FILES) \
-    $(THUMBS_FILES)
+	$(JOBSADDON_FILES) \
+	$(PROTOCOLHANLDERADDONCPP_FILES) \
+	$(PROTOCOLHANLDERADDONJAVA_FILES) \
+	$(CPPCOMPONENT_FILES) \
+	$(JAVACOMPONENT_FILES) \
+	$(THUMBS_FILES)
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/devguide_components_dirs_created.txt
@@ -113,8 +113,8 @@ DIR_FILE_FLAG=$(MISC)$/devguide_components.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/DevelopersGuide/Config/ConfigExamples.java b/odk/examples/DevelopersGuide/Config/ConfigExamples.java
index d978cf19..6e88494d 100644
--- a/odk/examples/DevelopersGuide/Config/ConfigExamples.java
+++ b/odk/examples/DevelopersGuide/Config/ConfigExamples.java
@@ -78,7 +78,7 @@ import com.sun.star.util.ChangesEvent;
 /* These examples show how to use the following features of the Config API:
 
     o Accessing data
-    o Updating data synchronously and asynchronously
+    o Updating data
     o Updating properties in groups
     o Adding and removing items in sets
     o Resetting data to their defaults
@@ -144,20 +144,6 @@ public class ConfigExamples
         mxProvider = null;
     }
 
-    /** Run the examples with an AdministrationProvider
-    */
-    public void runForAdmin(Object [] aAdminArgs) 
-        throws com.sun.star.uno.Exception
-    {
-        mxProvider = createAdminProvider(aAdminArgs);
-
-        runExamples( );
-
-        // this is not the default ConfigurationProvider, so we can dispose it
-        ((XComponent)UnoRuntime.queryInterface( XComponent.class, mxProvider )).dispose();
-        mxProvider = null;
-    }
-
     /** Run the examples with a given ConfigurationProvider
     */
     public void runExamples( ) 
@@ -170,11 +156,11 @@ public class ConfigExamples
 
             browseDataExample();
 
-            updateGroupSyncExample();
+            updateGroupExample();
 
             resetGroupExample();
 
-            updateSetAsyncExample();
+            updateSetExample();
 
             System.out.println("\nAll Examples completed.");
         }
@@ -245,25 +231,6 @@ public class ConfigExamples
         return xProvider;
     }
 
-    /** Create an administration provider 
-
-        @param aAdminArguments
-            An array of extra arguments to be used to create the provider
-     */
-    public XMultiServiceFactory createAdminProvider(Object[] aAdminArguments)
-        throws com.sun.star.uno.Exception
-    {
-        final String sAdminService = "com.sun.star.configuration.AdministrationProvider";
-
-        // create the provider and remember it as a XMultiServiceFactory
-        XMultiServiceFactory xAdminProvider = (XMultiServiceFactory)
-            UnoRuntime.queryInterface(XMultiServiceFactory.class,
-                mxServiceManager.createInstanceWithArgumentsAndContext(
-                    sAdminService, aAdminArguments, mxContext));	
-
-        return xAdminProvider;
-    }
-
     /** Create a specified read-only configuration view
      */
     public Object createConfigurationView( String sPath )
@@ -288,7 +255,7 @@ public class ConfigExamples
         return xViewRoot;
     }
 
-    /** Create a specified updatable configuration view using default synchronicity
+    /** Create a specified updatable configuration view
      */
     Object createUpdatableView( String sPath )
         throws com.sun.star.uno.Exception
@@ -312,36 +279,6 @@ public class ConfigExamples
         return xViewRoot;
     }
 
-    /** Create a specified updatable configuration view
-     */
-    Object createUpdatableView( String sPath, boolean bAsync )
-        throws com.sun.star.uno.Exception
-    {
-        XMultiServiceFactory xProvider = getProvider();
-
-        // The service name: Need update access:
-        final String cUpdatableView = "com.sun.star.configuration.ConfigurationUpdateAccess";
-
-        // creation arguments: nodepath   
-        com.sun.star.beans.PropertyValue aPathArgument = new com.sun.star.beans.PropertyValue();
-        aPathArgument.Name = "nodepath";
-        aPathArgument.Value = sPath;
-
-        // creation arguments: commit mode - write-through or write-back  
-        com.sun.star.beans.PropertyValue aModeArgument = new com.sun.star.beans.PropertyValue();
-        aModeArgument.Name = "lazywrite";
-        aModeArgument.Value = new Boolean(bAsync);
-
-        Object[] aArguments = new Object[2];
-        aArguments[0] = aPathArgument;
-        aArguments[1] = aModeArgument;
-
-        // create the view
-        Object xViewRoot = xProvider.createInstanceWithArguments(cUpdatableView, aArguments);
-
-        return xViewRoot;
-    }
-
     /** This method demonstrates read access to data
      */
     protected void readDataExample ()
@@ -374,13 +311,13 @@ public class ConfigExamples
         }
     }
 
-    /** This method demonstrates synchronous update access to group data
+    /** This method demonstrates update access to group data
      */
-    protected void updateGroupSyncExample ()
+    protected void updateGroupExample ()
     {
         try
         {
-            System.out.println("\n--- starting example: update group data synchronously --------------");
+            System.out.println("\n--- starting example: update group data --------------");
             editGridOptions( );
         }   
         catch ( Exception e )
@@ -408,13 +345,13 @@ public class ConfigExamples
         }
     }
 
-    /** This method demonstrates asynchronous update access to set data
+    /** This method demonstrates update access to set data
      */
-    protected void updateSetAsyncExample ()
+    protected void updateSetExample ()
     {
         try
         {
-            System.out.println("\n--- starting example: update set data asynchronously ---------------");
+            System.out.println("\n--- starting example: update set data ---------------");
             storeSampleDataSource( );
         }
         catch ( Exception e )
@@ -639,8 +576,8 @@ public class ConfigExamples
         // The path to the root element 
         final String cGridOptionsPath = "/org.openoffice.Office.Calc/Grid";
 
-      // create the SYNCHRONOUS view for better error handling
-        Object xViewRoot = createUpdatableView( cGridOptionsPath, false);
+      // create the view
+        Object xViewRoot = createUpdatableView( cGridOptionsPath );
 
         // the 'editor'
         GridOptionsEditor dialog = new GridOptionsEditor();
@@ -816,7 +753,7 @@ public class ConfigExamples
     {
         try
         {
-            Object xOtherViewRoot = createUpdatableView(xKey, false);
+            Object xOtherViewRoot = createUpdatableView(xKey);
 
             XNameReplace aReplace = (XNameReplace)UnoRuntime.queryInterface(XNameReplace.class, xOtherViewRoot);
 
@@ -1002,9 +939,6 @@ public class ConfigExamples
 
     /** This method gets the DataSourceDescription for a data source.
         It either gets the existing entry or creates a new instance.
-
-        The method attempts to keep the view used as small as possible. In particular there
-        is no view created, that contains data for all data source that are registered.
     */
     Object createDataSourceDescription(XMultiServiceFactory xProvider, String sDataSourceName )
         throws com.sun.star.uno.Exception
@@ -1020,22 +954,10 @@ public class ConfigExamples
         aPathArgument.Name = "nodepath";
         aPathArgument.Value = cDataSourcesPath ;
 
-        // creation arguments: commit mode   
-        com.sun.star.beans.PropertyValue aModeArgument = new com.sun.star.beans.PropertyValue();
-        aModeArgument.Name = "lazywrite";
-        aModeArgument.Value = new Boolean( true );
-
-        // creation arguments: depth   
-        com.sun.star.beans.PropertyValue aDepthArgument = new com.sun.star.beans.PropertyValue();
-        aDepthArgument.Name = "depth";
-        aDepthArgument.Value = new Integer( 1 );
-
-        Object[] aArguments = new Object[3];
+        Object[] aArguments = new Object[1];
         aArguments[0] = aPathArgument;
-        aArguments[1] = aModeArgument;
-        aArguments[2] = aDepthArgument;
 
-        // create the view: asynchronously updatable, with depth 1
+        // create the view
         Object xViewRoot = 
             xProvider.createInstanceWithArguments(cUpdatableView, aArguments);
 
@@ -1045,7 +967,7 @@ public class ConfigExamples
         Object xDataSourceDescriptor = null; // the result
         if ( xSetOfDataSources .hasByName( sDataSourceName ))
         {
-            // the element is there, but it is loaded only with depth zero !
+            // the element is there
             try 
             {
                 // the view should point to the element directly, so we need to extend the path
@@ -1057,12 +979,11 @@ public class ConfigExamples
                 // use the name of the element now
                 aPathArgument.Value = sElementPath;
 
-                // create another view now (without depth limit)
-                Object[] aDeepArguments = new Object[2];
+                // create another view now
+                Object[] aDeepArguments = new Object[1];
                 aDeepArguments[0] = aPathArgument;
-                aDeepArguments[1] = aModeArgument;
 
-                // create the view: asynchronously updatable, with unlimited depth
+                // create the view
                 xDataSourceDescriptor  = 
                       xProvider.createInstanceWithArguments(cUpdatableView, aDeepArguments);
 
diff --git a/odk/examples/DevelopersGuide/Config/makefile.mk b/odk/examples/DevelopersGuide/Config/makefile.mk
index d65ce268..971521f2 100644
--- a/odk/examples/DevelopersGuide/Config/makefile.mk
+++ b/odk/examples/DevelopersGuide/Config/makefile.mk
@@ -40,11 +40,11 @@ TARGET=copying
 #----------------------------------------------------
 
 CONFIG_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Config$/ConfigExamples.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Config$/Makefile
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Config$/ConfigExamples.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Config$/Makefile
 
 DIR_FILE_LIST= \
-    $(CONFIG_FILES) \
+	$(CONFIG_FILES) \
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/devguide_config_dirs_created.txt
@@ -54,8 +54,8 @@ DIR_FILE_FLAG=$(MISC)$/devguide_config.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/DevelopersGuide/Database/makefile.mk b/odk/examples/DevelopersGuide/Database/makefile.mk
index 35fed3e3..ca8190cf 100644
--- a/odk/examples/DevelopersGuide/Database/makefile.mk
+++ b/odk/examples/DevelopersGuide/Database/makefile.mk
@@ -40,42 +40,42 @@ TARGET=copying
 #----------------------------------------------------
 
 DATABASE_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/CodeSamples.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/Makefile \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/OpenQuery.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/RowSet.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/RowSetEventListener.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/Sales.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/SalesMan.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/sdbcx.java
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/CodeSamples.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/Makefile \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/OpenQuery.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/RowSet.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/RowSetEventListener.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/Sales.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/SalesMan.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/sdbcx.java
 
 DATABASEDRIVERSKELETON_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/How_to_write_my_own_driver.txt \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/Makefile \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/OSubComponent.hxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/OTypeInfo.hxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/propertyids.cxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/propertyids.hxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SConnection.cxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SConnection.hxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SDatabaseMetaData.cxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SDatabaseMetaData.hxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SDriver.cxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SDriver.hxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/skeleton.xml \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SPreparedStatement.cxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SPreparedStatement.hxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SResultSet.cxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SResultSet.hxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SResultSetMetaData.cxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SResultSetMetaData.hxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SServices.cxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SStatement.cxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SStatement.hxx
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/How_to_write_my_own_driver.txt \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/Makefile \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/OSubComponent.hxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/OTypeInfo.hxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/propertyids.cxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/propertyids.hxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SConnection.cxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SConnection.hxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SDatabaseMetaData.cxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SDatabaseMetaData.hxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SDriver.cxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SDriver.hxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/skeleton.xml \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SPreparedStatement.cxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SPreparedStatement.hxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SResultSet.cxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SResultSet.hxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SResultSetMetaData.cxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SResultSetMetaData.hxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SServices.cxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SStatement.cxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Database$/DriverSkeleton$/SStatement.hxx
 
 DIR_FILE_LIST= \
-    $(DATABASE_FILES) \
-    $(DATABASEDRIVERSKELETON_FILES)
+	$(DATABASE_FILES) \
+	$(DATABASEDRIVERSKELETON_FILES)
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/devguide_database_dirs_created.txt
@@ -85,8 +85,8 @@ DIR_FILE_FLAG=$(MISC)$/devguide_database.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/DevelopersGuide/Drawing/makefile.mk b/odk/examples/DevelopersGuide/Drawing/makefile.mk
index 50c892f6..51b3300a 100644
--- a/odk/examples/DevelopersGuide/Drawing/makefile.mk
+++ b/odk/examples/DevelopersGuide/Drawing/makefile.mk
@@ -40,28 +40,28 @@ TARGET=copying
 #----------------------------------------------------
 
 DRAWING_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/ChangeOrderDemo.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/ControlAndSelectDemo.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/CustomShowDemo.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/DrawingDemo.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/DrawViewDemo.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/FillAndLineStyleDemo.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/GluePointDemo.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/GraphicExportDemo.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/Helper.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/LayerDemo.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/Makefile \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/ObjectTransformationDemo.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/Organigram.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/PageHelper.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/PresentationDemo.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/ShapeHelper.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/SimplePresentation.odp \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/StyleDemo.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/TextDemo.java
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/ChangeOrderDemo.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/ControlAndSelectDemo.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/CustomShowDemo.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/DrawingDemo.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/DrawViewDemo.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/FillAndLineStyleDemo.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/GluePointDemo.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/GraphicExportDemo.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/Helper.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/LayerDemo.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/Makefile \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/ObjectTransformationDemo.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/Organigram.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/PageHelper.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/PresentationDemo.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/ShapeHelper.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/SimplePresentation.odp \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/StyleDemo.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Drawing$/TextDemo.java
 
 DIR_FILE_LIST= \
-    $(DRAWING_FILES) \
+	$(DRAWING_FILES) \
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/devguide_drawing_dirs_created.txt
@@ -71,8 +71,8 @@ DIR_FILE_FLAG=$(MISC)$/devguide_drawing.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/DevelopersGuide/FirstSteps/makefile.mk b/odk/examples/DevelopersGuide/FirstSteps/makefile.mk
index 3582a1e1..4751aabf 100644
--- a/odk/examples/DevelopersGuide/FirstSteps/makefile.mk
+++ b/odk/examples/DevelopersGuide/FirstSteps/makefile.mk
@@ -40,14 +40,14 @@ TARGET=copying
 #----------------------------------------------------
 
 FIRSTSTEPS_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/FirstSteps$/FirstUnoContact.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/FirstSteps$/build_FirstUnoContact.xml \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/FirstSteps$/FirstLoadComponent.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/FirstSteps$/HelloTextTableShape.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/FirstSteps$/Makefile
+	$(DESTDIRDEVGUIDEEXAMPLES)$/FirstSteps$/FirstUnoContact.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/FirstSteps$/build_FirstUnoContact.xml \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/FirstSteps$/FirstLoadComponent.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/FirstSteps$/HelloTextTableShape.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/FirstSteps$/Makefile
 
 DIR_FILE_LIST= \
-    $(FIRSTSTEPS_FILES) \
+	$(FIRSTSTEPS_FILES) \
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/devguide_firststeps_dirs_created.txt
@@ -57,8 +57,8 @@ DIR_FILE_FLAG=$(MISC)$/devguide_firststeps.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/DevelopersGuide/Forms/makefile.mk b/odk/examples/DevelopersGuide/Forms/makefile.mk
index 5fd059fc..8ef435aa 100644
--- a/odk/examples/DevelopersGuide/Forms/makefile.mk
+++ b/odk/examples/DevelopersGuide/Forms/makefile.mk
@@ -40,44 +40,44 @@ TARGET=copying
 #----------------------------------------------------
 
 FORMS_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/BooleanValidator.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/ButtonOperator.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/ComponentTreeTraversal.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/ControlLock.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/ControlValidation.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/ControlValidator.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/DataAwareness.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/DateValidator.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/DocumentBasedExample.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/DocumentHelper.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/DocumentType.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/DocumentViewHelper.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/FLTools.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/FormLayer.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/GridFieldValidator.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/InteractionRequest.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/KeyGenerator.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/ListSelectionValidator.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/Makefile \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/NumericValidator.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/ProgrammaticScriptAssignment.odt \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/SalesFilter.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/SingleControlValidation.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/SpreadsheetDocument.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/SpreadsheetValueBinding.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/SpreadsheetView.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/TableCellTextBinding.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/TextValidator.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/TimeValidator.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/UNO.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/ValueBinding.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/URLHelper.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/HsqlDatabase.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/RowSet.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/WaitForInput.java
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/BooleanValidator.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/ButtonOperator.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/ComponentTreeTraversal.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/ControlLock.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/ControlValidation.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/ControlValidator.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/DataAwareness.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/DateValidator.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/DocumentBasedExample.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/DocumentHelper.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/DocumentType.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/DocumentViewHelper.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/FLTools.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/FormLayer.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/GridFieldValidator.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/InteractionRequest.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/KeyGenerator.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/ListSelectionValidator.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/Makefile \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/NumericValidator.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/ProgrammaticScriptAssignment.odt \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/SalesFilter.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/SingleControlValidation.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/SpreadsheetDocument.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/SpreadsheetValueBinding.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/SpreadsheetView.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/TableCellTextBinding.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/TextValidator.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/TimeValidator.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/UNO.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/ValueBinding.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/URLHelper.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/HsqlDatabase.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/RowSet.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Forms$/WaitForInput.java
 
 DIR_FILE_LIST= \
-    $(FORMS_FILES)
+	$(FORMS_FILES)
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/devguide_forms_dirs_created.txt
@@ -87,8 +87,8 @@ DIR_FILE_FLAG=$(MISC)$/devguide_forms.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/DevelopersGuide/OfficeBean/makefile.mk b/odk/examples/DevelopersGuide/OfficeBean/makefile.mk
index 4d56dbe7..47e8ddca 100644
--- a/odk/examples/DevelopersGuide/OfficeBean/makefile.mk
+++ b/odk/examples/DevelopersGuide/OfficeBean/makefile.mk
@@ -40,15 +40,15 @@ TARGET=copying
 #----------------------------------------------------
 
 OFFICEBEAN_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/OfficeBean$/OOoBeanViewer.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/OfficeBean$/OfficeIconColor16.jpg \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/OfficeBean$/OfficeIconColor32.jpg \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/OfficeBean$/OfficeIconMono16.jpg \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/OfficeBean$/OfficeIconMono32.jpg \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/OfficeBean$/Makefile
+	$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeBean$/OOoBeanViewer.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeBean$/OfficeIconColor16.jpg \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeBean$/OfficeIconColor32.jpg \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeBean$/OfficeIconMono16.jpg \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeBean$/OfficeIconMono32.jpg \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeBean$/Makefile
 
 DIR_FILE_LIST= \
-    $(OFFICEBEAN_FILES) 
+	$(OFFICEBEAN_FILES) 
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/devguide_officebean_dirs_created.txt
@@ -58,8 +58,8 @@ DIR_FILE_FLAG=$(MISC)$/devguide_officebean.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/DevelopersGuide/OfficeDev/makefile.mk b/odk/examples/DevelopersGuide/OfficeDev/makefile.mk
index f2ffe0cd..bbd0c554 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/makefile.mk
+++ b/odk/examples/DevelopersGuide/OfficeDev/makefile.mk
@@ -41,126 +41,126 @@ TARGET=copying
 
 
 OFFICEDEV_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/ContextMenuInterceptor.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/Makefile \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/MenuElement.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/Number_Formats.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/OfficeConnect.java
+	$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/ContextMenuInterceptor.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/Makefile \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/MenuElement.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/Number_Formats.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/OfficeConnect.java
 
 DESTCLIPBOARD=$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/Clipboard
 CLIPBOARD_FILES=\
-    $(DESTCLIPBOARD)$/Clipboard.java \
-    $(DESTCLIPBOARD)$/ClipboardListener.java \
-    $(DESTCLIPBOARD)$/ClipboardOwner.java \
-    $(DESTCLIPBOARD)$/Makefile \
-    $(DESTCLIPBOARD)$/TextTransferable.java
+	$(DESTCLIPBOARD)$/Clipboard.java \
+	$(DESTCLIPBOARD)$/ClipboardListener.java \
+	$(DESTCLIPBOARD)$/ClipboardOwner.java \
+	$(DESTCLIPBOARD)$/Makefile \
+	$(DESTCLIPBOARD)$/TextTransferable.java
 
 DESTDESKTOPENV=$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/DesktopEnvironment
 DESKTOPENV_FILES=\
-    $(DESTDESKTOPENV)$/nativelib$/unix$/exports.dxp \
-    $(DESTDESKTOPENV)$/nativelib$/unix$/Makefile \
-    $(DESTDESKTOPENV)$/nativelib$/unix$/nativeview.c \
-    $(DESTDESKTOPENV)$/nativelib$/unix$/nativeview.h \
-    $(DESTDESKTOPENV)$/nativelib$/windows$/exports.dxp \
-    $(DESTDESKTOPENV)$/nativelib$/windows$/Makefile \
-    $(DESTDESKTOPENV)$/nativelib$/windows$/nativeview.c \
-    $(DESTDESKTOPENV)$/nativelib$/windows$/nativeview.h \
-    $(DESTDESKTOPENV)$/CustomizeView.java \
-    $(DESTDESKTOPENV)$/Desk.java \
-    $(DESTDESKTOPENV)$/DocumentView.java \
-    $(DESTDESKTOPENV)$/FunctionHelper.java \
-    $(DESTDESKTOPENV)$/Install.txt \
-    $(DESTDESKTOPENV)$/Interceptor.java \
-    $(DESTDESKTOPENV)$/IOnewayLink.java \
-    $(DESTDESKTOPENV)$/IShutdownListener.java \
-    $(DESTDESKTOPENV)$/JavaWindowPeerFake.java \
-    $(DESTDESKTOPENV)$/Makefile \
-    $(DESTDESKTOPENV)$/NativeView.java \
-    $(DESTDESKTOPENV)$/OfficeConnect.java \
-    $(DESTDESKTOPENV)$/OnewayExecutor.java \
-    $(DESTDESKTOPENV)$/StatusListener.java \
-    $(DESTDESKTOPENV)$/StatusView.java \
-    $(DESTDESKTOPENV)$/ViewContainer.java
+	$(DESTDESKTOPENV)$/nativelib$/unix$/exports.dxp \
+	$(DESTDESKTOPENV)$/nativelib$/unix$/Makefile \
+	$(DESTDESKTOPENV)$/nativelib$/unix$/nativeview.c \
+	$(DESTDESKTOPENV)$/nativelib$/unix$/nativeview.h \
+	$(DESTDESKTOPENV)$/nativelib$/windows$/exports.dxp \
+	$(DESTDESKTOPENV)$/nativelib$/windows$/Makefile \
+	$(DESTDESKTOPENV)$/nativelib$/windows$/nativeview.c \
+	$(DESTDESKTOPENV)$/nativelib$/windows$/nativeview.h \
+	$(DESTDESKTOPENV)$/CustomizeView.java \
+	$(DESTDESKTOPENV)$/Desk.java \
+	$(DESTDESKTOPENV)$/DocumentView.java \
+	$(DESTDESKTOPENV)$/FunctionHelper.java \
+	$(DESTDESKTOPENV)$/Install.txt \
+	$(DESTDESKTOPENV)$/Interceptor.java \
+	$(DESTDESKTOPENV)$/IOnewayLink.java \
+	$(DESTDESKTOPENV)$/IShutdownListener.java \
+	$(DESTDESKTOPENV)$/JavaWindowPeerFake.java \
+	$(DESTDESKTOPENV)$/Makefile \
+	$(DESTDESKTOPENV)$/NativeView.java \
+	$(DESTDESKTOPENV)$/OfficeConnect.java \
+	$(DESTDESKTOPENV)$/OnewayExecutor.java \
+	$(DESTDESKTOPENV)$/StatusListener.java \
+	$(DESTDESKTOPENV)$/StatusView.java \
+	$(DESTDESKTOPENV)$/ViewContainer.java
 
 DESTASCIIFILTER=$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/FilterDevelopment$/AsciiFilter
 ASCIIFILTER_FILES=\
-    $(DESTASCIIFILTER)$/AsciiReplaceFilter.java \
-    $(DESTASCIIFILTER)$/FilterOptions.java \
-    $(DESTASCIIFILTER)$/Makefile \
-    $(DESTASCIIFILTER)$/TypeDetection.xcu
+	$(DESTASCIIFILTER)$/AsciiReplaceFilter.java \
+	$(DESTASCIIFILTER)$/FilterOptions.java \
+	$(DESTASCIIFILTER)$/Makefile \
+	$(DESTASCIIFILTER)$/TypeDetection.xcu
 
 DESTFILTERDETECTION=$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/FilterDevelopment$/FlatXmlFilterDetection
 FILTERDETECTION_FILES=\
-    $(DESTFILTERDETECTION)$/fdcomp.cxx \
-    $(DESTFILTERDETECTION)$/filterdetect.cxx \
-    $(DESTFILTERDETECTION)$/filterdetect.hxx \
-    $(DESTFILTERDETECTION)$/FlatXmlTypeDetection.uno.xml \
-    $(DESTFILTERDETECTION)$/FlatXmlTypeDetection.xcu \
-    $(DESTFILTERDETECTION)$/Makefile
+	$(DESTFILTERDETECTION)$/fdcomp.cxx \
+	$(DESTFILTERDETECTION)$/filterdetect.cxx \
+	$(DESTFILTERDETECTION)$/filterdetect.hxx \
+	$(DESTFILTERDETECTION)$/FlatXmlTypeDetection.uno.xml \
+	$(DESTFILTERDETECTION)$/FlatXmlTypeDetection.xcu \
+	$(DESTFILTERDETECTION)$/Makefile
 
 DESTFLATXMLCPP=$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/FilterDevelopment$/FlatXmlFilter_cpp
 FLATXMLCPP_FILES=\
-    $(DESTFLATXMLCPP)$/FlatXml.cxx \
-    $(DESTFLATXMLCPP)$/FlatXmlFilter_cpp.uno.xml \
-    $(DESTFLATXMLCPP)$/Makefile \
-    $(DESTFLATXMLCPP)$/FlatXmlFilter_cpp.xcu
+	$(DESTFLATXMLCPP)$/FlatXml.cxx \
+	$(DESTFLATXMLCPP)$/FlatXmlFilter_cpp.uno.xml \
+	$(DESTFLATXMLCPP)$/Makefile \
+	$(DESTFLATXMLCPP)$/FlatXmlFilter_cpp.xcu
 
 DESTFLATXMLJAVA=$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/FilterDevelopment$/FlatXmlFilter_java
 FLATXMLJAVA_FILES=\
-    $(DESTFLATXMLJAVA)$/Makefile \
-    $(DESTFLATXMLJAVA)$/FlatXmlFilter_java.xcu \
-    $(DESTFLATXMLJAVA)$/FlatXml.java
+	$(DESTFLATXMLJAVA)$/Makefile \
+	$(DESTFLATXMLJAVA)$/FlatXmlFilter_java.xcu \
+	$(DESTFLATXMLJAVA)$/FlatXml.java
 
 DESTLINGUISTIC=$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/Linguistic
 LINGUISTIC_FILES=\
-    $(DESTLINGUISTIC)$/LinguisticExamples.java \
-    $(DESTLINGUISTIC)$/Makefile \
-    $(DESTLINGUISTIC)$/OneInstanceFactory.java \
-    $(DESTLINGUISTIC)$/PropChgHelper.java \
-    $(DESTLINGUISTIC)$/PropChgHelper_Hyph.java \
-    $(DESTLINGUISTIC)$/PropChgHelper_Spell.java \
-    $(DESTLINGUISTIC)$/SampleHyphenator.java \
-    $(DESTLINGUISTIC)$/SampleSpellChecker.java \
-    $(DESTLINGUISTIC)$/SampleThesaurus.java \
-    $(DESTLINGUISTIC)$/XHyphenatedWord_impl.java \
-    $(DESTLINGUISTIC)$/XMeaning_impl.java \
-    $(DESTLINGUISTIC)$/XPossibleHyphens_impl.java \
-    $(DESTLINGUISTIC)$/XSpellAlternatives_impl.java
+	$(DESTLINGUISTIC)$/LinguisticExamples.java \
+	$(DESTLINGUISTIC)$/Makefile \
+	$(DESTLINGUISTIC)$/OneInstanceFactory.java \
+	$(DESTLINGUISTIC)$/PropChgHelper.java \
+	$(DESTLINGUISTIC)$/PropChgHelper_Hyph.java \
+	$(DESTLINGUISTIC)$/PropChgHelper_Spell.java \
+	$(DESTLINGUISTIC)$/SampleHyphenator.java \
+	$(DESTLINGUISTIC)$/SampleSpellChecker.java \
+	$(DESTLINGUISTIC)$/SampleThesaurus.java \
+	$(DESTLINGUISTIC)$/XHyphenatedWord_impl.java \
+	$(DESTLINGUISTIC)$/XMeaning_impl.java \
+	$(DESTLINGUISTIC)$/XPossibleHyphens_impl.java \
+	$(DESTLINGUISTIC)$/XSpellAlternatives_impl.java
 
 DESTPATHSETTINGS=$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/PathSettings
 PATHSETTINGS_FILES=\
-    $(DESTPATHSETTINGS)$/Makefile \
-    $(DESTPATHSETTINGS)$/PathSettingsTest.java
+	$(DESTPATHSETTINGS)$/Makefile \
+	$(DESTPATHSETTINGS)$/PathSettingsTest.java
 
 DESTPATHSUBSTITUTION=$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/PathSubstitution
 PATHSUBSTITUTION_FILES=\
-    $(DESTPATHSUBSTITUTION)$/Makefile \
-    $(DESTPATHSUBSTITUTION)$/PathSubstitutionTest.java
+	$(DESTPATHSUBSTITUTION)$/Makefile \
+	$(DESTPATHSUBSTITUTION)$/PathSubstitutionTest.java
 
 DESTTERMINATIONTEST=$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/TerminationTest
 TERMINATION_FILES=\
-    $(DESTTERMINATIONTEST)$/Makefile \
-    $(DESTTERMINATIONTEST)$/TerminateListener.java \
-    $(DESTTERMINATIONTEST)$/TerminationTest.java
+	$(DESTTERMINATIONTEST)$/Makefile \
+	$(DESTTERMINATIONTEST)$/TerminateListener.java \
+	$(DESTTERMINATIONTEST)$/TerminationTest.java
 
 DESTDISABLECOMMANDS=$(DESTDIRDEVGUIDEEXAMPLES)$/OfficeDev$/DisableCommands
 DISABLECOMMANDS_FILES=\
-    $(DESTDISABLECOMMANDS)$/Makefile \
-    $(DESTDISABLECOMMANDS)$/DisableCommandsTest.java
+	$(DESTDISABLECOMMANDS)$/Makefile \
+	$(DESTDISABLECOMMANDS)$/DisableCommandsTest.java
 
 DIR_FILE_LIST= \
-    $(OFFICEDEV_FILES) \
-    $(CLIPBOARD_FILES) \
-    $(DESKTOPENV_FILES) \
-    $(ASCIIFILTER_FILES) \
-    $(FILTERDETECTION_FILES) \
-    $(FLATXMLCPP_FILES) \
-    $(FLATXMLJAVA_FILES) \
-    $(LINGUISTIC_FILES) \
-    $(PATHSETTINGS_FILES) \
-    $(PATHSUBSTITUTION_FILES) \
-    $(TERMINATION_FILES) \
-    $(DISABLECOMMANDS_FILES)
+	$(OFFICEDEV_FILES) \
+	$(CLIPBOARD_FILES) \
+	$(DESKTOPENV_FILES) \
+	$(ASCIIFILTER_FILES) \
+	$(FILTERDETECTION_FILES) \
+	$(FLATXMLCPP_FILES) \
+	$(FLATXMLJAVA_FILES) \
+	$(LINGUISTIC_FILES) \
+	$(PATHSETTINGS_FILES) \
+	$(PATHSUBSTITUTION_FILES) \
+	$(TERMINATION_FILES) \
+	$(DISABLECOMMANDS_FILES)
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/devguide_officedev_dirs_created.txt
@@ -170,8 +170,8 @@ DIR_FILE_FLAG=$(MISC)$/devguide_officedev.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/DevelopersGuide/ProfUNO/makefile.mk b/odk/examples/DevelopersGuide/ProfUNO/makefile.mk
index fbacdfc6..6e5e11a7 100644
--- a/odk/examples/DevelopersGuide/ProfUNO/makefile.mk
+++ b/odk/examples/DevelopersGuide/ProfUNO/makefile.mk
@@ -40,37 +40,37 @@ TARGET=copying
 #----------------------------------------------------
 
 CPPBINDING_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/CppBinding$/Makefile \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/CppBinding$/office_connect.cxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/CppBinding$/office_connect.ini \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/CppBinding$/office_connectrc \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/CppBinding$/string_samples.cxx
+	$(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/CppBinding$/Makefile \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/CppBinding$/office_connect.cxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/CppBinding$/office_connect.ini \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/CppBinding$/office_connectrc \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/CppBinding$/string_samples.cxx
 
 INTERPROCESSCONN_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/InterprocessConn$/ConnectionAwareClient.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/InterprocessConn$/Makefile \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/InterprocessConn$/UrlResolver.java
+	$(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/InterprocessConn$/ConnectionAwareClient.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/InterprocessConn$/Makefile \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/InterprocessConn$/UrlResolver.java
 
 LIFETIME_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/Lifetime$/Makefile \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/Lifetime$/MyUnoObject.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/Lifetime$/object_lifetime.cxx
+	$(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/Lifetime$/Makefile \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/Lifetime$/MyUnoObject.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/Lifetime$/object_lifetime.cxx
 
 SIMPLEBOOTSTRAP_JAVA_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/SimpleBootstrap_java$/SimpleBootstrap_java.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/SimpleBootstrap_java$/manifest.mf \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/SimpleBootstrap_java$/Makefile
+	$(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/SimpleBootstrap_java$/SimpleBootstrap_java.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/SimpleBootstrap_java$/manifest.mf \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/SimpleBootstrap_java$/Makefile
 
 SIMPLEBOOTSTRAP_CPP_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/SimpleBootstrap_cpp$/SimpleBootstrap_cpp.cxx \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/SimpleBootstrap_cpp$/Makefile
+	$(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/SimpleBootstrap_cpp$/SimpleBootstrap_cpp.cxx \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/ProfUNO$/SimpleBootstrap_cpp$/Makefile
 
 DIR_FILE_LIST= \
-    $(CPPBINDING_FILES) \
-    $(INTERPROCESSCONN_FILES) \
-    $(LIFETIME_FILES) \
-    $(SIMPLEBOOTSTRAP_JAVA_FILES) \
-    $(SIMPLEBOOTSTRAP_CPP_FILES)
+	$(CPPBINDING_FILES) \
+	$(INTERPROCESSCONN_FILES) \
+	$(LIFETIME_FILES) \
+	$(SIMPLEBOOTSTRAP_JAVA_FILES) \
+	$(SIMPLEBOOTSTRAP_CPP_FILES)
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/devguide_profuno_dirs_created.txt
@@ -80,8 +80,8 @@ DIR_FILE_FLAG=$(MISC)$/devguide_profuno.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
@@ -89,7 +89,7 @@ all : \
 .INCLUDE: $(PRJ)$/util$/odk_rules.pmk
 
 $(DESTDIREXAMPLES)$/%$/office_connectrc : $(PRJ)$/examples$/%$/office_connectrc
-    -$(MKDIRHIER) $(@:d)        
-    @@-rm -f $@
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
+	-$(MKDIRHIER) $(@:d)        
+	@@-rm -f $@
+	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@
 
diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/makefile.mk b/odk/examples/DevelopersGuide/ScriptingFramework/makefile.mk
index 615a8c13..2666b8fb 100644
--- a/odk/examples/DevelopersGuide/ScriptingFramework/makefile.mk
+++ b/odk/examples/DevelopersGuide/ScriptingFramework/makefile.mk
@@ -58,7 +58,7 @@ SF_FILES=\
     $(DESTSF)$/ScriptSelector$/ScriptSelector$/parcel-descriptor.xml
 
 DIR_FILE_LIST= \
-    $(SF_FILES) \
+	$(SF_FILES) \
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/devguide_sf_dirs_created.txt
@@ -68,8 +68,8 @@ DIR_FILE_FLAG=$(MISC)$/devguide_sf.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/DevelopersGuide/Spreadsheet/makefile.mk b/odk/examples/DevelopersGuide/Spreadsheet/makefile.mk
index e853066e..915493e0 100644
--- a/odk/examples/DevelopersGuide/Spreadsheet/makefile.mk
+++ b/odk/examples/DevelopersGuide/Spreadsheet/makefile.mk
@@ -40,19 +40,19 @@ TARGET=copying
 #----------------------------------------------------
 
 SPREADSHEET_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/ExampleAddIn.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/ExampleAddIn.ods \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/ExampleDataPilotSource.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/GeneralTableSample.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/Makefile \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/SpreadsheetDocHelper.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/SpreadsheetSample.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/ViewSample.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/XExampleAddIn.idl \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/DataPilotReadme.txt
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/ExampleAddIn.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/ExampleAddIn.ods \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/ExampleDataPilotSource.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/GeneralTableSample.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/Makefile \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/SpreadsheetDocHelper.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/SpreadsheetSample.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/ViewSample.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/XExampleAddIn.idl \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Spreadsheet$/DataPilotReadme.txt
 
 DIR_FILE_LIST= \
-    $(SPREADSHEET_FILES) \
+	$(SPREADSHEET_FILES) \
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/devguide_spreadsheet_dirs_created.txt
@@ -62,8 +62,8 @@ DIR_FILE_FLAG=$(MISC)$/devguide_spreadsheet.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/DevelopersGuide/Text/makefile.mk b/odk/examples/DevelopersGuide/Text/makefile.mk
index dbb2000e..526074c8 100644
--- a/odk/examples/DevelopersGuide/Text/makefile.mk
+++ b/odk/examples/DevelopersGuide/Text/makefile.mk
@@ -40,14 +40,14 @@ TARGET=copying
 #----------------------------------------------------
 
 TEXT_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Text$/Makefile \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Text$/PrintDemo.odt \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Text$/TextDocuments.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/Text$/TextTemplateWithUserFields.odt
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Text$/Makefile \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Text$/PrintDemo.odt \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Text$/TextDocuments.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/Text$/TextTemplateWithUserFields.odt
 #	$(DESTDIRDEVGUIDEEXAMPLES)$/Text$/ViewCursorExample.sxw
 
 DIR_FILE_LIST= \
-    $(TEXT_FILES) \
+	$(TEXT_FILES) \
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/devguide_text_dirs_created.txt
@@ -57,8 +57,8 @@ DIR_FILE_FLAG=$(MISC)$/devguide_text.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/DevelopersGuide/UCB/makefile.mk b/odk/examples/DevelopersGuide/UCB/makefile.mk
index c95d3769..85df7310 100644
--- a/odk/examples/DevelopersGuide/UCB/makefile.mk
+++ b/odk/examples/DevelopersGuide/UCB/makefile.mk
@@ -40,22 +40,22 @@ TARGET=copying
 #----------------------------------------------------
 
 UCB_FILES=\
-    $(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/data$/data.txt \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/ChildrenRetriever.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/DataStreamComposer.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/DataStreamRetriever.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/Helper.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/Makefile \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/MyActiveDataSink.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/MyInputStream.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/PropertiesComposer.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/PropertiesRetriever.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/ResourceCreator.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/ResourceManager.java \
-    $(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/ResourceRemover.java
+	$(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/data$/data.txt \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/ChildrenRetriever.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/DataStreamComposer.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/DataStreamRetriever.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/Helper.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/Makefile \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/MyActiveDataSink.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/MyInputStream.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/PropertiesComposer.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/PropertiesRetriever.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/ResourceCreator.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/ResourceManager.java \
+	$(DESTDIRDEVGUIDEEXAMPLES)$/UCB$/ResourceRemover.java
 
 DIR_FILE_LIST= \
-    $(UCB_FILES) \
+	$(UCB_FILES) \
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/devguide_ucb_dirs_created.txt
@@ -65,8 +65,8 @@ DIR_FILE_FLAG=$(MISC)$/devguide_ucb.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/OLE/makefile.mk b/odk/examples/OLE/makefile.mk
index 49c7a822..954a2ad8 100644
--- a/odk/examples/OLE/makefile.mk
+++ b/odk/examples/OLE/makefile.mk
@@ -40,40 +40,40 @@ TARGET=copying
 #----------------------------------------------------
 
 ACTIVEX_FILES=\
-    $(DESTDIROLEEXAMPLES)$/activex$/example.html \
-    $(DESTDIROLEEXAMPLES)$/activex$/Makefile \
-    $(DESTDIROLEEXAMPLES)$/activex$/README.txt \
-    $(DESTDIROLEEXAMPLES)$/activex$/resource.h \
-    $(DESTDIROLEEXAMPLES)$/activex$/SOActiveX.cpp \
-    $(DESTDIROLEEXAMPLES)$/activex$/SOActiveX.h \
-    $(DESTDIROLEEXAMPLES)$/activex$/SOActiveX.rgs \
-    $(DESTDIROLEEXAMPLES)$/activex$/SOComWindowPeer.cpp \
-    $(DESTDIROLEEXAMPLES)$/activex$/SOComWindowPeer.h \
-    $(DESTDIROLEEXAMPLES)$/activex$/SOComWindowPeer.rgs \
-    $(DESTDIROLEEXAMPLES)$/activex$/so_activex.cpp \
-    $(DESTDIROLEEXAMPLES)$/activex$/so_activex.def \
-    $(DESTDIROLEEXAMPLES)$/activex$/so_activex.idl \
-    $(DESTDIROLEEXAMPLES)$/activex$/so_activex.rc \
-    $(DESTDIROLEEXAMPLES)$/activex$/StdAfx2.cpp \
-    $(DESTDIROLEEXAMPLES)$/activex$/StdAfx2.h
+	$(DESTDIROLEEXAMPLES)$/activex$/example.html \
+	$(DESTDIROLEEXAMPLES)$/activex$/Makefile \
+	$(DESTDIROLEEXAMPLES)$/activex$/README.txt \
+	$(DESTDIROLEEXAMPLES)$/activex$/resource.h \
+	$(DESTDIROLEEXAMPLES)$/activex$/SOActiveX.cpp \
+	$(DESTDIROLEEXAMPLES)$/activex$/SOActiveX.h \
+	$(DESTDIROLEEXAMPLES)$/activex$/SOActiveX.rgs \
+	$(DESTDIROLEEXAMPLES)$/activex$/SOComWindowPeer.cpp \
+	$(DESTDIROLEEXAMPLES)$/activex$/SOComWindowPeer.h \
+	$(DESTDIROLEEXAMPLES)$/activex$/SOComWindowPeer.rgs \
+	$(DESTDIROLEEXAMPLES)$/activex$/so_activex.cpp \
+	$(DESTDIROLEEXAMPLES)$/activex$/so_activex.def \
+	$(DESTDIROLEEXAMPLES)$/activex$/so_activex.idl \
+	$(DESTDIROLEEXAMPLES)$/activex$/so_activex.rc \
+	$(DESTDIROLEEXAMPLES)$/activex$/StdAfx2.cpp \
+	$(DESTDIROLEEXAMPLES)$/activex$/StdAfx2.h
 
 DELPHI_FILES=\
-    $(DESTDIROLEEXAMPLES)$/delphi$/InsertTables$/Project1.dpr \
-    $(DESTDIROLEEXAMPLES)$/delphi$/InsertTables$/Project1.res \
-    $(DESTDIROLEEXAMPLES)$/delphi$/InsertTables$/SampleCode.pas \
-    $(DESTDIROLEEXAMPLES)$/delphi$/InsertTables$/SampleUI.dfm \
-    $(DESTDIROLEEXAMPLES)$/delphi$/InsertTables$/SampleUI.pas \
-    $(DESTDIROLEEXAMPLES)$/delphi$/StarOffice_and_Delphi.pdf \
-    $(DESTDIROLEEXAMPLES)$/delphi$/StarOffice_Delphi.sxw
+	$(DESTDIROLEEXAMPLES)$/delphi$/InsertTables$/Project1.dpr \
+	$(DESTDIROLEEXAMPLES)$/delphi$/InsertTables$/Project1.res \
+	$(DESTDIROLEEXAMPLES)$/delphi$/InsertTables$/SampleCode.pas \
+	$(DESTDIROLEEXAMPLES)$/delphi$/InsertTables$/SampleUI.dfm \
+	$(DESTDIROLEEXAMPLES)$/delphi$/InsertTables$/SampleUI.pas \
+	$(DESTDIROLEEXAMPLES)$/delphi$/StarOffice_and_Delphi.pdf \
+	$(DESTDIROLEEXAMPLES)$/delphi$/StarOffice_Delphi.sxw
 
 VBSCRIPT_FILES=\
-    $(DESTDIROLEEXAMPLES)$/vbscript$/readme.txt \
-    $(DESTDIROLEEXAMPLES)$/vbscript$/WriterDemo.vbs
+	$(DESTDIROLEEXAMPLES)$/vbscript$/readme.txt \
+	$(DESTDIROLEEXAMPLES)$/vbscript$/WriterDemo.vbs
 
 DIR_FILE_LIST= \
-    $(ACTIVEX_FILES) \
-    $(DELPHI_FILES) \
-    $(VBSCRIPT_FILES)
+	$(ACTIVEX_FILES) \
+	$(DELPHI_FILES) \
+	$(VBSCRIPT_FILES)
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/ex_ole_dirs_created.txt
@@ -83,8 +83,8 @@ DIR_FILE_FLAG=$(MISC)$/ex_ole_files.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/basic/makefile.mk b/odk/examples/basic/makefile.mk
index 594b93fb..392ca01c 100644
--- a/odk/examples/basic/makefile.mk
+++ b/odk/examples/basic/makefile.mk
@@ -40,37 +40,37 @@ TARGET=copying
 #----------------------------------------------------
 
 DRAWING_FILES=\
-    $(DESTDIRBASICEXAMPLES)$/drawing$/dirtree.txt \
-    $(DESTDIRBASICEXAMPLES)$/drawing$/importexportofasciifiles.odg
+	$(DESTDIRBASICEXAMPLES)$/drawing$/dirtree.txt \
+	$(DESTDIRBASICEXAMPLES)$/drawing$/importexportofasciifiles.odg
 
 FORMSANDCONTROLS_FILES=\
-    $(DESTDIRBASICEXAMPLES)$/forms_and_controls$/beef.wmf \
-    $(DESTDIRBASICEXAMPLES)$/forms_and_controls$/burger.wmf \
-    $(DESTDIRBASICEXAMPLES)$/forms_and_controls$/burger_factory.odt \
-    $(DESTDIRBASICEXAMPLES)$/forms_and_controls$/chicken.wmf \
-    $(DESTDIRBASICEXAMPLES)$/forms_and_controls$/fish.wmf \
-    $(DESTDIRBASICEXAMPLES)$/forms_and_controls$/vegetable.wmf
+	$(DESTDIRBASICEXAMPLES)$/forms_and_controls$/beef.wmf \
+	$(DESTDIRBASICEXAMPLES)$/forms_and_controls$/burger.wmf \
+	$(DESTDIRBASICEXAMPLES)$/forms_and_controls$/burger_factory.odt \
+	$(DESTDIRBASICEXAMPLES)$/forms_and_controls$/chicken.wmf \
+	$(DESTDIRBASICEXAMPLES)$/forms_and_controls$/fish.wmf \
+	$(DESTDIRBASICEXAMPLES)$/forms_and_controls$/vegetable.wmf
 
 SHEET_FILES=\
-    $(DESTDIRBASICEXAMPLES)$/sheet$/adapting_to_euroland.ods
+	$(DESTDIRBASICEXAMPLES)$/sheet$/adapting_to_euroland.ods
 
 STOCKQUOTEUPDATER_FILES=\
-    $(DESTDIRBASICEXAMPLES)$/stock_quotes_updater$/stock.ods
+	$(DESTDIRBASICEXAMPLES)$/stock_quotes_updater$/stock.ods
 
 TEXT_FILES=\
-    $(DESTDIRBASICEXAMPLES)$/text$/creating_an_index$/index.odt \
-    $(DESTDIRBASICEXAMPLES)$/text$/creating_an_index$/indexlist.txt \
-    $(DESTDIRBASICEXAMPLES)$/text$/modifying_text_automatically$/changing_appearance.odt \
-    $(DESTDIRBASICEXAMPLES)$/text$/modifying_text_automatically$/inserting_bookmarks.odt \
-    $(DESTDIRBASICEXAMPLES)$/text$/modifying_text_automatically$/replacing_text.odt \
-    $(DESTDIRBASICEXAMPLES)$/text$/modifying_text_automatically$/using_regular_expressions.odt
+	$(DESTDIRBASICEXAMPLES)$/text$/creating_an_index$/index.odt \
+	$(DESTDIRBASICEXAMPLES)$/text$/creating_an_index$/indexlist.txt \
+	$(DESTDIRBASICEXAMPLES)$/text$/modifying_text_automatically$/changing_appearance.odt \
+	$(DESTDIRBASICEXAMPLES)$/text$/modifying_text_automatically$/inserting_bookmarks.odt \
+	$(DESTDIRBASICEXAMPLES)$/text$/modifying_text_automatically$/replacing_text.odt \
+	$(DESTDIRBASICEXAMPLES)$/text$/modifying_text_automatically$/using_regular_expressions.odt
 
 DIR_FILE_LIST= \
-    $(DRAWING_FILES) \
-    $(FORMSANDCONTROLS_FILES) \
-    $(SHEET_FILES) \
-    $(STOCKQUOTEUPDATER_FILES) \
-    $(TEXT_FILES) \
+	$(DRAWING_FILES) \
+	$(FORMSANDCONTROLS_FILES) \
+	$(SHEET_FILES) \
+	$(STOCKQUOTEUPDATER_FILES) \
+	$(TEXT_FILES) \
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/ex_basic_dirs_created.txt
@@ -80,8 +80,8 @@ DIR_FILE_FLAG=$(MISC)$/ex_basic_files.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/cpp/makefile.mk b/odk/examples/cpp/makefile.mk
index 462dba06..420d1049 100644
--- a/odk/examples/cpp/makefile.mk
+++ b/odk/examples/cpp/makefile.mk
@@ -40,26 +40,26 @@ TARGET=copying
 #----------------------------------------------------
 
 COUNTER_FILES=\
-    $(DESTDIRCPPEXAMPLES)$/counter$/counter.cxx \
-    $(DESTDIRCPPEXAMPLES)$/counter$/counter.uno.xml \
-    $(DESTDIRCPPEXAMPLES)$/counter$/countermain.cxx \
-    $(DESTDIRCPPEXAMPLES)$/counter$/Makefile \
-    $(DESTDIRCPPEXAMPLES)$/counter$/XCountable.idl
+	$(DESTDIRCPPEXAMPLES)$/counter$/counter.cxx \
+	$(DESTDIRCPPEXAMPLES)$/counter$/counter.uno.xml \
+	$(DESTDIRCPPEXAMPLES)$/counter$/countermain.cxx \
+	$(DESTDIRCPPEXAMPLES)$/counter$/Makefile \
+	$(DESTDIRCPPEXAMPLES)$/counter$/XCountable.idl
 
 DOUCMENTLOADER_FILES=\
-    $(DESTDIRCPPEXAMPLES)$/DocumentLoader$/DocumentLoader.cxx \
-    $(DESTDIRCPPEXAMPLES)$/DocumentLoader$/Makefile \
-    $(DESTDIRCPPEXAMPLES)$/DocumentLoader$/test.odt
+	$(DESTDIRCPPEXAMPLES)$/DocumentLoader$/DocumentLoader.cxx \
+	$(DESTDIRCPPEXAMPLES)$/DocumentLoader$/Makefile \
+	$(DESTDIRCPPEXAMPLES)$/DocumentLoader$/test.odt
 
 REMOTECLIENT_FILES=\
-    $(DESTDIRCPPEXAMPLES)$/remoteclient$/Makefile \
-    $(DESTDIRCPPEXAMPLES)$/remoteclient$/remoteclient.cxx \
-    $(DESTDIRCPPEXAMPLES)$/remoteclient$/remoteclientsample.uno.xml
+	$(DESTDIRCPPEXAMPLES)$/remoteclient$/Makefile \
+	$(DESTDIRCPPEXAMPLES)$/remoteclient$/remoteclient.cxx \
+	$(DESTDIRCPPEXAMPLES)$/remoteclient$/remoteclientsample.uno.xml
 
 DIR_FILE_LIST= \
-    $(COUNTER_FILES) \
-    $(DOUCMENTLOADER_FILES) \
-    $(REMOTECLIENT_FILES)
+	$(COUNTER_FILES) \
+	$(DOUCMENTLOADER_FILES) \
+	$(REMOTECLIENT_FILES)
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/ex_cpp_dirs_created.txt
@@ -69,8 +69,8 @@ DIR_FILE_FLAG=$(MISC)$/ex_cpp_files.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/examples/java/makefile.mk b/odk/examples/java/makefile.mk
index 564b615e..b419763d 100644
--- a/odk/examples/java/makefile.mk
+++ b/odk/examples/java/makefile.mk
@@ -40,101 +40,101 @@ TARGET=copying
 #----------------------------------------------------
 
 DRAWING_FILES= \
-    $(DESTDIRJAVAEXAMPLES)$/Drawing$/SDraw.java \
-    $(DESTDIRJAVAEXAMPLES)$/Drawing$/Makefile
+	$(DESTDIRJAVAEXAMPLES)$/Drawing$/SDraw.java \
+	$(DESTDIRJAVAEXAMPLES)$/Drawing$/Makefile
 
 SPREADSHEET_FILES= \
-    $(DESTDIRJAVAEXAMPLES)$/Spreadsheet$/SCalc.java		   	\
-    $(DESTDIRJAVAEXAMPLES)$/Spreadsheet$/EuroAdaption.java		\
-    $(DESTDIRJAVAEXAMPLES)$/Spreadsheet$/ChartTypeChange.java   	\
-    $(DESTDIRJAVAEXAMPLES)$/Spreadsheet$/CalcAddins.java	   	\
-    $(DESTDIRJAVAEXAMPLES)$/Spreadsheet$/CalcAddins.ods	   	\
-    $(DESTDIRJAVAEXAMPLES)$/Spreadsheet$/XCalcAddins.idl	   	\
-    $(DESTDIRJAVAEXAMPLES)$/Spreadsheet$/Makefile
+	$(DESTDIRJAVAEXAMPLES)$/Spreadsheet$/SCalc.java		   	\
+	$(DESTDIRJAVAEXAMPLES)$/Spreadsheet$/EuroAdaption.java		\
+	$(DESTDIRJAVAEXAMPLES)$/Spreadsheet$/ChartTypeChange.java   	\
+	$(DESTDIRJAVAEXAMPLES)$/Spreadsheet$/CalcAddins.java	   	\
+	$(DESTDIRJAVAEXAMPLES)$/Spreadsheet$/CalcAddins.ods	   	\
+	$(DESTDIRJAVAEXAMPLES)$/Spreadsheet$/XCalcAddins.idl	   	\
+	$(DESTDIRJAVAEXAMPLES)$/Spreadsheet$/Makefile
 
 TEXT_FILES= \
-    $(DESTDIRJAVAEXAMPLES)$/Text$/SWriter.java	   		\
-    $(DESTDIRJAVAEXAMPLES)$/Text$/StyleInitialization.java 	\
-    $(DESTDIRJAVAEXAMPLES)$/Text$/TextDocumentStructure.java 	\
-    $(DESTDIRJAVAEXAMPLES)$/Text$/TextReplace.java 		\
-    $(DESTDIRJAVAEXAMPLES)$/Text$/BookmarkInsertion.java 	\
-    $(DESTDIRJAVAEXAMPLES)$/Text$/HardFormatting.java 	\
-    $(DESTDIRJAVAEXAMPLES)$/Text$/StyleCreation.java  	\
-    $(DESTDIRJAVAEXAMPLES)$/Text$/WriterSelector.java  	\
-    $(DESTDIRJAVAEXAMPLES)$/Text$/GraphicsInserter.java  	\
-    $(DESTDIRJAVAEXAMPLES)$/Text$/oo_smiley.gif  	\
-    $(DESTDIRJAVAEXAMPLES)$/Text$/Makefile
+	$(DESTDIRJAVAEXAMPLES)$/Text$/SWriter.java	   		\
+	$(DESTDIRJAVAEXAMPLES)$/Text$/StyleInitialization.java 	\
+	$(DESTDIRJAVAEXAMPLES)$/Text$/TextDocumentStructure.java 	\
+	$(DESTDIRJAVAEXAMPLES)$/Text$/TextReplace.java 		\
+	$(DESTDIRJAVAEXAMPLES)$/Text$/BookmarkInsertion.java 	\
+	$(DESTDIRJAVAEXAMPLES)$/Text$/HardFormatting.java 	\
+	$(DESTDIRJAVAEXAMPLES)$/Text$/StyleCreation.java  	\
+	$(DESTDIRJAVAEXAMPLES)$/Text$/WriterSelector.java  	\
+	$(DESTDIRJAVAEXAMPLES)$/Text$/GraphicsInserter.java  	\
+	$(DESTDIRJAVAEXAMPLES)$/Text$/oo_smiley.gif  	\
+	$(DESTDIRJAVAEXAMPLES)$/Text$/Makefile
 
 DOCUMENTHANDLING_FILES= \
-    $(DESTDIRJAVAEXAMPLES)$/DocumentHandling$/DocumentConverter.java	\
-    $(DESTDIRJAVAEXAMPLES)$/DocumentHandling$/DocumentLoader.java	\
-    $(DESTDIRJAVAEXAMPLES)$/DocumentHandling$/DocumentPrinter.java	\
-    $(DESTDIRJAVAEXAMPLES)$/DocumentHandling$/DocumentSaver.java	\
-    $(DESTDIRJAVAEXAMPLES)$/DocumentHandling$/Makefile \
-    $(DESTDIRJAVAEXAMPLES)$/DocumentHandling$/test$/test1.odt
+	$(DESTDIRJAVAEXAMPLES)$/DocumentHandling$/DocumentConverter.java	\
+	$(DESTDIRJAVAEXAMPLES)$/DocumentHandling$/DocumentLoader.java	\
+	$(DESTDIRJAVAEXAMPLES)$/DocumentHandling$/DocumentPrinter.java	\
+	$(DESTDIRJAVAEXAMPLES)$/DocumentHandling$/DocumentSaver.java	\
+	$(DESTDIRJAVAEXAMPLES)$/DocumentHandling$/Makefile \
+	$(DESTDIRJAVAEXAMPLES)$/DocumentHandling$/test$/test1.odt
 
 CONVERTERSERVLET_FILES= \
-    $(DESTDIRJAVAEXAMPLES)$/ConverterServlet$/ConverterServlet.html	\
-    $(DESTDIRJAVAEXAMPLES)$/ConverterServlet$/ConverterServlet.java	\
-    $(DESTDIRJAVAEXAMPLES)$/ConverterServlet$/web.xml	\
-    $(DESTDIRJAVAEXAMPLES)$/ConverterServlet$/Makefile			\
-    $(DESTDIRJAVAEXAMPLES)$/ConverterServlet$/README
+	$(DESTDIRJAVAEXAMPLES)$/ConverterServlet$/ConverterServlet.html	\
+	$(DESTDIRJAVAEXAMPLES)$/ConverterServlet$/ConverterServlet.java	\
+	$(DESTDIRJAVAEXAMPLES)$/ConverterServlet$/web.xml	\
+	$(DESTDIRJAVAEXAMPLES)$/ConverterServlet$/Makefile			\
+	$(DESTDIRJAVAEXAMPLES)$/ConverterServlet$/README
 
 EMBEDDEDOBJECT_FILES= \
-    $(DESTDIRJAVAEXAMPLES)$/EmbedDocument$/EmbeddedObject$/EmbeddedObject.xcu \
-    $(DESTDIRJAVAEXAMPLES)$/EmbedDocument$/EmbeddedObject$/OwnEmbeddedObject.java \
-    $(DESTDIRJAVAEXAMPLES)$/EmbedDocument$/EmbeddedObject$/EditorFrame.java  \
-    $(DESTDIRJAVAEXAMPLES)$/EmbedDocument$/EmbeddedObject$/Makefile \
-    $(DESTDIRJAVAEXAMPLES)$/EmbedDocument$/EmbeddedObject$/OwnEmbeddedObjectFactory.java
+	$(DESTDIRJAVAEXAMPLES)$/EmbedDocument$/EmbeddedObject$/EmbeddedObject.xcu \
+	$(DESTDIRJAVAEXAMPLES)$/EmbedDocument$/EmbeddedObject$/OwnEmbeddedObject.java \
+	$(DESTDIRJAVAEXAMPLES)$/EmbedDocument$/EmbeddedObject$/EditorFrame.java  \
+	$(DESTDIRJAVAEXAMPLES)$/EmbedDocument$/EmbeddedObject$/Makefile \
+	$(DESTDIRJAVAEXAMPLES)$/EmbedDocument$/EmbeddedObject$/OwnEmbeddedObjectFactory.java
 
 INSPECTOR_FILES= \
-    $(DESTDIRJAVAEXAMPLES)$/Inspector$/Inspector.jpg \
-    $(DESTDIRJAVAEXAMPLES)$/Inspector$/InspectorThumbnail.jpg \
-    $(DESTDIRJAVAEXAMPLES)$/Inspector$/Inspector.uno.xml \
-    $(DESTDIRJAVAEXAMPLES)$/Inspector$/Inspector.java \
-    $(DESTDIRJAVAEXAMPLES)$/Inspector$/Makefile \
-    $(DESTDIRJAVAEXAMPLES)$/Inspector$/TestInspector.java \
-    $(DESTDIRJAVAEXAMPLES)$/Inspector$/XInstanceInspector.idl \
-    $(DESTDIRJAVAEXAMPLES)$/Inspector$/InstanceInspector.idl \
-    $(DESTDIRJAVAEXAMPLES)$/Inspector$/InstanceInspectorTest.odt
+	$(DESTDIRJAVAEXAMPLES)$/Inspector$/Inspector.jpg \
+	$(DESTDIRJAVAEXAMPLES)$/Inspector$/InspectorThumbnail.jpg \
+	$(DESTDIRJAVAEXAMPLES)$/Inspector$/Inspector.uno.xml \
+	$(DESTDIRJAVAEXAMPLES)$/Inspector$/Inspector.java \
+	$(DESTDIRJAVAEXAMPLES)$/Inspector$/Makefile \
+	$(DESTDIRJAVAEXAMPLES)$/Inspector$/TestInspector.java \
+	$(DESTDIRJAVAEXAMPLES)$/Inspector$/XInstanceInspector.idl \
+	$(DESTDIRJAVAEXAMPLES)$/Inspector$/InstanceInspector.idl \
+	$(DESTDIRJAVAEXAMPLES)$/Inspector$/InstanceInspectorTest.odt
 
 NOTESACCESS_FILES= \
-    $(DESTDIRJAVAEXAMPLES)$/NotesAccess$/NotesAccess.java \
-    $(DESTDIRJAVAEXAMPLES)$/NotesAccess$/Makefile \
-    $(DESTDIRJAVAEXAMPLES)$/NotesAccess$/Stocks.nsf
+	$(DESTDIRJAVAEXAMPLES)$/NotesAccess$/NotesAccess.java \
+	$(DESTDIRJAVAEXAMPLES)$/NotesAccess$/Makefile \
+	$(DESTDIRJAVAEXAMPLES)$/NotesAccess$/Stocks.nsf
 
 TODO_FILES= \
-    $(DESTDIRJAVAEXAMPLES)$/ToDo$/ToDo.java \
-    $(DESTDIRJAVAEXAMPLES)$/ToDo$/ToDo.ods  \
-    $(DESTDIRJAVAEXAMPLES)$/ToDo$/ToDo.uno.xml  \
-    $(DESTDIRJAVAEXAMPLES)$/ToDo$/ToDo.idl  \
-    $(DESTDIRJAVAEXAMPLES)$/ToDo$/XToDo.idl  \
-    $(DESTDIRJAVAEXAMPLES)$/ToDo$/Makefile
+	$(DESTDIRJAVAEXAMPLES)$/ToDo$/ToDo.java \
+	$(DESTDIRJAVAEXAMPLES)$/ToDo$/ToDo.ods  \
+	$(DESTDIRJAVAEXAMPLES)$/ToDo$/ToDo.uno.xml  \
+	$(DESTDIRJAVAEXAMPLES)$/ToDo$/ToDo.idl  \
+	$(DESTDIRJAVAEXAMPLES)$/ToDo$/XToDo.idl  \
+	$(DESTDIRJAVAEXAMPLES)$/ToDo$/Makefile
 
 MINIMALCOMPONENT_FILES= \
-    $(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/MinimalComponent.idl \
-    $(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/MinimalComponent.java\
-    $(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/MinimalComponent.uno.xml \
-    $(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/TestMinimalComponent.java\
-    $(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/Makefile
+	$(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/MinimalComponent.idl \
+	$(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/MinimalComponent.java\
+	$(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/MinimalComponent.uno.xml \
+	$(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/TestMinimalComponent.java\
+	$(DESTDIRJAVAEXAMPLES)$/MinimalComponent$/Makefile
 
 PROPERTYSET_FILES= \
-    $(DESTDIRJAVAEXAMPLES)$/PropertySet$/PropTest.java \
-    $(DESTDIRJAVAEXAMPLES)$/PropertySet$/PropertySet.odt \
-    $(DESTDIRJAVAEXAMPLES)$/PropertySet$/Makefile
+	$(DESTDIRJAVAEXAMPLES)$/PropertySet$/PropTest.java \
+	$(DESTDIRJAVAEXAMPLES)$/PropertySet$/PropertySet.odt \
+	$(DESTDIRJAVAEXAMPLES)$/PropertySet$/Makefile
 
 DIR_FILE_LIST= \
-    $(DRAWING_FILES) \
-    $(SPREADSHEET_FILES) \
-    $(TEXT_FILES) \
-    $(DOCUMENTHANDLING_FILES) \
-    $(CONVERTERSERVLET_FILES) \
-    $(EMBEDDEDOBJECT_FILES) \
-    $(INSPECTOR_FILES) \
-    $(NOTESACCESS_FILES) \
-    $(TODO_FILES) \
-    $(MINIMALCOMPONENT_FILES) \
-    $(PROPERTYSET_FILES)
+	$(DRAWING_FILES) \
+	$(SPREADSHEET_FILES) \
+	$(TEXT_FILES) \
+	$(DOCUMENTHANDLING_FILES) \
+	$(CONVERTERSERVLET_FILES) \
+	$(EMBEDDEDOBJECT_FILES) \
+	$(INSPECTOR_FILES) \
+	$(NOTESACCESS_FILES) \
+	$(TODO_FILES) \
+	$(MINIMALCOMPONENT_FILES) \
+	$(PROPERTYSET_FILES)
 
 DIR_DIRECTORY_LIST=$(uniq $(DIR_FILE_LIST:d))
 DIR_CREATE_FLAG=$(MISC)$/ex_java_dirs_created.txt
@@ -144,8 +144,8 @@ DIR_FILE_FLAG=$(MISC)$/ex_java_files.txt
 # TARGETS
 #--------------------------------------------------
 all : \
-    $(DIR_FILE_LIST) \
-    $(DIR_FILE_FLAG)
+	$(DIR_FILE_LIST) \
+	$(DIR_FILE_FLAG)
 
 #--------------------------------------------------
 # use global rules
diff --git a/odk/inc/makefile.mk b/odk/inc/makefile.mk
index c22fda1d..653bbf80 100644
--- a/odk/inc/makefile.mk
+++ b/odk/inc/makefile.mk
@@ -40,8 +40,8 @@ TARGET=inc
 
 .IF "$(ENABLE_PCH)"!=""
 ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
+	$(SLO)$/precompiled.pch \
+	$(SLO)$/precompiled_ex.pch
+	
 .ENDIF			# "$(ENABLE_PCH)"!=""
 
diff --git a/odk/pack/checkbin/makefile.mk b/odk/pack/checkbin/makefile.mk
index 52c744c6..3ee41cc1 100644
--- a/odk/pack/checkbin/makefile.mk
+++ b/odk/pack/checkbin/makefile.mk
@@ -39,11 +39,11 @@ ODKCHECKFILE=$(MISC)$/$(TARGET).txt
 all: $(ODKCHECKFILE)
 
 $(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES)
-    @echo "" > $(ODKCHECKFILE)
+	@echo "" > $(ODKCHECKFILE)
 # THE PERL SCRIPT DELETES THE CHECK FILE, WHEN AN ERROR OCCURS
-    $(PERL) $(PRJ)$/util$/check.pl $(DESTDIR) $(DESTPLATFROM) "$(EXEPOSTFIX)" $(ODKCHECKFILE)
+	$(PERL) $(PRJ)$/util$/check.pl $(DESTDIR) $(DESTPLATFROM) "$(EXEPOSTFIX)" $(ODKCHECKFILE)
 # RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE
-    cat $(ODKCHECKFILE)
+	cat $(ODKCHECKFILE)
 
 .ELSE
 pseudo:
diff --git a/odk/pack/checkidl/makefile.mk b/odk/pack/checkidl/makefile.mk
index f585bb3c..e6e89a7a 100644
--- a/odk/pack/checkidl/makefile.mk
+++ b/odk/pack/checkidl/makefile.mk
@@ -39,11 +39,11 @@ ODKCHECKFILE=$(MISC)$/$(TARGET).txt
 all : $(ODKCHECKFILE)
 
 $(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES)
-    @echo "" > $(ODKCHECKFILE)
+	@echo "" > $(ODKCHECKFILE)
 # THE PERL SCRIPT DELETES THE CHECK FILE, WHEN AN ERROR OCCURS
-    -diff -br $(DESTDIRIDL) $(SOLARIDLDIR) $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+	-diff -br $(DESTDIRIDL) $(SOLARIDLDIR) $(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
 # RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE
-    cat $(ODKCHECKFILE)
+	cat $(ODKCHECKFILE)
 
 .ELSE
 pseudo:
diff --git a/odk/pack/checkinc2/makefile.mk b/odk/pack/checkinc2/makefile.mk
index 78e0aa35..57298e0a 100644
--- a/odk/pack/checkinc2/makefile.mk
+++ b/odk/pack/checkinc2/makefile.mk
@@ -38,16 +38,16 @@ ODKCHECKFILE=$(MISC)$/$(TARGET).txt
 all : $(ODKCHECKFILE)
 
 $(ODKCHECKFILE) : $(SDK_CONTENT_CHECK_FILES)
-    @echo "" > $(ODKCHECKFILE)
+	@echo "" > $(ODKCHECKFILE)
 # THE PERL SCRIPT DELETES THE CHECK FILE, WHEN AN ERROR OCCURS
-    -diff -br $(DESTDIRINC)$/typelib  $(SOLARINCDIR)$/typelib 	$(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
-    -diff -br $(DESTDIRINC)$/uno   	$(SOLARINCDIR)$/uno 		$(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
-    -diff -br $(DESTDIRINC)$/bridges  $(SOLARINCDIR)$/bridges 	$(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
-    -diff -br $(DESTDIRINC)$/cppu   	$(SOLARINCDIR)$/cppu 		$(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
-    -diff -br $(DESTDIRINC)$/com$/sun$/star$/uno   	$(SOLARINCDIR)$/com$/sun$/star$/uno 	$(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
-    -diff -br $(DESTDIRINC)$/cppuhelper 		$(SOLARINCDIR)$/cppuhelper 		$(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+	-diff -br $(DESTDIRINC)$/typelib  $(SOLARINCDIR)$/typelib 	$(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+	-diff -br $(DESTDIRINC)$/uno   	$(SOLARINCDIR)$/uno 		$(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+	-diff -br $(DESTDIRINC)$/bridges  $(SOLARINCDIR)$/bridges 	$(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+	-diff -br $(DESTDIRINC)$/cppu   	$(SOLARINCDIR)$/cppu 		$(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+	-diff -br $(DESTDIRINC)$/com$/sun$/star$/uno   	$(SOLARINCDIR)$/com$/sun$/star$/uno 	$(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
+	-diff -br $(DESTDIRINC)$/cppuhelper 		$(SOLARINCDIR)$/cppuhelper 		$(PIPEERROR) $(PERL) $(PRJ)$/util$/checkdiff.pl $(ODKCHECKFILE)
 # RAISE AN ERROR WHEN TAG FILE IS NOT THERE ANYMORE
-    cat $(ODKCHECKFILE)
+	cat $(ODKCHECKFILE)
 .ELSE
 pseudo:
 
diff --git a/odk/pack/copying/idl_chapter_refs.txt b/odk/pack/copying/idl_chapter_refs.txt
index e1a15de0..58d93cce 100644
--- a/odk/pack/copying/idl_chapter_refs.txt
+++ b/odk/pack/copying/idl_chapter_refs.txt
@@ -2462,7 +2462,6 @@ LINK:Documentation/DevGuide/Config/Using_a_Data_Source
 DESCR:Config - Using a Data Source
 REF:
 com.sun.star.configuration.ConfigurationUpdateAccess
-com.sun.star.configuration.AdministrationProvider
 com.sun.star.configuration.ConfigurationAccess
 TOPIC:
 
@@ -2504,17 +2503,10 @@ com.sun.star.frame.XFrame
 LINK:Documentation/DevGuide/Config/Connecting_to_a_Data_Source
 DESCR:Config - Connecting to a Data Source
 REF:
-com.sun.star.configuration.backend.LocalSingleBackend
-com.sun.star.configuration.AdministrationProvider
 com.sun.star.lang.XMultiServiceFactory
-com.sun.star.configuration.backend.SingleBackendAdapter
-com.sun.star.configuration.backend.Backend
-com.sun.star.configuration.backend.BackendAdapter
 com.sun.star.configuration.ConfigurationProvider
-com.sun.star.configuration.backend.SingleBackend
 com.sun.star.lang.ServiceManager
 TOPIC:
-com.sun.star.configuration.AdministrationProvider
 com.sun.star.configuration.ConfigurationProvider
 
 LINK:Documentation/DevGuide/Spreadsheets/Creating_a_New_DataPilot_Table
@@ -2924,7 +2916,6 @@ LINK:Documentation/DevGuide/Config/Configuration_Data_Sources
 DESCR:Config - Configuration Data Sources
 REF:
 com.sun.star.configuration.ConfigurationUpdateAccess
-com.sun.star.configuration.AdministrationProvider
 com.sun.star.configuration.ConfigurationProvider
 com.sun.star.configuration.ConfigurationAccess
 TOPIC:
@@ -5128,18 +5119,6 @@ com.sun.star.document.XExporter
 TOPIC:
 com.sun.star.drawing.GraphicExportFilter
 
-LINK:Documentation/DevGuide/Config/Installing_a_Custom_Configuration_Schema
-DESCR:Config - Installing a Custom Configuration Schema
-REF:
-com.sun.star.configuration.backend.MergeImporter
-com.sun.star.configuration.backend.LocalDataImporter
-com.sun.star.configuration.backend.CopyImporter
-com.sun.star.configuration.ConfigurationProvider
-TOPIC:
-com.sun.star.configuration.backend.MergeImporter
-com.sun.star.configuration.backend.LocalDataImporter
-com.sun.star.configuration.backend.CopyImporter
-
 LINK:Documentation/DevGuide/OfficeDev/Component/Getting_Frames%2C_Controllers_and_Models_from_Each_Other
 DESCR:OfficeDev - Component - Getting Frames, Controllers and Models from Each Other
 REF:
@@ -5571,12 +5550,10 @@ LINK:Documentation/DevGuide/Config/Object_Model
 DESCR:Config - Object Model
 REF:
 com.sun.star.configuration.ConfigurationUpdateAccess
-com.sun.star.configuration.AdministrationProvider
 com.sun.star.configuration.ConfigurationProvider
 com.sun.star.configuration.ConfigurationAccess
 TOPIC:
 com.sun.star.configuration.ConfigurationUpdateAccess
-com.sun.star.configuration.AdministrationProvider
 com.sun.star.configuration.ConfigurationProvider
 com.sun.star.configuration.ConfigurationAccess
 
@@ -7178,18 +7155,6 @@ com.sun.star.util.XModifiable
 com.sun.star.util.XCloseable
 TOPIC:
 
-LINK:Documentation/DevGuide/Config/Adding_a_Backend_Data_Store
-DESCR:Config - Adding a Backend Data Store
-REF:
-com.sun.star.configuration.backend.SingleBackendAdapter
-com.sun.star.configuration.backend.Backend
-com.sun.star.configuration.ConfigurationProvider
-com.sun.star.configuration.backend.BackendAdapter
-com.sun.star.configuration.backend.SingleBackend
-TOPIC:
-com.sun.star.configuration.backend.Backend
-com.sun.star.configuration.backend.SingleBackend
-
 LINK:Documentation/DevGuide/Charts/Chart_Document_Controller
 DESCR:Charts - Chart Document Controller
 REF:
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index fc9abf18..2396e305 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -83,8 +83,8 @@ JAVADOCLOG = $(MISC)$/javadoc_log.txt
 
 .IF "$(SOLAR_JAVA)"!=""
 all: \
-    $(CPP_DOCU_INDEX_FILE) \
-    $(JAVA_DOCU_INDEX_FILE)
+	$(CPP_DOCU_INDEX_FILE) \
+	$(JAVA_DOCU_INDEX_FILE)
 
 .ELSE
 all: $(CPP_DOCU_INDEX_FILE)
@@ -92,19 +92,19 @@ all: $(CPP_DOCU_INDEX_FILE)
 
 
 $(CPP_DOCU_CLEANUP_FLAG) : $(INCLUDELIST) $(PRJ)$/docs$/cpp$/ref$/cpp.css
-    @@-$(MY_DELETE_RECURSIVE) $(DESTDIRGENCPPREF)
-    $(TOUCH) $@
+	@@-$(MY_DELETE_RECURSIVE) $(DESTDIRGENCPPREF)
+	$(TOUCH) $@
 
 $(CPP_DOCU_INDEX_FILE) : $(CPP_DOCU_CLEANUP_FLAG)
-    -$(MKDIRHIER) $(@:d)        
-    $(MY_AUTODOC) -html $(DESTDIRGENCPPREF) -name $(CPPDOCREFNAME) $(AUTODOCPARAMS)
-    -rm $(@:d:d)$/cpp.css
-    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/cpp$/ref$/cpp.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/cpp.css
+	-$(MKDIRHIER) $(@:d)        
+	$(MY_AUTODOC) -html $(DESTDIRGENCPPREF) -name $(CPPDOCREFNAME) $(AUTODOCPARAMS)
+	-rm $(@:d:d)$/cpp.css
+	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/cpp$/ref$/cpp.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/cpp.css
 
 $(JAVA_SRC_FILES) : $(SOLARCOMMONBINDIR)$/$$(@:f)
-    -$(MKDIRHIER) $(@:d)        
-    $(MY_COPY) $< $@
-    cd $(JAVA_SRC_DIR) && unzip -quo $(@:f)
+	-$(MKDIRHIER) $(@:d)        
+	$(MY_COPY) $< $@
+	cd $(JAVA_SRC_DIR) && unzip -quo $(@:f)
 
 #$(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/%.java : $(PRJ)$/source$/bean$/com$/sun$/star$/beans$/%.java 
 #	-$(MKDIRHIER) $(@:d)        
@@ -113,8 +113,8 @@ $(JAVA_SRC_FILES) : $(SOLARCOMMONBINDIR)$/$$(@:f)
 #$(JAVA_DOCU_INDEX_FILE) .SEQUENTIAL : $(JAVA_SRC_FILES) $(JAVA_BEAN_SRC_FILES)
 .IF "$(SOLAR_JAVA)"!=""
 $(JAVA_DOCU_INDEX_FILE) .SEQUENTIAL : $(JAVA_SRC_FILES)
-    -$(MKDIRHIER) $(@:d)        
-    $(JAVADOC) -J-Xmx120m $(JAVADOCPARAMS) > $(JAVADOCLOG)
+	-$(MKDIRHIER) $(@:d)        
+	$(JAVADOC) -J-Xmx120m $(JAVADOCPARAMS) > $(JAVADOCLOG)
 .ENDIF
 
 .ELSE
diff --git a/odk/pack/unzip_udk/makefile.mk b/odk/pack/unzip_udk/makefile.mk
index 1a06dd2b..4c972c30 100644
--- a/odk/pack/unzip_udk/makefile.mk
+++ b/odk/pack/unzip_udk/makefile.mk
@@ -37,10 +37,10 @@ TARGET=unzip_udk
 all: ..$/misc$/deltree.txt
 
 ..$/misc$/deltree.txt .SETDIR=$(OUT)$/bin : $(PRJ)$/pack$/unzip_udk$/deltree.txt
-    @@-$(MY_DELETE_RECURSIVE) $(PRODUCT_NAME)
-    @@-rm -f $(PRODUCT_NAME).zip
-    @@-$(MY_DELETE_RECURSIVE) $(PRODUCT_NAME2)
-    @@-rm -f odkidl.zip
-    @@-rm -f odk_ooidl.zip
-    @echo "" > ..$/misc$/deltree.txt
+	@@-$(MY_DELETE_RECURSIVE) $(PRODUCT_NAME)
+	@@-rm -f $(PRODUCT_NAME).zip
+	@@-$(MY_DELETE_RECURSIVE) $(PRODUCT_NAME2)
+	@@-rm -f odkidl.zip
+	@@-rm -f odk_ooidl.zip
+	@echo "" > ..$/misc$/deltree.txt
 
diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 6deb065f..f50705ae 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -52,12 +52,12 @@ REGMERGE="$(OO_SDK_URE_HOME)/bin/regmerge"
 REGCOMP="$(OO_SDK_URE_HOME)/bin/regcomp"
 
 SDK_JAVA_UNO_BOOTSTRAP_FILES=\
-    -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader.class$(SQM) \
-    -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \
-    -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class$(SQM) \
-    -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \
-    -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/InstallationFinder.class$(SQM) \
-    -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/InstallationFinder$$StreamGobbler.class$(SQM) \
-    -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/WinRegKey.class$(SQM) \
-    -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/WinRegKeyException.class$(SQM) \
-    -C $(CLASSES_DIR) $(SQM)win/unowinreg.dll$(SQM)
+	-C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader.class$(SQM) \
+	-C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \
+	-C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class$(SQM) \
+	-C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \
+	-C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/InstallationFinder.class$(SQM) \
+	-C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/InstallationFinder$$StreamGobbler.class$(SQM) \
+	-C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/WinRegKey.class$(SQM) \
+	-C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/WinRegKeyException.class$(SQM) \
+	-C $(CLASSES_DIR) $(SQM)win/unowinreg.dll$(SQM)
diff --git a/odk/source/com/sun/star/lib/loader/makefile.mk b/odk/source/com/sun/star/lib/loader/makefile.mk
index f44b6f55..19848e58 100644
--- a/odk/source/com/sun/star/lib/loader/makefile.mk
+++ b/odk/source/com/sun/star/lib/loader/makefile.mk
@@ -38,16 +38,16 @@ TARGET  = com_sun_star_lib_loader
 
 .IF "$(SOLAR_JAVA)"==""
 nojava:
-    @echo "Not building javaunohelper because Java is disabled"
+	@echo "Not building javaunohelper because Java is disabled"
 .ENDIF
 
 # Files --------------------------------------------------------
 
 JAVAFILES= \
-    Loader.java\
-    InstallationFinder.java\
-    WinRegKey.java\
-    WinRegKeyException.java
+	Loader.java\
+	InstallationFinder.java\
+	WinRegKey.java\
+	WinRegKeyException.java
 
 JAVACLASSFILES=	$(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 
diff --git a/odk/source/unowinreg/win/makefile.mk b/odk/source/unowinreg/win/makefile.mk
index 605848b3..c506d625 100644
--- a/odk/source/unowinreg/win/makefile.mk
+++ b/odk/source/unowinreg/win/makefile.mk
@@ -54,7 +54,7 @@ JAVA_INCLUDES+= -I$(JAVA_HOME)/include/netbsd
 
 .IF "$(SOLAR_JAVA)"==""
 nojava:
-    @echo "Not building javaunohelper because Java is disabled"
+	@echo "Not building javaunohelper because Java is disabled"
 .ENDIF
 
 .IF "$(OS)" != "WNT"
@@ -62,10 +62,10 @@ nojava:
 .IF "$(BUILD_UNOWINREG)" == "YES"
 
 $(BIN)$/unowinreg.dll : unowinreg.cxx
-    $(MINGWCXX) -Wall -D_JNI_IMPLEMENTATION_ $(JAVA_INCLUDES) \
-        -I$(PRJ)/inc/pch -shared -o $(BIN)$/unowinreg.dll unowinreg.cxx \
-            -Wl,--kill-at -lkernel32 -ladvapi32
-    $(MINGWSTRIP) $(BIN)$/unowinreg.dll
+	$(MINGWCXX) -Wall -D_JNI_IMPLEMENTATION_ $(JAVA_INCLUDES) \
+		-I$(PRJ)/inc/pch -shared -o $(BIN)$/unowinreg.dll unowinreg.cxx \
+	        -Wl,--kill-at -lkernel32 -ladvapi32
+	$(MINGWSTRIP) $(BIN)$/unowinreg.dll
 
 .ELSE
 
@@ -82,7 +82,7 @@ $(BIN)$/unowinreg.dll : $(TARFILE_LOCATION)/185d60944ea767075d27247c3162b3bc-uno
 
 LINKFLAGS+=-MANIFEST:NO
 SLOFILES = \
-    $(SLO)$/unowinreg.obj
+	$(SLO)$/unowinreg.obj
 SHL1TARGET=$(TARGET)
 SHL1LIBS=$(SLB)$/$(TARGET).lib
 
@@ -97,8 +97,8 @@ SHL1STDLIBS += -lgcc -lmingw32 -lmoldname -lmsvcrt
 .ENDIF
 
 SHL1STDLIBS +=\
-        $(KERNEL32LIB)\
-        $(ADVAPI32LIB)
+		$(KERNEL32LIB)\
+		$(ADVAPI32LIB)
 
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 
diff --git a/odk/util/makefile.mk b/odk/util/makefile.mk
index 7f6517ed..e05511c7 100644
--- a/odk/util/makefile.mk
+++ b/odk/util/makefile.mk
@@ -29,30 +29,30 @@ $(BIN)$/$(PRODUCTZIPFILE) : $(SDK_CONTENT_CHECK_FILES) $(SDK_CHECK_FLAGS)
 #	cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/odkidl.zip idl/* $(CHECKZIPRESULT)
 
 ODK_OO_FILES=\
-    $(PRJ)$/index.html \
-    $(PRJ)$/docs$/tools.html \
-    $(PRJ)$/docs$/notsupported.html \
-    $(PRJ)$/docs$/install.html \
-    $(PRJ)$/docs$/sdk_styles.css \
-    $(PRJ)$/docs$/images$/arrow-1.gif \
-    $(PRJ)$/docs$/images$/arrow-3.gif \
-    $(PRJ)$/docs$/images$/bg_table.gif \
-    $(PRJ)$/docs$/images$/bg_table2.gif \
-    $(PRJ)$/docs$/images$/bg_table3.gif \
-    $(PRJ)$/docs$/images$/nav_down.png \
-    $(PRJ)$/docs$/images$/nav_home.png \
-    $(PRJ)$/docs$/images$/nav_left.png \
-    $(PRJ)$/docs$/images$/nav_right.png \
-    $(PRJ)$/docs$/images$/nav_up.png \
-    $(PRJ)$/docs$/images$/sdk_head-1.gif \
-    $(PRJ)$/docs$/images$/sdk_head-2.gif \
-    $(PRJ)$/docs$/images$/sdk_head-3.gif \
-    $(PRJ)$/docs$/images$/sdk_line-1.gif \
-    $(PRJ)$/docs$/images$/sdk_line-2.gif \
-    $(PRJ)$/examples$/examples.html \
-    $(PRJ)$/examples$/DevelopersGuide$/examples.html
+	$(PRJ)$/index.html \
+	$(PRJ)$/docs$/tools.html \
+	$(PRJ)$/docs$/notsupported.html \
+	$(PRJ)$/docs$/install.html \
+	$(PRJ)$/docs$/sdk_styles.css \
+	$(PRJ)$/docs$/images$/arrow-1.gif \
+	$(PRJ)$/docs$/images$/arrow-3.gif \
+	$(PRJ)$/docs$/images$/bg_table.gif \
+	$(PRJ)$/docs$/images$/bg_table2.gif \
+	$(PRJ)$/docs$/images$/bg_table3.gif \
+	$(PRJ)$/docs$/images$/nav_down.png \
+	$(PRJ)$/docs$/images$/nav_home.png \
+	$(PRJ)$/docs$/images$/nav_left.png \
+	$(PRJ)$/docs$/images$/nav_right.png \
+	$(PRJ)$/docs$/images$/nav_up.png \
+	$(PRJ)$/docs$/images$/sdk_head-1.gif \
+	$(PRJ)$/docs$/images$/sdk_head-2.gif \
+	$(PRJ)$/docs$/images$/sdk_head-3.gif \
+	$(PRJ)$/docs$/images$/sdk_line-1.gif \
+	$(PRJ)$/docs$/images$/sdk_line-2.gif \
+	$(PRJ)$/examples$/examples.html \
+	$(PRJ)$/examples$/DevelopersGuide$/examples.html
 
 
 $(BIN)$/odk_oo.zip : $(ODK_OO_FILES)
-    cd $(PRJ) && zip -urq $(subst,$(PRJ)$/, $(BIN)$/odk_oo.zip) $(subst,$(PRJ)$/, $<) $(CHECKZIPRESULT)
+	cd $(PRJ) && zip -urq $(subst,$(PRJ)$/, $(BIN)$/odk_oo.zip) $(subst,$(PRJ)$/, $<) $(CHECKZIPRESULT)
 
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index b4979777..3166d48b 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -160,7 +160,7 @@ DESTPLATFROM=macosx
 
 .ELIF "$(OS)"=="AIX"
 ###########
-# MACOSX
+# AIX
 ###########
 DESTPLATFROM=aix
 
diff --git a/udm/source/html/makefile.mk b/udm/source/html/makefile.mk
index 73eba36d..e61a99b5 100644
--- a/udm/source/html/makefile.mk
+++ b/udm/source/html/makefile.mk
@@ -43,7 +43,7 @@ ENABLE_EXCEPTIONS=true
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
-    $(OBJ)$/htmlitem.obj	
+	$(OBJ)$/htmlitem.obj	
 
 
 
diff --git a/udm/source/unittest/makefile.mk b/udm/source/unittest/makefile.mk
new file mode 100644
index 00000000..45372b9e
--- /dev/null
+++ b/udm/source/unittest/makefile.mk
@@ -0,0 +1,77 @@
+#*************************************************************************
+#
+# DO NOT ALTER 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>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=cosv
+TARGET=udm_unittest
+TARGETTYPE=CUI
+
+# --- Settings -----------------------------------------------------
+
+ENABLE_EXCEPTIONS=true
+PRJINC=$(PRJ)$/source
+
+.INCLUDE :  settings.mk
+.INCLUDE :  static.mk
+
+.INCLUDE : $(PRJ)$/source$/mkinc$/fullcpp.mk
+
+
+
+
+# --- Files --------------------------------------------------------
+
+OBJFILES= \
+	$(OBJ)$/test.obj
+
+
+
+
+APP1TARGET=	$(TARGET)
+APP1STACK=	1000000
+APP1OBJS=   $(OBJ)$/test.obj
+
+.IF "$(COMEX)"=="10"
+APP1STDLIBS= $(STATIC_LIBS) cosv.lib
+.ELSE
+APP1STDLIBS= $(STATIC_LIBS) msvcirt.lib cosv.lib
+.ENDIF
+
+
+APP1LIBS=	$(LB)$/$(TARGET).lib
+
+
+APP1DEPN=   $(LB)$/$(TARGET).lib $(L)$/cosv.lib
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
diff --git a/udm/source/unittest/test.cxx b/udm/source/unittest/test.cxx
new file mode 100644
index 00000000..b39ab6ea
--- /dev/null
+++ b/udm/source/unittest/test.cxx
@@ -0,0 +1,112 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER 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>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <precomp.h>
+
+
+// NOT FULLY DEFINED SERVICES
+#include <udm/integer_i.hxx>
+#include <udm/string_i.hxx>
+
+using namespace udm;
+
+// TypeSystem      aTypeSys;
+
+
+class Function
+{
+  public:
+
+    intt                nId;
+};
+
+class Ctor : public Function
+{
+  public:
+
+    csv::String         sClassName;
+};
+
+class Method : public Function
+{
+  public:
+
+    csv::String         sFunctionName;
+    std::vector< std::pair< intt, String > >
+                        aParameters;
+};
+
+
+class PrObj
+{
+  public:
+    intt                nId;
+    csv::String         sName;
+    std::vector< PrObj* >
+                        aMethods;
+    std::vector< PrObj* >
+                        aData;
+};
+
+
+
+
+void fx()
+{
+    intt            n = 5;
+    Dyn<Integer_i>  px = new Integer_i(n);
+    Integer &       x = *px;
+
+    csv::String     s;
+    Dyn<String_i>   ps = new String_i(s);
+    String &        xs = *ps;
+
+    xs = "Hallo";
+
+    int dev01 = 2;
+
+    xs = csv::String("Haha");
+
+    dev01 = 2;
+
+    csv::String s2 = xs;
+
+
+    dev01 = 2;
+
+//  const char * pc = xs;
+
+
+    intt a = x;
+    x = 15;
+
+    Cout() << a << " " << x << Endl();  // Must be:   5 15
+}
+
+
+
+
diff --git a/udm/source/xml/makefile.mk b/udm/source/xml/makefile.mk
index a90d71be..ff48eddb 100644
--- a/udm/source/xml/makefile.mk
+++ b/udm/source/xml/makefile.mk
@@ -43,7 +43,7 @@ ENABLE_EXCEPTIONS=true
 # --- Files --------------------------------------------------------
 
 OBJFILES= \
-    $(OBJ)$/xmlitem.obj
+	$(OBJ)$/xmlitem.obj
 
 
 
diff --git a/udm/util/makefile.mk b/udm/util/makefile.mk
index 4acc3f22..41bfa429 100644
--- a/udm/util/makefile.mk
+++ b/udm/util/makefile.mk
@@ -41,8 +41,8 @@ ENABLE_EXCEPTIONS=true
 # --- Files --------------------------------------------------------
 
 LIB1FILES= 	\
-        $(LB)$/csi_html.lib     \
-        $(LB)$/csi_xml.lib
+		$(LB)$/csi_html.lib     \
+		$(LB)$/csi_xml.lib
 
 
 # --- Targets ------------------------------------------------------
diff --git a/unodevtools/source/skeletonmaker/makefile.mk b/unodevtools/source/skeletonmaker/makefile.mk
index 72ac80ec..0c7b273a 100644
--- a/unodevtools/source/skeletonmaker/makefile.mk
+++ b/unodevtools/source/skeletonmaker/makefile.mk
@@ -41,16 +41,16 @@ APP1TARGET = $(TARGET)
 APP1RPATH=SDK
 
 APP1OBJS = $(OBJ)$/skeletonmaker.obj \
-    $(OBJ)$/skeletoncommon.obj \
-    $(OBJ)$/javatypemaker.obj \
-    $(OBJ)$/cpptypemaker.obj \
-    $(OBJ)$/javacompskeleton.obj \
-    $(OBJ)$/cppcompskeleton.obj
+	$(OBJ)$/skeletoncommon.obj \
+	$(OBJ)$/javatypemaker.obj \
+	$(OBJ)$/cpptypemaker.obj \
+	$(OBJ)$/javacompskeleton.obj \
+	$(OBJ)$/cppcompskeleton.obj
 
 APP1DEPN= $(OUT)$/lib$/$(UNODEVTOOLSLIBDEPN) $(SOLARLIBDIR)$/$(CODEMAKERLIBDEPN) \
-    $(SOLARLIBDIR)$/$(COMMONCPPLIBDEPN) $(SOLARLIBDIR)$/$(COMMONJAVALIBDEPN)
+	$(SOLARLIBDIR)$/$(COMMONCPPLIBDEPN) $(SOLARLIBDIR)$/$(COMMONJAVALIBDEPN)
 APP1STDLIBS = $(REGLIB) $(SALLIB) $(SALHELPERLIB) $(CPPULIB) $(CPPUHELPERLIB) \
-    $(UNODEVTOOLSLIBST) $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST)
+	$(UNODEVTOOLSLIBST) $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST)
 
 OBJFILES = $(APP1OBJS)
 
diff --git a/unodevtools/source/unodevtools/makefile.mk b/unodevtools/source/unodevtools/makefile.mk
index d8f0920a..ab70640c 100644
--- a/unodevtools/source/unodevtools/makefile.mk
+++ b/unodevtools/source/unodevtools/makefile.mk
@@ -38,9 +38,9 @@ ENABLE_EXCEPTIONS=TRUE
 # ------------------------------------------------------------------
 
 SLOFILES= \
-    $(SLO)$/typemanager.obj	\
-    $(SLO)$/typeblob.obj \
-    $(SLO)$/options.obj
+	$(SLO)$/typemanager.obj	\
+	$(SLO)$/typeblob.obj \
+	$(SLO)$/options.obj
 
 LIB1TARGET=$(LB)$/$(TARGET).lib
 LIB1ARCHIV=$(LB)$/lib$(TARGET).a
author	Michael Meeks <michael.meeks@novell.com>	2011-03-04 19:45:04 +0000
committer	Michael Meeks <michael.meeks@novell.com>	2011-03-04 19:45:04 +0000
commit	3c94dd6761ae3882241a6a83854d7e5f840a6303 (patch)
tree	993ab85eb3bcc8faf380a19432e4b15efa24deef
parent	48beb485e05723815a3595de7be202f0cbff461a (diff)
parent	60443dd0c88a7dee913027ced9830d811a676c8b (diff)