diff options
| -rw-r--r-- | odk/examples/DevelopersGuide/Forms/URLHelper.java | 1 | ||||
| -rw-r--r-- | swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java | 11 |
2 files changed, 3 insertions, 9 deletions
diff --git a/odk/examples/DevelopersGuide/Forms/URLHelper.java b/odk/examples/DevelopersGuide/Forms/URLHelper.java index dd8e94075e7b..f24d9bbfbc8f 100644 --- a/odk/examples/DevelopersGuide/Forms/URLHelper.java +++ b/odk/examples/DevelopersGuide/Forms/URLHelper.java @@ -32,7 +32,6 @@ public class URLHelper * @return [String] * a file url which represent the given system path */ - @SuppressWarnings("deprecation") public static String getFileURLFromSystemPath( File aSystemPath ) { String sFileURL = null; diff --git a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java index 038f4998caab..b4cb658e7734 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java +++ b/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java @@ -56,7 +56,9 @@ public class MainThreadDialogExecutor implements XCallback static public boolean Close( XComponentContext xContext, XDialog xDialog ) { - MainThreadDialogExecutor aExecutor = new MainThreadDialogExecutor( xDialog, true ); + MainThreadDialogExecutor aExecutor = new MainThreadDialogExecutor( xDialog ); + aExecutor.m_bClose = true; + aExecutor.m_bCalled = true; // no yielding, asynchronous closing return GetCallback( xContext, aExecutor ); } @@ -116,13 +118,6 @@ public class MainThreadDialogExecutor implements XCallback m_xDialog = xDialog; } - private MainThreadDialogExecutor( XDialog xDialog, boolean bClose ) - { - m_xDialog = xDialog; - m_bClose = true; - m_bCalled = true; // no yielding, asynchronous closing - } - private MainThreadDialogExecutor( XMessageBox xMessageBox ) { m_xMessageBox = xMessageBox; |