[Libreoffice-commits] .: svtools/inc svtools/source

[Jan Holesovsky]

 svtools/inc/svtools/javacontext.hxx            |    5 +----
 svtools/inc/svtools/javainteractionhandler.hxx |    3 +--
 svtools/source/java/javacontext.cxx            |    8 --------
 svtools/source/java/javainteractionhandler.cxx |   12 ------------
 4 files changed, 2 insertions(+), 26 deletions(-)

New commits:
commit 11fbb85b7378bf1f97b9873bf661796d93333705
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Oct 29 12:13:09 2010 +0200

    Show Java error just once by default.
    
    Improves n#628806, where the user is presented with an amount of the same
    dialogs.

diff --git a/svtools/inc/svtools/javacontext.hxx b/svtools/inc/svtools/javacontext.hxx
index da7954a..adde966 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 3280bb0..28391ca 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 fc1ccfc..9d3ca38 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 86cc702..b402934 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),