[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfsdrimport.hxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 51a4292c7423346df0aee1757f2902290dba
Author: Miklos Vajna vmik...@frugalware.org
Date: Sat Nov 19 12:55:10 2011 +0100
RTFSdrImport: unneeded include
diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx
b/writerfilter/source/rtftok/rtfsdrimport.hxx
index a0092a2..e99445d 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.hxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.hxx
@@ -28,8 +28,6 @@
#ifndef _RTFSDRIMPORT_HXX_
#define _RTFSDRIMPORT_HXX_
-#include com/sun/star/drawing/XDrawPage.hpp
-
#include rtfdocumentimpl.hxx
namespace writerfilter {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source editeng/inc starmath/inc starmath/source svtools/source svx/inc tools/inc tools/Package_inc.mk
cui/source/options/optlingu.cxx |1 editeng/inc/pch/precompiled_editeng.hxx |1 starmath/inc/symbol.hxx |1 starmath/source/math_pch.cxx|1 svtools/source/filter/wmf/winmtf.hxx|1 svx/inc/pch/precompiled_svx.hxx |1 tools/Package_inc.mk|1 tools/inc/tools/dynary.hxx | 105 8 files changed, 112 insertions(+) New commits: commit 6db8af3e8b5020f8726276ef70b0cd29f9adebeb Author: Norbert Thiebaud nthieb...@gmail.com Date: Sat Nov 19 10:14:18 2011 -0600 Revert Removed tools/dynarray.hxx, break binfilter This reverts commit 89a783cde071d63120bfa63768b4680dd2e58fee. diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index d716f7f..61ce1b2 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -32,6 +32,7 @@ #include vcl/field.hxx #include vcl/fixed.hxx #include tools/shl.hxx +#include tools/dynary.hxx #include i18npool/mslangid.hxx #include unotools/lingucfg.hxx #include editeng/unolingu.hxx diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx index 450f381..81f0cc6 100644 --- a/editeng/inc/pch/precompiled_editeng.hxx +++ b/editeng/inc/pch/precompiled_editeng.hxx @@ -785,6 +785,7 @@ #include tools/contnr.hxx #include tools/debug.hxx #include tools/diagnose_ex.h +#include tools/dynary.hxx #include tools/errcode.hxx #include tools/errinf.hxx #include tools/fract.hxx diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx index 21f2c5c..d72df34 100644 --- a/starmath/inc/symbol.hxx +++ b/starmath/inc/symbol.hxx @@ -30,6 +30,7 @@ #define SYMBOL_HXX #include vcl/font.hxx +#include tools/dynary.hxx #include svl/lstner.hxx #include svl/svarray.hxx diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx index e85359b..0c3e560 100644 --- a/starmath/source/math_pch.cxx +++ b/starmath/source/math_pch.cxx @@ -134,6 +134,7 @@ #include osl/thread.hxx #include osl/thread.h #include vcl/apptypes.hxx +#include tools/dynary.hxx #include vcl/svapp.hxx #include vcl/timer.hxx #include sfx2/app.hxx diff --git a/svtools/source/filter/wmf/winmtf.hxx b/svtools/source/filter/wmf/winmtf.hxx index 58bb5bf..6dced91 100644 --- a/svtools/source/filter/wmf/winmtf.hxx +++ b/svtools/source/filter/wmf/winmtf.hxx @@ -38,6 +38,7 @@ #include tools/debug.hxx #include tools/stack.hxx #include tools/table.hxx +#include tools/dynary.hxx #include vcl/graph.hxx #include vcl/virdev.hxx #include tools/poly.hxx diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 64d1f7c..19b3034 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -855,6 +855,7 @@ #include tools/contnr.hxx #include tools/debug.hxx #include tools/diagnose_ex.h +#include tools/dynary.hxx #include tools/errcode.hxx #include tools/errinf.hxx #include tools/fract.hxx diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk index d1ca76b..22f034c 100644 --- a/tools/Package_inc.mk +++ b/tools/Package_inc.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/date.hxx,tools/date.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/datetime.hxx,tools/datetime.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/debug.hxx,tools/debug.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/diagnose_ex.h,tools/diagnose_ex.h)) +$(eval $(call gb_Package_add_file,tools_inc,inc/tools/dynary.hxx,tools/dynary.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/errcode.hxx,tools/errcode.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/errinf.hxx,tools/errinf.hxx)) $(eval $(call gb_Package_add_file,tools_inc,inc/tools/extendapplicationenvironment.hxx,tools/extendapplicationenvironment.hxx)) diff --git a/tools/inc/tools/dynary.hxx b/tools/inc/tools/dynary.hxx new file mode 100644 index 000..7e17455 --- /dev/null +++ b/tools/inc/tools/dynary.hxx @@ -0,0 +1,105 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx |1
binfilter/inc/bf_starmath/dynary.hxx | 105 ++
binfilter/inc/bf_starmath/node.hxx|3
binfilter/inc/bf_starmath/symbol.hxx |2
4 files changed, 107 insertions(+), 4 deletions(-)
New commits:
commit da4705764d8192f5ee2a02fe19fd31d5ebf955bd
Author: Michael Stahl mst...@redhat.com
Date: Sat Nov 19 18:00:17 2011 +0100
binfilter: move dynary.hxx from tools here
should fix breakage from 89a783cde071d63120bfa63768b4680dd2e58fee
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
b/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
index 31b2235..eee90f4 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -42,7 +42,6 @@
#include tools/debug.hxx
#include tools/stack.hxx
#include tools/table.hxx
-#include tools/dynary.hxx
#include vcl/graph.hxx
#include vcl/virdev.hxx
#include tools/poly.hxx
diff --git a/binfilter/inc/bf_starmath/dynary.hxx
b/binfilter/inc/bf_starmath/dynary.hxx
new file mode 100644
index 000..7e17455
--- /dev/null
+++ b/binfilter/inc/bf_starmath/dynary.hxx
@@ -0,0 +1,105 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * http://www.openoffice.org/license.html
+ * for a copy of the LGPLv3 License.
+ *
+ /
+
+#ifndef _DYNARY_HXX
+#define _DYNARY_HXX
+
+#include tools/solar.h
+#include tools/contnr.hxx
+
+//
+// - DynArray -
+//
+
+#define DYNARRAY_ENTRY_NOTFOUND CONTAINER_ENTRY_NOTFOUND
+
+class DynArray : private Container
+{
+public:
+using Container::SetSize;
+using Container::GetSize;
+using Container::Clear;
+
+DynArray( sal_uIntPtr nSize = 16 ) : Container( nSize ) {}
+DynArray( const DynArray rAry ) : Container( rAry ) {}
+
+void* Put( sal_uIntPtr nIndex, void* p )
+{ return Container::Replace( p, nIndex ); }
+void* Get( sal_uIntPtr nIndex ) const
+{ return Container::GetObject( nIndex ); }
+
+sal_uIntPtr GetIndex( const void* p ) const
+{ return Container::GetPos( p ); }
+
+DynArray operator =( const DynArray rAry )
+{ Container::operator =( rAry ); return *this; }
+
+sal_Booloperator ==( const DynArray rAry ) const
+{ return Container::operator ==( rAry ); }
+sal_Booloperator !=( const DynArray rAry ) const
+{ return Container::operator !=( rAry ); }
+};
+
+//
+// - DECLARE_DYNARRAY -
+//
+
+#define DECLARE_DYNARRAY( ClassName, Type ) \
+class ClassName : private DynArray \
+{ \
+public: \
+using DynArray::SetSize;\
+using DynArray::GetSize;\
+using DynArray::Clear; \
+\
+ClassName( sal_uIntPtr nSize = 16 ) : \
+DynArray( nSize ) {}\
+ClassName( const ClassName rClassName ) : \
+DynArray( rClassName ) {} \
+\
+TypePut( sal_uIntPtr nIndex, Type p ) \
+{ return (Type)DynArray::Put( nIndex, (void*)p ); } \
+
[Libreoffice-commits] .: distro-configs/LibreOfficeDragonFly.conf
distro-configs/LibreOfficeDragonFly.conf |1 + 1 file changed, 1 insertion(+) New commits: commit 752f365a2655bd074e1adad7fdf5b55b90d42da1 Author: François Tigeot ftig...@wolfpond.org Date: Sat Nov 19 20:08:17 2011 +0100 Do not use mozilla headers The configure script checks for them by default now. Disable this nonsense. diff --git a/distro-configs/LibreOfficeDragonFly.conf b/distro-configs/LibreOfficeDragonFly.conf index 2a5d87c..d2a3c6c 100644 --- a/distro-configs/LibreOfficeDragonFly.conf +++ b/distro-configs/LibreOfficeDragonFly.conf @@ -22,5 +22,6 @@ --without-system-libcmis --without-system-libvisio --without-system-mdds +--without-system-mozilla-headers --without-system-mythes --x-includes=/usr/pkg/include ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fd094baaf79e391f99da9c8259b13144e8de7847 Author: François Tigeot ftig...@wolfpond.org Date: Sat Nov 19 21:51:37 2011 +0100 Fix --with-max-jobs description diff --git a/configure.in b/configure.in index 0043bdb..49d3b8e 100644 --- a/configure.in +++ b/configure.in @@ -1744,7 +1744,7 @@ AC_ARG_WITH(num-cpus, AC_ARG_WITH(max-jobs, AS_HELP_STRING([--with-max-jobs], -[Maximum number of jobs per one CPU that will be issued at the same time by dmake. +[Maximum number of jobs that will be issued at the same time per dmake or gbuild subproject. The real number of the jobs is affected by the --with-num-cpus too, it can get up to CPUS*max_jobs. Defaults to 1, unless you configure --enable-icecream - then to 10.]), ,) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/python/module_python.ulf |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b338e513f77d469f9ba252220db164cf3cb5bcea Author: Andras Timar ati...@suse.com Date: Sat Nov 19 22:42:24 2011 +0100 change URL pointing to openoffice.org domain - fdo#39734 diff --git a/scp2/source/python/module_python.ulf b/scp2/source/python/module_python.ulf index 2303dcd..400c25e 100644 --- a/scp2/source/python/module_python.ulf +++ b/scp2/source/python/module_python.ulf @@ -29,4 +29,4 @@ en-US = Python-UNO Bridge [STR_DESC_MODULE_OPTIONAL_PYTHON] -en-US = Adds the ability to automate %PRODUCTNAME with the python scripting language. See http://udk.openoffice.org/python/python-bridge.html for a complete documentation. +en-US = Adds the ability to automate %PRODUCTNAME with the Python scripting language. See https://wiki.documentfoundation.org/Development/PyUno for a complete documentation. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ef23848eb252e65e0f83250512547ce684e6d4eb Author: Eike Rathke er...@redhat.com Date: Sun Nov 20 01:04:54 2011 +0100 change OUTDIR to OUTDIR_FOR_BUILD for cross-compilation diff --git a/i18npool/source/localedata/Makefile b/i18npool/source/localedata/Makefile index d279269..246385c 100755 --- a/i18npool/source/localedata/Makefile +++ b/i18npool/source/localedata/Makefile @@ -37,7 +37,7 @@ localedata_%.cxx : localedata_%_invis.cxx sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $ $@ localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \ - $(OUTDIR)/bin/saxparser$(gb_Executable_EXT) + $(OUTDIR_FOR_BUILD)/bin/saxparser$(gb_Executable_EXT) ifeq ($(OS_FOR_BUILD),WNT) $(gb_Helper_execute)saxparser $* `cygpath -m $` $@ \ $(my_file)`cygpath -m $(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m $(OUTDIR)/bin/types.rdb` \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 63d29ac431f492595486512ba413454baf636b65 Author: Eike Rathke er...@redhat.com Date: Sun Nov 20 03:14:34 2011 +0100 hopefully gb_Executable_EXT_for_build does it diff --git a/i18npool/source/localedata/Makefile b/i18npool/source/localedata/Makefile index 246385c..5b899f0 100755 --- a/i18npool/source/localedata/Makefile +++ b/i18npool/source/localedata/Makefile @@ -37,7 +37,7 @@ localedata_%.cxx : localedata_%_invis.cxx sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $ $@ localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \ - $(OUTDIR_FOR_BUILD)/bin/saxparser$(gb_Executable_EXT) + $(OUTDIR_FOR_BUILD)/bin/saxparser$(gb_Executable_EXT_for_build) ifeq ($(OS_FOR_BUILD),WNT) $(gb_Helper_execute)saxparser $* `cygpath -m $` $@ \ $(my_file)`cygpath -m $(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m $(OUTDIR)/bin/types.rdb` \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/qa
basic/qa/cppunit/test_scanner.cxx | 31 ++-
1 file changed, 30 insertions(+), 1 deletion(-)
New commits:
commit b97774aefa122aebf20de4208a820953c39172b1
Author: August Sodora aug...@gmail.com
Date: Sun Nov 20 00:44:53 2011 -0500
Added regression test for scanner
diff --git a/basic/qa/cppunit/test_scanner.cxx
b/basic/qa/cppunit/test_scanner.cxx
index dd46b7a..95bbb47 100644
--- a/basic/qa/cppunit/test_scanner.cxx
+++ b/basic/qa/cppunit/test_scanner.cxx
@@ -34,6 +34,7 @@ namespace
void testAlphanum();
void testComments();
void testGoto();
+void testGotoCompatible();
void testExclamation();
void testNumbers();
void testDataType();
@@ -47,6 +48,7 @@ namespace
CPPUNIT_TEST(testAlphanum);
CPPUNIT_TEST(testComments);
CPPUNIT_TEST(testGoto);
+CPPUNIT_TEST(testGotoCompatible);
CPPUNIT_TEST(testExclamation);
CPPUNIT_TEST(testNumbers);
CPPUNIT_TEST(testDataType);
@@ -62,10 +64,11 @@ namespace
const static rtl::OUString goto_(RTL_CONSTASCII_USTRINGPARAM(goto));
const static rtl::OUString excl(RTL_CONSTASCII_USTRINGPARAM(!));
- std::vectorSymbol getSymbols(const rtl::OUString source)
+ std::vectorSymbol getSymbols(const rtl::OUString source, bool bCompatible
= false)
{
std::vectorSymbol symbols;
SbiScanner scanner(source);
+scanner.SetCompatible(bCompatible);
while(scanner.NextSym())
{
Symbol symbol;
@@ -449,6 +452,32 @@ namespace
CPPUNIT_ASSERT(symbols[3].type == SbxVARIANT);
}
+ void ScannerTest::testGotoCompatible()
+ {
+const rtl::OUString source1(RTL_CONSTASCII_USTRINGPARAM(goto));
+const rtl::OUString source2(RTL_CONSTASCII_USTRINGPARAM(go to));
+const rtl::OUString source3(RTL_CONSTASCII_USTRINGPARAM(go\nto));
+
+std::vectorSymbol symbols;
+
+symbols = getSymbols(source1, true);
+CPPUNIT_ASSERT(symbols.size() == 2);
+CPPUNIT_ASSERT(symbols[0].text == goto_);
+CPPUNIT_ASSERT(symbols[1].text == cr);
+
+symbols = getSymbols(source2, true);
+CPPUNIT_ASSERT(symbols.size() == 2);
+CPPUNIT_ASSERT(symbols[0].text == rtl::OUString(goto_));
+CPPUNIT_ASSERT(symbols[1].text == cr);
+
+symbols = getSymbols(source3, true);
+CPPUNIT_ASSERT(symbols.size() == 4);
+CPPUNIT_ASSERT(symbols[0].text ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(go)));
+CPPUNIT_ASSERT(symbols[1].text == cr);
+CPPUNIT_ASSERT(symbols[2].text ==
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(to)));
+CPPUNIT_ASSERT(symbols[3].text == cr);
+ }
+
void ScannerTest::testExclamation()
{
const rtl::OUString source1(RTL_CONSTASCII_USTRINGPARAM(asdf!asdf));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
