Tag: cws_src680_dba24d
User: fs      
Date: 2007-11-08 14:18:32+0000
Modified:
   dba/dbaccess/source/ui/uno/ColumnControl.cxx
   dba/dbaccess/source/ui/uno/ColumnModel.cxx
   dba/dbaccess/source/ui/uno/ColumnPeer.cxx
   dba/dbaccess/source/ui/uno/composerdialogs.cxx

Log:
 during #i81658#: string cleanup

File Changes:

Directory: /dba/dbaccess/source/ui/uno/
=======================================

File [changed]: ColumnControl.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/ColumnControl.cxx?r1=1.6&r2=1.6.170.1
Delta lines:  +4 -4
-------------------
--- ColumnControl.cxx   2006-09-17 07:32:05+0000        1.6
+++ ColumnControl.cxx   2007-11-08 14:18:29+0000        1.6.170.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ColumnControl.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.6.170.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 07:32:05 $
+ *  last change: $Author: fs $ $Date: 2007/11/08 14:18:29 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -114,7 +114,7 @@
                Reference<XPropertySet> xProp(getModel(), UNO_QUERY);
                if ( xProp.is() )
                {
-                       Reference<XConnection> 
xCon(xProp->getPropertyValue(PROPERTY_ACTIVECONNECTION),UNO_QUERY);
+                       Reference<XConnection> 
xCon(xProp->getPropertyValue(PROPERTY_ACTIVE_CONNECTION),UNO_QUERY);
                        pPeer->setConnection(xCon);
                        Reference<XPropertySet> 
xColumn(xProp->getPropertyValue(PROPERTY_COLUMN),UNO_QUERY);
                        pPeer->setColumn(xColumn);

File [changed]: ColumnModel.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/ColumnModel.cxx?r1=1.7&r2=1.7.170.1
Delta lines:  +4 -4
-------------------
--- ColumnModel.cxx     2006-09-17 07:32:19+0000        1.7
+++ ColumnModel.cxx     2007-11-08 14:18:29+0000        1.7.170.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ColumnModel.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.7.170.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 07:32:19 $
+ *  last change: $Author: fs $ $Date: 2007/11/08 14:18:29 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -128,7 +128,7 @@
 // 
-----------------------------------------------------------------------------
 void OColumnControlModel::registerProperties()
 {
-       registerProperty( PROPERTY_ACTIVECONNECTION, 
PROPERTY_ID_ACTIVECONNECTION, PropertyAttribute::TRANSIENT | 
PropertyAttribute::BOUND,
+       registerProperty( PROPERTY_ACTIVE_CONNECTION, 
PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::TRANSIENT | 
PropertyAttribute::BOUND,
                &m_xConnection, ::getCppuType( &m_xConnection ) );
        Any a;
        a <<= m_xColumn;

File [changed]: ColumnPeer.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/ColumnPeer.cxx?r1=1.8&r2=1.8.170.1
Delta lines:  +5 -5
-------------------
--- ColumnPeer.cxx      2006-09-17 07:32:32+0000        1.8
+++ ColumnPeer.cxx      2007-11-08 14:18:29+0000        1.8.170.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ColumnPeer.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.8.170.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 07:32:32 $
+ *  last change: $Author: fs $ $Date: 2007/11/08 14:18:29 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -150,7 +150,7 @@
                Reference<XPropertySet> xProp(Value,UNO_QUERY);
                setColumn(xProp);
        }
-       else if ( 0 == _rPropertyName.compareToAscii( PROPERTY_ACTIVECONNECTION 
) )
+       else if ( 0 == _rPropertyName.compareToAscii( 
PROPERTY_ACTIVE_CONNECTION ) )
        {
                Reference<XConnection> xCon(Value,UNO_QUERY);
                setConnection(xCon);
@@ -167,7 +167,7 @@
        {
                aProp <<= m_xColumn;
        }
-       else if ( pFieldControl && 0 == _rPropertyName.compareToAscii( 
PROPERTY_ACTIVECONNECTION ) )
+       else if ( pFieldControl && 0 == _rPropertyName.compareToAscii( 
PROPERTY_ACTIVE_CONNECTION ) )
        {
                aProp <<= pFieldControl->getConnection();
        }

File [changed]: composerdialogs.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/composerdialogs.cxx?r1=1.8&r2=1.8.168.1
Delta lines:  +4 -4
-------------------
--- composerdialogs.cxx 2006-09-17 07:33:54+0000        1.8
+++ composerdialogs.cxx 2007-11-08 14:18:29+0000        1.8.168.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: composerdialogs.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.8.168.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 07:33:54 $
+ *  last change: $Author: fs $ $Date: 2007/11/08 14:18:29 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -131,7 +131,7 @@
             {
                            Reference< XPropertySet > xRowsetProps( m_xRowSet, 
UNO_QUERY );
                            if ( xRowsetProps.is() )
-                                   xRowsetProps->getPropertyValue( 
PROPERTY_ACTIVECONNECTION ) >>= xConnection;
+                                   xRowsetProps->getPropertyValue( 
PROPERTY_ACTIVE_CONNECTION ) >>= xConnection;
             }
 
             // fallback: if there is a connection and thus a row set, but no 
composer, create one




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

Reply via email to