Tag: cws_src680_dba24d
User: fs      
Date: 2007-11-08 14:17:21+0000
Modified:
   dba/dbaccess/source/ui/querydesign/querycontroller.cxx

Log:
 during #i81658#: string cleanup

File Changes:

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

File [changed]: querycontroller.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/querycontroller.cxx?r1=1.111&r2=1.111.2.1
Delta lines:  +9 -9
-------------------
--- querycontroller.cxx 2007-11-01 15:34:59+0000        1.111
+++ querycontroller.cxx 2007-11-08 14:17:19+0000        1.111.2.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: querycontroller.cxx,v $
  *
- *  $Revision: 1.111 $
+ *  $Revision: 1.111.2.1 $
  *
- *  last change: $Author: hr $ $Date: 2007/11/01 15:34:59 $
+ *  last change: $Author: fs $ $Date: 2007/11/08 14:17:19 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -793,7 +793,7 @@
     const NamedValueCollection& rArguments( getInitParams() );
 
        Reference< XConnection > xConnection;
-    xConnection = rArguments.getOrDefault( 
(::rtl::OUString)PROPERTY_ACTIVECONNECTION, xConnection );
+    xConnection = rArguments.getOrDefault( 
(::rtl::OUString)PROPERTY_ACTIVE_CONNECTION, xConnection );
        if ( xConnection.is() )
         initializeConnection( xConnection );
 
@@ -1166,7 +1166,7 @@
                                aProps[0].Name = PROPERTY_DATASOURCENAME;
                                aProps[0].Value <<= sDataSourceName;
 
-                               aProps[1].Name = PROPERTY_COMMANDTYPE;
+                               aProps[1].Name = PROPERTY_COMMAND_TYPE;
                                aProps[1].Value <<= CommandType::COMMAND;
 
                                aProps[2].Name = PROPERTY_COMMAND;
@@ -1178,7 +1178,7 @@
                                aProps[4].Name = PROPERTY_SHOWTREEVIEWBUTTON;
                                aProps[4].Value = ::cppu::bool2any(sal_False);
 
-                               aProps[5].Name = PROPERTY_ACTIVECONNECTION;
+                               aProps[5].Name = PROPERTY_ACTIVE_CONNECTION;
                                aProps[5].Value <<= getConnection();
 
                                aProps[6].Name = PROPERTY_UPDATE_CATALOGNAME;
@@ -1190,7 +1190,7 @@
                                aProps[8].Name = PROPERTY_UPDATE_TABLENAME;
                                aProps[8].Value <<= m_sUpdateTableName;
 
-                               aProps[9].Name = PROPERTY_USE_ESCAPE_PROCESSING;
+                               aProps[9].Name = PROPERTY_ESCAPE_PROCESSING;
                                aProps[9].Value = 
::cppu::bool2any(m_bEsacpeProcessing);
 
                                xDisp->dispatch(aWantToDispatch, aProps);
@@ -1364,7 +1364,7 @@
                                        
xQuery->setPropertyValue(PROPERTY_UPDATE_TABLENAME,makeAny(m_sUpdateTableName));
                                        
xQuery->setPropertyValue(PROPERTY_UPDATE_CATALOGNAME,makeAny(m_sUpdateCatalogName));
                                        
xQuery->setPropertyValue(PROPERTY_UPDATE_SCHEMANAME,makeAny(m_sUpdateSchemaName));
-                                       
xQuery->setPropertyValue(PROPERTY_USE_ESCAPE_PROCESSING,::cppu::bool2any(m_bEsacpeProcessing));
+                                       
xQuery->setPropertyValue(PROPERTY_ESCAPE_PROCESSING,::cppu::bool2any(m_bEsacpeProcessing));
 
                                        // now we save the layout information
                                        getContainer()->SaveUIConfig();
@@ -1530,7 +1530,7 @@
                     ::rtl::OUString sNewStatement;
                                    xProp->getPropertyValue( PROPERTY_COMMAND ) 
>>= sNewStatement;
                     setStatement_fireEvent( sNewStatement );
-                    xProp->getPropertyValue( PROPERTY_USE_ESCAPE_PROCESSING ) 
>>= m_bEsacpeProcessing;
+                    xProp->getPropertyValue( PROPERTY_ESCAPE_PROCESSING ) >>= 
m_bEsacpeProcessing;
                                    m_bDesign = m_bDesign && 
m_bEsacpeProcessing;
                     bValid = true;
 




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

Reply via email to