[Libreoffice-commits] core.git: stoc/source

[Stephan Bergmann]

 stoc/source/javavm/interact.cxx  |    6 ++----
 stoc/source/typeconv/convert.cxx |    2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3f65d353a652db15dbfd0a750e062286e70619a5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 9 09:53:01 2014 +0200

    Clean up function declarations
    
    Change-Id: Ife3cb18d22c57c9c2e59317b68cf11a4bf94a40a

diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx
index 78f393a..d8bdcb4 100644
--- a/stoc/source/javavm/interact.cxx
+++ b/stoc/source/javavm/interact.cxx
@@ -49,7 +49,8 @@ private:
 }
 
 class InteractionRequest::RetryContinuation:
-    public cppu::WeakImplHelper1< css::task::XInteractionRetry >
+    public cppu::WeakImplHelper1<css::task::XInteractionRetry>,
+    private boost::noncopyable
 {
 public:
     inline RetryContinuation(): m_bSelected(false) {}
@@ -59,9 +60,6 @@ public:
     bool isSelected() const;
 
 private:
-    RetryContinuation(RetryContinuation &); // not implemented
-    void operator =(RetryContinuation); // not implemented
-
     virtual inline ~RetryContinuation() {}
 
     mutable osl::Mutex m_aMutex;
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 65bc779..beeddc3 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -41,6 +41,8 @@
 #include <com/sun/star/container/XSet.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 
+#include <stocservices.hxx>
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::script;