Make SvViewDataItem a struct, with only one public data member...

Change-Id: Ib6b710f87fcdfe465fb78a397100f82da11b3611

6 files changed, 16 insertions, 34 deletions

diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index 6624934427b0..0aa4177bbd30 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -146,7 +146,7 @@ public:
     const Size&         GetSize(const SvViewDataEntry* pData, sal_uInt16 nItemPos) const
                         {
                             const SvViewDataItem* pIData = pData->pItemData + nItemPos;
-                            return pIData->aSize;
+                            return pIData->maSize;
                         }
 
     virtual void        Paint( const Point& rPos, SvTreeListBox& rOutDev,
diff --git a/svtools/inc/svtools/viewdataentry.hxx b/svtools/inc/svtools/viewdataentry.hxx
index 87def0a0f11e..4e14bc50faab 100644
--- a/svtools/inc/svtools/viewdataentry.hxx
+++ b/svtools/inc/svtools/viewdataentry.hxx
@@ -31,7 +31,10 @@
 #define SVLISTENTRYFLAG_CURSORED        0x0008
 #define SVLISTENTRYFLAG_NOT_SELECTABLE  0x0010
 
-class SvViewDataItem;
+struct SvViewDataItem
+{
+    Size maSize;
+};
 
 class SVT_DLLPUBLIC SvViewData
 {
@@ -70,15 +73,6 @@ public:
     virtual         ~SvViewDataEntry();
 };
 
-class SvViewDataItem
-{
-public:
-    Size aSize;
-
-    SvViewDataItem();
-    ~SvViewDataItem();
-};
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 1545543bcbc7..138ae3b5bef2 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -245,7 +245,7 @@ void SvLBoxString::InitViewData(
     DBG_CHKTHIS(SvLBoxString,0);
     if( !pViewData )
         pViewData = pView->GetViewDataItem( pEntry, this );
-    pViewData->aSize = Size(pView->GetTextWidth(maText), pView->GetTextHeight());
+    pViewData->maSize = Size(pView->GetTextWidth(maText), pView->GetTextHeight());
 }
 
 // ***************************************************************
@@ -276,7 +276,7 @@ void SvLBoxBmp::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry,
     DBG_CHKTHIS(SvLBoxBmp,0);
     if( !pViewData )
         pViewData = pView->GetViewDataItem( pEntry, this );
-    pViewData->aSize = aBmp.GetSizePixel();
+    pViewData->maSize = aBmp.GetSizePixel();
 }
 
 void SvLBoxBmp::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /* nFlags */,
@@ -447,7 +447,7 @@ void SvLBoxButton::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry,
     ControlType eCtrlType = (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX;
     if ( eKind != SvLBoxButtonKind_staticImage && pView )
         ImplAdjustBoxSize( aSize, eCtrlType, pView );
-    pViewData->aSize = aSize;
+    pViewData->maSize = aSize;
 }
 
 bool SvLBoxButton::CheckModification() const
@@ -525,7 +525,7 @@ void SvLBoxContextBmp::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntr
     DBG_CHKTHIS(SvLBoxContextBmp,0);
     if( !pViewData )
         pViewData = pView->GetViewDataItem( pEntry, this );
-    pViewData->aSize = m_pImpl->m_aImage1.GetSizePixel();
+    pViewData->maSize = m_pImpl->m_aImage1.GetSizePixel();
 }
 
 void SvLBoxContextBmp::Paint( const Point& _rPos, SvTreeListBox& _rDev,
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 5f8a40b1a3f6..f7fe4d8f42bc 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -363,7 +363,7 @@ const Size& SvLBoxItem::GetSize(const SvTreeListBox* pView, const SvTreeListEntr
 {
     DBG_CHKTHIS(SvLBoxItem,0);
     const SvViewDataItem* pViewData = pView->GetViewDataItem( pEntry, this );
-    return pViewData->aSize;
+    return pViewData->maSize;
 }
 
 struct SvTreeListBoxImpl
diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx
index 544bb030cc7d..3b35c7578d1d 100644
--- a/svtools/source/contnr/viewdataentry.cxx
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -116,16 +116,4 @@ SvViewDataEntry::~SvViewDataEntry()
     delete [] pItemData;
 }
 
-DBG_NAME(SvViewDataItem);
-
-SvViewDataItem::SvViewDataItem()
-{
-    DBG_CTOR(SvViewDataItem,0);
-}
-
-SvViewDataItem::~SvViewDataItem()
-{
-    DBG_DTOR(SvViewDataItem,0);
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index cd9e13f8c812..8a409090f500 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -1673,18 +1673,18 @@ void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry
     if( !pViewData )
         pViewData = pView->GetViewDataItem( pEntry, this );
 
-    pViewData->aSize = maImage.GetSizePixel();
+    pViewData->maSize = maImage.GetSizePixel();
 
     const Size aTextSize(pView->GetTextWidth( maText ), pView->GetTextHeight());
-    if( pViewData->aSize.Width() )
+    if( pViewData->maSize.Width() )
     {
-        pViewData->aSize.Width() += 6 + aTextSize.Width();
-        if( pViewData->aSize.Height() < aTextSize.Height() )
-            pViewData->aSize.Height() = aTextSize.Height();
+        pViewData->maSize.Width() += 6 + aTextSize.Width();
+        if( pViewData->maSize.Height() < aTextSize.Height() )
+            pViewData->maSize.Height() = aTextSize.Height();
     }
     else
     {
-        pViewData->aSize = aTextSize;
+        pViewData->maSize = aTextSize;
     }
 }