[ooo-build-commit] .: 3 commits - bin/unpack patches/dev300 patches/lwp
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Jun 24 05:29:44 PDT 2010
bin/unpack | 6 +++++
patches/dev300/apply | 4 ---
patches/dev300/wpgimporter.diff | 33 +---------------------------
patches/dev300/wpsimport-writerperfect.diff | 30 +------------------------
patches/lwp/lwp-filter-component.diff | 3 --
5 files changed, 12 insertions(+), 64 deletions(-)
New commits:
commit 278f638db1315d477bbde1331a5c198760472ea8
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Jun 24 14:29:19 2010 +0200
Disable xmloff_dis26300_conformance.diff.
* patches/dev300/apply:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index df205d4..d3e3a61 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1051,7 +1051,6 @@ solenv-installer-cleaner-paths.diff, pmladek
# gid_Module_Langpack_Basis_es.es
solenv-installer-lang-filelist-names.diff, pmladek
-[ BuildBits ]
# allow to get path also from ./file
# otherwise, it installed the license files into ugly subdirectories
# for example into <ooo-home>/LICENSE.html/LICENSE.html
@@ -1074,7 +1073,6 @@ dmake-space-in-envvar-name.diff, i#101786, jholesov
# find gsicheck in the solver
# FIXME dev300-m77 transex3-localize-gsicheck-path.diff, i#109378, pmladek # RENAMED transex3 -> l10ntools
-[ BuildBits ]
# add -o option to force localizition of ooo modules
# return 0 with -h option
# FIXME dev300-m77 transex3-localize.pl-ooo-build.diff, i#107386, pmladek # RENAMED transex3 -> l10ntools
@@ -2782,7 +2780,7 @@ sd-custom-show-fix.diff, n#355638, i#90145, thorsten
# to waste for time with this fix but to focus on the refactoring
sw-nested-positionned-tables-ww8-import-fix.diff, n#376688, flr
-xmloff_dis26300_conformance.diff, n#396280, flr
+# FIXME dev300-m83 xmloff_dis26300_conformance.diff, n#396280, flr
# don't do dns lookup on startup
# TODO file up-stream
commit 047486b383a7b67b99e26a0858eb61ef88569e84
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Jun 24 14:28:31 2010 +0200
Treat the DOWNLOAD source type as CGIT.
[The only difference is the download location, otherwise they are the same.]
* bin/unpack:
diff --git a/bin/unpack b/bin/unpack
index 1eda417..4201d24 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -5,6 +5,12 @@
#
. ./setup
+# source type DOWNLOAD is the same you get with CGIT, just downloaded from
+# somewhere else
+if test "$SOURCE_TYPE" = "DOWNLOAD" ; then
+ SOURCE_TYPE=CGIT
+fi
+
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
echo_n=echo echo_c=
commit 3e6eecf25301d84a96294ae76d8704a363f76f4d
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Jun 24 13:01:04 2010 +0200
Do not include xmloff/xmlkywd.hxx, does not exist any more.
* patches/dev300/wpgimporter.diff:
* patches/dev300/wpsimport-writerperfect.diff:
* patches/lwp/lwp-filter-component.diff:
diff --git a/patches/dev300/wpgimporter.diff b/patches/dev300/wpgimporter.diff
index 1049ae0..d8e3b4a 100644
--- a/patches/dev300/wpgimporter.diff
+++ b/patches/dev300/wpgimporter.diff
@@ -794,7 +794,7 @@ new file mode 100644
index 0000000..0ac0f80
--- /dev/null
+++ writerperfect/source/wpgimp/WPGImportFilter.cxx
-@@ -0,0 +1,331 @@
+@@ -0,0 +1,302 @@
+/* WPGImportFilter: Sets up the filter, and calls OdgExporter
+ * to do the actual filtering
+ *
@@ -826,50 +826,21 @@ index 0000000..0ac0f80
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
-+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
-+#endif
-+#ifndef _RTL_TENCINFO_H_
+#include <rtl/tencinfo.h>
-+#endif
-+#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
++
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_
+#include <com/sun/star/io/XInputStream.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_XML_SAX_XATTRIBUTELIST_HPP_
+#include <com/sun/star/xml/sax/XAttributeList.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_XML_SAX_INPUTSOURCE_HPP_
+#include <com/sun/star/xml/sax/InputSource.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_XML_SAX_XPARSER_HPP_
+#include <com/sun/star/xml/sax/XParser.hpp>
-+#endif
-+
-+#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_
+#include <com/sun/star/io/XInputStream.hpp>
-+#endif
-+
-+#ifndef _COM_SUN_STAR_IO_XSEEKABLE_HPP_
+#include <com/sun/star/io/XSeekable.hpp>
-+#endif
-+
+#include <com/sun/star/uno/Reference.h>
+
-+#ifndef _ATTRLIST_HPP_
+#include <xmloff/attrlist.hxx>
-+#endif
-+#ifndef _XMLKYWD_HPP
-+#include <xmloff/xmlkywd.hxx>
-+#endif
+
+#include "filter/DocumentHandler.hxx"
+#include "OdgExporter.hxx"
diff --git a/patches/dev300/wpsimport-writerperfect.diff b/patches/dev300/wpsimport-writerperfect.diff
index 208f2ba..01097ee 100644
--- a/patches/dev300/wpsimport-writerperfect.diff
+++ b/patches/dev300/wpsimport-writerperfect.diff
@@ -407,7 +407,7 @@ new file mode 100644
index 0000000..417ff05
--- /dev/null
+++ writerperfect/source/wpsimp/MSWorksImportFilter.cxx
-@@ -0,0 +1,303 @@
+@@ -0,0 +1,277 @@
+/* MSWorksImportFilter: Sets up the filter, and calls DocumentCollector
+ * to do the actual filtering
+ *
@@ -438,45 +438,19 @@ index 0000000..417ff05
+ * Corel Corporation or Corel Corporation Limited."
+ */
+
-+#ifndef _OSL_DIAGNOSE_H_
+#include <osl/diagnose.h>
-+#endif
-+#ifndef _RTL_TENCINFO_H_
+#include <rtl/tencinfo.h>
-+#endif
-+#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
++
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_
+#include <com/sun/star/io/XInputStream.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_XML_SAX_XATTRIBUTELIST_HPP_
+#include <com/sun/star/xml/sax/XAttributeList.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_XML_SAX_INPUTSOURCE_HPP_
+#include <com/sun/star/xml/sax/InputSource.hpp>
-+#endif
-+#ifndef _COM_SUN_STAR_XML_SAX_XPARSER_HPP_
+#include <com/sun/star/xml/sax/XParser.hpp>
-+#endif
-+
-+#ifndef _COM_SUN_STAR_UCB_XCOMMANDENVIRONMENT_HPP
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-+#endif
+
-+#ifndef _ATTRLIST_HPP_
+#include <xmloff/attrlist.hxx>
-+#endif
-+#ifndef _XMLKYWD_HPP
-+#include <xmloff/xmlkywd.hxx>
-+#endif
-+
-+#ifndef _UCBHELPER_CONTENT_HXX
+#include <ucbhelper/content.hxx>
-+#endif
+
+#include "filter/FilterInternal.hxx"
+#include "filter/DocumentHandler.hxx"
diff --git a/patches/lwp/lwp-filter-component.diff b/patches/lwp/lwp-filter-component.diff
index 3e41452..6af0b09 100644
--- a/patches/lwp/lwp-filter-component.diff
+++ b/patches/lwp/lwp-filter-component.diff
@@ -107,7 +107,7 @@ new file mode 100644
index 0000000..3de1d92
--- /dev/null
+++ lotuswordpro/source/filter/LotusWordProImportFilter.cxx
-@@ -0,0 +1,397 @@
+@@ -0,0 +1,396 @@
+#include <osl/diagnose.h>
+#include <rtl/tencinfo.h>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -119,7 +119,6 @@ index 0000000..3de1d92
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <xmloff/attrlist.hxx>
-+#include <xmloff/xmlkywd.hxx>
+
+#include <ucbhelper/content.hxx>
+
More information about the ooo-build-commit
mailing list