[Libreoffice-commits] core.git: starmath/source
Takeshi Abe
tabe at fixedpoint.jp
Sun Nov 16 02:06:28 PST 2014
starmath/source/cfgitem.hxx | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
New commits:
commit 1bbda773e98cf1c651311b03c1684393b73c7f50
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sun Nov 16 11:18:20 2014 +0900
Mark as noncopyable
Change-Id: Ibbec7a5d9b6726865da14c9bdfad8b8118f85e5b
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index 1e4d90e..680c414 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -37,6 +37,7 @@
#include <symbol.hxx>
#include <types.hxx>
+#include <boost/noncopyable.hpp>
class SmSym;
class SmFormat;
@@ -67,15 +68,11 @@ struct SmFntFmtListEntry
SmFntFmtListEntry( const OUString &rId, const SmFontFormat &rFntFmt );
};
-class SmFontFormatList
+class SmFontFormatList : private boost::noncopyable
{
std::deque<SmFntFmtListEntry> aEntries;
bool bModified;
- // disallow copy-constructor and assignment-operator for now
- SmFontFormatList( const SmFontFormatList & );
- SmFontFormatList & operator = ( const SmFontFormatList & );
-
public:
SmFontFormatList();
@@ -95,7 +92,7 @@ public:
void SetModified( bool bVal ) { bModified = bVal; }
};
-class SmMathConfig : public utl::ConfigItem
+class SmMathConfig : public utl::ConfigItem, private boost::noncopyable
{
SmFormat * pFormat;
SmCfgOther * pOther;
@@ -104,11 +101,6 @@ class SmMathConfig : public utl::ConfigItem
bool bIsOtherModified;
bool bIsFormatModified;
- // disallow copy-constructor and assignment-operator for now
- SmMathConfig( const SmMathConfig & );
- SmMathConfig & operator = ( const SmMathConfig & );
-
-
void StripFontFormatList( const std::vector< SmSym > &rSymbols );
More information about the Libreoffice-commits
mailing list