[Libreoffice-commits] core.git: jvmfwk/plugins

[Stephan Bergmann]

 jvmfwk/plugins/sunmajor/pluginlib/util.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 5180805c3f74998c27b0ab0af3292f9d35a61a1b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 9 10:42:38 2014 +0200

    Clean up function declarations
    
    Change-Id: I0ad09f02d1d09d6ce45bc204c8cd8d26ef663ddb

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 59999c1..8ac2b4e 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -31,6 +31,7 @@
 #include "rtl/instance.hxx"
 #include "salhelper/linkhelper.hxx"
 #include "salhelper/thread.hxx"
+#include "boost/noncopyable.hpp"
 #include "boost/scoped_array.hpp"
 #include "com/sun/star/uno/Sequence.hxx"
 #include <utility>
@@ -124,8 +125,11 @@ namespace jfw_plugin
 {
 extern VendorSupportMapEntry gVendorMap[];
 
+#if defined WNT
 bool getSDKInfoFromRegistry(vector<OUString> & vecHome);
 bool getJREInfoFromRegistry(vector<OUString>& vecJavaHome);
+#endif
+
 bool decodeOutput(const OString& s, OUString* out);
 
 
@@ -179,7 +183,7 @@ rtl::Bootstrap * getBootstrap()
 
 
 
-class FileHandleGuard
+class FileHandleGuard: private boost::noncopyable
 {
 public:
     inline FileHandleGuard(oslFileHandle & rHandle) SAL_THROW(()):
@@ -191,9 +195,6 @@ public:
 
 private:
     oslFileHandle & m_rHandle;
-
-    FileHandleGuard(FileHandleGuard &); // not implemented
-    void operator =(FileHandleGuard); // not implemented
 };
 
 inline FileHandleGuard::~FileHandleGuard() SAL_THROW(())