8076325
--- openoffice.org/officecfg/registry/data/org/openoffice/Office/Writer.xcu.orig	2005-04-18 20:39:35.000000000 +0530
8076325
+++ openoffice.org/officecfg/registry/data/org/openoffice/Office/Writer.xcu	2005-05-10 17:30:14.000000000 +0530
8076325
@@ -40,6 +40,32 @@
8076325
     <prop oor:name="IsHideEmptyParagraphs" >
8076325
      <value>true</value>
8076325
     </prop>
8076325
+    <node oor:name="DataSource">
8076325
+     <prop oor:name="DataSourceName" oor:type="xs:string">
8076325
+      <value>EvolutionLocal</value>
8076325
+     </prop>
8076325
+     <prop oor:name="DataTableName" oor:type="xs:string">
8076325
+      <value>Personal</value>
8076325
+     </prop>
8076325
+    </node>
8076325
+    <node oor:name="AddressDataAssignments">
8076325
+     <node oor:name="_0" oor:op="replace">
8076325
+      <prop oor:name="DBColumnAssignments" oor:type="oor:string-list">
8076325
+       <value oor:separator=",">title,full_name,family_name,org,addr_line1,addr_line2,city,state,zip,country,home_phone,business_phone,email_1,</value>
8076325
+      </prop>
8076325
+      <node oor:name="DataSource">
8076325
+       <prop oor:name="DataCommandType" oor:type="xs:short">
8076325
+        <value>0</value>
8076325
+       </prop>
8076325
+       <prop oor:name="DataSourceName" oor:type="xs:string">
8076325
+        <value>EvolutionLocal</value>
8076325
+       </prop>
8076325
+       <prop oor:name="DataTableName" oor:type="xs:string">
8076325
+        <value>Personal</value>
8076325
+       </prop>
8076325
+      </node>
8076325
+     </node>
8076325
+    </node>
8076325
     <prop oor:name="EMailSupported">
8076325
      <value>true</value>
8076325
     </prop>
8076325
--- openoffice.org/extras/source/database/makefile.mk.bakj	2005-03-16 18:49:33.251075928 +0530
8076325
+++ openoffice.org/extras/source/database/makefile.mk	2005-03-16 18:50:38.651285353 +0530
8076325
@@ -72,8 +72,8 @@
8076325
 
8076325
 ZIP1TARGET      = $(DATABASE_USER_TARGET)
8076325
 
8076325
-ZIP1LIST        = biblio.odb
8076325
-
8076325
+ZIP1LIST        = biblio.odb \
8076325
+		  evolocal.odb	
8076325
 ZIP2TARGET      = $(DATABASE_USER_BIBLIO_TARGET)
8076325
 
8076325
 ZIP2LIST        = biblio.dbf biblio.dbt
8076325
--- openoffice.org/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu.bakj	2005-03-16 18:51:43.777536725 +0530
8076325
+++ openoffice.org/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu	2005-03-16 18:52:51.471404727 +0530
8076325
@@ -161,6 +161,14 @@
8076325
 			<value>Bibliography</value>
8076325
 		</prop>
8076325
 	</node>
8076325
+    <node oor:name="EvolutionLocal" oor:op="replace">
8076325
+		<prop oor:name="Location" oor:type="xs:string">
8076325
+			<value>$(userurl)/database/evolocal.odb</value>
8076325
+		</prop>
8076325
+		<prop oor:name="Name" oor:type="xs:string">
8076325
+			<value>EvolutionLocal</value>
8076325
+		</prop>
8076325
+	</node>
8076325
   </node>
8076325
   <node oor:name="Bibliography">
8076325
     <node oor:name="CurrentDataSource">
8076325
--- openoffice.org.orig/extensions/source/abpilot/abspilot.cxx	19 Dec 2005 17:26:24 -0000	1.13
8076325
+++ openoffice.org/extensions/source/abpilot/abspilot.cxx	16 Feb 2006 12:45:38 -0000
8076325
@@ -124,12 +124,8 @@
8076325
 		// some initial settings
8076325
 #ifdef MACOSX
8076325
         m_aSettings.eType = AST_MACAB;
8076325
-#elif WITH_MOZILLA
8076325
-#ifdef UNX
8076325
-		m_aSettings.eType = AST_MORK;
8076325
-#else
8076325
-		m_aSettings.eType = AST_OE;
8076325
-#endif
8076325
+#elif UNX
8076325
+		m_aSettings.eType = AST_EVOLUTION;
8076325
 #else
8076325
 		m_aSettings.eType = AST_OTHER;
8076325
 #endif