[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - i18npool/source officecfg/registry solenv/inc sw/source

[Oliver-Rainer Wittmann]

 i18npool/source/localedata/data/pt_PT.xml                  |    2 +-
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |    2 +-
 solenv/inc/minor.mk                                        |    6 +++---
 sw/source/filter/ww8/ww8scan.cxx                           |    8 +++++---
 4 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 609e0583acbcf8c9a062d889df392aa49bb991eb
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Wed Jul 3 08:45:55 2013 +0000

    WW8 import: further adjustment to the validation check for PLCF position arrays

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 6db4cf6..c71b27e 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -940,15 +940,17 @@ namespace {
     {
         bool bIsValid = true;
 
-        WW8_CP nValue = 0;
+        //WW8_CP nValue = 0;
         for ( sal_Int32 i = 0; i <= nMaxIndex; ++i )
         {
-            if ( pPLCFPosArray[i] != 0 && pPLCFPosArray[i] < nValue )
+            if ( pPLCFPosArray[i] < 0
+                 && !( i == nMaxIndex-1 && pPLCFPosArray[i] == -63488 )   // pPLCFPosArray[nMaxIndex-1]==-63488 seems to be allowed
+                 && !( i == nMaxIndex-1 && pPLCFPosArray[i] == -65536 ) ) // pPLCFPosArray[nMaxIndex-1]==-65536 seems to be allowed
             {
                 bIsValid = false;
                 break;
             }
-            nValue = pPLCFPosArray[i];
+            //nValue = pPLCFPosArray[i];
         }
 
         return bIsValid;
commit a88242ee00ca1b5d8da95ad2e04af2edd3d2c802
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Wed Jul 3 08:43:34 2013 +0000

    #122614# disable help agent by default

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 32dca84..8000a10 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3473,7 +3473,7 @@
 						<desc>Specifies whether the HelpAgent is enabled.</desc>
 						<label>enable HelpAgent</label>
 					</info>
-					<value>true</value>
+					<value>false</value>
 				</prop>
 				<prop oor:name="Timeout" oor:type="xs:int">
 					<info>
commit e8082b7306e1db2806edad6a8f0c851d20af1a63
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Wed Jul 3 08:40:46 2013 +0000

    #122648# fix minor translation issue in localedata, not on Pootle

diff --git a/i18npool/source/localedata/data/pt_PT.xml b/i18npool/source/localedata/data/pt_PT.xml
index fbd301e..d24cb36 100644
--- a/i18npool/source/localedata/data/pt_PT.xml
+++ b/i18npool/source/localedata/data/pt_PT.xml
@@ -176,7 +176,7 @@
 <DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER"  formatindex="0">
-<FormatCode>Estandar</FormatCode>
+<FormatCode>Padrão</FormatCode>
 <DefaultName></DefaultName>
 </FormatElement>
 <FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER"  formatindex="1">
commit e02d01cc658b6ca067ddc048e5a68bb4f2d16313
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Wed Jul 3 08:13:46 2013 +0000

    increase build number for next snapshot

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 7e9a080..8fbfec4 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -19,7 +19,7 @@
 #
 # *************************************************************
 RSCVERSION=400
-RSCREVISION=400m2(Build:9701)
-BUILD=9701
-LAST_MINOR=m2
+RSCREVISION=400m3(Build:9702)
+BUILD=9702
+LAST_MINOR=m3
 SOURCEVERSION=AOO400