Kaydet (Commit) 62c9eb97 authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Noel Grandin

Replace boost::noncopyable with use of SAL_DELETED_FUNCTION

Change-Id: Id657299322ddefb095a2f192df818a873498e411
Reviewed-on: https://gerrit.libreoffice.org/14825Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst a788eea4
......@@ -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
......
......@@ -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 );
......
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment