[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 985ac59356a62ff30518355235c66e0e3126fbb6 Author: Andrea Gelmini AuthorDate: Wed Jun 28 11:21:00 2023 +0200 Commit: Julien Nabet CommitDate: Wed Jun 28 21:44:39 2023 +0200 Fix typo Change-Id: I4c55e4a263a01fd4fa1d84feb49ac97bed793a59 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153710 Tested-by: Jenkins Reviewed-by: Julien Nabet 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 c0147ae7b753..d41478c57c6b 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 @@ -90,7 +90,7 @@ The general error shown in case the document could not be sent to the wiki server. - The error is shown in case wiki filter is not evailable. + The error is shown in case wiki filter is not available. The error is shown in case no wiki system was found on specified URL.
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 03552ba854243dd05de37f471dabeb5873f5e73c
Author: Michael Stahl
AuthorDate: Fri Mar 4 17:22:28 2022 +0100
Commit: Michael Stahl
CommitDate: Mon Mar 7 11:01:32 2022 +0100
cid#1500542 swext: Wiki Publisher: "Insecure TLS version"
Change-Id: I4b481cae6c1e13d34ea5a6dc3ff35a3b03ee281a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131005
Reviewed-by: Caolán McNamara
Reviewed-by: Michael Stahl
Tested-by: Jenkins
diff --git
a/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
b/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
index 0990cf6a7bea..7ca94390dce4 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
@@ -93,7 +93,7 @@ class WikiProtocolSocketFactory extends SSLSocketFactory
try
{
-SSLContext aContext = SSLContext.getInstance("SSL");
+SSLContext aContext = SSLContext.getInstance("TLSv1.2");
if ( aContext != null )
{
aContext.init( null, pTrustUnknownCerts, null );
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 1534c125440725631bcfd5b2ebd1592ee8104287
Author: Caolán McNamara
AuthorDate: Mon Mar 22 10:42:00 2021 +
Commit: Caolán McNamara
CommitDate: Mon Mar 22 15:05:32 2021 +0100
cid#1473816 Dereference null return value
Change-Id: Iebafaa477670041d184a5d01221355fca61a5e62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112878
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git
a/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
b/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
index 17527cad187b..0990cf6a7bea 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiProtocolSocketFactory.java
@@ -64,6 +64,9 @@ class WikiProtocolSocketFactory extends SSLSocketFactory
}
}
+if (m_aOrgTrustManager == null)
+throw new RuntimeException("No access to the default
trust manager!");
+
return m_aOrgTrustManager;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/com/sun/star/wiki/Helper.java | 50 +
swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java | 38 +++-
2 files changed, 50 insertions(+), 38 deletions(-)
New commits:
commit 3f837a85191a646e2fd14a8871c0f74b28d5714e
Author: Caolán McNamara
AuthorDate: Mon Mar 22 10:31:53 2021 +
Commit: Caolán McNamara
CommitDate: Mon Mar 22 14:43:22 2021 +0100
cid#1473739 Resource leak on an exceptional path
and
cid#1474111 Resource leak on an exceptional path
Change-Id: Iea50865f975b9b8281da78b2dc63ff43bcb07c2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112876
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index bde53b39f89c..4a5ec943ad8c 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
@@ -783,30 +783,36 @@ public class Helper
connPost.connect();
OutputStreamWriter post = new
OutputStreamWriter(connPost.getOutputStream(), "UTF-8");
-post.write("wpName=");
-post.write(URLEncoder.encode(sWikiUser, "UTF-8"));
-post.write("&wpRemember=1");
-post.write("&wpPassword=");
-post.write(URLEncoder.encode(sWikiPass, "UTF-8"));
-
-if (sLoginToken.length() > 0) {
-post.write("&wpLoginToken=");
-post.write(URLEncoder.encode(sLoginToken, "UTF-8"));
-}
+try
+{
+post.write("wpName=");
+post.write(URLEncoder.encode(sWikiUser, "UTF-8"));
+post.write("&wpRemember=1");
+post.write("&wpPassword=");
+post.write(URLEncoder.encode(sWikiPass, "UTF-8"));
+
+if (sLoginToken.length() > 0) {
+post.write("&wpLoginToken=");
+ post.write(URLEncoder.encode(sLoginToken, "UTF-8"));
+}
-String[][] pArgs = GetSpecialArgs( xContext,
aMainURL.getHost() );
-if ( pArgs != null )
-for ( int nArgInd = 0; nArgInd < pArgs.length; nArgInd++ )
-if ( pArgs[nArgInd].length == 2 && pArgs[nArgInd][0]
!= null && pArgs[nArgInd][1] != null )
-{
-post.write("&");
-post.write(URLEncoder.encode(pArgs[nArgInd][0],
"UTF-8"));
-post.write("=");
-post.write(URLEncoder.encode(pArgs[nArgInd][0],
"UTF-8"));
-}
+String[][] pArgs = GetSpecialArgs( xContext,
aMainURL.getHost() );
+if ( pArgs != null )
+for ( int nArgInd = 0; nArgInd < pArgs.length;
nArgInd++ )
+if ( pArgs[nArgInd].length == 2 &&
pArgs[nArgInd][0] != null && pArgs[nArgInd][1] != null )
+{
+post.write("&");
+
post.write(URLEncoder.encode(pArgs[nArgInd][0], "UTF-8"));
+post.write("=");
+ post.write(URLEncoder.encode(pArgs[nArgInd][0],
"UTF-8"));
+ }
-post.flush();
-post.close();
+post.flush();
+}
+finally
+{
+post.close();
+}
nResultCode = connPost.getResponseCode();
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java
b/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java
index a576ef9c732e..5c22afa2a651 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java
@@ -205,23 +205,29 @@ public class WikiArticle
connPost.connect();
OutputStreamWriter post = new
OutputStreamWriter(connPost.getOutputStream(), "UTF-8");
-post.write("wpTextbox1=");
-post.write(URLEncoder.encode(sWikiCode, "UTF-8"));
-post.write("&wpSummary=");
-post.write(URLEncoder.encode(sWikiComment, "UTF-8"));
-post.write("&wpSection=");
-post.write("&wpEdittime=");
-post.write(URLEncoder.encode(m_sEditTime, "UTF-8"));
-post.write("&wpSave=Save%20page");
-post.write("&wpEditToken=");
-post.write(URLEncoder.encode(m_sEditToken, "UTF-8"));
-
-if (bMinorEdit) {
-post.write("&wpMinoredit=1");
-}
+try
+{
+post.write("wpTextbox1=");
+post.write(URLEncoder.encode(sWikiCode
[Libreoffice-commits] core.git: swext/mediawiki sw/qa
sw/qa/extras/inc/swmodeltestbase.hxx
|2 +-
sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
|2 +-
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
|2 +-
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
|2 +-
sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
|4 ++--
sw/qa/extras/unowriter/unowriter.cxx
|2 +-
swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs
|2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 325ef6cc363c0584f4b277bc4787f514e277444d
Author: Andrea Gelmini
AuthorDate: Mon Aug 12 14:21:06 2019 +0200
Commit: Julien Nabet
CommitDate: Mon Aug 12 15:03:11 2019 +0200
Fix typos
Change-Id: I4a334f1f40c829ddffb93cd8a41f0a9c8e65d5d8
Reviewed-on: https://gerrit.libreoffice.org/77279
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index a9542ae116fb..23cc46af3016 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -911,7 +911,7 @@ protected:
}
/**
- * Returns an xml stream of a an exported file.
+ * Returns an xml stream of an exported file.
* To be used when the exporter doesn't create zip archives, but single
files
* (like Flat ODF Export)
*/
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index 1c973369902b..de66fe780b8b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -636,7 +636,7 @@ DECLARE_OOXMLEXPORT_TEST(testObjectCrossReference,
"object_cross_reference.odt")
OUString sValue;
xPropertySet->getPropertyValue("CurrentPresentation") >>=
sValue;
CPPUNIT_ASSERT_EQUAL(OUString("Illustration 1: A picture"),
- sValue.trim()); // failes on MAC without
trim
+ sValue.trim()); // fails on MAC without
trim
xPropertySet->getPropertyValue("SourceName") >>= sValue;
CPPUNIT_ASSERT_EQUAL(OUString("Ref_Illustration0_full"),
sValue);
break;
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index e81e8fca8b5d..140c90723a1a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -963,7 +963,7 @@ DECLARE_OOXMLEXPORT_TEST(test76108, "test76108.docx")
DECLARE_OOXMLEXPORT_TEST(testTCTagMisMatch, "TCTagMisMatch.docx")
{
- // TCTagMisMatch.docx : This document contains a empty table with borders.
+ // TCTagMisMatch.docx : This document contains an empty table with borders.
// there was a TC tag mismatch which resulted into a crash.
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index b70657edb1a0..7647c02142de 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -173,7 +173,7 @@ DECLARE_OOXMLEXPORT_TEST(testFDO77890 , "fdo77890.docx")
/*
Ensure that the page break is preserved i.e it should not be converted to
a section break, in case
if the different first page is set for the pages in the document.
-For additional comments pls refer
https://www.libreoffice.org/bugzilla/show_bug.cgi?id=77890#c2
+For additional comments please refer to
https://www.libreoffice.org/bugzilla/show_bug.cgi?id=77890#c2
*/
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
if (!pXmlDoc)
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index e89134d6ab65..b673c06a3d2a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -124,7 +124,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo76249, "fdo76249.docx")
{
/*
* The Locked Canvas is imported correctly, but while exporting
- * the drawing element is exported inside a textbox. However a the drawing
has to exported
+ * the drawing element is exported inside a textbox. However the drawing
has to exported
* as a Locked Canvas inside a text-box for the RT file to work in MS
Word, as drawing elements
* are not allowed inside the textboxes.
*/
@@ -947,7 +947,7 @@ DECLARE_OOXMLEXPORT_TEST(testPictureWrapPolygon,
"picture-wrap-polygon.docx")
DECLARE_OOXMLEXPORT_TEST(testPictureColormodeGrayscale,
"picture_colormode_grayscale.docx")
{
-// THe problem was that the grayscale was not exported
+// The problem was that the grayscale was no
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/help/wiki.xhp | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit 8057e37abd81e301bb14f2945eea1ead3839b049 Author: Sophia Schröder AuthorDate: Fri Nov 9 16:08:35 2018 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Thu Nov 15 04:50:23 2018 +0100 Help files: http -> https + some more conservative changes Change-Id: I28ca18b962ffe42ca8b2938de606b30d2692855c Reviewed-on: https://gerrit.libreoffice.org/63194 Reviewed-by: Sophie Gautier Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/swext/mediawiki/help/wiki.xhp b/swext/mediawiki/help/wiki.xhp index 56f0bd2c96d0..23464c0be9cb 100644 --- a/swext/mediawiki/help/wiki.xhp +++ b/swext/mediawiki/help/wiki.xhp @@ -42,7 +42,7 @@ Java Runtime Environment -A wiki account on a supported http://www.mediawiki.org/wiki/MediaWiki";>MediaWiki server +A wiki account on a supported https://www.mediawiki.org/wiki/MediaWiki";>MediaWiki server Installing Wiki Publisher @@ -55,23 +55,23 @@ Open a Writer document, and choose Tools - Options - Internet - MediaWiki. -In the Options dialog, click Add. +In the Options dialog, click Add. -In the MediaWiki dialog, enter the account information for the wiki. +In the MediaWiki dialog, enter the account information for the wiki. -In the URL text box, enter the address of a wiki that you want to connect to. + In the URL text box, enter the address of a wiki that you want to connect to. You can copy the URL from a web browser and paste it into the textbox. -In the Username box, enter your user ID for your wiki account. + In the Username box, enter your user ID for your wiki account. If the wiki allows anonymous write access, you can leave the Username and Password boxes empty. -In the Password box, enter the password for your wiki account, then click OK. +In the Password box, enter the password for your wiki account, then click OK. Optionally enable “Save password” to save the password between sessions. A master password is used to maintain access to all saved passwords. Choose Tools - Options - %PRODUCTNAME - Security to enable the master password. “Save password” is unavailable when the master password is not enabled. @@ -87,7 +87,7 @@ Choose File - Send - To MediaWiki. -In the Send to MediaWiki dialog, specify the settings for your entry. +In the Send to MediaWiki dialog, specify the settings for your entry. MediaWiki server: Select the wiki. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/help/wikisend.xhp | 32 1 file changed, 16 insertions(+), 16 deletions(-) New commits: commit 6bfbd08794c1f4daa5d4588007f80074265bbb94 Author: Sophia Schröder AuthorDate: Thu Nov 8 13:20:02 2018 +0100 Commit: Olivier Hallot CommitDate: Fri Nov 9 11:48:10 2018 +0100 Related: tdf#121134: Changing http to https where possible Change-Id: I6d99873416d9679f330a471b1f836f084bd5d0c9 Reviewed-on: https://gerrit.libreoffice.org/63092 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/swext/mediawiki/help/wikisend.xhp b/swext/mediawiki/help/wikisend.xhp index 3b73ed6639b8..f61f0367e4ed 100644 --- a/swext/mediawiki/help/wikisend.xhp +++ b/swext/mediawiki/help/wikisend.xhp @@ -1,4 +1,5 @@ + - + --> + - -Send to MediaWiki -/com.sun.wiki-publisher/wikisend.xhp - - - - + +Send to MediaWiki +/com.sun.wiki-publisher/wikisend.xhp + + + + Send to MediaWiki -In the Send to MediaWiki dialog, specify the settings for your current wiki upload.MediaWiki server + In the Send to MediaWiki dialog, specify the settings for your current wiki upload. -Select the MediaWiki server where you want to publish your document. Click Add to add a new server to the list.title + Select the MediaWiki server where you want to publish your document. Click Add to add a new server to the list. -Enter the title of your wiki entry. This is the top heading of your wiki entry. For a new entry, the title must be unique on this wiki. If you enter an existing title, your upload will overwrite the existing wiki entry.summary + Enter the title of your wiki entry. This is the top heading of your wiki entry. For a new entry, the title must be unique on this wiki. If you enter an existing title, your upload will overwrite the existing wiki entry. -Enter an optional short summary or comment. See http://meta.wikimedia.org/wiki/Help:Edit_summary";>http://meta.wikimedia.org/wiki/Help:Edit_summary. + Enter an optional short summary or comment. See https://meta.wikimedia.org/wiki/Help:Edit_summary";>https://meta.wikimedia.org/wiki/Help:Edit_summary. - -This is a minor edit: Check this box to mark the uploaded page as a minor edit of the already existing page with the same title. + This is a minor edit: Check this box to mark the uploaded page as a minor edit of the already existing page with the same title. -Show in web browser: Check this box to open your system web browser and show the uploaded wiki page. + Show in web browser: Check this box to open your system web browser and show the uploaded wiki page. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/help/wikiaccount.xhp | 35 ++- 1 file changed, 18 insertions(+), 17 deletions(-) New commits: commit 91a3c3c179b788bcaadbf3ac2c3009753672a8a5 Author: Sophia Schröder AuthorDate: Thu Nov 8 13:08:36 2018 +0100 Commit: Olivier Hallot CommitDate: Fri Nov 9 11:46:32 2018 +0100 Related: tdf#121134: Changing http to https where possible Change-Id: I3a8d66f97a9e33c9415a469c2c6e7a6b5df89248 Reviewed-on: https://gerrit.libreoffice.org/63091 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/swext/mediawiki/help/wikiaccount.xhp b/swext/mediawiki/help/wikiaccount.xhp index a81226828dfb..5cc49c674816 100644 --- a/swext/mediawiki/help/wikiaccount.xhp +++ b/swext/mediawiki/help/wikiaccount.xhp @@ -1,4 +1,5 @@ + - + --> + - -MediaWiki -/com.sun.wiki-publisher/wikiaccount.xhp - - - - + +MediaWiki +/com.sun.wiki-publisher/wikiaccount.xhp + + + + MediaWiki -Use the MediaWiki dialog to add or edit your MediaWiki account settings.URL + Use the MediaWiki dialog to add or edit your MediaWiki account settings. -Enter the URL of a MediaWiki server, starting with http://Username + Enter the URL of a MediaWiki server, starting with "https://";. -Enter your user name on the MediaWiki server. Leave empty for anonymous access.Password + Enter your user name on the MediaWiki server. Leave empty for anonymous access. -Enter your password on the MediaWiki server. Leave empty for anonymous access.Save password + Enter your password on the MediaWiki server. Leave empty for anonymous access. -Enable to store your password between sessions. The master password must be enabled; see Tools - Options - %PRODUCTNAME - Security. -Enter the Internet address of a wiki server in a format like “http://wiki.documentfoundation.org” or copy the URL from a web browser. -If the wiki allows anonymous access, you can leave the account text boxes empty. Else enter your user name and password. -If you have enabled the master password feature on the Security tab page of the Tools - Options - %PRODUCTNAME dialog, then the software can store your password and automatically insert the data where necessary. Enable the "Save password" checkbox to store your password. + Enable to store your password between sessions. The master password must be enabled; see Tools - Options - %PRODUCTNAME - Security. +Enter the Internet address of a wiki server in a format like “https://wiki.documentfoundation.org” or copy the URL from a web browser. + If the wiki allows anonymous access, you can leave the account text boxes empty. Else enter your user name and password. + If you have enabled the master password feature on the Security tab page of the Tools - Options - %PRODUCTNAME dialog, then the software can store your password and automatically insert the data where necessary. Enable the Save password checkbox to store your password. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/help/wikiformats.xhp |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit fe1c13d4ba288e45acdba5bc01b0ef81da08f125 Author: dennisroczek Date: Sat Mar 24 13:29:19 2018 +0100 remove notice about cite.php The extension Cite is distributed with MediaWiki 1.21 (released May 2013) and is integrated in core since MediaWiki 1.25. No need to keep that notice any longer. Change-Id: I8a91fbb45bc6f410b551c206177d63c584349c37 Reviewed-on: https://gerrit.libreoffice.org/51795 Reviewed-by: Olivier Hallot Tested-by: Olivier Hallot diff --git a/swext/mediawiki/help/wikiformats.xhp b/swext/mediawiki/help/wikiformats.xhp index 6026c0d46d84..6e463778fb94 100644 --- a/swext/mediawiki/help/wikiformats.xhp +++ b/swext/mediawiki/help/wikiformats.xhp @@ -27,7 +27,7 @@ - + MediaWiki Formats The following list gives an overview of the text formats that the Wiki Publisher can upload to the wiki server. The OpenDocument format used by Writer and the MediaWiki format are quite different. Only a subset of all features can be transformed from one format to the other. @@ -44,8 +44,6 @@ A paragraph style with a fixed-width font is transformed as pre-formatted text. Pre-formatted text is shown on the wiki with a border around the text. Character styles Character styles modify the appearance of parts of a paragraph. The transformation supports bold, italics, bold/italics, subscript and superscript. All fixed-width fonts are transformed into the wiki typewriter style. -Footnotes -Note: The transformation uses the new style of footnotes with andtags that requires the Cite.php extension to be installed into MediaWiki. If those tags are shown as plain text in the transformation result, ask the wiki administrator to install this extension. Images Images cannot be exported by a transformation producing a single file of wiki text. However, if the image is already uploaded to the target wiki domain (e. g., Wikimedia Commons), then the transformation produces a valid image tag that includes the image. Image captions are also supported. Tables ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki wizards/com
swext/mediawiki/src/filter/odt2mediawiki.xsl | 2 +- wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 3d0c0abea7ed5f59ab30aa8f120d55e54d3e7098 Author: Jens Carl Date: Mon Sep 25 23:13:22 2017 + tdf#39468: Translate some random German comments and terms Change-Id: I5499676506a7570482388eb153f4667785b016ed Reviewed-on: https://gerrit.libreoffice.org/42770 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index f6cf345fca61..435f0f498cac 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -329,7 +329,7 @@
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 6a24160894e91c007d4a2f8ef193eed670909ea5 Author: Julien Nabet Date: Sun Jun 11 21:57:14 2017 +0200 tdf#80671: mediawiki, no superscript tags allowed in footnotes Change-Id: I54c2cc0fc6b2a9c631fc83f59c2204dd5e374d2c Reviewed-on: https://gerrit.libreoffice.org/38666 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index bf186ef6723a..8812be4d282d 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -1438,7 +1438,7 @@ --> - + @@ -1476,7 +1476,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java | 15 --
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit e34b02834b24be4062ffd535aa1b929481ff427e
Author: Julien Nabet
Date: Sat Jun 10 10:45:23 2017 +0200
tdf#97743: mediawiki account
To find main url in header section, search link containing:
- load.php
- or opensearch_desc.php
In Wikipedia or wiki.documentfoundation.org, I haven't seen any link with
index.php
Change-Id: Iccb27aa8aaaf936faf8ec3b3f67eaa98d0426f19
Reviewed-on: https://gerrit.libreoffice.org/38631
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
index 4ef08950c11b..114709fae36e 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
@@ -103,13 +103,16 @@ public class EditPageParser extends
HTMLEditorKit.ParserCallback
String sName = ( String ) a.getAttribute( HTML.Attribute.HREF
);
if ( sName != null )
{
-int nIndexStart = sName.indexOf( "index.php" );
-// get the main URL from the first header-link with
index.php
-// the link with "action=edit" inside is preferable
-if ( nIndexStart>= 0
- && ( m_sMainURL.length() == 0 ||
sName.contains("action=edit") ) )
+// get the main URL from the first header-link with
load.php (which is used for stylesheet)
+int nPhpFileStart = sName.indexOf( "load.php" );
+if (nPhpFileStart < 0)
+// if not found, try header-link with
opensearch_desc.php
+nPhpFileStart = sName.indexOf( "opensearch_desc.php" );
+
+if ( nPhpFileStart >= 0
+ && m_sMainURL.length() == 0 )
{
-m_sMainURL = sName.substring( 0, nIndexStart );
+m_sMainURL = sName.substring( 0, nPhpFileStart );
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c7874d890d55e9736b065c8396d65438a57b55ad Author: Julien Nabet Date: Sat Jun 10 20:27:50 2017 +0200 Typo in mediawiki: height and width mixed It'll change nothing since InsertThrobber function (which contains these args) are called with value=10 for both vars Just for sanity sake then Change-Id: Ie084a5a3cb15a121574aa0d06b43f1a6d34c0d09 Reviewed-on: https://gerrit.libreoffice.org/38639 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java index 55893cf88e53..66bef678e4e1 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java @@ -179,8 +179,8 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener xThrobberProps.setPropertyValue( "Name", "WikiThrobber" ); xThrobberProps.setPropertyValue( "PositionX", Integer.valueOf( X ) ); xThrobberProps.setPropertyValue( "PositionY", Integer.valueOf( Y ) ); -xThrobberProps.setPropertyValue( "Height", Integer.valueOf( Width ) ); -xThrobberProps.setPropertyValue( "Width", Integer.valueOf( Height ) ); +xThrobberProps.setPropertyValue( "Width", Integer.valueOf( Width ) ); +xThrobberProps.setPropertyValue( "Height", Integer.valueOf( Height ) ); XNameContainer xDialogContainer = UnoRuntime.queryInterface( XNameContainer.class, xDialogModel ); xDialogContainer.insertByName( "WikiThrobber", xThrobberModel ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8a400cfa468655142103f18f722adf1d5cbda9c7 Author: Julien Nabet Date: Tue Jun 6 23:15:20 2017 +0200 tdf#9: mediawiki inserts redundant emptylines in There's a newline in case of heading, table or bibliography following text:p ok but only if we're not in text:note node Change-Id: I71172751a51e29abdd770e758d27b1bc8f15cb0d Reviewed-on: https://gerrit.libreoffice.org/38470 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index 1b41b712cf5e..bf186ef6723a 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -874,7 +874,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit a8124c2eaf401741e2235939a20cef2617ad8bd1 Author: Arianna Masciolini Date: Mon May 29 17:10:40 2017 +0200 tdf#33831 swext: mention images by name in the mediawiki export odt files with pictures exported in mediawiki format now contain references to each image Change-Id: Idd73da997e2fe983899dd4514d3c393b3607a52d Reviewed-on: https://gerrit.libreoffice.org/38160 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index f3da0651bbeb..1b41b712cf5e 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -1017,6 +1017,8 @@ [[ + + |thumb @@ -1038,6 +1040,7 @@ [[ + @@ -1155,7 +1158,9 @@ - + + + @@ -1166,6 +1171,8 @@ + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/help/wiki.xhp | 31 ++- swext/mediawiki/help/wikiaccount.xhp |6 +++--- swext/mediawiki/help/wikiformats.xhp | 28 ++-- swext/mediawiki/help/wikisend.xhp |7 +++ swext/mediawiki/help/wikisettings.xhp |4 ++-- 5 files changed, 36 insertions(+), 40 deletions(-) New commits: commit b65c618f2d9c29838f5ed3cfe9cff4e34dea977e Author: Adolfo Jayme Barrientos Date: Tue Sep 27 15:05:45 2016 -0500 MediaWiki export help: âWikiMediaâ â âMediaWikiâ; minor copyediting Why is âwikiâ always capitalized? Itâs not a proper name. Change-Id: I55941f192e149dc93a6576e5ca21edac78299cb4 diff --git a/swext/mediawiki/help/wiki.xhp b/swext/mediawiki/help/wiki.xhp index fe46c36..56f0bd2 100644 --- a/swext/mediawiki/help/wiki.xhp +++ b/swext/mediawiki/help/wiki.xhp @@ -33,7 +33,7 @@ extensions;MediaWiki Wiki Publisher -By using the Wiki Publisher you can upload your current Writer text document to a MediaWiki server. After uploading, all Wiki users can read your document on the Wiki. +By using the Wiki Publisher you can upload your current Writer text document to a MediaWiki server. After uploading, all wiki users can read your document on the wiki. Choose File - Send - To MediaWiki to upload the current Writer document to a MediaWiki server. System Requirements @@ -42,11 +42,11 @@ Java Runtime Environment -A Wiki account on a supported http://www.mediawiki.org/wiki/MediaWiki";>MediaWiki server +A wiki account on a supported http://www.mediawiki.org/wiki/MediaWiki";>MediaWiki server Installing Wiki Publisher -Before you use the Wiki Publisher, ensure that %PRODUCTNAME uses a Java Runtime Environment (JRE). To check the status of the JRE, choose Tools - Options - %PRODUCTNAME - Advanced. Ensure that "Use a Java runtime environment" is marked and that a Java runtime folder is selected in the big listbox. If no JRE was activated, then activate a JRE 1.4 or later and restart %PRODUCTNAME. +Before you use the Wiki Publisher, ensure that %PRODUCTNAME uses a Java Runtime Environment (JRE). To check the status of the JRE, choose Tools - Options - %PRODUCTNAME - Advanced. Ensure that âUse a Java runtime environmentâ is checked and that a Java runtime folder is selected in the big listbox. If no JRE was activated, then activate a JRE of version 1.4 or later and restart %PRODUCTNAME. To Connect to a Wiki Note: You can store your user name and password for all respective dialogs inside %PRODUCTNAME. The password will be stored in a secure way, where access is maintained by a master password. To enable the master password, choose Tools - Options - %PRODUCTNAME - Security. Note: If you connect to the web using a proxy server, enter the proxy information to Tools - Options - Internet - Proxy, and restart the software. @@ -58,30 +58,30 @@ In the Options dialog, click Add. -In the MediaWiki dialog, enter the account information for the Wiki. +In the MediaWiki dialog, enter the account information for the wiki. -In the URL textbox, enter the address of a Wiki that you want to connect to. +In the URL text box, enter the address of a wiki that you want to connect to. You can copy the URL from a web browser and paste it into the textbox. -In the Username box, enter your user ID for your Wiki account. -If the Wiki allows anonymous write access, you can leave the Username and Password boxes empty. +In the Username box, enter your user ID for your wiki account. +If the wiki allows anonymous write access, you can leave the Username and Password boxes empty. -In the Password box, enter the password for your Wiki account, then click OK. +In the Password box, enter the password for your wiki account, then click OK. -Optionally enable "Save password" to save the password between sessions. A master password is used to maintain access to all saved passwords. Choose Tools - Options - %PRODUCTNAME - Security to enable the master password. "Save password" is unavailable when the master password is not enabled. +Optionally enable âSave passwordâ to save the password between sessions. A master password is used to maintain access to all saved passwords. Choose Tools - Options - %PRODUCTNAME - Security to enable the master password. âSave passwordâ is unavailable when the master password is not enabled. To Create a New Wiki Page Open a Writer document. -Write the content of the Wiki page. You can use formatting like text formats, headings, footnotes, and more. See the list of supported formats. +Write the content of the wiki page. You can use formatting such as text formats, headings, footnotes, and more. See the list of supported formats. Choose File - Send - To MediaWiki. @@ -90,19 +90,16 @@ In the Send to MediaWiki dialog, specify the settings for your entry. - -MediaWiki server: Select
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl | 30 +-- 1 file changed, 6 insertions(+), 24 deletions(-) New commits: commit 9947af03f9d1384099dda596bd3fe1dc66481062 Author: Robert Antoni Buj Gelonch Date: Tue May 19 12:47:31 2015 +0200 odt2mediawiki.xsl: ensure the node selection Change-Id: I78d773feaa1766904d455bd9ff5f9ea79c7b6dce Reviewed-on: https://gerrit.libreoffice.org/15801 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index d599749..705c482 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -1301,7 +1301,7 @@ - + @@ -1311,10 +1311,10 @@ - + - + - - - - - - - - + + - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl |2 ++ 1 file changed, 2 insertions(+) New commits: commit 6c3e4b8e5430a80678bd5a77b781a2218be349a1 Author: Robert Antoni Buj Gelonch Date: Tue May 19 08:50:37 2015 +0200 odt2mediawiki.xsl: hide table of contents if there is a customized toc Change-Id: I3be7f0929db94658ac1eabb0996364f53b52034c Reviewed-on: https://gerrit.libreoffice.org/15795 Tested-by: David Tardon Reviewed-by: David Tardon diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index f0a9f12..d599749 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -296,6 +296,8 @@ + __NOTOC__ + == == ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl | 31 +++ 1 file changed, 31 insertions(+) New commits: commit b532d46551489e84d2754c815f5076f47f824117 Author: Robert Antoni Buj Gelonch Date: Mon May 18 14:15:28 2015 +0200 odt2mediawiki.xsl: tabulation in toc entries Change-Id: I596bd1c8814efcf2070d3e6d2ff126c03c0ec168 Reviewed-on: https://gerrit.libreoffice.org/15785 Tested-by: David Tardon Reviewed-by: David Tardon diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index d8a9fba..f0a9f12 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -174,6 +174,12 @@ /> + + + + + + + + + + + + + + + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) New commits: commit b32953d19825605ed5d919f515c355a11b9c1e87 Author: Robert Antoni Buj Gelonch Date: Mon Apr 20 22:20:59 2015 +0200 tdf#75360 tdf#90474 line breaks in exporting to mediawiki Change-Id: Icb44653a9286c8bfbe912f391f0492fe49498f58 Reviewed-on: https://gerrit.libreoffice.org/15449 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index b0bc0500..d8a9fba 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -285,6 +285,7 @@ + @@ -293,6 +294,7 @@ == + - + @@ -801,7 +803,7 @@ --> -
+
@@ -839,12 +841,13 @@ - + - + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl | 169 ---
1 file changed, 126 insertions(+), 43 deletions(-)
New commits:
commit c4a8c792c7246939be04cff9a57dcc35f6418566
Author: Robert Antoni Buj Gelonch
Date: Mon Apr 27 00:21:38 2015 +0200
odt2mediawiki.xsl: vertical & horizontal align of a image
Change-Id: I45cdffe132a796ccf06023f4465a2633df1926f3
Reviewed-on: https://gerrit.libreoffice.org/15544
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index dab745b..b0bc0500 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -977,53 +977,38 @@
- [[
-
-
+
+ [[
+
+
+
+ |thumb
+
+
+
+
+
- |thumb|
-
-
- alt="
-
- "|
-
+
+
+|
- ]]
+
+]]
- [[
-
-
-
+
+ [[
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
|center
-
-
-
|none
-
-
-
-
-
|none
-
-
-
-
-
-
+
+
+
+
@@ -1031,8 +1016,106 @@
"
- ]]
-
+
+ ]]
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{clear}}
+
+
+
+
+
+
+
|center
+
+
+
|none
+
+
+
+
+
|none
+
+
+
+
+
+
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl |8 1 file changed, 8 insertions(+) New commits: commit 4f351515bc4efb72343941f9d97d43572788512a Author: Robert Antoni Buj Gelonch Date: Mon Apr 20 23:14:29 2015 +0200 tdf#75531 failed to convert the margins Change-Id: I025c4c14bcae9c925809f44425fabb6bc3d66806 Reviewed-on: https://gerrit.libreoffice.org/15451 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index 88354e3..dab745b 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -755,6 +755,14 @@ + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl | 58 +++ 1 file changed, 51 insertions(+), 7 deletions(-) New commits: commit 26b9122e7861906337c260d233910ed5ebf19dfa Author: Robert Antoni Buj Gelonch Date: Thu Apr 23 00:17:00 2015 +0200 tdf#75019 bookmarks in exporting to mediawiki Add support for exporting common bookmarks Add support for going to a specific bookmark (including TOC) Change-Id: I2775d8b03a5bd986ffcbdf7c95a1fbed755e3bd6 Reviewed-on: https://gerrit.libreoffice.org/15486 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index c9f5964..88354e3 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -658,12 +658,37 @@ - - [ - - - - ] + + + [[ + + + + + + + + + | + + + + + + + + + ]] + + + + [ + + + + ] + + @@ -1124,7 +1149,26 @@ - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl | 61 ++- 1 file changed, 41 insertions(+), 20 deletions(-) New commits: commit a323ec686a25cfe9049b02a57642dd225b3b8319 Author: Robert Antoni Buj Gelonch Date: Mon Apr 20 16:10:43 2015 +0200 odt2mediawiki.xsl: table cell color in cell attributes Change-Id: I44f1969a227a811cdb740b387e30cf10994360b9 Reviewed-on: https://gerrit.libreoffice.org/15445 Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index 54f6003..c9f5964 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -534,7 +534,18 @@ - + + + + + + + + + + + + style=" @@ -702,26 +713,37 @@ select="($alignment mod (2 * $RIGHT_BIT)) - ($alignment mod ($RIGHT_BIT)) != 0"/> - - - - text-align:center; - - - text-align:right; - - - - - + + + + + text-align:center; + + + text-align:right; + + + + - - - - - - + + + + + + + + + + + + + + + + +[Libreoffice-commits] core.git: swext/mediawikiswext/mediawiki/src/filter/odt2mediawiki.xsl | 233 +-- 1 file changed, 78 insertions(+), 155 deletions(-) New commits: commit 50c43b030b2911d83b2e8fc4bc0499b1641cb043 Author: Robert Antoni Buj Gelonch Date: Mon Apr 20 13:01:28 2015 +0200 odt2mediawiki.xsl: reuse table cell code, check USE_DEFAULT_TABLE_CLASS, use current vbles Change-Id: Iedaddf11604b13c7db1d2b588a5f205f691ea2b4 Reviewed-on: https://gerrit.libreoffice.org/15440 Tested-by: David Tardon Reviewed-by: David Tardon diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index d680680..54f6003 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -409,67 +409,26 @@ - - - - - - - - - - + |- - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - |- + + + + + + + - -style=" - - " + +style=" + + " + @@ -509,57 +468,14 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl | 423 ++- 1 file changed, 356 insertions(+), 67 deletions(-) New commits: commit f472ab2d1341ee194ff2be65035ef4e75f420d5f Author: Robert Antoni Buj Gelonch Date: Sun Apr 19 23:34:17 2015 +0200 odt2mediawiki.xsl: improve export filter Replace with Image + Add the alternative text in a image + Add support for image align with wrap='none' Paragraph + Replace tags + Add support for background-color and font-color Table: * Cell: + Use align element + Add support for background-color and font-color + If all cells have the same style then specify that in the row section * Table: + Add support for table align and table width * Row: + Fix new line at the end of the row * Header + Treat the header like the row Text: + Add support for background-color and font-color Change-Id: Icd7196006b6d06d6c0c030d967686ed8f8a5e454 Reviewed-on: https://gerrit.libreoffice.org/15391 Tested-by: David Tardon Reviewed-by: David Tardon diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index 89fecbc..d680680 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -345,7 +345,7 @@ --> - + {| @@ -356,60 +356,70 @@ - -style="border-spacing:0;" + + + + + + + + center + + + + +align=" + + " + + + + + border-spacing:0; + + + + + margin:auto; + + + + + width: + + ; + + +style=" + + " - + - + |- + |} - + - - - - |- - - - - - - - - - ! - - colspan=" - - " | - - - - - - - | - -colspan=" - - " - - - - - + + + + + + + - + @@ -430,7 +440,7 @@ - + @@ -451,12 +461,212 @@
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2844128a9494c2877595b65ee01f4c099176cafa Author: rbuj Date: Wed Sep 10 00:31:08 2014 +0200 mediawiki: use String.length()==0 instead of String.equals(empty string) Change-Id: I849da46aee801686cf6a581d65276ab60575c078 Reviewed-on: https://gerrit.libreoffice.org/11372 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java index 2c74d40..aa95ea4 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java @@ -233,13 +233,13 @@ public class WikiEditSettingDialog extends WikiDialog //the URL is valid String sMainURL = Helper.GetMainURL( sWebPage, sURL ); -if ( sMainURL.equals( "" ) ) +if ( sMainURL.length() == 0 ) { // TODO: // it's not a Wiki Page, check first whether a redirect is requested // happens usually in case of https sRedirectURL = Helper.GetRedirectURL( sWebPage, sURL ); -if ( sRedirectURL.equals( "" ) ) +if ( sRedirectURL.length() == 0 ) { // show error Helper.ShowError( m_xContext, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/com/sun/star/wiki/Helper.java |2 +- swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 4157780bedd048a27cc33302ab5ebca5a93afa70 Author: rbuj Date: Wed Sep 10 00:29:04 2014 +0200 mediawiki: use a character literal Change-Id: I1dadf4f905fcf06aee616cc0cfea3d77a145a3a1 Reviewed-on: https://gerrit.libreoffice.org/11371 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java index 50f1ece..1eb4204 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java +++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java @@ -341,7 +341,7 @@ public class Helper int nURL = sWebPage.indexOf( "URL=", nContent ); if ( nURL > 0 ) { -int nEndURL = sWebPage.indexOf( "\"", nURL ); +int nEndURL = sWebPage.indexOf('"', nURL ); if ( nEndURL > 0 ) sResultURL = sWebPage.substring( nURL + 4, nEndURL ); } diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java b/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java index d293cb2..6b87778 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java @@ -146,7 +146,7 @@ public class WikiArticle if ( iPosStart >= 0 && iPosEnd > 0 ) { String sArticle = sWebPage.substring(iPosStart, iPosEnd); -iPosStart = sArticle.indexOf(">") + 1; +iPosStart = sArticle.indexOf('>') + 1; sWikiCode = sArticle.substring( iPosStart, sArticle.length() ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/com/sun/star/wiki/Settings.java | 101 +--- 1 file changed, 48 insertions(+), 53 deletions(-) New commits: commit c88eae0866b943e7c664819fadbf4d2c4f0c55a8 Author: rbuj Date: Mon Sep 8 02:40:54 2014 +0200 mediawiki: improve storeConfiguration & loadConfiguration methods * Use enhanced for-loops (storeConfiguration & loadConfiguration) * Use curly braces to reduce the variable scope and, to reuse variable names (storeConfiguration) * Avoid map.get(key) in iterations over each map's entry (storeConfiguration): for (Map.Entry entry : ht.entrySet()) Change-Id: I678d5a9f205efb2c89ab868b59e1b654419381d8 Reviewed-on: https://gerrit.libreoffice.org/11331 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/swext/mediawiki/src/com/sun/star/wiki/Settings.java b/swext/mediawiki/src/com/sun/star/wiki/Settings.java index 3d87446..74d6018 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/Settings.java +++ b/swext/mediawiki/src/com/sun/star/wiki/Settings.java @@ -20,7 +20,6 @@ package com.sun.star.wiki; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; @@ -214,58 +213,56 @@ public class Settings { try { -// remove stored connection information -XNameContainer xContainer = Helper.GetConfigNameContainer( m_xContext, "org.openoffice.Office.Custom.WikiExtension/ConnectionList" ); -String[] pNames = xContainer.getElementNames(); -for( int i=0; i ht : m_WikiConnections) +{ +Object oNewConnection = xConnectionFactory.createInstance(); +XNameReplace xNewConn = UnoRuntime.queryInterface(XNameReplace.class, oNewConnection); +if (xNewConn != null) +{ +xNewConn.replaceByName("UserName", ht.get("Username")); +} +xContainer.insertByName(ht.get("Url"), xNewConn); +} +// commit changes +XChangesBatch xBatch = UnoRuntime.queryInterface(XChangesBatch.class, xContainer); +xBatch.commitChanges(); } -// store all connections -XSingleServiceFactory xConnectionFactory = UnoRuntime.queryInterface( XSingleServiceFactory.class, xContainer ); -for ( int i=0; i< m_WikiConnections.size(); i++ ) { -Object oNewConnection = xConnectionFactory.createInstance(); -Map ht = m_WikiConnections.get( i ); -XNameReplace xNewConn = UnoRuntime.queryInterface( XNameReplace.class, oNewConnection ); - -if ( xNewConn != null ) -xNewConn.replaceByName( "UserName", ht.get( "Username" ) ); - -xContainer.insertByName( ht.get( "Url" ), xNewConn ); -} -// commit changes -XChangesBatch xBatch = UnoRuntime.queryInterface( XChangesBatch.class, xContainer ); -xBatch.commitChanges(); - -// remove stored connection information -XNameContainer xContainer2 = Helper.GetConfigNameContainer( m_xContext, "org.openoffice.Office.Custom.WikiExtension/RecentDocs" ); -String[] pNames2 = xContainer2.getElementNames(); -for( int i=0; i ht = m_aWikiDocs.get( i ); - -Object oNewDoc = xDocListFactory.createInstance(); -XNameReplace xNewDoc = UnoRuntime.queryInterface( XNameReplace.class, oNewDoc ); - -for ( Iterator iter = ht.keySet().iterator(); iter.hasNext(); ) +// remove stored connection information +XNameContainer xContainer = Helper.GetConfigNameContainer(m_xContext, "org.openoffice.Office.Custom.WikiExtension/RecentDocs"); +String[] pNames = xContainer.getElementNames(); +for (String pName : pNames) { -String key = iter.next(); -xNewDoc.replaceByName( key, ht.get( key ) ); +xContainer.removeByName(pName); } - -xContainer2.insertByName( "d" + i, xNewDoc ); +// store all Docs +XSingleServiceFactory xDocListFactory = UnoRuntime.queryInterface(XSingleServiceFactory.class, xContainer); +int i = 0; +for (Map ht : m_aWikiDocs) +{ +Object oNewDoc = xDocListFactory.createInstance(); +XNameReplace xNewDoc = UnoRuntime.queryInterface(XNameReplace.class, oNewDoc); +for (Map.Entry entry : ht.entrySet()) +{ +xNewDoc.replaceByName(entry.getKey(), entry.getValue()); +} +xContainer.insertByName("d" + i++, xNewDoc);
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dbc24b1ff71a8da7e23e9c1657492fb3c8a66de8 Author: rbuj Date: Fri Sep 5 16:26:31 2014 +0200 mediawiki: if...else if...else Statement Change-Id: I3722aef2064e0878ac9a1b1f835d20f507f178af Reviewed-on: https://gerrit.libreoffice.org/11299 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java index 9300b7c..f583447 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java +++ b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java @@ -127,7 +127,7 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback { m_bInHead = true; } -if ( t == HTML.Tag.TEXTAREA ) +else if ( t == HTML.Tag.TEXTAREA ) { String sName = ( String ) a.getAttribute( HTML.Attribute.NAME ); if ( sName != null ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7dbd88a070f20c56dd60162f9e7073bc114aaa86 Author: rbuj Date: Fri Sep 5 16:01:10 2014 +0200 mediawiki: use contains to check if a string contains a substring Change-Id: Ic98d295bb56c5466a388930b6cea403d6307b850 Reviewed-on: https://gerrit.libreoffice.org/11298 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java index ebc3d88..9300b7c 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java +++ b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java @@ -107,7 +107,7 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback // get the main URL from the first header-link with index.php // the link with "action=edit" inside is preferable if ( nIndexStart>= 0 - && ( m_sMainURL.length() == 0 || sName.indexOf( "action=edit" ) >= 0 ) ) + && ( m_sMainURL.length() == 0 || sName.contains("action=edit") ) ) { m_sMainURL = sName.substring( 0, nIndexStart ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java |8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) New commits: commit add27e4e3bc59fdfb572404f3ea0a0a76638638c Author: rbuj Date: Fri Sep 5 15:59:19 2014 +0200 mediawiki: the assigned value is never used Change-Id: Icb2c4477b96c6bab9004b9c7ead2272b86e78dfb Reviewed-on: https://gerrit.libreoffice.org/11297 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java index fb55817..ebc3d88 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java +++ b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java @@ -121,9 +121,7 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback public void handleStartTag( HTML.Tag t, MutableAttributeSet a,int pos ) { // insert code to handle starting tags -String sName = ""; -String sId = ""; -String sClass = ""; +String sClass; if ( t == HTML.Tag.HEAD ) { @@ -131,7 +129,7 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback } if ( t == HTML.Tag.TEXTAREA ) { -sName = ( String ) a.getAttribute( HTML.Attribute.NAME ); +String sName = ( String ) a.getAttribute( HTML.Attribute.NAME ); if ( sName != null ) { if ( sName.equalsIgnoreCase( "wpTextbox1" ) ) @@ -142,7 +140,7 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback } else if ( t == HTML.Tag.DIV ) { -sId = ( String ) a.getAttribute( HTML.Attribute.ID ); +String sId = ( String ) a.getAttribute( HTML.Attribute.ID ); sClass = ( String ) a.getAttribute( HTML.Attribute.CLASS ); if ( sId != null ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl | 59 +++ 1 file changed, 51 insertions(+), 8 deletions(-) New commits: commit b8f4db5bad245c2e340b3217b10df994785eecd3 Author: Julien Nabet Date: Mon Jul 21 11:36:27 2014 +0200 Resolves fdo#81581: Mediawiki doesn't recognize underlining Change-Id: I27ec27bd733e5161bbd18ba7cf813daa3ac6c089 diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index 64474b3..1205536 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -118,23 +118,26 @@ + + + - + - + - + - + - + - + @@ -976,6 +979,8 @@ select="($style mod (2 * $BOLD_BIT)) != 0"/> + + + + + + ''' @@ -1044,6 +1056,9 @@ ''' + + + @@ -1255,6 +1270,8 @@ select="($style-mask mod (2 * $BOLD_BIT)) = 0"/> + + + + + + + + + + + + + + + + + + + + + + + + @@ -1473,9 +1516,9 @@ guaranteed to be disjoint, therefore, addition can be use instead of bitwise or (which is missing in XPath). --> + select="$style-set + $bold-style + $italic-style + $underline-style + $superscript-style + $subscript-style + $code-style + $typewriter-style + $center-style + $right-style"/> + select="$style-mask + $bold-mask + $italic-mask + $underline-mask + $superscript-mask + $subscript-mask + $code-mask + $typewriter-mask + $center-mask + $right-mask"/> ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl | 21 ++--- 1 file changed, 6 insertions(+), 15 deletions(-) New commits: commit dbc78f2e41c22e0b25598c349e4496a5e0c53164 Author: Julien Nabet Date: Sat Feb 22 09:06:05 2014 +0100 Resolves: fdo#75308 Asterisk at the beginning of Paragraph without "Nowiki" The fix of fdo#74875 brings a huge regression since nowiki must be used With this patch, fdo#74875 is still ok hopefully. Change-Id: Ic6ed34630b40b09ab4f63166cbb1985b6313d168 diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index 1b14aa1..64474b3 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -1129,21 +1129,12 @@ - - - -- - - - - - - - - - - + ++ + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 9e2d1d21f9a58e320444f6eaea2f006530bbd2cb Author: Julien Nabet Date: Wed Feb 19 22:23:58 2014 +0100 Resolves: fdo#69925 Wiki Publisher Extension is not working Regression from http://cgit.freedesktop.org/libreoffice/core/commit/?id=b80d8c695e6b6ded231e67ed9a80bcd1f1250c03 "compareTo" has been replaced by "==", so we compared the equality ot the pointers on the objects instead of the content of the strings To make it simple and since we compare String objects, let's simply use "equals" method Change-Id: I65bc1a87751297411fdbe722d3f49bce5e291638 diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java index ff9f85a..4cad2f6 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java @@ -134,7 +134,7 @@ public final class WikiEditorImpl extends WeakBase { final com.sun.star.util.URL myURL = aURL; //logger.log( Level.INFO, "received dispatch request for: "+aURL.Complete ); -if ( aURL.Protocol == protocolName ) +if ( aURL.Protocol.equals(protocolName) ) { /* synchronized( this ) @@ -146,7 +146,7 @@ public final class WikiEditorImpl extends WeakBase try { -if ( myURL.Path == "send" ) +if ( myURL.Path.equals("send") ) { sendArticle(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 7da3f43e636112b30a15d29de2f419d4b82dcb38 Author: Julien Nabet Date: Tue Feb 11 22:39:00 2014 +0100 Resolves: fdo#74820 Failed to recognized Heading 6-Export to MediaWiki See http://www.mediawiki.org/wiki/Help:Formatting Change-Id: I6cf50e957d3aef6bff6e86a031da175d5544e98c diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index 6a44ecd..6992249 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -296,14 +296,14 @@ Function generating a wiki heading prefix. @param level - The heading level. The value must be between 1 and 5. + The heading level. The value must be between 1 and 6. --> - + - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu | 2 +- swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit fa5c7ccff482c23f96def89978377f2d7d41d225 Author: Julien Nabet Date: Fri Oct 4 19:02:08 2013 +0200 Fix path for common-update.dtd Change-Id: If87cb8da51bb85b6b1f4af166a6bbb6005bde55b diff --git a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu index a37369a..3309b50 100644 --- a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu +++ b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu @@ -16,7 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:package="org.openoffice.TypeDetection" oor:name="Filter"> diff --git a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu index 8c864a3..15e4f85 100644 --- a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu +++ b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu @@ -16,7 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:package="org.openoffice.TypeDetection" oor:name="Types"> ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/filter/odt2mediawiki.xsl | 48 ++- 1 file changed, 33 insertions(+), 15 deletions(-) New commits: commit bc0e857b9699bfefa2d8204fe627063675c9cfc9 Author: Ariel Constenla-Haile Date: Sat Mar 23 12:49:10 2013 + Resolves: #i121907# upgrade odt2mediawiki to latest version upstream changed license to ALv2 Besides the license change, there are two bug fixes: * Do not apply any transformation to the contents marked as WikiMath. * Join sibling nodes marked as WikiMath. Patch by: Bernhard Haumacher (cherry picked from commit 414a61fa4c4f03a2b2645682c55ee56ae9c84a79) Change-Id: I6b996631ebdd908c6d96d2c9dde1a3d6dd3e212f diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl index 845a11a..6a44ecd 100644 --- a/swext/mediawiki/src/filter/odt2mediawiki.xsl +++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl @@ -1,22 +1,21 @@ + http://www.w3.org/1999/XSL/Transform"; @@ -478,12 +477,31 @@ == WikiMath == --> + - + + + + + + + + + + + + + +
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java |2 swext/mediawiki/src/com/sun/star/wiki/Helper.java | 62 +++- swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java|2 swext/mediawiki/src/com/sun/star/wiki/Settings.java| 75 -- swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java | 36 ++-- swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java | 45 ++ swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java | 35 ++-- swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java | 72 +++-- swext/mediawiki/src/com/sun/star/wiki/WikiOptionsEventHandlerImpl.java | 18 -- swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java | 11 - 10 files changed, 167 insertions(+), 191 deletions(-) New commits: commit a79d43dcd7989ee927de1b8c69ebc2981cc7166e Author: Noel Grandin Date: Wed Apr 17 13:51:15 2013 +0200 Java cleanup in mediawiki extension - remove unnecessary casts - convert Hashtable->Map and Vector->ArrayList - remove dead fields Change-Id: Id85abee74857325a113133bf61474b962256489c Reviewed-on: https://gerrit.libreoffice.org/3430 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java index 3967710..7500be6 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java +++ b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java @@ -29,7 +29,6 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback protected String m_sLoginToken = ""; protected String m_sMainURL = ""; -private int m_nWikiArticleHash = 0; private boolean m_bHTMLStartFound = false; private boolean m_bInHead = false; @@ -138,7 +137,6 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback { if ( sName.equalsIgnoreCase( "wpTextbox1" ) ) { -m_nWikiArticleHash = t.hashCode(); m_nWikiArticleStart = pos; } } diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java index 9601579..345be2c 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java +++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java @@ -55,8 +55,6 @@ import com.sun.star.uno.XComponentContext; import com.sun.star.util.XChangesBatch; import java.net.*; import java.io.*; -import java.util.Hashtable; -import java.util.Random; import javax.net.ssl.SSLException; import javax.swing.text.html.HTMLEditorKit; @@ -149,11 +147,9 @@ public class Helper private static final String sHTMLHeader = ""; private static final String sHTMLFooter = ""; -private static Random m_aRandom; private static MultiThreadedHttpConnectionManager m_aConnectionManager; private static HttpClient m_aClient; private static boolean m_bAllowConnection = true; -private static Hashtable m_aAcceptedUnknownCerts; private static Boolean m_bShowInBrowser = null; @@ -245,7 +241,7 @@ public class Helper XPropertySet xProps = Helper.GetConfigProps( xContext, "org.openoffice.Office.Custom.WikiExtension/Settings" ); xProps.setPropertyValue( "PreselectShowBrowser", new Boolean( bValue ) ); -XChangesBatch xBatch = ( XChangesBatch ) UnoRuntime.queryInterface( XChangesBatch.class, xProps ); +XChangesBatch xBatch = UnoRuntime.queryInterface( XChangesBatch.class, xProps ); if ( xBatch != null ) xBatch.commitChanges(); } @@ -262,7 +258,7 @@ public class Helper { XMultiComponentFactory xFactory = xContext.getServiceManager(); if ( xFactory != null ) -m_xPasswordContainer = (XPasswordContainer)UnoRuntime.queryInterface( +m_xPasswordContainer = UnoRuntime.queryInterface( XPasswordContainer.class, xFactory.createInstanceWithContext( "com.sun.star.task.PasswordContainer", xContext ) ); } @@ -280,7 +276,7 @@ public class Helper { XMultiComponentFactory xFactory = xContext.getServiceManager(); if ( xFactory != null ) -m_xInteractionHandler = ( XInteractionHandler )UnoRuntime.queryInterface( +m_xInteractionHandler = UnoRuntime.queryInterface( XInteractionHandler.class, xFactory.createInstanceWithContext( "com.sun.star.task.InteractionHandler", xContext ) ); } @@ -384,8 +380,8 @@ public class Helper try { Object oTempFile
[Libreoffice-commits] core.git: swext/mediawiki
swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu | 12 -- 1 file changed, 12 deletions(-) New commits: commit 6ac759dde11267c91931a645bfafab6383403f3c Author: Bjoern Michaelsen Date: Mon Feb 25 02:50:51 2013 +0100 remove specialcasing for old internal sun wiki Change-Id: Idb8efc3f900172dea2ded6b7aa39e0b6f8fe49b7 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 c96e7a8..729f80b 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 @@ -18,18 +18,6 @@ --> http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:name="WikiExtension" oor:package="org.openoffice.Office.Custom"> - - -true - - - - -sun - - - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
