diff options
| author | Mikhail Voitenko <mav@openoffice.org> | 2008-02-12 17:41:06 +0000 |
|---|---|---|
| committer | Mikhail Voitenko <mav@openoffice.org> | 2008-02-12 17:41:06 +0000 |
| commit | 61be50dfcb6c0ba6db30ee462eaedbaad02a15d8 (patch) | |
| tree | 6fa9c279e8b6b069424af8588040b1c30a336cdd /swext | |
| parent | d5699b27db478065e4224a48367ee678e18768f0 (diff) | |
start the browser in correct thread
Diffstat (limited to 'swext')
| -rw-r--r-- | swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java | 7 | ||||
| -rw-r--r-- | swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java | 11 |
2 files changed, 10 insertions, 8 deletions
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java index 9b3f03a04e4f..d5bacae261d4 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java @@ -4,9 +4,9 @@ * * $RCSfile: WikiEditorImpl.java,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: mav $ $Date: 2008-02-04 08:52:18 $ + * last change: $Author: mav $ $Date: 2008-02-12 18:41:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -421,9 +421,6 @@ public final class WikiEditorImpl extends WeakBase aDocInfo.put( "CompleteUrl", aArticle.GetMainURL() + aArticle.GetTitle() ); m_aSettings.addWikiDoc( aDocInfo ); m_aSettings.storeConfiguration(); - - if ( Helper.GetShowInBrowserByDefault( m_xContext ) ) - Helper.ShowURLInBrowser( m_xContext, aArticle.GetViewURL() ); } else { diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java index d8daaf5f51af..4e53a95ca497 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.15 $ + * $Revision: 1.16 $ * - * last change: $Author: mav $ $Date: 2008-02-11 12:44:22 $ + * last change: $Author: mav $ $Date: 2008-02-12 18:41:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -117,7 +117,12 @@ public class WikiPropDialog extends WikiDialog{ public boolean show() { EnableControls( true ); - return super.show(); + boolean bResult = super.show(); + + if ( bResult && Helper.GetShowInBrowserByDefault( m_xContext ) ) + Helper.ShowURLInBrowser( m_xContext, m_sWikiEngineURL + "index.php?title=" + m_sWikiTitle ); + + return bResult; } public synchronized void ThreadStop( boolean bSelf ) |