summaryrefslogtreecommitdiff
path: root/include/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-02-17 09:31:38 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-02-17 11:44:56 +0000
commit8de63ad5bb2a60f7306a9bfe15384cd0164109df (patch)
tree6f1f5947a1ddc1cc1a883cb8c21afee8fc582124 /include/svx
parent0f46d90621eb5af6548ec6e9933b3a041728bd4e (diff)
some more de-boostification
Change-Id: I8ee8fd7b99598e484430d91e17e468951288d72d
Diffstat (limited to 'include/svx')
-rw-r--r--include/svx/langbox.hxx7
-rw-r--r--include/svx/sdr/overlay/overlaymanager.hxx8
-rw-r--r--include/svx/sdr/overlay/overlayobject.hxx5
3 files changed, 13 insertions, 7 deletions
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index da82e900453b..f804f32b0d33 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -24,7 +24,6 @@
#include <vcl/image.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/combobox.hxx>
-#include <boost/noncopyable.hpp>
#define LANG_LIST_EMPTY 0x0000
@@ -45,12 +44,14 @@
// locale, such as Arabic as
// opposed to Arabic-Egypt.
-
// load language strings from resource
SVX_DLLPUBLIC OUString GetDicInfoStr( const OUString& rName, const sal_uInt16 nLang, bool bNeg );
-class SVX_DLLPUBLIC SvxLanguageBoxBase : boost::noncopyable
+class SVX_DLLPUBLIC SvxLanguageBoxBase
{
+private:
+ SvxLanguageBoxBase(const SvxLanguageBoxBase&) SAL_DELETED_FUNCTION;
+ SvxLanguageBoxBase& operator=(const SvxLanguageBoxBase&) SAL_DELETED_FUNCTION;
public:
explicit SvxLanguageBoxBase( bool bCheck );
virtual ~SvxLanguageBoxBase();
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index c0a03c405521..24e77e8a7f30 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGER_HXX
#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGER_HXX
-#include <boost/utility.hpp>
#include <rtl/ref.hxx>
#include <svx/sdr/animation/scheduler.hxx>
#include <svx/sdr/overlay/overlayobject.hxx>
@@ -54,10 +53,13 @@ namespace sdr
namespace overlay
{
class SVX_DLLPUBLIC OverlayManager
- : private boost::noncopyable
- , protected ::sdr::animation::Scheduler
+ : protected ::sdr::animation::Scheduler
, public salhelper::SimpleReferenceObject
{
+ private:
+ OverlayManager(const OverlayManager&) SAL_DELETED_FUNCTION;
+ OverlayManager& operator=(const OverlayManager&) SAL_DELETED_FUNCTION;
+
protected:
// the OutputDevice to work on, set on construction and not to be changed
OutputDevice& rmOutputDevice;
diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx
index 857b7f9f20c0..7d803a289eda 100644
--- a/include/svx/sdr/overlay/overlayobject.hxx
+++ b/include/svx/sdr/overlay/overlayobject.hxx
@@ -56,9 +56,12 @@ namespace sdr
{
namespace overlay
{
- class SVX_DLLPUBLIC OverlayObject : private ::boost::noncopyable, public ::sdr::animation::Event
+ class SVX_DLLPUBLIC OverlayObject : public ::sdr::animation::Event
{
private:
+ OverlayObject(const OverlayObject&) SAL_DELETED_FUNCTION;
+ OverlayObject& operator=(const OverlayObject&) SAL_DELETED_FUNCTION;
+
// Manager is allowed access to private Member mpOverlayManager
friend class OverlayManager;