strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Jan Holesovsky 2010-10-06 16:04:22 +02:00
commit 0b956daac8
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
officecfg/registry/schema/org/openoffice/Office/Math.xcs
View file

@ -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 -->

4
officecfg/registry/schema/org/openoffice/Office/Writer.xcs
View file

@ -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 -->

7
sfx2/qa/cppunit/makefile.mk
View file

@ -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

2
sfx2/qa/cppunit/test_metadatable.cxx
View file

@ -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>