[Libreoffice-commits] .: Branch 'feature/vos-removal' - 2 commits - dbaccess/source dbaccess/util reportdesign/util

[Norbert Thiebaud]

 dbaccess/source/core/api/RowSetCache.cxx   |    2 +-
 dbaccess/source/ext/adabas/AdabasNewDb.cxx |    2 --
 dbaccess/util/makefile.mk                  |    1 -
 reportdesign/util/makefile.mk              |    1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit c9dbefc2752792604e8266ea51a37af93d644b36
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 21 16:29:18 2010 -0500

    Finally, gut the vos module out of the build

diff --git a/dbaccess/util/makefile.mk b/dbaccess/util/makefile.mk
index 8402151..ee38f81 100644
--- a/dbaccess/util/makefile.mk
+++ b/dbaccess/util/makefile.mk
@@ -127,7 +127,6 @@ SHL2STDLIBS= \
         $(CPPUHELPERLIB)		\
         $(CPPULIB)				\
         $(SO2LIB)				\
-        $(VOSLIB)				\
         $(SALLIB) \
         $(SALHELPERLIB) \
         $(EDITENGLIB)
diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk
index 32fe4eb..fd6a316 100644
--- a/reportdesign/util/makefile.mk
+++ b/reportdesign/util/makefile.mk
@@ -68,7 +68,6 @@ SHL1STDLIBS= \
         $(CPPULIB)				\
         $(VCLLIB)				\
         $(TKLIB)				\
-        $(VOSLIB)				\
         $(SALLIB)
 
 .IF "$(GUI)"=="OS2"
commit 88c90d9e22dbf3fec7918938deb10fffa16d66ac
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Oct 21 15:39:43 2010 -0500

    make a osl:Reference de-reference a little more sane..

diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 6ac0697..1323ad3 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -1628,7 +1628,7 @@ sal_Bool ORowSetCache::fill(ORowSetMatrix::iterator& _aIter,const ORowSetMatrix:
             TOldRowSetRows::iterator aOldRowEnd = m_aOldRows.end();
             for (TOldRowSetRows::iterator aOldRowIter = m_aOldRows.begin(); aOldRowIter != aOldRowEnd; ++aOldRowIter)
             {
-                if ( (*(*aOldRowIter)).getRow() == *_aIter )
+                if ( (*aOldRowIter)->getRow() == *_aIter )
                     *_aIter = new ORowSetValueVector(nColumnCount);
             }
         }
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
index e743453..d6833f0 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
@@ -29,7 +29,6 @@
 #include "AdabasNewDb.hxx"
 #include "AdabasNewDb.hrc"
 
-#include <vos/process.hxx>
 #include <osl/process.h>
 #include <vcl/msgbox.hxx>
 #include <sfx2/passwd.hxx>
@@ -60,7 +59,6 @@
 using namespace adabasui;
 using namespace ucbhelper;
 using namespace utl;
-using namespace vos;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbcx;