[Libreoffice-commits] core.git: 4 commits - sal/rtl shell/Library_recentfile.mk shell/source stoc/Library_stocservices.mk stoc/source
Stephan Bergmann
sbergman at redhat.com
Wed Apr 2 23:20:52 PDT 2014
sal/rtl/bootstrap.cxx | 6 ---
shell/Library_recentfile.mk | 1
shell/source/unix/sysshell/recently_used_file_handler.cxx | 8 ++--
stoc/Library_stocservices.mk | 2 +
stoc/source/implementationregistration/implreg.cxx | 5 +-
stoc/source/inspect/introspection.cxx | 3 -
stoc/source/javavm/interact.cxx | 7 +--
stoc/source/javavm/javavm.cxx | 11 +-----
stoc/source/uriproc/ExternalUriReferenceTranslator.cxx | 10 ++---
stoc/source/uriproc/UriReferenceFactory.cxx | 18 +++++-----
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx | 16 +++-----
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx | 16 +++-----
stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx | 10 ++---
13 files changed, 49 insertions(+), 64 deletions(-)
New commits:
commit c04f4393f5ec63dbd546b5c503ddc82d9cd2377e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 2 18:23:43 2014 +0200
Unused declaration
Change-Id: Ib753cacf91baa6a761ac8f971b67c0f5ade555b6
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index b3accdc..edcb739 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -229,9 +229,6 @@ class IntrospectionAccessStatic_Impl: public salhelper::SimpleReferenceObject
// Sequence of Listener, that can be registered
Sequence< Type > maSupportedListenerSeq;
- // BaseInit (should be done later in the application!)
- void BaseInit( void );
-
// Helper-methods for adjusting sizes of Sequences
void checkPropertyArraysSize
(
commit 5cd46e2b3b8bbc81aca4d45717be05d2424a6c59
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 2 18:22:07 2014 +0200
Use boost::noncopyable
Change-Id: I9cba1299c54f196a5a7b35384f4c15bbbea273bb
diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk
index 9c0cb84..3c5dc90 100644
--- a/stoc/Library_stocservices.mk
+++ b/stoc/Library_stocservices.mk
@@ -23,6 +23,8 @@ $(eval $(call gb_Library_use_libraries,stocservices,\
$(gb_UWINAPI) \
))
+$(eval $(call gb_Library_use_external,stocservices,boost_headers))
+
$(eval $(call gb_Library_set_componentfile,stocservices,stoc/util/stocservices))
$(eval $(call gb_Library_add_exception_objects,stocservices,\
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 8a53877..3174547 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -21,6 +21,7 @@
#include <string.h>
#include <list>
+#include <boost/noncopyable.hpp>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/implbase3.hxx>
@@ -64,7 +65,7 @@ using namespace osl;
namespace {
-struct StringPool
+struct StringPool: private boost::noncopyable
{
OUString slash_UNO_slash_REGISTRY_LINKS;
OUString slash_IMPLEMENTATIONS;
@@ -90,8 +91,6 @@ struct StringPool
, com_sun_star_registry_SimpleRegistry("com.sun.star.registry.SimpleRegistry" )
, Registry( "Registry" )
{}
-private:
- StringPool( const StringPool & );
};
const StringPool &spool()
diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx
index 3edc3ff..78f393a 100644
--- a/stoc/source/javavm/interact.cxx
+++ b/stoc/source/javavm/interact.cxx
@@ -20,6 +20,7 @@
#include "interact.hxx"
+#include "boost/noncopyable.hpp"
#include "com/sun/star/java/JavaDisabledException.hpp"
#include "com/sun/star/java/JavaVMCreationFailureException.hpp"
#include "com/sun/star/task/XInteractionAbort.hpp"
@@ -33,7 +34,8 @@ using stoc_javavm::InteractionRequest;
namespace {
class AbortContinuation:
- public cppu::WeakImplHelper1< css::task::XInteractionAbort >
+ public cppu::WeakImplHelper1<css::task::XInteractionAbort>,
+ private boost::noncopyable
{
public:
inline AbortContinuation() {}
@@ -41,9 +43,6 @@ public:
virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE {}
private:
- AbortContinuation(AbortContinuation &); // not implemented
- void operator =(AbortContinuation); // not implemented
-
virtual inline ~AbortContinuation() {}
};
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 36fd069..e38367c 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -119,16 +119,14 @@ class NoJavaIniException: public css::uno::Exception
};
class SingletonFactory:
- private cppu::WeakImplHelper1< css::lang::XEventListener >
+ private cppu::WeakImplHelper1< css::lang::XEventListener >,
+ private boost::noncopyable
{
public:
static css::uno::Reference< css::uno::XInterface > getSingleton(
css::uno::Reference< css::uno::XComponentContext > const & rContext);
private:
- SingletonFactory(SingletonFactory &); // not implemented
- void operator =(SingletonFactory); // not implemented
-
inline SingletonFactory() {}
virtual inline ~SingletonFactory() {}
@@ -545,7 +543,7 @@ void initVMConfiguration(
}
-class DetachCurrentThread {
+class DetachCurrentThread: private boost::noncopyable {
public:
explicit DetachCurrentThread(JavaVM * jvm): m_jvm(jvm) {}
@@ -556,9 +554,6 @@ public:
}
private:
- DetachCurrentThread(DetachCurrentThread &); // not defined
- void operator =(DetachCurrentThread &); // not defined
-
JavaVM * m_jvm;
};
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index 976a386..a8a0f5a 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -20,6 +20,7 @@
#include "stocservices.hxx"
+#include "boost/noncopyable.hpp"
#include "com/sun/star/lang/XServiceInfo.hpp"
#include "com/sun/star/uno/Exception.hpp"
#include "com/sun/star/uno/Reference.hxx"
@@ -42,8 +43,10 @@
namespace {
-class Translator: public cppu::WeakImplHelper2<
- css::lang::XServiceInfo, css::uri::XExternalUriReferenceTranslator >
+class Translator:
+ public cppu::WeakImplHelper2<
+ css::lang::XServiceInfo, css::uri::XExternalUriReferenceTranslator>,
+ private boost::noncopyable
{
public:
explicit Translator(
@@ -68,9 +71,6 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- Translator(Translator &); // not implemented
- void operator =(Translator); // not implemented
-
virtual ~Translator() {}
css::uno::Reference< css::uno::XComponentContext > m_context;
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index 2e3b35b..a3a7946 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -25,6 +25,7 @@
#include <exception>
#include <vector>
+#include "boost/noncopyable.hpp"
#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"
#include "com/sun/star/lang/XMultiComponentFactory.hpp"
#include "com/sun/star/lang/XServiceInfo.hpp"
@@ -93,7 +94,10 @@ sal_Int32 parseScheme(OUString const & uriReference) {
return -1;
}
-class UriReference: public cppu::WeakImplHelper1< css::uri::XUriReference > {
+class UriReference:
+ public cppu::WeakImplHelper1<css::uri::XUriReference>,
+ private boost::noncopyable
+{
public:
UriReference(
OUString const & scheme, bool bIsHierarchical, bool bHasAuthority,
@@ -173,9 +177,6 @@ public:
{ m_base.clearFragment(); }
private:
- UriReference(UriReference &); // not implemented
- void operator =(UriReference); // not implemented
-
virtual ~UriReference() {}
stoc::uriproc::UriReference m_base;
@@ -257,8 +258,10 @@ void processSegments(
}
}
-class Factory: public cppu::WeakImplHelper2<
- css::lang::XServiceInfo, css::uri::XUriReferenceFactory >
+class Factory:
+ public cppu::WeakImplHelper2<
+ css::lang::XServiceInfo, css::uri::XUriReferenceFactory>,
+ private boost::noncopyable
{
public:
explicit Factory(
@@ -296,9 +299,6 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- Factory(Factory &); // not implemented
- void operator =(Factory); // not implemented
-
virtual ~Factory() {}
css::uno::Reference< css::uri::XUriReference > clone(
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index fb37a04..5143428 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -23,6 +23,7 @@
#include <exception>
+#include "boost/noncopyable.hpp"
#include "com/sun/star/lang/IllegalArgumentException.hpp"
#include "com/sun/star/lang/XServiceInfo.hpp"
#include "com/sun/star/uno/Reference.hxx"
@@ -56,7 +57,8 @@ bool parseSchemeSpecificPart(OUString const & part) {
}
class UrlReference:
- public ::cppu::WeakImplHelper1< css::uri::XVndSunStarExpandUrlReference >
+ public ::cppu::WeakImplHelper1<css::uri::XVndSunStarExpandUrlReference>,
+ private boost::noncopyable
{
public:
UrlReference(OUString const & scheme, OUString const & path):
@@ -134,9 +136,6 @@ public:
throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- UrlReference(UrlReference &); // not defined
- void operator =(UrlReference); // not defined
-
virtual ~UrlReference() {}
stoc::uriproc::UriReference base_;
@@ -152,8 +151,10 @@ OUString UrlReference::expand(
getPath(), ::rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8));
}
-class Parser: public ::cppu::WeakImplHelper2<
- css::lang::XServiceInfo, css::uri::XUriSchemeParser >
+class Parser:
+ public ::cppu::WeakImplHelper2<
+ css::lang::XServiceInfo, css::uri::XUriSchemeParser>,
+ private boost::noncopyable
{
public:
Parser() {}
@@ -175,9 +176,6 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- Parser(Parser &); // not defined
- void operator =(Parser); // not defined
-
virtual ~Parser() {}
};
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index 1bade01..77cfff7 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -22,6 +22,7 @@
#include "UriReference.hxx"
+#include "boost/noncopyable.hpp"
#include "com/sun/star/lang/IllegalArgumentException.hpp"
#include "com/sun/star/lang/XServiceInfo.hpp"
#include "com/sun/star/uno/Reference.hxx"
@@ -190,7 +191,8 @@ bool parseSchemeSpecificPart(OUString const & part) {
}
class UrlReference:
- public cppu::WeakImplHelper1< css::uri::XVndSunStarScriptUrlReference >
+ public cppu::WeakImplHelper1<css::uri::XVndSunStarScriptUrlReference>,
+ private boost::noncopyable
{
public:
UrlReference(OUString const & scheme, OUString const & path):
@@ -281,9 +283,6 @@ public:
throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE;
private:
- UrlReference(UrlReference &); // not implemented
- void operator =(UrlReference); // not implemented
-
virtual ~UrlReference() {}
sal_Int32 findParameter(OUString const & key);
@@ -376,8 +375,10 @@ sal_Int32 UrlReference::findParameter(OUString const & key) {
}
}
-class Parser: public cppu::WeakImplHelper2<
- css::lang::XServiceInfo, css::uri::XUriSchemeParser >
+class Parser:
+ public cppu::WeakImplHelper2<
+ css::lang::XServiceInfo, css::uri::XUriSchemeParser>,
+ private boost::noncopyable
{
public:
Parser() {}
@@ -397,9 +398,6 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- Parser(Parser &); // not implemented
- void operator =(Parser); // not implemented
-
virtual ~Parser() {}
};
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index f83ccbf..8c9ea5b 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -20,6 +20,7 @@
#include "stocservices.hxx"
+#include "boost/noncopyable.hpp"
#include "com/sun/star/lang/XServiceInfo.hpp"
#include "com/sun/star/uno/Exception.hpp"
#include "com/sun/star/uno/Reference.hxx"
@@ -44,8 +45,10 @@
namespace {
-class Factory: public cppu::WeakImplHelper2<
- css::lang::XServiceInfo, css::uri::XVndSunStarPkgUrlReferenceFactory >
+class Factory:
+ public cppu::WeakImplHelper2<
+ css::lang::XServiceInfo, css::uri::XVndSunStarPkgUrlReferenceFactory>,
+ private boost::noncopyable
{
public:
explicit Factory(
@@ -67,9 +70,6 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- Factory(Factory &); // not implemented
- void operator =(Factory); // not implemented
-
virtual ~Factory() {}
css::uno::Reference< css::uno::XComponentContext > m_context;
commit d59fe933fe3ecabdc80737b72683923fc5bcae0e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 2 18:20:24 2014 +0200
Use boost::noncopyable
Change-Id: I1cd2ad1284f2fb9f6847cdb9175a5872a66726cd
diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk
index 6ba88de..41b4022 100644
--- a/shell/Library_recentfile.mk
+++ b/shell/Library_recentfile.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_Library_set_include,recentfile,\
))
$(eval $(call gb_Library_use_externals,recentfile,\
+ boost_headers \
expat \
))
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index e6f7fad..a2f7f0c 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -17,7 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+#include "boost/noncopyable.hpp"
#include "osl/process.h"
#include "rtl/ustring.hxx"
#include "rtl/string.hxx"
@@ -207,7 +209,8 @@ namespace /* private */ {
// thrown if we encounter xml tags that we do not know
class unknown_xml_format_exception {};
- class recently_used_file_filter : public i_xml_parser_event_handler
+ class recently_used_file_filter:
+ public i_xml_parser_event_handler, private boost::noncopyable
{
public:
recently_used_file_filter(recently_used_item_list_t& item_list) :
@@ -278,9 +281,6 @@ namespace /* private */ {
std::map<string_t, SET_COMMAND> named_command_map_;
string_t current_element_;
recently_used_item_list_t& item_list_;
- private:
- recently_used_file_filter(const recently_used_file_filter&);
- recently_used_file_filter& operator=(const recently_used_file_filter&);
};
commit b6f4658003c91e8a76738d1ec9436c89fcb08f09
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 2 18:19:14 2014 +0200
Use boost::noncopyable
Change-Id: Ifeee0632f6e163037bea9ba2ee8d19f050f9a212
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index e33df5e..e31790d 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -451,7 +451,7 @@ Bootstrap_Impl * get_static_bootstrap_handle() SAL_THROW(())
return s_handle;
}
-struct FundamentalIniData {
+struct FundamentalIniData: private boost::noncopyable {
rtlBootstrapHandle ini;
FundamentalIniData() {
@@ -466,10 +466,6 @@ struct FundamentalIniData {
}
~FundamentalIniData() { rtl_bootstrap_args_close(ini); }
-
-private:
- FundamentalIniData(FundamentalIniData &); // not defined
- void operator =(FundamentalIniData &); // not defined
};
struct FundamentalIni: public rtl::Static< FundamentalIniData, FundamentalIni >
More information about the Libreoffice-commits
mailing list