diff options
Diffstat (limited to 'unotools/source/config')
-rw-r--r-- | unotools/source/config/configmgr.cxx | 6 | ||||
-rw-r--r-- | unotools/source/config/lingucfg.cxx | 6 | ||||
-rw-r--r-- | unotools/source/config/searchopt.cxx | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 0fa8f6f123b3..c0a79eb7e3e6 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -21,7 +21,6 @@ #include <list> -#include <boost/noncopyable.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> @@ -39,7 +38,7 @@ namespace { -class RegisterConfigItemHelper: private boost::noncopyable { +class RegisterConfigItemHelper { public: RegisterConfigItemHelper( utl::ConfigManager & manager, utl::ConfigItem & item): @@ -59,6 +58,9 @@ public: private: utl::ConfigManager & manager_; utl::ConfigItem * item_; + + RegisterConfigItemHelper(const RegisterConfigItemHelper&) SAL_DELETED_FUNCTION; + RegisterConfigItemHelper& operator=(const RegisterConfigItemHelper&) SAL_DELETED_FUNCTION; }; css::uno::Reference< css::lang::XMultiServiceFactory > diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 9194c838a79e..881c81889ed0 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <boost/noncopyable.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> @@ -142,7 +141,7 @@ SvtLinguOptions::SvtLinguOptions() { } -class SvtLinguConfigItem: public utl::ConfigItem, private boost::noncopyable +class SvtLinguConfigItem : public utl::ConfigItem { SvtLinguOptions aOpt; @@ -151,6 +150,9 @@ class SvtLinguConfigItem: public utl::ConfigItem, private boost::noncopyable bool LoadOptions( const uno::Sequence< OUString > &rProperyNames ); bool SaveOptions( const uno::Sequence< OUString > &rProperyNames ); + SvtLinguConfigItem(const SvtLinguConfigItem&) SAL_DELETED_FUNCTION; + SvtLinguConfigItem& operator=(const SvtLinguConfigItem&) SAL_DELETED_FUNCTION; + public: SvtLinguConfigItem(); virtual ~SvtLinguConfigItem(); diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index c4b0578963ab..bca047c4e270 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <boost/noncopyable.hpp> #include <unotools/searchopt.hxx> #include <tools/debug.hxx> #include <unotools/configitem.hxx> @@ -36,11 +35,14 @@ using namespace com::sun::star::i18n; #define MAX_FLAGS_OFFSET 27 -class SvtSearchOptions_Impl: public ConfigItem, private boost::noncopyable +class SvtSearchOptions_Impl : public ConfigItem { sal_Int32 nFlags; bool bModified; + SvtSearchOptions_Impl(const SvtSearchOptions_Impl&) SAL_DELETED_FUNCTION; + SvtSearchOptions_Impl& operator=(const SvtSearchOptions_Impl&) SAL_DELETED_FUNCTION; + protected: bool IsModified() const { return bModified; } using ConfigItem::SetModified; |