Tag: cws_src680_rptchart01
User: oj      
Date: 2008-01-24 14:47:22+0000
Modified:
   dba/connectivity/source/commontools/dbtools.cxx
   dba/connectivity/source/commontools/makefile.mk
   dba/connectivity/source/commontools/propertyids.cxx

Log:
 #i85225# mved fromforms

File Changes:

Directory: /dba/connectivity/source/commontools/
================================================

File [changed]: dbtools.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/dbtools.cxx?r1=1.70&r2=1.70.30.1
Delta lines:  +4 -29
--------------------
--- dbtools.cxx 2007-11-21 14:59:13+0000        1.70
+++ dbtools.cxx 2008-01-24 14:47:19+0000        1.70.30.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dbtools.cxx,v $
  *
- *  $Revision: 1.70 $
+ *  $Revision: 1.70.30.1 $
  *
- *  last change: $Author: ihi $ $Date: 2007/11/21 14:59:13 $
+ *  last change: $Author: oj $ $Date: 2008/01/24 14:47:19 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -39,6 +39,7 @@
 #include "connectivity/CommonTools.hxx"
 #include "diagnose_ex.h"
 #include "TConnection.hxx"
+#include "connectivity/ParameterCont.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/awt/XWindow.hpp>
@@ -1665,32 +1666,6 @@
        return bSuccessfullyReRouted;
 }
 
-//==================================================================
-// OParameterContinuation
-//==================================================================
-class OParameterContinuation : public OInteraction< 
XInteractionSupplyParameters >
-{
-       Sequence< PropertyValue >               m_aValues;
-
-protected:
-       virtual ~OParameterContinuation();
-public:
-       OParameterContinuation() { }
-
-       Sequence< PropertyValue >       getValues() const { return m_aValues; }
-
-// XInteractionSupplyParameters
-    virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& 
_rValues ) throw(RuntimeException);
-};
-
-OParameterContinuation::~OParameterContinuation()
-{
-}
-//------------------------------------------------------------------
-void SAL_CALL OParameterContinuation::setParameters( const Sequence< 
PropertyValue >& _rValues ) throw(RuntimeException)
-{
-       m_aValues = _rValues;
-}
 //..................................................................
 
 

File [changed]: makefile.mk
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/makefile.mk?r1=1.32&r2=1.32.32.1
Delta lines:  +5 -3
-------------------
--- makefile.mk 2007-11-21 16:56:12+0000        1.32
+++ makefile.mk 2008-01-24 14:47:19+0000        1.32.32.1
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.32 $
+#   $Revision: 1.32.32.1 $
 #
-#   last change: $Author: ihi $ $Date: 2007/11/21 16:56:12 $
+#   last change: $Author: oj $ $Date: 2008/01/24 14:47:19 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -76,6 +76,8 @@
         $(SLO)$/paramwrapper.obj                        \
         $(SLO)$/statementcomposer.obj                   \
         $(SLO)$/sqlerror.obj                            \
+        $(SLO)$/filtermanager.obj                       \
+        $(SLO)$/parameters.obj                                                 
\
         $(SLO)$/formattedcolumnvalue.obj
 
 SLOFILES=\

File [changed]: propertyids.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/propertyids.cxx?r1=1.5&r2=1.5.112.1
Delta lines:  +24 -9
--------------------
--- propertyids.cxx     2007-05-10 09:37:49+0000        1.5
+++ propertyids.cxx     2008-01-24 14:47:19+0000        1.5.112.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: propertyids.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.5.112.1 $
  *
- *  last change: $Author: kz $ $Date: 2007/05/10 09:37:49 $
+ *  last change: $Author: oj $ $Date: 2008/01/24 14:47:19 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -95,6 +95,15 @@
                const sal_Char* getPROPERTY_ID_HAVINGCLAUSE()           { 
return        "HavingClause"; }
                const sal_Char* getPROPERTY_ID_ISSIGNED()                       
{ return        "IsSigned"; }
         const sal_Char* getPROPERTY_ID_ISSEARCHABLE()          { return        
"IsSearchable"; }
+
+        const sal_Char* getPROPERTY_ID_APPLYFILTER()           { return        
"ApplyFilter"; }
+        const sal_Char* getPROPERTY_ID_FILTER()                        { 
return        "Filter"; }
+        const sal_Char* getPROPERTY_ID_MASTERFIELDS()      { return    
"MasterFields"; }
+        const sal_Char* getPROPERTY_ID_DETAILFIELDS()          { return        
"DetailFields"; }
+        const sal_Char* getPROPERTY_ID_FIELDTYPE()                     { 
return        "FieldType"; }
+        const sal_Char* getPROPERTY_ID_VALUE()                         { 
return        "Value"; }
+        const sal_Char* getPROPERTY_ID_ACTIVE_CONNECTION()     { return        
"ActiveConnection"; }
+
        //============================================================
        //= error messages
        //============================================================
@@ -170,7 +179,7 @@
                                case PROPERTY_ID_AGGREGATEFUNCTION:          { 
rtl_uString_newFromAscii(&pStr,getPROPERTY_AGGREGATEFUNCTION()   ); break; }
                                case PROPERTY_ID_TABLENAME:                     
{ rtl_uString_newFromAscii(&pStr,getPROPERTY_TABLENAME()                        
        ); break; }             
                                case PROPERTY_ID_REALNAME:                      
{ rtl_uString_newFromAscii(&pStr,getPROPERTY_REALNAME()                         
); break; }              
-                               case PROPERTY_ID_DBASEPRECISIONCHANGED:         
{ rtl_uString_newFromAscii(&pStr,getPROPERTY_DBASEPRECISIONCHANGED() ); break; 
}                        
+                               case PROPERTY_ID_DBASEPRECISIONCHANGED:         
{ rtl_uString_newFromAscii(&pStr,getPROPERTY_DBASEPRECISIONCHANGED()); break; } 
                        
                                case PROPERTY_ID_ISCURRENCY:                    
        { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISCURRENCY()               
        ); break; }            
                                case PROPERTY_ID_ISBOOKMARKABLE:                
        { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISBOOKMARKABLE()           
); break; }                     
                                case PROPERTY_ID_INVALID_INDEX:                 
        { rtl_uString_newFromAscii(&pStr,getSTAT_INVALID_INDEX()                
        ); break; }                     
@@ -179,12 +188,18 @@
                                case PROPERTY_ID_DELIMITER:                     
                { rtl_uString_newFromAscii(&pStr,getSTR_DELIMITER()             
                        ); break; }                       
                                case PROPERTY_ID_FORMATKEY:                     
                { rtl_uString_newFromAscii(&pStr,getPROPERTY_FORMATKEY()        
                ); break; }
                                case PROPERTY_ID_LOCALE:                        
                { rtl_uString_newFromAscii(&pStr,getPROPERTY_LOCALE()           
                ); break; }
-                               case PROPERTY_ID_AUTOINCREMENTCREATION:         
{ rtl_uString_newFromAscii(&pStr,getPROPERTY_AUTOINCREMENTCREATION()            
); break; }
+                               case PROPERTY_ID_AUTOINCREMENTCREATION:         
{ rtl_uString_newFromAscii(&pStr,getPROPERTY_AUTOINCREMENTCREATION()); break; }
                                case PROPERTY_ID_PRIVILEGES:                    
        { rtl_uString_newFromAscii(&pStr,getPROPERTY_PRIVILEGES()               
        ); break; }
                                case PROPERTY_ID_HAVINGCLAUSE:                  
        { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_HAVINGCLAUSE()          
        ); break; }
                                case PROPERTY_ID_ISSIGNED:                      
                { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ISSIGNED()      
                ); break; }
                 case PROPERTY_ID_ISSEARCHABLE:                         { 
rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ISSEARCHABLE()                  
); break; }
-                                                                               
                                        
+                case PROPERTY_ID_APPLYFILTER:                          { 
rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_APPLYFILTER()           ); break; 
}
+                case PROPERTY_ID_FILTER:                                   { 
rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_FILTER()                    ); 
break; }
+                case PROPERTY_ID_MASTERFIELDS:                         { 
rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_MASTERFIELDS()          ); break; 
}
+                case PROPERTY_ID_DETAILFIELDS:                         { 
rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_DETAILFIELDS()          ); break; 
}
+                case PROPERTY_ID_FIELDTYPE:                                { 
rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_FIELDTYPE()                 ); 
break; }
+                case PROPERTY_ID_VALUE:                                        
{ rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_VALUE()                     ); 
break; }
+                case PROPERTY_ID_ACTIVE_CONNECTION:                    { 
rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ACTIVE_CONNECTION() ); break; }
                        }
                        m_aPropertyMap[_nIndex] = pStr;
                        return pStr;




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to