diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/formula/FormulaCompiler.hxx | 13 | ||||
| -rw-r--r-- | include/svx/langbox.hxx | 7 | ||||
| -rw-r--r-- | include/svx/sdr/overlay/overlaymanager.hxx | 8 | ||||
| -rw-r--r-- | include/svx/sdr/overlay/overlayobject.hxx | 5 | ||||
| -rw-r--r-- | include/toolkit/awt/animatedimagespeer.hxx | 5 |
5 files changed, 23 insertions, 15 deletions
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index ace9f3b383e3..0758ddaa479d 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -25,9 +25,6 @@ #include <rtl/ustring.hxx> #include <tools/debug.hxx> -#include <boost/shared_ptr.hpp> -#include <boost/noncopyable.hpp> - #include <com/sun/star/uno/Sequence.hxx> #include <formula/opcode.hxx> @@ -35,6 +32,7 @@ #include <formula/token.hxx> #include <formula/ExternalReferenceHelper.hxx> +#include <memory> #include <unordered_map> #define FORMULA_MAXJUMPCOUNT 32 /* maximum number of jumps (ocChoose) */ @@ -64,8 +62,11 @@ struct FormulaArrayStack typedef std::unordered_map< OUString, OpCode, OUStringHash, ::std::equal_to< OUString > > OpCodeHashMap; typedef std::unordered_map< OUString, OUString, OUStringHash, ::std::equal_to< OUString > > ExternalHashMap; -class FORMULA_DLLPUBLIC FormulaCompiler : boost::noncopyable +class FORMULA_DLLPUBLIC FormulaCompiler { +private: + FormulaCompiler(const FormulaCompiler&) SAL_DELETED_FUNCTION; + FormulaCompiler& operator=(const FormulaCompiler&) SAL_DELETED_FUNCTION; public: FormulaCompiler(); FormulaCompiler(FormulaTokenArray& _rArr); @@ -191,8 +192,8 @@ public: }; public: - typedef ::boost::shared_ptr< const OpCodeMap > OpCodeMapPtr; - typedef ::boost::shared_ptr< OpCodeMap > NonConstOpCodeMapPtr; + typedef std::shared_ptr< const OpCodeMap > OpCodeMapPtr; + typedef std::shared_ptr< OpCodeMap > NonConstOpCodeMapPtr; /** Get OpCodeMap for formula language. @param nLanguage 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; diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx index 15dcac26e7eb..b0e366d1654b 100644 --- a/include/toolkit/awt/animatedimagespeer.hxx +++ b/include/toolkit/awt/animatedimagespeer.hxx @@ -27,7 +27,6 @@ #include <cppuhelper/implbase3.hxx> -#include <boost/noncopyable.hpp> #include <memory> namespace toolkit @@ -45,7 +44,6 @@ namespace toolkit > AnimatedImagesPeer_Base; class AnimatedImagesPeer :public AnimatedImagesPeer_Base - ,public ::boost::noncopyable { public: AnimatedImagesPeer(); @@ -86,6 +84,9 @@ namespace toolkit void impl_updateImages_nolck( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_animatedImages ); private: + AnimatedImagesPeer(const AnimatedImagesPeer&) SAL_DELETED_FUNCTION; + AnimatedImagesPeer& operator=(const AnimatedImagesPeer&) SAL_DELETED_FUNCTION; + std::unique_ptr< AnimatedImagesPeer_Data > m_xData; }; |