summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2012-11-27 13:48:44 -0500
committerKohei Yoshida <kohei.yoshida@gmail.com>2012-11-28 10:01:31 -0500
commit80ee754ca184ab98fa0d23b58294255f8592422b (patch)
tree33def7bab7442a53fddca62044f61af3ae0656fc /svtools
parentcf9b196bf8b925f6059c638251e93011e6ebde23 (diff)
Move SvViewDataEntry and SvViewDataItem into these files too.
Change-Id: Ib25e7b4ff692804e4e4b617ffba228c4b2cae1db
Diffstat (limited to 'svtools')
-rw-r--r--svtools/inc/svtools/treelistbox.hxx25
-rw-r--r--svtools/inc/svtools/viewdataentry.hxx25
-rw-r--r--svtools/source/contnr/treelistbox.cxx31
-rw-r--r--svtools/source/contnr/viewdataentry.cxx27
4 files changed, 52 insertions, 56 deletions
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index 11e36c1a32f9..6624934427b0 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -132,31 +132,6 @@ public:
};
// *********************************************************************
-// *********************** View-dependent data *************************
-// *********************************************************************
-
-class SvViewDataItem
-{
-public:
- Size aSize;
- SvViewDataItem();
- ~SvViewDataItem();
-};
-
-// View-dependent data for an Entry is created in the virtual function
-// SvTreeListBox::CreateViewData. The View creation of Items cannot be
-// changed (because it's an array)
-class SvViewDataEntry : public SvViewData
-{
-public:
- SvViewDataItem* pItemData; // An array of SvViewDataItems
- sal_uInt16 nItmCnt; // Item count for delete operator
-
- SvViewDataEntry();
- virtual ~SvViewDataEntry();
-};
-
-// *********************************************************************
// ****************************** Items ********************************
// *********************************************************************
diff --git a/svtools/inc/svtools/viewdataentry.hxx b/svtools/inc/svtools/viewdataentry.hxx
index b657cbcf6916..594a1c030642 100644
--- a/svtools/inc/svtools/viewdataentry.hxx
+++ b/svtools/inc/svtools/viewdataentry.hxx
@@ -22,6 +22,7 @@
#include "svtdllapi.h"
#include "tools/solar.h"
+#include "tools/gen.hxx"
// Entryflags that are attached to the View
#define SVLISTENTRYFLAG_SELECTED 0x0001
@@ -30,6 +31,8 @@
#define SVLISTENTRYFLAG_CURSORED 0x0008
#define SVLISTENTRYFLAG_NOT_SELECTABLE 0x0010
+class SvViewDataItem;
+
class SVT_DLLPUBLIC SvViewData
{
friend class SvTreeList;
@@ -54,6 +57,28 @@ public:
void SetSelectable( bool bSelectable );
};
+// View-dependent data for an Entry is created in the virtual function
+// SvTreeListBox::CreateViewData. The View creation of Items cannot be
+// changed (because it's an array)
+class SvViewDataEntry : public SvViewData
+{
+public:
+ SvViewDataItem* pItemData; // An array of SvViewDataItems
+ sal_uInt16 nItmCnt; // Item count for delete operator
+
+ SvViewDataEntry();
+ virtual ~SvViewDataEntry();
+};
+
+class SvViewDataItem
+{
+public:
+ Size aSize;
+
+ SvViewDataItem();
+ ~SvViewDataItem();
+};
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index a5cd300a58e1..5f8a40b1a3f6 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -366,37 +366,6 @@ const Size& SvLBoxItem::GetSize(const SvTreeListBox* pView, const SvTreeListEntr
return pViewData->aSize;
}
-DBG_NAME(SvViewDataItem);
-
-SvViewDataItem::SvViewDataItem()
-{
- DBG_CTOR(SvViewDataItem,0);
-}
-
-SvViewDataItem::~SvViewDataItem()
-{
- DBG_DTOR(SvViewDataItem,0);
-}
-
-// ***************************************************************
-// class SvLBoxViewData
-// ***************************************************************
-
-DBG_NAME(SvViewDataEntry);
-
-SvViewDataEntry::SvViewDataEntry()
- : SvViewData()
-{
- DBG_CTOR(SvViewDataEntry,0);
- pItemData = 0;
-}
-
-SvViewDataEntry::~SvViewDataEntry()
-{
- DBG_DTOR(SvViewDataEntry,0);
- delete [] pItemData;
-}
-
struct SvTreeListBoxImpl
{
bool m_bIsEmptyTextAllowed:1;
diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx
index b0efde066252..f26ad15c35bb 100644
--- a/svtools/source/contnr/viewdataentry.cxx
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -101,4 +101,31 @@ void SvViewData::SetSelectable( bool bSelectable )
nFlags |= SVLISTENTRYFLAG_NOT_SELECTABLE;
}
+DBG_NAME(SvViewDataEntry);
+
+SvViewDataEntry::SvViewDataEntry()
+ : SvViewData()
+{
+ DBG_CTOR(SvViewDataEntry,0);
+ pItemData = 0;
+}
+
+SvViewDataEntry::~SvViewDataEntry()
+{
+ DBG_DTOR(SvViewDataEntry,0);
+ delete [] pItemData;
+}
+
+DBG_NAME(SvViewDataItem);
+
+SvViewDataItem::SvViewDataItem()
+{
+ DBG_CTOR(SvViewDataItem,0);
+}
+
+SvViewDataItem::~SvViewDataItem()
+{
+ DBG_DTOR(SvViewDataItem,0);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */