Kaydet (Commit) 5badba20 authored tarafından Jan Holesovsky's avatar Jan Holesovsky

A bit of cleanup.

Change-Id: Ia7c5cf07dba7f65ee65dab67a0a32975c8026dce
üst 5f363ce8
......@@ -96,7 +96,7 @@ public:
sal_uInt16 nCol=HEADERBAR_APPEND,
HeaderBarItemBits nBits = HIB_STDSTYLE);
void SetTabs( long* pTabs, MapUnit = MAP_APPFONT );
void SetTabs(const long* pTabs, MapUnit = MAP_APPFONT);
void ClearHeader();
......
......@@ -65,7 +65,7 @@ protected:
public:
SvTabListBox( vcl::Window* pParent, WinBits = WB_BORDER );
virtual ~SvTabListBox();
void SetTabs( long* pTabs, MapUnit = MAP_APPFONT );
void SetTabs(const long* pTabs, MapUnit = MAP_APPFONT);
sal_uInt16 TabCount() const { return (sal_uInt16)nTabCount; }
using SvTreeListBox::GetTab;
long GetTab( sal_uInt16 nTab ) const;
......
......@@ -42,9 +42,7 @@
#define FLT_DATE_BETWEEN 4
#define FLT_DATE_SAVE 5
// Struct for sorting data
/// Struct for sorting data.
class SVX_DLLPUBLIC RedlinData
{
public:
......@@ -55,6 +53,7 @@ public:
void* pData;
};
/// Entries for list.
class SvxRedlinEntry : public SvTreeListEntry
{
public:
......@@ -62,7 +61,7 @@ public:
virtual ~SvxRedlinEntry();
};
// Class for the representation of Strings depending on the font
/// Class for the representation of Strings depending on the font.
class SvLBoxColorString : public SvLBoxString
{
private:
......@@ -75,6 +74,10 @@ public:
SvLBoxColorString();
virtual ~SvLBoxColorString();
/** Paint function of the SvLBoxColorString class.
The relevant text with the selected color is drawn in the output device.
*/
virtual void Paint(
const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE;
......@@ -109,8 +112,6 @@ protected:
virtual sal_Int32 ColCompare(SvTreeListEntry*,SvTreeListEntry*) SAL_OVERRIDE;
virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE;
public:
SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits = WB_BORDER);
......@@ -165,9 +166,7 @@ public:
const Link& GetColCompareHdl() const { return aColCompareLink; }
};
// Filter- Tabpage
/// Tabpage with the filter text entries etc.
class SVX_DLLPUBLIC SvxTPFilter: public TabPage
{
private:
......@@ -208,7 +207,6 @@ private:
DECL_LINK( ModifyDate, void* );
DECL_LINK( RefHandle, PushButton* );
protected:
void ShowDateFields(sal_uInt16 nKind);
......@@ -232,7 +230,7 @@ public:
void SetLastTime(const tools::Time &aTime);
void SetDateMode(sal_uInt16 nMode);
sal_uInt16 GetDateMode();
sal_uInt16 GetDateMode();
void ClearAuthors();
void InsertAuthor( const OUString& rString, sal_Int32 nPos = LISTBOX_APPEND );
......@@ -242,7 +240,6 @@ public:
void SetComment(const OUString& rComment);
OUString GetComment()const;
// Methods for Calc {
void SetRange(const OUString& rString);
OUString GetRange() const;
......@@ -293,15 +290,10 @@ public:
void Enable( bool bEnable = true, bool bChild = true );
void Disable( bool bChild = true );
// } Methods for Calc
};
// View- Tabpage
/// Tabpage with the redlining entries.
class SVX_DLLPUBLIC SvxTPView: public TabPage
{
private:
......@@ -399,7 +391,6 @@ public:
SvxRedlinTable* GetViewTable();
};
#endif // INCLUDED_SVX_CTREDLIN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -168,7 +168,7 @@ void SvSimpleTable::SetTabs()
}
}
void SvSimpleTable::SetTabs( long* pTabs, MapUnit eMapUnit)
void SvSimpleTable::SetTabs(const long* pTabs, MapUnit eMapUnit)
{
SvHeaderTabListBox::SetTabs(pTabs,eMapUnit);
}
......
......@@ -118,7 +118,7 @@ SvTabListBox::~SvTabListBox()
#endif
}
void SvTabListBox::SetTabs( long* pTabs, MapUnit eMapUnit )
void SvTabListBox::SetTabs(const long* pTabs, MapUnit eMapUnit)
{
DBG_ASSERT(pTabs,"SetTabs:NULL-Ptr");
if( !pTabs )
......
......@@ -33,33 +33,19 @@
#include <svx/ctredlin.hxx>
#include "helpid.hrc"
// Local Defines and Function
static long nStaticTabs[]=
{
5,10,65,120,170,220
};
#define WRITER_DATE 2
#define CALC_DATE 3
RedlinData::RedlinData()
:
aDateTime( DateTime::EMPTY )
RedlinData::RedlinData() : aDateTime(DateTime::EMPTY)
{
bDisabled=false;
pData=NULL;
}
RedlinData::~RedlinData()
{
}
// class SvxRedlinEntry (Entries for list)
SvxRedlinEntry::SvxRedlinEntry()
: SvTreeListEntry()
{
......@@ -71,9 +57,6 @@ SvxRedlinEntry::~SvxRedlinEntry()
delete pRedDat;
}
// Functions in the inserts Items of SvxRedlinTable
SvLBoxColorString::SvLBoxColorString(SvTreeListEntry*pEntry, sal_uInt16 nFlags, const OUString& rStr,
const Color& rCol)
: SvLBoxString(pEntry, nFlags, rStr)
......@@ -99,12 +82,6 @@ SvLBoxItem* SvLBoxColorString::Create() const
void SvLBoxColorString::Paint(
const Point& rPos, SvTreeListBox& rDev,
const SvViewDataEntry* pView, const SvTreeListEntry* pEntry)
/* [Description]
Paint function of the SvLBoxColorString class. The relevant text with the
selected color is drawn in the output device.
*/
{
Color aColor=rDev.GetTextColor();
Color a2Color=aColor;
......@@ -192,7 +169,6 @@ void SvxRedlinTable::SetCalcView(bool bFlag)
}
}
void SvxRedlinTable::UpdateFilterTest()
{
Date aDateMax( Date::SYSTEM );
......@@ -202,7 +178,6 @@ void SvxRedlinTable::UpdateFilterTest()
tools::Time aTMin(0);
tools::Time aTMax(23,59,59);
DateTime aDTMin(aDateMin);
DateTime aDTMax(aDateMax);
......@@ -236,7 +211,6 @@ void SvxRedlinTable::UpdateFilterTest()
}
}
void SvxRedlinTable::SetFilterDate(bool bFlag)
{
bDate=bFlag;
......@@ -414,7 +388,8 @@ SvxTPView::SvxTPView(vcl::Window *pParent, VclBuilderContainer *pTopLevel)
m_pRejectAll->SetClickHdl(aLink);
m_pUndo->SetClickHdl(aLink);
m_pViewData->SetTabs(nStaticTabs);
const long pTabs[] = { 5, 10, 65, 120, 170, 220 };
m_pViewData->SetTabs(pTabs);
}
void SvxTPView::ActivatePage()
......@@ -1102,8 +1077,6 @@ void SvxAcceptChgCtr::ShowViewPage()
SetCurPageId(m_nViewPageId);
}
SvxRedlinTable* SvxAcceptChgCtr::GetViewTable()
{
return pTPView ? pTPView->GetTableControl() : NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment