diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-10 10:26:54 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-10 10:26:54 +0000 |
| commit | 02c7934f2cb471df40e0d8ca70511d56b46ef07f (patch) | |
| tree | c9bc8e26ecd6de09ed462c9916e0c199dc4fc693 | |
| parent | aeccdbcad3ea68c23b43285f4af3ffa814e3c9cb (diff) | |
INTEGRATION: CWS impress98 (1.5.434); FILE MERGED
2006/06/26 21:34:22 cl 1.5.434.2: RESYNC: (1.5-1.6); FILE MERGED
2006/06/23 13:54:19 sj 1.5.434.1: #i66688# moved header file
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index eed0eef30877..7e0d82bec70e 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -4,9 +4,9 @@ * * $RCSfile: EnhancedCustomShapeFunctionParser.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2006-06-19 14:57:06 $ + * last change: $Author: obo $ $Date: 2006-07-10 11:26:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,8 +33,10 @@ * ************************************************************************/ -// must be first -#include <EnhancedCustomShapeFunctionParser.hxx> +#ifndef _ENHANCEDCUSTOMSHAPEFUNCTIONPARSER_HXX +#include "EnhancedCustomShapeFunctionParser.hxx" +#endif + #ifndef _ENHANCEDCUSTOMSHAPE2D_HXX #include "EnhancedCustomShape2d.hxx" #endif @@ -60,10 +62,11 @@ #include <functional> #include <algorithm> #include <stack> +using namespace EnhancedCustomShape; using namespace com::sun::star; using namespace com::sun::star::drawing; -void FillEquationParameter( const EnhancedCustomShapeParameter& rSource, const sal_Int32 nDestPara, EnhancedCustomShapeEquation& rDest ) +void EnhancedCustomShape::FillEquationParameter( const EnhancedCustomShapeParameter& rSource, const sal_Int32 nDestPara, EnhancedCustomShapeEquation& rDest ) { sal_Int32 nValue = 0; if ( rSource.Value.getValueTypeClass() == uno::TypeClass_DOUBLE ) @@ -1151,7 +1154,9 @@ const ParserContextSharedPtr& getParserContext() }; -ExpressionNodeSharedPtr EnhancedCustomShapeFunctionParser::parseFunction( const ::rtl::OUString& rFunction, const EnhancedCustomShape2d& rCustoShape ) +namespace EnhancedCustomShape { + +ExpressionNodeSharedPtr FunctionParser::parseFunction( const ::rtl::OUString& rFunction, const EnhancedCustomShape2d& rCustoShape ) { // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* // gives better conversion robustness here (we might want to map space @@ -1192,3 +1197,5 @@ ExpressionNodeSharedPtr EnhancedCustomShapeFunctionParser::parseFunction( const return pContext->maOperandStack.top(); } + +} |