Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/libs-core

4 files changed, 40 insertions, 9 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
index d185b67fcc6e..f4c3c3f8c21d 100644
--- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
@@ -153,6 +153,14 @@
     </node>
   </node>
   <node oor:name="RegisteredNames">
+    <node oor:name="EvolutionLocal" oor:op="replace">
+        <prop oor:name="Location" oor:type="xs:string">
+            <value>$(userurl)/database/evolocal.odb</value>
+        </prop>
+        <prop oor:name="Name" oor:type="xs:string">
+            <value>EvolutionLocal</value>
+        </prop>
+    </node>
     <node oor:name="org.openoffice.Bibliography" oor:op="replace">
         <prop oor:name="Location" oor:type="xs:string">
             <value>$(userurl)/database/biblio.odb</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/Writer.xcu b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
index b318614ef789..bdc54ceb1ea1 100644
--- a/officecfg/registry/data/org/openoffice/Office/Writer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Writer.xcu
@@ -40,6 +40,32 @@
     <prop oor:name="IsHideEmptyParagraphs" >
      <value>true</value>
     </prop>
+    <node oor:name="DataSource">
+      <prop oor:name="DataSourceName" oor:type="xs:string">
+        <value>EvolutionLocal</value>
+      </prop>
+      <prop oor:name="DataTableName" oor:type="xs:string">
+        <value>Personal</value>
+      </prop>
+    </node>
+    <node oor:name="AddressDataAssignments">
+      <node oor:name="_0" oor:op="replace">
+        <prop oor:name="DBColumnAssignments" oor:type="oor:string-list">
+          <value oor:separator=",">title,full_name,family_name,org,addr_line1,addr_line2,city,state,zip,country,home_phone,business_phone,email_1,</value>
+        </prop>
+        <node oor:name="DataSource">
+          <prop oor:name="DataCommandType" oor:type="xs:short">
+            <value>0</value>
+          </prop>
+          <prop oor:name="DataSourceName" oor:type="xs:string">
+            <value>EvolutionLocal</value>
+          </prop>
+          <prop oor:name="DataTableName" oor:type="xs:string">
+            <value>Personal</value>
+          </prop>
+        </node>
+      </node>
+    </node>
     <prop oor:name="EMailSupported">
      <value>true</value>
     </prop>
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index e609b6822ebe..b62b0da0f893 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -627,7 +627,7 @@ BOOL Gallery::CreateTheme( const String& rThemeName, UINT32 nNumFrom )
 
     if( !HasTheme( rThemeName ) && ( GetUserURL().GetProtocol() != INET_PROT_NOT_VALID ) )
     {
-        nLastFileNumber=nNumFrom > nLastFileNumber ? nNumFrom : ++nLastFileNumber;
+        nLastFileNumber = nNumFrom > nLastFileNumber ? nNumFrom : nLastFileNumber + 1;
         GalleryThemeEntry* pNewEntry = new GalleryThemeEntry( GetUserURL(), rThemeName,
                                                               nLastFileNumber,
                                                               FALSE, FALSE, TRUE, 0, FALSE );
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index cbba2b80df9a..441c3b8dca7b 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -1444,17 +1444,14 @@ void XPolygon::Rotate20()
     long     nPntCnt = pImpXPolygon->nPoints;
     long     nIndex0 = 0;
 
-    for (long nPoints = 1;
-              nPoints < nPntCnt;
-              nPoints ++)
+    for (long nPoints = 1; nPoints < nPntCnt; ++nPoints)
     {
-        Point &rPnt = pImpXPolygon->pPointAry[nPoints];
+        const Point &rPnt = pImpXPolygon->pPointAry[nPoints];
 
-        if ((rPnt.X () < fMinX) || (fMinX == rPnt.X ()) &&
-                                   (fMinY >= rPnt.Y ()))
+        if ( (rPnt.X() < fMinX) || (fMinX == rPnt.X() && fMinY >= rPnt.Y()) )
         {
-            fMinX   = rPnt.X ();
-            fMinY   = rPnt.Y ();
+            fMinX   = rPnt.X();
+            fMinY   = rPnt.Y();
             nIndex0 = nPoints;
         }
     }