diff options
6 files changed, 15 insertions, 33 deletions
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java index cc2e2e5df070..c50a7ab3e1bc 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java +++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java @@ -4,9 +4,9 @@ * * $RCSfile: Helper.java,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: mav $ $Date: 2008-02-11 10:31:29 $ + * last change: $Author: mav $ $Date: 2008-02-11 12:44:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -100,7 +100,7 @@ public class Helper public final static int DLG_NO = 8; public final static int DLG_OK = 9; public final static int DLG_YES = 10; - public final static int DLG_HELP = 11; + // 11 is reserved public final static int DLG_ADDBUTTON = 12; public final static int DLG_EDITBUTTON = 13; public final static int DLG_SENDBUTTON = 14; @@ -137,7 +137,7 @@ public class Helper "Dlg_No", "Dlg_OK", "Dlg_Yes", - "Dlg_Help", + null, // reserved "Dlg_AddButton", "Dlg_EditButton", "Dlg_SendButton", diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java index ab0a9405a279..7b6112a70cf3 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java @@ -4,9 +4,9 @@ * * $RCSfile: WikiEditSettingDialog.java,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: mav $ $Date: 2008-02-11 08:35:34 $ + * last change: $Author: mav $ $Date: 2008-02-11 12:44:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -52,10 +52,9 @@ public class WikiEditSettingDialog extends WikiDialog { private final String sOKMethod = "OK"; - private final String sHelpMethod = "Help"; String[] Methods = - {sOKMethod, sHelpMethod}; + {sOKMethod }; private Hashtable setting; private boolean addMode; private boolean m_bAllowURLChange = true; @@ -152,7 +151,6 @@ public class WikiEditSettingDialog extends WikiDialog GetPropSet( "WikiLine" ).setPropertyValue( "Label", Helper.GetLocalizedString( xContext, Helper.DLG_EDITSETTING_WIKILINE ) ); GetPropSet( "SaveBox" ).setPropertyValue( "Label", Helper.GetLocalizedString( xContext, Helper.DLG_EDITSETTING_SAVEBOX ) ); GetPropSet( "OkButton" ).setPropertyValue( "Label", Helper.GetLocalizedString( xContext, Helper.DLG_OK ) ); - GetPropSet( "HelpButton" ).setPropertyValue( "Label", Helper.GetLocalizedString( xContext, Helper.DLG_HELP ) ); } catch( Exception e ) { @@ -395,10 +393,6 @@ public class WikiEditSettingDialog extends WikiDialog return true; } - else if ( MethodName.equals( sHelpMethod ) ) - { - return true; - } return false; } diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java index 4ec11868cefc..d8daaf5f51af 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java @@ -4,9 +4,9 @@ * * $RCSfile: WikiPropDialog.java,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: mav $ $Date: 2008-02-10 15:56:36 $ + * last change: $Author: mav $ $Date: 2008-02-11 12:44:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -55,12 +55,11 @@ public class WikiPropDialog extends WikiDialog{ WikiEditorImpl m_aWikiEditor; private final String sSendMethod = "Send"; - private final String sHelpMethod = "Help"; private final String sWikiListMethod = "WikiListChange"; private final String sArticleTextMethod = "ArticleTextChange"; private final String sAddWikiMethod = "AddWiki"; - String[] m_pMethods = {sSendMethod, sHelpMethod, sWikiListMethod, sArticleTextMethod, sAddWikiMethod}; + String[] m_pMethods = {sSendMethod, sWikiListMethod, sArticleTextMethod, sAddWikiMethod}; private String m_sWikiTitle = ""; protected String m_sWikiEngineURL = ""; @@ -94,7 +93,6 @@ public class WikiPropDialog extends WikiDialog{ GetPropSet( "Label3" ).setPropertyValue( "Label", Helper.GetLocalizedString( xContext, Helper.DLG_SENDTOMEDIAWIKI_LABEL3 ) ); GetPropSet( "MinorCheck" ).setPropertyValue( "Label", Helper.GetLocalizedString( xContext, Helper.DLG_SENDTOMEDIAWIKI_MINORCHECK ) ); GetPropSet( "BrowserCheck" ).setPropertyValue( "Label", Helper.GetLocalizedString( xContext, Helper.DLG_SENDTOMEDIAWIKI_BROWSERCHECK ) ); - GetPropSet( "HelpButton" ).setPropertyValue( "Label", Helper.GetLocalizedString( xContext, Helper.DLG_HELP ) ); GetPropSet( "AddButton" ).setPropertyValue( "Label", Helper.GetLocalizedString( xContext, Helper.DLG_ADDBUTTON ) ); GetPropSet( "SendButton" ).setPropertyValue( "Label", Helper.GetLocalizedString( xContext, Helper.DLG_SENDBUTTON ) ); } @@ -344,10 +342,6 @@ public class WikiPropDialog extends WikiDialog{ return true; } - else if ( MethodName.equals( sHelpMethod ) ) - { - return true; - } else if ( MethodName.equals( sWikiListMethod ) ) { fillDocList(); diff --git a/swext/mediawiki/src/description.xml b/swext/mediawiki/src/description.xml index 525d37ad5d9e..d17ba397198a 100644 --- a/swext/mediawiki/src/description.xml +++ b/swext/mediawiki/src/description.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> - <version value="0.9.1"/> + <version value="0.9.2"/> <identifier value="com.sun.sun-mediawiki"/> <display-name> <name lang="en-US">MediaWiki Extension</name> 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 c2d9696396a7..2a9e51e1c101 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 @@ -5,9 +5,9 @@ * * $RCSfile: WikiExtension.xcu,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: mav $ $Date: 2008-02-08 15:14:40 $ + * last change: $Author: mav $ $Date: 2008-02-11 12:44:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -106,9 +106,6 @@ <prop oor:name="Dlg_Yes"> <value xml:lang="en-US">Yes</value> </prop> - <prop oor:name="Dlg_Help"> - <value xml:lang="en-US">~Help</value> - </prop> <prop oor:name="Dlg_AddButton"> <value xml:lang="en-US">~Add...</value> </prop> 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 09ec51322310..1c237eaa1f2b 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 @@ -5,9 +5,9 @@ * * $RCSfile: WikiExtension.xcs,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mav $ $Date: 2008-02-11 10:31:30 $ + * last change: $Author: mav $ $Date: 2008-02-11 12:44:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -139,9 +139,6 @@ <prop oor:name="Dlg_Yes" oor:type="xs:string" oor:localized="true"> <info><desc>"Yes" button in dialog.</desc></info> </prop> - <prop oor:name="Dlg_Help" oor:type="xs:string" oor:localized="true"> - <info><desc>"Help" button in dialog.</desc></info> - </prop> <prop oor:name="Dlg_AddButton" oor:type="xs:string" oor:localized="true"> <info><desc>"Add..." button text.</desc></info> </prop> |