Tag: cws_src680_dba24d
User: fs      
Date: 2007-11-08 14:14:42+0000
Modified:
   dba/dbaccess/source/ui/app/AppController.cxx

Log:
 #i81658# re-factoring of the Copy Table wizard

File Changes:

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

File [changed]: AppController.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.48.2.1&r2=1.48.2.2
Delta lines:  +14 -23
---------------------
--- AppController.cxx   2007-11-07 14:54:00+0000        1.48.2.1
+++ AppController.cxx   2007-11-08 14:14:39+0000        1.48.2.2
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: AppController.cxx,v $
  *
- *  $Revision: 1.48.2.1 $
+ *  $Revision: 1.48.2.2 $
  *
- *  last change: $Author: oj $ $Date: 2007/11/07 14:54:00 $
+ *  last change: $Author: fs $ $Date: 2007/11/08 14:14:39 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -967,37 +967,28 @@
                                break;
                        case ID_BROWSER_PASTE:
                                {
-                                       TransferableDataHelper 
aTransferData(TransferableDataHelper::CreateFromSystemClipboard(getView()));
+                                       const TransferableDataHelper& 
rTransferData( getViewClipboard() );
                                        ElementType eType = 
getContainer()->getElementType();
 
                                        switch( eType )
                                        {
                                                case E_TABLE:
                                                        {
-                                                               //dyf add 
-                                                               //for get the 
selected tablename
-                                                               ::std::vector< 
::rtl::OUString> aList;
-                                                               
getSelectionElementNames(aList);
-                                                               ::rtl::OUString 
sTableNameToInsertInto;
-                                                               
+                                                               // get the 
selected tablename
+                                                               ::std::vector< 
::rtl::OUString > aList;
+                                                               
getSelectionElementNames( aList );
                                                                if ( 
!aList.empty() )
-                                                               {
-                                                                       
sTableNameToInsertInto = *aList.begin();
-                                                                       
m_aTableCopyHelper.SetDefaultTableName(sTableNameToInsertInto);
-                                                                       
m_aTableCopyHelper.SetIsSelectCopytable(true);
-                                                               }
+                                                                       
m_aTableCopyHelper.SetTableNameForAppend( *aList.begin() );
                                                                else
-                                                               {
-                                                                       
m_aTableCopyHelper.SetIsSelectCopytable(false);
-                                                               }
-                                                               //dyf add end  
-                                                               
m_aTableCopyHelper.pasteTable( aTransferData , getDatabaseName(), 
ensureConnection());
+                                    
m_aTableCopyHelper.ResetTableNameForAppend();
+
+                                                               
m_aTableCopyHelper.pasteTable( rTransferData , getDatabaseName(), 
ensureConnection() );
                                                        }
                                                        break;
                                                        
                                                case E_QUERY:
-                            if ( 
getViewClipboard().HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY) )
-                                                           paste( 
E_QUERY,ODataAccessObjectTransferable::extractObjectDescriptor(aTransferData) );
+                            if ( 
rTransferData.HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY) )
+                                                           paste( E_QUERY, 
ODataAccessObjectTransferable::extractObjectDescriptor( rTransferData ) );
                                                        break;
                                                default:
                                                        {
@@ -1014,7 +1005,7 @@
                                                                                
)
                                                                                
sFolderNameToInsertInto = *aList.begin();
                                                                }
-                                                               paste( 
eType,OComponentTransferable::extractComponentDescriptor(aTransferData),sFolderNameToInsertInto
 );
+                                                               paste( eType, 
OComponentTransferable::extractComponentDescriptor( rTransferData ), 
sFolderNameToInsertInto );
                                                        }
                                                        break;
                                        }




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

Reply via email to