diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-03-10 18:19:05 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-03-10 11:36:34 +0000 |
| commit | 62c9eb97853dcdb89bf30983c5318c45ed8e977c (patch) | |
| tree | a8f63697c51674be6b9390b167ebd810bd436a25 | |
| parent | a788eea404b71ddca24eb13506fd51ea41485a69 (diff) | |
Replace boost::noncopyable with use of SAL_DELETED_FUNCTION
Change-Id: Id657299322ddefb095a2f192df818a873498e411
Reviewed-on: https://gerrit.libreoffice.org/14825
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
| -rw-r--r-- | starmath/inc/parse.hxx | 7 | ||||
| -rw-r--r-- | starmath/source/cfgitem.hxx | 11 | ||||
| -rw-r--r-- | starmath/source/tmpdevice.hxx | 6 |
3 files changed, 16 insertions, 8 deletions
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx index 8219407ea594..0ff2afee1d9d 100644 --- a/starmath/inc/parse.hxx +++ b/starmath/inc/parse.hxx @@ -28,9 +28,7 @@ #include "error.hxx" #include "node.hxx" -#include <boost/noncopyable.hpp> - -class SmParser : boost::noncopyable +class SmParser { OUString m_aBufferString; SmToken m_aCurToken; @@ -51,6 +49,9 @@ class SmParser : boost::noncopyable //! locale where '.' is decimal separator! ::com::sun::star::lang::Locale m_aDotLoc; + SmParser(const SmParser&) SAL_DELETED_FUNCTION; + SmParser& operator=(const SmParser&) SAL_DELETED_FUNCTION; + #if OSL_DEBUG_LEVEL > 1 bool IsDelimiter( const OUString &rTxt, sal_Int32 nPos ); #endif diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx index 269a857af56d..bcbfe4e80fd3 100644 --- a/starmath/source/cfgitem.hxx +++ b/starmath/source/cfgitem.hxx @@ -33,7 +33,6 @@ #include <symbol.hxx> #include <types.hxx> -#include <boost/noncopyable.hpp> class SmSym; class SmFormat; @@ -64,11 +63,14 @@ struct SmFntFmtListEntry SmFntFmtListEntry( const OUString &rId, const SmFontFormat &rFntFmt ); }; -class SmFontFormatList : private boost::noncopyable +class SmFontFormatList { std::deque<SmFntFmtListEntry> aEntries; bool bModified; + SmFontFormatList(const SmFontFormatList&) SAL_DELETED_FUNCTION; + SmFontFormatList& operator=(const SmFontFormatList&) SAL_DELETED_FUNCTION; + public: SmFontFormatList(); @@ -88,7 +90,7 @@ public: void SetModified( bool bVal ) { bModified = bVal; } }; -class SmMathConfig : public utl::ConfigItem, private boost::noncopyable +class SmMathConfig : public utl::ConfigItem { SmFormat * pFormat; SmCfgOther * pOther; @@ -97,6 +99,9 @@ class SmMathConfig : public utl::ConfigItem, private boost::noncopyable bool bIsOtherModified; bool bIsFormatModified; + SmMathConfig(const SmMathConfig&) SAL_DELETED_FUNCTION; + SmMathConfig& operator=(const SmMathConfig&) SAL_DELETED_FUNCTION; + void StripFontFormatList( const std::vector< SmSym > &rSymbols ); diff --git a/starmath/source/tmpdevice.hxx b/starmath/source/tmpdevice.hxx index 12c1d55bed98..34638da946e1 100644 --- a/starmath/source/tmpdevice.hxx +++ b/starmath/source/tmpdevice.hxx @@ -20,15 +20,17 @@ #ifndef INCLUDED_STARMATH_SOURCE_TMPDEVICE_HXX #define INCLUDED_STARMATH_SOURCE_TMPDEVICE_HXX -#include <boost/noncopyable.hpp> #include <tools/color.hxx> #include <vcl/lineinfo.hxx> #include <vcl/outdev.hxx> -class SmTmpDevice: private boost::noncopyable +class SmTmpDevice { OutputDevice &rOutDev; + SmTmpDevice(const SmTmpDevice&) SAL_DELETED_FUNCTION; + SmTmpDevice& operator=(const SmTmpDevice&) SAL_DELETED_FUNCTION; + Color Impl_GetColor( const Color& rColor ); public: |