[Libreoffice-commits] .: 4 commits -

[Jan Holesovsky]

 0 files changed

New commits:
commit 985644ba3b2e3826b5e7035252473fa5d034f0e8
Merge: 229f690... bed896d...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Nov 12 14:21:51 2010 +0100

    Merge remote branch 'origin/libreoffice-3-3'

commit bed896d99d9d228081d174d23f7bb74ce15109cc
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Nov 11 13:24:47 2010 +0100

    Version 3.2.99.3, tag LIBREOFFICE_3_2_99_3 (3.3-beta3)
commit ffa8c3c72edffbc39bb468d811b8cf335b2ee987
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Nov 6 21:38:12 2010 +0200

    Fix build breakage in a dbgutil-enabled build

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 8f6dbd2..6339b8d 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1665,7 +1665,7 @@ Reference< XResultSet > ORowSet::impl_prepareAndExecute_throw()
     catch( const SQLException& )
     {
         SQLExceptionInfo aError( ::cppu::getCaughtException() );
-        OSL_ENSURE( aError.is(), "ORowSet::impl_prepareAndExecute_throw: caught an SQLException which we cannot analyze!" );
+        OSL_ENSURE( aError.isValid(), "ORowSet::impl_prepareAndExecute_throw: caught an SQLException which we cannot analyze!" );
 
         // append information about what we were actually going to execute
         try
commit f94a127b3be1acfafa7875ab9f907a29d19a778d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Nov 6 20:03:40 2010 +0200

    Fix build breakage in a dbgutil-enabled build

diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 14f6ec9..4700ebf 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -188,7 +188,7 @@ void OQueryTableWindow::OnEntryDoubleClicked(SvLBoxEntry* pEntry)
 sal_Bool OQueryTableWindow::ExistsField(const ::rtl::OUString& strFieldName, OTableFieldDescRef& rInfo)
 {
     DBG_ASSERT(m_pListBox != NULL, "OQueryTableWindow::ExistsField : habe keine ::com::sun::star::form::ListBox !");
-    OSL_ENSURE(rInfo.isValid(),"OQueryTableWindow::ExistsField: invlid argument for OTableFieldDescRef!");
+    OSL_ENSURE(rInfo.is(),"OQueryTableWindow::ExistsField: invlid argument for OTableFieldDescRef!");
     Reference< XConnection> xConnection = getTableView()->getDesignView()->getController().getConnection();
     sal_Bool bExists = sal_False;
     if(xConnection.is())