From 5e3d6a9f7a20e65dc3aaa5c3e346ccc1e0ff9702 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 22 Apr 2009 17:14:21 +0000 Subject: CWS-TOOLING: integrate CWS mav46 2009-04-03 13:43:02 +0200 mav r270481 : #i81373# fix delivering 2009-04-01 09:13:45 +0200 hjs r270299 : #i81373# a bit too specific 2009-03-31 14:55:42 +0200 mav r270282 : #i81373# the new tarball patching mechanics from hjs 2009-03-31 12:47:18 +0200 mav r270274 : #i81373# use the new tarball patching mechanics 2009-03-31 12:46:35 +0200 mav r270273 : #i81373# the change from the version attached to issue 2009-03-29 19:39:21 +0200 mav r270191 : CWS-TOOLING: rebase CWS mav46 to trunk@270033 (milestone: DEV300:m45) 2009-02-27 09:07:23 +0100 mav r268552 : #i99703# workaround Ubuntu problem 2009-02-25 12:51:27 +0100 mav r268434 : #i81373# change the version of the extension 2009-02-25 11:25:15 +0100 mav r268420 : #i81373# the filter installation needs at least 3.0 to work 2009-02-23 13:04:34 +0100 mav r268352 : #i88682# use correct representation of CR in xml 2009-02-20 16:40:25 +0100 mav r268334 : #i88682# show a warning if the page exists already 2009-02-20 15:42:10 +0100 mav r268330 : #i99462# remove wiki filter from OOo installation 2009-02-20 15:39:57 +0100 mav r268329 : #i99462# remove wiki filter from OOo installation 2009-02-20 15:36:41 +0100 mav r268328 : #i99462# remove wiki filter from OOo installation 2009-02-20 15:33:29 +0100 mav r268326 : #i99462# remove wiki filter from OOo installation 2009-02-20 14:19:45 +0100 mav r268320 : #i88650# fix the typo 2009-02-20 13:02:38 +0100 mav r268315 : #i81373# add math transformation into wiki filter 2009-02-20 11:46:20 +0100 mav r268309 : #i81373# add the tarball 2009-02-19 09:46:10 +0100 mav r268262 : #i82560# add wiki template into the extension 2009-02-19 07:26:45 +0100 mav r268258 : #i82560#,#i81373# add wiki filter and template into the extension 2009-02-17 12:47:16 +0100 mav r268115 : #i81373# commit the patch 2009-02-16 14:32:34 +0100 mav r267814 : #i82560# rename the template 2009-02-16 14:29:40 +0100 mav r267812 : #i82560# rename the template 2009-02-16 14:29:15 +0100 mav r267811 : #i82560# rename the template 2009-02-16 12:16:23 +0100 mav r267788 : #i90840# integrate the patch 2009-02-16 11:48:28 +0100 mav r267786 : #i95568#,#i95340# improve parsing of html wiki-pages while looking for the server 2009-02-13 13:46:35 +0100 mav r267720 : #i95568# fix typos 2009-02-13 13:38:42 +0100 mav r267719 : #i96279# integrate the patch 2009-02-13 13:37:32 +0100 mav r267718 : #i95568# check the retrieved URL 2009-02-13 11:39:55 +0100 mav r267706 : #i95568# allow to connect to Wikipedia successfuly --- .../org/openoffice/Office/Custom/WikiExtension.xcu | 6 ++- .../registry/data/org/openoffice/Office/Paths.xcu | 36 ++++++++++++++ .../data/org/openoffice/Office/makefile.mk | 2 +- .../data/org/openoffice/TypeDetection/Filter.xcu | 56 ++++++++++++++++++++++ .../data/org/openoffice/TypeDetection/Types.xcu | 44 +++++++++++++++++ .../data/org/openoffice/TypeDetection/makefile.mk | 50 +++++++++++++++++++ .../org/openoffice/Office/Custom/WikiExtension.xcs | 3 ++ 7 files changed, 194 insertions(+), 3 deletions(-) create mode 100644 swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu create mode 100644 swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu create mode 100644 swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu create mode 100644 swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk (limited to 'swext/mediawiki/src/registry') diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu index d8271598f492..cfa97b9a752d 100644 --- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu +++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu @@ -70,7 +70,7 @@ User name or password is incorrect. Please try again, or leave the fields blank for an anonymous connection. - A connection could not be created, because the URL is invalid. + A connection could not be created because the URL is invalid. Specify a MediaWiki server by providing a URL. @@ -150,6 +150,8 @@ @WIKIEXTENSIONPRODUCTNAME@ - + + A wiki article with the title '$ARG1' already exists. Do you want to replace the current article with your article? + diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu new file mode 100644 index 000000000000..82586e861c6c --- /dev/null +++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu @@ -0,0 +1,36 @@ + + + + + + + + + + + diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk b/swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk index c5085ed2c40e..c9ff540bff5b 100644 --- a/swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk +++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/makefile.mk @@ -43,7 +43,7 @@ LOCALIZEDFILES= Addons.xcu OptionsDialog.xcu MODULEFILES= -XCUFILES = Addons.xcu OptionsDialog.xcu ProtocolHandler.xcu +XCUFILES = Addons.xcu OptionsDialog.xcu ProtocolHandler.xcu Paths.xcu .ENDIF .INCLUDE : target.mk diff --git a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu new file mode 100644 index 000000000000..32577a7cbd8b --- /dev/null +++ b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu @@ -0,0 +1,56 @@ + + + + + + + 0 + MediaWiki + com.sun.star.text.TextDocument + + com.sun.star.documentconversion.XSLTFilter,,,com.sun.star.comp.Writer.XMLOasisExporter,,%origin%/filter/odt2mediawiki.xsl + com.sun.star.comp.Writer.XmlFilterAdaptor + + MediaWiki + + EXPORT ALIEN 3RDPARTYFILTER + + + 0 + MediaWiki + com.sun.star.text.WebDocument + + com.sun.star.documentconversion.XSLTFilter,,,com.sun.star.comp.Writer.XMLOasisExporter,,%origin%/filter/odt2mediawiki.xsl + com.sun.star.comp.Writer.XmlFilterAdaptor + + MediaWiki + + EXPORT ALIEN 3RDPARTYFILTER + + + diff --git a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu new file mode 100644 index 000000000000..2417be198b59 --- /dev/null +++ b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu @@ -0,0 +1,44 @@ + + + + + + + com.sun.star.comp.filters.XMLFilterDetect + + txt + + false + + + MediaWiki + + + + + diff --git a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk new file mode 100644 index 000000000000..4ef01de9ded2 --- /dev/null +++ b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/makefile.mk @@ -0,0 +1,50 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: makefile.mk,v $ +# +# $Revision: 1.4 $ +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=..$/..$/..$/..$/..$/..$/.. +PRJNAME=swext +CUSTID=mediawiki +TARGET=mediawiki_registry_data_typedetection +PACKAGE=org.openoffice.TypeDetection + +.INCLUDE : settings.mk +.INCLUDE : ${PRJ}$/makefile.pmk + +.IF "$(ENABLE_MEDIAWIKI)" == "YES" +LOCALIZEDFILES= + +MODULEFILES= + +XCUFILES = Filter.xcu Types.xcu +.ENDIF + +.INCLUDE : target.mk + diff --git a/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs b/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs index 81684f91d53a..d87ac892f7c4 100644 --- a/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs +++ b/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs @@ -192,6 +192,9 @@ The string containing the name of the extension. + + The text asking whether an existing wiki page should be overwritten. + -- cgit