6 files changed, 11 insertions, 92 deletions
diff --git a/swext/mediawiki/help/makefile.mk b/swext/mediawiki/help/makefile.mk
deleted file mode 100644
index 70ed4cd1eb1d..000000000000
--- a/swext/mediawiki/help/makefile.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=swext
-TARGET=$(PRJNAME)_help
-
-.INCLUDE : settings.mk
-
-.IF "$(WITH_LANG)"!=""
-# workaround for the problem in help, the help uses en instead of en-US
-MEDIAWIKI_LANG=$(uniq en $(alllangiso))
-aux_alllangiso:=$(MEDIAWIKI_LANG)
-.ELSE          # "$(WITH_LANG)"!=""
-aux_alllangiso:=$(defaultlangiso)
-MEDIAWIKI_LANG=$(uniq en $(alllangiso))
-.ENDIF          # "$(WITH_LANG)"!=""
-
-.IF "$(ENABLE_MEDIAWIKI)" != "YES"
-all:
-    @echo Building mediawiki disabled...
-.ELSE           # "$(ENABLE_MEDIAWIKI)" != "YES"
-
-PACKAGE=com.sun.wiki-publisher
-
-OUT_MEDIAWIKI:=$(MISC)$/mediawiki
-
-LINKNAME:=help
-XHPLINKSRC:=$(OUT_MEDIAWIKI)/help
-
-XHPDEST=$(OUT_MEDIAWIKI)_merge/help
-
-XHPFILES= \
-    wiki.xhp\
-    wikiaccount.xhp\
-    wikiformats.xhp\
-    wikisend.xhp\
-    wikisettings.xhp
-
-LINKLINKFILES= \
-    $(PACKAGE)/{$(XHPFILES)}
-
-# define with own language set
-HLANGXHPFILES=$(foreach,i,$(XHPFILES) $(foreach,j,$(MEDIAWIKI_LANG) $(XHPDEST)$/$j$/$(PACKAGE)$/$(i:f)))
-
-.INCLUDE : target.mk
-.INCLUDE : tg_help.mk
-.INCLUDE : extension_helplink.mk
-
-$(OUT_MEDIAWIKI)/help/%.xhp : $(OUT_MEDIAWIKI)_merge/help/%.xhp
-    @-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)cat $< | \
-        sed  's/@WIKIEXTENSIONID@/com.sun.wiki-publisher/g' | \
-        sed 's/@WIKIEXTENSIONFILENAME@/wiki-publisher/g' > $@
-
-.ENDIF          # "$(ENABLE_MEDIAWIKI)" != "YES"
-
diff --git a/swext/mediawiki/help/wiki.xhp b/swext/mediawiki/help/wiki.xhp
index 20a57b58cb22..8d49b1385715 100644
--- a/swext/mediawiki/help/wiki.xhp
+++ b/swext/mediawiki/help/wiki.xhp
@@ -30,7 +30,7 @@
 <meta>
 <topic id="comsunstarwikiMediaWikiwikixml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Wiki Publisher</title>
-<filename>/@WIKIEXTENSIONID@/wiki.xhp</filename>
+<filename>/com.sun.wiki-publisher/wiki.xhp</filename>
 </topic>
 <history>
 <created date="2008-02-08T12:13:25"/>
@@ -73,7 +73,7 @@
 <paragraph role="paragraph" id="par_id4338511" xml-lang="en-US" l10n="NEW">In the Extension Manager dialog, click Add.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id5882442" xml-lang="en-US" l10n="NEW">Locate the @WIKIEXTENSIONFILENAME@.oxt file, click Open, and then click Close. </paragraph>
+<paragraph role="paragraph" id="par_id5882442" xml-lang="en-US" l10n="NEW">Locate the wiki-publisher.oxt file, click Open, and then click Close. </paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id4008911" xml-lang="en-US" l10n="NEW">Close %PRODUCTNAME, and close also the Quickstarter if enabled.</paragraph>
@@ -102,10 +102,10 @@
 <paragraph role="paragraph" id="par_id9533677" xml-lang="en-US" l10n="NEW">Open a Writer document, and choose <item type="menuitem">Tools - Options - Internet - MediaWiki</item>.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id368968" xml-lang="en-US" l10n="NEW">In the <link href="@WIKIEXTENSIONID@/wikisettings.xhp">Options</link> dialog, click Add.</paragraph>
+<paragraph role="paragraph" id="par_id368968" xml-lang="en-US" l10n="NEW">In the <link href="com.sun.wiki-publisher/wikisettings.xhp">Options</link> dialog, click Add.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id6962187" xml-lang="en-US" l10n="NEW">In the <link href="@WIKIEXTENSIONID@/wikiaccount.xhp">MediaWiki</link> dialog, enter the account information for the Wiki.</paragraph>
+<paragraph role="paragraph" id="par_id6962187" xml-lang="en-US" l10n="NEW">In the <link href="com.sun.wiki-publisher/wikiaccount.xhp">MediaWiki</link> dialog, enter the account information for the Wiki.</paragraph>
 </listitem>
 </list>
 <list type="ordered">
@@ -128,13 +128,13 @@
 <paragraph role="paragraph" id="par_id3514206" xml-lang="en-US" l10n="NEW">Open a Writer document.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id944853" xml-lang="en-US" l10n="NEW">Write the content of the Wiki page. You can use formatting like text formats, headings, footnotes, and more. See the <link href="@WIKIEXTENSIONID@/wikiformats.xhp">list of supported formats</link>.</paragraph>
+<paragraph role="paragraph" id="par_id944853" xml-lang="en-US" l10n="NEW">Write the content of the Wiki page. You can use formatting like text formats, headings, footnotes, and more. See the <link href="com.sun.wiki-publisher/wikiformats.xhp">list of supported formats</link>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id4566484" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">File - Send - To MediaWiki</item>.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id228278" xml-lang="en-US" l10n="NEW">In the <link href="@WIKIEXTENSIONID@/wikisend.xhp">Send to MediaWiki</link> dialog, specify the settings for your entry.</paragraph>
+<paragraph role="paragraph" id="par_id228278" xml-lang="en-US" l10n="NEW">In the <link href="com.sun.wiki-publisher/wikisend.xhp">Send to MediaWiki</link> dialog, specify the settings for your entry.</paragraph>
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id2564165" xml-lang="en-US" l10n="NEW">
diff --git a/swext/mediawiki/help/wikiaccount.xhp b/swext/mediawiki/help/wikiaccount.xhp
index 8d1d57ba1d25..3254de7e8128 100644
--- a/swext/mediawiki/help/wikiaccount.xhp
+++ b/swext/mediawiki/help/wikiaccount.xhp
@@ -30,7 +30,7 @@
 <meta>
 <topic id="comsunstarwikiMediaWikiwikiaccountxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">MediaWiki</title>
-<filename>/@WIKIEXTENSIONID@/wikiaccount.xhp</filename>
+<filename>/com.sun.wiki-publisher/wikiaccount.xhp</filename>
 </topic>
 <history>
 <created date="2008-02-08T12:13:25"/>
diff --git a/swext/mediawiki/help/wikiformats.xhp b/swext/mediawiki/help/wikiformats.xhp
index eb02a5f4ad96..86db68dd8205 100644
--- a/swext/mediawiki/help/wikiformats.xhp
+++ b/swext/mediawiki/help/wikiformats.xhp
@@ -30,7 +30,7 @@
 <meta>
 <topic id="comsunstarwikiMediaWikiwikiformatsxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">MediaWiki Formats</title>
-<filename>/@WIKIEXTENSIONID@/wikiformats.xhp</filename>
+<filename>/com.sun.wiki-publisher/wikiformats.xhp</filename>
 </topic>
 <history>
 <created date="2008-02-08T12:13:25"/>
diff --git a/swext/mediawiki/help/wikisend.xhp b/swext/mediawiki/help/wikisend.xhp
index f9a5613b5184..f34b0e5e4377 100644
--- a/swext/mediawiki/help/wikisend.xhp
+++ b/swext/mediawiki/help/wikisend.xhp
@@ -30,7 +30,7 @@
 <meta>
 <topic id="comsunstarwikiMediaWikiwikisendxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Send to MediaWiki</title>
-<filename>/@WIKIEXTENSIONID@/wikisend.xhp</filename>
+<filename>/com.sun.wiki-publisher/wikisend.xhp</filename>
 </topic>
 <history>
 <created date="2008-02-08T12:13:25"/>
diff --git a/swext/mediawiki/help/wikisettings.xhp b/swext/mediawiki/help/wikisettings.xhp
index ce15f11c187c..d7994e00c931 100644
--- a/swext/mediawiki/help/wikisettings.xhp
+++ b/swext/mediawiki/help/wikisettings.xhp
@@ -30,7 +30,7 @@
 <meta>
 <topic id="comsunstarwikiMediaWikiwikisettingsxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">MediaWiki Options</title>
-<filename>/@WIKIEXTENSIONID@/wikisettings.xhp</filename>
+<filename>/com.sun.wiki-publisher/wikisettings.xhp</filename>
 </topic>
 <history>
 <created date="2008-02-08T12:13:25"/>
@@ -49,6 +49,6 @@
 <paragraph role="paragraph" id="par_id3386333" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the MediaWiki dialog to edit the selected entry.</ahelp></paragraph><comment>Remove button</comment>
 <bookmark xml-lang="en-US" branch="hid/com.sun.star.wiki.MediaWiki.Settings.RemoveButton" id="bm_id6067386" localize="false"/>
 <paragraph role="paragraph" id="par_id7285073" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Removes the selected entry from the list.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id1029084" xml-lang="en-US" l10n="NEW">When you click Add or Edit, the <link href="@WIKIEXTENSIONID@/wikiaccount.xhp">MediaWiki</link> dialog opens.</paragraph>
+<paragraph role="paragraph" id="par_id1029084" xml-lang="en-US" l10n="NEW">When you click Add or Edit, the <link href="com.sun.wiki-publisher/wikiaccount.xhp">MediaWiki</link> dialog opens.</paragraph>
 </body>
 </helpdocument>