diff options
author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 15:04:07 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 15:04:07 +0000 |
commit | 99c625321af19c3f5c00ea054fbe952652b30fcd (patch) | |
tree | d08eef672b40ea93988ee67078694e7e2178060b /slideshow | |
parent | 137ef66431a0685de41ab1bba58b9777b1293c9d (diff) |
INTEGRATION: CWS presfixes09 (1.3.18); FILE MERGED
2006/03/24 18:23:38 thb 1.3.18.3: #i37778# Moved whole slideshow engine from namespace presentation (which conflicts with one of the UNO subnamespaces) to slideshow
2006/03/23 17:22:45 thb 1.3.18.2: #i49357# Changed manual noncopyable boiler plate to boost::noncopyable
2006/03/15 15:22:24 thb 1.3.18.1: #i49357# Removed external include guards from all non-export headers (and from the cxx files, anyway)
Diffstat (limited to 'slideshow')
-rw-r--r-- | slideshow/source/inc/smilfunctionparser.hxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/slideshow/source/inc/smilfunctionparser.hxx b/slideshow/source/inc/smilfunctionparser.hxx index 8e9bcf6a95c2..059a5b94afce 100644 --- a/slideshow/source/inc/smilfunctionparser.hxx +++ b/slideshow/source/inc/smilfunctionparser.hxx @@ -4,9 +4,9 @@ * * $RCSfile: smilfunctionparser.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-07 21:21:08 $ + * last change: $Author: kz $ $Date: 2006-12-13 16:04:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,9 +39,9 @@ #include <expressionnode.hxx> #include <slideshowexceptions.hxx> -#ifndef _BGFX_RANGE_B2DRECTANGLE_HXX #include <basegfx/range/b2drectangle.hxx> -#endif + +#include <boost/utility.hpp> namespace rtl { @@ -50,11 +50,11 @@ namespace rtl /* Definition of SmilFunctionParser class */ -namespace presentation +namespace slideshow { namespace internal { - class SmilFunctionParser + class SmilFunctionParser : private boost::noncopyable { public: /** Parse a string containing a SMIL value. @@ -168,10 +168,6 @@ namespace presentation // disabled constructor/destructor, since this is // supposed to be a singleton SmilFunctionParser(); - - // default: disabled copy/assignment - SmilFunctionParser(const SmilFunctionParser&); - SmilFunctionParser& operator=( const SmilFunctionParser& ); }; } } |