[Libreoffice-commits] .: svx/inc

Joseph Powers jpowers at kemper.freedesktop.org
Mon Jan 3 06:39:25 PST 2011


 svx/inc/svx/gridctrl.hxx |   18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

New commits:
commit 75dacf5680cb7392613dd620f4b0fedb4df9c011
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Mon Jan 3 06:39:20 2011 -0800

    Remove DECLARE_LIST(DbDataColumns, ::svxform::DataColumn*)
    
    This one is easy since no one seams to use it.

diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index 51302b9..491eb01 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,18 +47,13 @@
 #include <comphelper/propmultiplex.hxx>
 #include <svtools/transfer.hxx>
 #include "svx/svxdllapi.h"
+#include <vector>
 
 class DbGridControl;
 class CursorWrapper;
 
 sal_Bool CompareBookmark(const ::com::sun::star::uno::Any& aLeft, const ::com::sun::star::uno::Any& aRight);
 
-namespace svxform
-{
-    class DataColumn;
-}
-DECLARE_LIST(DbDataColumns, ::svxform::DataColumn*)
-
 enum GridRowStatus
 {
     GRS_CLEAN,
@@ -74,7 +69,6 @@ enum GridRowStatus
 class DbGridRow : public SvRefBase
 {
     ::com::sun::star::uno::Any						m_aBookmark;		// ::com::sun::star::text::Bookmark of the row, can be set
-    DbDataColumns				m_aVariants;
     GridRowStatus				m_eStatus;
     sal_Bool						m_bIsNew;
                                                     // row is no longer valid
@@ -86,10 +80,6 @@ public:
 
     ~DbGridRow();
 
-    // Because GetField is tuned on speed, always use hasField first
-    sal_Bool HasField(sal_uInt32 nPos) const {return nPos < m_aVariants.Count();}
-    const ::svxform::DataColumn& GetField(sal_uInt32 nPos) const { return *m_aVariants.GetObject(nPos); }
-
     void			SetStatus(GridRowStatus _eStat) { m_eStatus = _eStat; }
     GridRowStatus	GetStatus() const				{ return m_eStatus; }
     void			SetNew(sal_Bool _bNew)				{ m_bIsNew = _bNew; }
@@ -248,7 +238,7 @@ private:
     // For that reason we have to listen to some properties of our data source.
     ::comphelper::OPropertyChangeMultiplexer*		m_pDataSourcePropMultiplexer;
     FmXGridSourcePropListener*						m_pDataSourcePropListener;
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowsChangeListener>		
+    ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowsChangeListener>
                                                     m_xRowSetListener; // get notification when rows were changed
 
     void*											m_pFieldListeners;
@@ -595,7 +585,7 @@ protected:
     const DbGridRowRef& GetSeekRow() const  { return m_xSeekRow;    }
     const DbGridRowRef& GetPaintRow() const { return m_xPaintRow;   }
     CursorWrapper* GetSeekCursor() const    { return m_pSeekCursor; }
-    
+
 
     void ConnectToFields();
     void DisconnectFromFields();


More information about the Libreoffice-commits mailing list