User: hr Date: 2007-08-02 14:36:05+0000 Modified: dba/reportdesign/source/ui/dlg/Condition.hxx
Log: INTEGRATION: CWS rpt23fix01 (1.2.2); FILE MERGED 2007/07/16 19:35:57 fs 1.2.2.2: #i77800# some more outsourcing 2007/07/16 13:43:53 fs 1.2.2.1: #i77800# outsourced ExpressionFactory and friends to a dedicated file (conditionalexpression.*) File Changes: Directory: /dba/reportdesign/source/ui/dlg/ =========================================== File [changed]: Condition.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/dlg/Condition.hxx?r1=1.2&r2=1.3 Delta lines: +14 -56 --------------------- --- Condition.hxx 2007-07-09 11:56:29+0000 1.2 +++ Condition.hxx 2007-08-02 14:36:02+0000 1.3 @@ -36,38 +36,23 @@ #ifndef RPTUI_CONDITION_HXX #define RPTUI_CONDITION_HXX -#ifndef _FIXED_HXX //autogen +#include "conditionalexpression.hxx" + +#include <com/sun/star/report/XFormatCondition.hpp> + +#include <dbaccess/ToolBoxHelper.hxx> + +#include <svx/fntctrl.hxx> + +#include <svtools/valueset.hxx> + #include <vcl/fixed.hxx> -#endif -#ifndef _SV_LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _SV_FIELD_HXX #include <vcl/field.hxx> -#endif -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif -#ifndef _SV_TOOLBOX_HXX #include <vcl/toolbox.hxx> -#endif -#ifndef DBAUI_TOOLBOXHELPER_HXX -#include <dbaccess/ToolBoxHelper.hxx> -#endif -#ifndef _COM_SUN_STAR_REPORT_XFORMATCONDITION_HPP_ -#include <com/sun/star/report/XFormatCondition.hpp> -#endif -#ifndef _SVX_FNTCTRL_HXX -#include <svx/fntctrl.hxx> -#endif -#ifndef _VALUESET_HXX -#include <svtools/valueset.hxx> -#endif - -#include <boost/shared_ptr.hpp> #include <memory> -#include <map> namespace svx { class ToolboxButtonColorUpdater; } @@ -79,33 +64,6 @@ class IConditionalFormatAction; //======================================================================== - //= ConditionType - //======================================================================== - enum ConditionType - { - eFieldValueComparison = 0, - eExpression = 1 - }; - - //======================================================================== - //= ComparisonOperation - //======================================================================== - enum ComparisonOperation - { - eBetween = 0, - eNotBetween = 1, - eEqualTo = 2, - eNotEqualTo = 3, - eGreaterThan = 4, - eLessThan = 5, - eGreaterOrEqual = 6, - eLessOrEqual = 7 - }; - - class IExpressionFactory; - typedef ::boost::shared_ptr< IExpressionFactory > PExpressionFactory; - typedef ::std::map< ComparisonOperation, PExpressionFactory > ExpressionFactories; - //======================================================================== //= Condition //======================================================================== class Condition :public Control @@ -135,7 +93,7 @@ long m_nLastKnownWindowWidth; bool m_bInDestruction; - ExpressionFactories m_aFieldExprFactories; + ConditionalExpressions m_aConditionalExpressions; DECL_LINK( OnFormatAction, ToolBox* ); DECL_LINK( DropdownClick, ToolBox* ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
