Tag: cws_src680_odbmacros2
User: fs      
Date: 2007-12-18 21:23:23+0000
Modified:
   dba/dbaccess/source/ui/browser/unodatbr.cxx

Log:
 removed an obsolete friend declaration

File Changes:

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

File [changed]: unodatbr.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.192.2.1&r2=1.192.2.2
Delta lines:  +17 -4
--------------------
--- unodatbr.cxx        2007-12-13 11:22:06+0000        1.192.2.1
+++ unodatbr.cxx        2007-12-18 21:23:20+0000        1.192.2.2
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: unodatbr.cxx,v $
  *
- *  $Revision: 1.192.2.1 $
+ *  $Revision: 1.192.2.2 $
  *
- *  last change: $Author: fs $ $Date: 2007/12/13 11:22:06 $
+ *  last change: $Author: fs $ $Date: 2007/12/18 21:23:20 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -349,6 +349,7 @@
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::view;
 using namespace ::com::sun::star::datatransfer;
+using namespace ::com::sun::star::document;
 using namespace ::dbtools;
 using namespace ::comphelper;
 using namespace ::svx;
@@ -1048,7 +1049,11 @@
                                        OSL_ENSURE(bProperFormat, 
"SbaTableQueryBrowser::statusChanged: need a data access descriptor here!");
                                        
m_aDocumentDataSource.initializeFrom(aDescriptor);
 
-                                       OSL_ENSURE(( 
m_aDocumentDataSource.has(daDataSource) || 
m_aDocumentDataSource.has(daDatabaseLocation)) && 
m_aDocumentDataSource.has(daCommand) && 
m_aDocumentDataSource.has(daCommandType),
+                                       OSL_ENSURE( (   
m_aDocumentDataSource.has(daDataSource)
+                                ||  
m_aDocumentDataSource.has(daDatabaseLocation)
+                                )
+                                &&  m_aDocumentDataSource.has(daCommand)
+                                &&  m_aDocumentDataSource.has(daCommandType),
                                                
"SbaTableQueryBrowser::statusChanged: incomplete descriptor!");
 
                                        // check if we know the object which is 
set as document data source
@@ -3152,7 +3157,7 @@
                }
                catch(const Exception&)
                {
-                       OSL_ENSURE(sal_False, 
"SbaTableQueryBrowser::initialize: could not set the update related names!");
+                       OSL_ENSURE(sal_False, 
"SbaTableQueryBrowser::impl_initialize: could not set the update related 
names!");
                }
        }
        else
@@ -3736,6 +3741,7 @@
        }
        return bIni;
 }
+
 // 
-----------------------------------------------------------------------------
 void SbaTableQueryBrowser::postReloadForm()
 {
@@ -3743,6 +3749,13 @@
        LoadFinished(sal_True);
        updateTitle();
 }
+
+//------------------------------------------------------------------------------
+Reference< XEmbeddedScripts > SAL_CALL 
SbaTableQueryBrowser::getScriptContainer() throw (RuntimeException)
+{
+    return Reference< XEmbeddedScripts >( );
+}
+
 // .........................................................................
 }      // namespace dbaui
 // .........................................................................




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

Reply via email to