Kaydet (Commit) ef59f096 authored tarafından Miklos Vajna's avatar Miklos Vajna

svx: prefix members of SvdProgressInfo

Change-Id: I23fa86080c001d3a78c3b7d7c49274f01444d9be
üst 37b465b3
......@@ -130,17 +130,17 @@ sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRange
class SVX_DLLPUBLIC SvdProgressInfo
{
private:
sal_uIntPtr nSumActionCount; // Sum of all Actions
sal_uIntPtr nSumCurAction; // Sum of all handled Actions
sal_uIntPtr m_nSumActionCount; // Sum of all Actions
sal_uIntPtr m_nSumCurAction; // Sum of all handled Actions
sal_uIntPtr nActionCount; // Count of Actions in the current object
sal_uIntPtr nCurAction; // Count of handled Actions in the current object
sal_uIntPtr m_nActionCount; // Count of Actions in the current object
sal_uIntPtr m_nCurAction; // Count of handled Actions in the current object
sal_uIntPtr nInsertCount; // Count of to-be-inserted Actions in the current object
sal_uIntPtr nCurInsert; // Count of already inserted Actions
sal_uIntPtr m_nInsertCount; // Count of to-be-inserted Actions in the current object
sal_uIntPtr m_nCurInsert; // Count of already inserted Actions
sal_uIntPtr nObjCount; // Count of selected objects
sal_uIntPtr nCurObj; // Current object
sal_uIntPtr m_nObjCount; // Count of selected objects
sal_uIntPtr m_nCurObj; // Current object
Link<void*,bool> maLink;
......@@ -157,15 +157,15 @@ public:
bool ReportActions( sal_uIntPtr nActionCount );
void ReportInserts( sal_uIntPtr nInsertCount );
sal_uIntPtr GetSumCurAction() const { return nSumCurAction; };
sal_uIntPtr GetObjCount() const { return nObjCount; };
sal_uIntPtr GetCurObj() const { return nCurObj; };
sal_uIntPtr GetSumCurAction() const { return m_nSumCurAction; };
sal_uIntPtr GetObjCount() const { return m_nObjCount; };
sal_uIntPtr GetCurObj() const { return m_nCurObj; };
sal_uIntPtr GetActionCount() const { return nActionCount; };
sal_uIntPtr GetCurAction() const { return nCurAction; };
sal_uIntPtr GetActionCount() const { return m_nActionCount; };
sal_uIntPtr GetCurAction() const { return m_nCurAction; };
sal_uIntPtr GetInsertCount() const { return nInsertCount; };
sal_uIntPtr GetCurInsert() const { return nCurInsert; };
sal_uIntPtr GetInsertCount() const { return m_nInsertCount; };
sal_uIntPtr GetCurInsert() const { return m_nCurInsert; };
void ReportRescales( sal_uIntPtr nRescaleCount );
};
......
......@@ -554,68 +554,68 @@ sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRange
SvdProgressInfo::SvdProgressInfo( const Link<void*,bool>&_rLink )
{
maLink = _rLink;
nSumActionCount = 0;
nSumCurAction = 0;
m_nSumActionCount = 0;
m_nSumCurAction = 0;
nObjCount = 0;
nCurObj = 0;
m_nObjCount = 0;
m_nCurObj = 0;
nActionCount = 0;
nCurAction = 0;
m_nActionCount = 0;
m_nCurAction = 0;
nInsertCount = 0;
nCurInsert = 0;
m_nInsertCount = 0;
m_nCurInsert = 0;
}
void SvdProgressInfo::Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount )
{
nSumActionCount = _nSumActionCount;
nObjCount = _nObjCount;
m_nSumActionCount = _nSumActionCount;
m_nObjCount = _nObjCount;
}
bool SvdProgressInfo::ReportActions( sal_uIntPtr nAnzActions )
{
nSumCurAction += nAnzActions;
nCurAction += nAnzActions;
if(nCurAction > nActionCount)
nCurAction = nActionCount;
m_nSumCurAction += nAnzActions;
m_nCurAction += nAnzActions;
if(m_nCurAction > m_nActionCount)
m_nCurAction = m_nActionCount;
return maLink.Call(nullptr);
}
void SvdProgressInfo::ReportInserts( sal_uIntPtr nAnzInserts )
{
nSumCurAction += nAnzInserts;
nCurInsert += nAnzInserts;
m_nSumCurAction += nAnzInserts;
m_nCurInsert += nAnzInserts;
maLink.Call(nullptr);
}
void SvdProgressInfo::ReportRescales( sal_uIntPtr nAnzRescales )
{
nSumCurAction += nAnzRescales;
m_nSumCurAction += nAnzRescales;
maLink.Call(nullptr);
}
void SvdProgressInfo::SetActionCount( sal_uIntPtr _nActionCount )
{
nActionCount = _nActionCount;
m_nActionCount = _nActionCount;
}
void SvdProgressInfo::SetInsertCount( sal_uIntPtr _nInsertCount )
{
nInsertCount = _nInsertCount;
m_nInsertCount = _nInsertCount;
}
void SvdProgressInfo::SetNextObject()
{
nActionCount = 0;
nCurAction = 0;
m_nActionCount = 0;
m_nCurAction = 0;
nInsertCount = 0;
nCurInsert = 0;
m_nInsertCount = 0;
m_nCurInsert = 0;
nCurObj++;
m_nCurObj++;
ReportActions(0);
}
......
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