[Libreoffice-commits] .: svx/inc

[Joseph Powers]

 svx/inc/svx/gridctrl.hxx |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 86673109223296d05b863e487fd826f1bbb0c17c
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Mon Jan 3 08:11:31 2011 -0800

    Revert previous patch

diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index 491eb01..a685b27 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -47,13 +47,18 @@
 #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,
@@ -69,6 +74,7 @@ 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
@@ -80,6 +86,9 @@ public:
 
     ~DbGridRow();
 
+    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; }