Tag: cws_src680_dba30
User: fs      
Date: 05/04/06 00:14:15

Modified:
 /dba/dbaccess/source/core/api/
  RowSet.cxx, RowSet.hxx, RowSetBase.hxx, RowSetBase.cxx

Log:
 #i46768# getPropertyDefaultByHandle signature changed

File Changes:

Directory: /dba/dbaccess/source/core/api/
=========================================

File [changed]: RowSet.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSet.cxx?r1=1.133&r2=1.133.12.1
Delta lines:  +15 -17
---------------------
--- RowSet.cxx  10 Mar 2005 16:30:55 -0000      1.133
+++ RowSet.cxx  6 Apr 2005 07:14:11 -0000       1.133.12.1
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RowSet.cxx,v $
  *
- *  $Revision: 1.133 $
+ *  $Revision: 1.133.12.1 $
  *
- *  last change: $Author: vg $ $Date: 2005/03/10 16:30:55 $
+ *  last change: $Author: fs $ $Date: 2005/04/06 07:14:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -371,46 +371,44 @@
        m_aParameterRow.clear(); // because it was constructed with one element 
as default
 }
 // 
-----------------------------------------------------------------------------
-Any ORowSet::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
+void ORowSet::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefault ) 
const
 {
-       Any aRet;
        switch( _nHandle )
        {
                case PROPERTY_ID_COMMANDTYPE:
-                       aRet <<= static_cast<sal_Int32>(CommandType::COMMAND);
+                       _rDefault <<= 
static_cast<sal_Int32>(CommandType::COMMAND);
                        break;
                case PROPERTY_ID_IGNORERESULT:
-                       aRet <<= sal_False;
+                       _rDefault <<= sal_False;
                        break;
                case PROPERTY_ID_APPLYFILTER:
-                       aRet <<= sal_False;
+                       _rDefault <<= sal_False;
                        break;
                case PROPERTY_ID_ISMODIFIED:
-                       aRet <<= sal_False;
+                       _rDefault <<= sal_False;
                        break;
                case PROPERTY_ID_ISBOOKMARKABLE:
-                       aRet <<= sal_True;
+                       _rDefault <<= sal_True;
                        break;
                case PROPERTY_ID_CANUPDATEINSERTEDROWS:
-                       aRet <<= sal_True;
+                       _rDefault <<= sal_True;
                        break;
                case PROPERTY_ID_RESULTSETTYPE:
-                       aRet <<= ResultSetType::SCROLL_INSENSITIVE;
+                       _rDefault <<= ResultSetType::SCROLL_INSENSITIVE;
                        break;
                case PROPERTY_ID_RESULTSETCONCURRENCY:
-                       aRet <<= ResultSetConcurrency::UPDATABLE;
+                       _rDefault <<= ResultSetConcurrency::UPDATABLE;
                        break;
                case PROPERTY_ID_FETCHDIRECTION:
-                       aRet <<= FetchDirection::FORWARD;
+                       _rDefault <<= FetchDirection::FORWARD;
                        break;
                case PROPERTY_ID_FETCHSIZE:
-                       aRet <<= static_cast<sal_Int32>(1);
+                       _rDefault <<= static_cast<sal_Int32>(1);
                        break;
                case PROPERTY_ID_USE_ESCAPE_PROCESSING:
-                       aRet <<= sal_True;
+                       _rDefault <<= sal_True;
                        break;
        }
-       return aRet;
 }
 // -------------------------------------------------------------------------
 //     typedef ::comphelper::OPropertyArrayUsageHelper<ORowSet> ORowSet_Prop;

File [changed]: RowSet.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSet.hxx?r1=1.39&r2=1.39.12.1
Delta lines:  +4 -4
-------------------
--- RowSet.hxx  10 Mar 2005 16:31:10 -0000      1.39
+++ RowSet.hxx  6 Apr 2005 07:14:12 -0000       1.39.12.1
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RowSet.hxx,v $
  *
- *  $Revision: 1.39 $
+ *  $Revision: 1.39.12.1 $
  *
- *  last change: $Author: vg $ $Date: 2005/03/10 16:31:10 $
+ *  last change: $Author: fs $ $Date: 2005/04/06 07:14:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -229,7 +229,7 @@
        protected:
                virtual void SAL_CALL 
setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const 
::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception);
                virtual void SAL_CALL 
getFastPropertyValue(::com::sun::star::uno::Any& rValue,sal_Int32 nHandle) 
const;
-               virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( 
sal_Int32 _nHandle ) const;
+               virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, 
::com::sun::star::uno::Any& _rDefault ) const;
 
                virtual void fireRowcount();
                virtual sal_Bool 
notifyAllListenersRowBeforeChange(::osl::ResettableMutexGuard& _rGuard,const 
::com::sun::star::sdb::RowChangeEvent &rEvt);

File [changed]: RowSetBase.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetBase.hxx?r1=1.31&r2=1.31.106.1
Delta lines:  +4 -4
-------------------
--- RowSetBase.hxx      2 Aug 2004 15:01:00 -0000       1.31
+++ RowSetBase.hxx      6 Apr 2005 07:14:12 -0000       1.31.106.1
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RowSetBase.hxx,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.31.106.1 $
  *
- *  last change: $Author: hr $ $Date: 2004/08/02 15:01:00 $
+ *  last change: $Author: fs $ $Date: 2005/04/06 07:14:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -214,7 +214,7 @@
                void fireProperty( sal_Int32 _nProperty, sal_Bool _bNew, 
sal_Bool _bOld );
 
        // OPropertyStateContainer
-               virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( 
sal_Int32 _nHandle ) const;
+               virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, 
::com::sun::star::uno::Any& _rDefault ) const;
                virtual void SAL_CALL 
getFastPropertyValue(::com::sun::star::uno::Any& rValue,sal_Int32 nHandle) 
const;
                // postions the cache which the currently bookmark m_aBookmark
                void positionCache();

File [changed]: RowSetBase.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetBase.cxx?r1=1.75&r2=1.75.6.1
Delta lines:  +5 -5
-------------------
--- RowSetBase.cxx      18 Mar 2005 10:05:00 -0000      1.75
+++ RowSetBase.cxx      6 Apr 2005 07:14:12 -0000       1.75.6.1
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RowSetBase.cxx,v $
  *
- *  $Revision: 1.75 $
+ *  $Revision: 1.75.6.1 $
  *
- *  last change: $Author: obo $ $Date: 2005/03/18 10:05:00 $
+ *  last change: $Author: fs $ $Date: 2005/04/06 07:14:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1245,9 +1245,9 @@
        return aOldValues;
 }
 // 
-----------------------------------------------------------------------------
-Any ORowSetBase::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
+void ORowSetBase::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& 
_rDefault ) const
 {
-       return Any();
+       _rDefault.clear();
 }
 // 
=============================================================================
 // 
-----------------------------------------------------------------------------




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

Reply via email to