User: kz      
Date: 05/06/30 09:31:00

Modified:
 /dba/dbaccess/source/ui/dlg/
  DbAdminImpl.hxx

Log:
 INTEGRATION: CWS wizopendb (1.5.48); FILE MERGED
 2005/06/06 10:40:39 fs 1.5.48.1: #i42477# allow the 'New Database' wizard to 
load existing documents

File Changes:

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

File [changed]: DbAdminImpl.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/DbAdminImpl.hxx?r1=1.5&r2=1.6
Delta lines:  +5 -4
-------------------
--- DbAdminImpl.hxx     10 Mar 2005 16:48:36 -0000      1.5
+++ DbAdminImpl.hxx     30 Jun 2005 16:30:58 -0000      1.6
@@ -120,7 +120,7 @@
                ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet >   m_xDatasource;
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >    
     m_xModel;
 
-               ::com::sun::star::uno::Any                              
m_aDataSourceName;
+               ::com::sun::star::uno::Any                              
m_aDataSourceOrName;
                typedef ::std::set< ::rtl::OUString >   StringSet;
                typedef StringSet::const_iterator               
ConstStringSetIterator;
 
@@ -164,13 +164,14 @@
                /** returns the data source the dialog is currently working with
                */
                ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet >       getCurrentDataSource();
+        /** returs the model we're currently working with
+        */
+        ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >    
     getCurrentModel();
 
         // returns the Url of a database document
         String              getDocumentUrl(SfxItemSet& _rDest);
 
-
-
-               void setCurrentDataSourceName(const ::com::sun::star::uno::Any& 
_aDataSourceName);
+               void setDataSourceOrName( const ::com::sun::star::uno::Any& 
_rDataSourceOrName );
 
                /** extracts the connection type from the given set<p/>
                        The connection type is determined by the value of the 
DSN item, analyzed by the TypeCollection item.




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

Reply via email to