diff options
author | Jan Holesovsky <kendy@suse.cz> | 2010-10-29 12:13:09 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2010-10-29 12:14:49 +0200 |
commit | 5785e4f4ab9c0e30d709e6150bc7230098ed550b (patch) | |
tree | 12cf22db78ee137983534d640808404c272cdc81 | |
parent | e321ace4d878331cdb862f47c31741cb44c74da3 (diff) |
Show Java error just once by default.
Improves n#628806, where the user is presented with an amount of the same
dialogs.
-rw-r--r-- | svtools/inc/svtools/javacontext.hxx | 5 | ||||
-rw-r--r-- | svtools/inc/svtools/javainteractionhandler.hxx | 3 | ||||
-rw-r--r-- | svtools/source/java/javacontext.cxx | 8 | ||||
-rw-r--r-- | svtools/source/java/javainteractionhandler.cxx | 12 |
4 files changed, 2 insertions, 26 deletions
diff --git a/svtools/inc/svtools/javacontext.hxx b/svtools/inc/svtools/javacontext.hxx index 0079e5e51021..7c32a49448b3 100644 --- a/svtools/inc/svtools/javacontext.hxx +++ b/svtools/inc/svtools/javacontext.hxx @@ -47,9 +47,6 @@ namespace svt { public: - JavaContext( const com::sun::star::uno::Reference< - com::sun::star::uno::XCurrentContext> & ctx); - /** The parameter bShowErrorsOnce controls whether a message box is only displayed once for a reocurring Java error. That is only the first time JavaInteractionHandler.handle is called with a @@ -58,7 +55,7 @@ namespace svt */ JavaContext( const com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext> & ctx, - bool bReportErrorOnce); + bool bReportErrorOnce = true ); virtual ~JavaContext(); // XInterface diff --git a/svtools/inc/svtools/javainteractionhandler.hxx b/svtools/inc/svtools/javainteractionhandler.hxx index d8b15f4f70d8..e3137f7bed2b 100644 --- a/svtools/inc/svtools/javainteractionhandler.hxx +++ b/svtools/inc/svtools/javainteractionhandler.hxx @@ -48,8 +48,7 @@ class SVT_DLLPUBLIC JavaInteractionHandler: public com::sun::star::task::XInteractionHandler { public: - JavaInteractionHandler(); - JavaInteractionHandler(bool bReportErrorOnce); + JavaInteractionHandler(bool bReportErrorOnce = true); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx index e0ab5d67f6c4..56b72ef1453c 100644 --- a/svtools/source/java/javacontext.cxx +++ b/svtools/source/java/javacontext.cxx @@ -39,14 +39,6 @@ using namespace com::sun::star::task; namespace svt { -JavaContext::JavaContext( const Reference< XCurrentContext > & ctx ) - : - m_aRefCount(0), - m_xNextContext( ctx ), - m_bShowErrorsOnce(false) -{ -} - JavaContext::JavaContext( const Reference< XCurrentContext > & ctx, bool bShowErrorsOnce) : m_aRefCount(0), diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index 887ae9b2c9f5..6c76d463216e 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -58,18 +58,6 @@ using namespace com::sun::star::task; namespace svt { -JavaInteractionHandler::JavaInteractionHandler(): - m_aRefCount(0), - m_bShowErrorsOnce(false), - m_bJavaDisabled_Handled(false), - m_bInvalidSettings_Handled(false), - m_bJavaNotFound_Handled(false), - m_bVMCreationFailure_Handled(false), - m_bRestartRequired_Handled(false), - m_nResult_JavaDisabled(RET_NO) -{ -} - JavaInteractionHandler::JavaInteractionHandler(bool bReportErrorOnce) : m_aRefCount(0), m_bShowErrorsOnce(bReportErrorOnce), |