[ooo-build-commit] .: 3 commits - officecfg/registry sfx2/qa

[Caolán McNamara]

 officecfg/registry/schema/org/openoffice/Office/Math.xcs   |    8 ++++----
 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |    4 ++--
 sfx2/qa/cppunit/makefile.mk                                |    7 +++++++
 sfx2/qa/cppunit/test_metadatable.cxx                       |    2 ++
 4 files changed, 15 insertions(+), 6 deletions(-)

New commits:
commit 2cb0e28f82fd35a860ce00f229d17e4ccf1839ec
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 6 12:33:06 2010 +0100

    turn off NumberRecognition in writer, its surprising behaviour

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 9abada4..d75708e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -2403,7 +2403,7 @@
 						<desc>Specifies if numbers in a table are recognized or if they are saved in a text format.</desc>
 						<label>Number recognition</label>
 					</info>
-                    <value>true</value>
+                    <value>false</value>
 				</prop>
 				<prop oor:name="NumberFormatRecognition" oor:type="xs:boolean">
 					<!-- OldPath: Writer/Insert/IntoTables -->
@@ -2414,7 +2414,7 @@
 						<desc>Specifies if only entries with the defined format are accepted. This option is only available if the number format recognition is active (Number_recognition = True).</desc>
 						<label>Number format recognition</label>
 					</info>
-					<value>true</value>
+					<value>false</value>
 				</prop>
 				<prop oor:name="Alignment" oor:type="xs:boolean">
 					<!-- OldPath: Writer/Insert/IntoTables -->
commit 70b40157a66a552c3e93b9c0327e2c9cb8c372bc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 6 12:30:29 2010 +0100

    default to just printing the formula itself in math, saves space

diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
index 31f6e00..da1071d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
@@ -240,7 +240,7 @@
 					<desc>Specifies if the title (filename) is printed.</desc>
 					<label>Title row</label>
 				</info>
-				<value>true</value>
+				<value>false</value>
 			</prop>
 			<prop oor:name="FormulaText" oor:type="xs:boolean">
 				<!-- OldPath: Math/Print -->
@@ -251,7 +251,7 @@
 					<desc>Specifies if the formula text is printed.</desc>
 					<label>Formula text</label>
 				</info>
-				<value>true</value>
+				<value>false</value>
 			</prop>
 			<prop oor:name="Frame" oor:type="xs:boolean">
 				<!-- OldPath: Math/Print -->
@@ -259,10 +259,10 @@
 				<!-- UIHints: Tools - Options  Formula  Settings - [Section] Print options -->
 				<info>
 					<author>TL</author>
-					<desc>Specifies if a border is drawn around the formula.</desc>
+					<desc>Specifies if a border is drawn around the formula when printed.</desc>
 					<label>Border</label>
 				</info>
-				<value>true</value>
+				<value>false</value>
 			</prop>
 			<prop oor:name="Size" oor:type="xs:short">
 				<!-- OldPath: Math/Print -->
commit 069c5a8153b13101f8d7516a0932b4f987c9361e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 6 12:15:48 2010 +0100

    #i113503# cppunit stl wrapper headers

diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk
index 2794c2a..dce0b86 100644
--- a/sfx2/qa/cppunit/makefile.mk
+++ b/sfx2/qa/cppunit/makefile.mk
@@ -35,6 +35,13 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+#building with stlport, but cppunit was not built with stlport
+.IF "$(USE_SYSTEM_STL)"!="YES"
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CFLAGSCXX+=-DADAPT_EXT_STL
+.ENDIF
+.ENDIF
+
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 DLLPRE = # no leading "lib" on .so files
 
diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx
index 903be69..6a0be13 100644
--- a/sfx2/qa/cppunit/test_metadatable.cxx
+++ b/sfx2/qa/cppunit/test_metadatable.cxx
@@ -27,10 +27,12 @@
 
 #include "precompiled_sfx2.hxx"
 
+#include "preextstl.h"
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
+#include "postextstl.h"
 
 #include <rtl/ustrbuf.hxx>