Kaydet (Commit) c1be3dab authored tarafından Maciej Rumianowski's avatar Maciej Rumianowski Kaydeden (comit) Eike Rathke

Replace SvULongs with vector and code clean up

Instead of SvULongs use std::vector<sal_uInt32>
replace sal_Bool with bool where variable is not interfering with return value
üst 7ec55399
...@@ -782,7 +782,7 @@ sal_Bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) ...@@ -782,7 +782,7 @@ sal_Bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
// -------------------------------------------------------------- // --------------------------------------------------------------
// List of changed user defined formats: // List of changed user defined formats:
// ------------------------------------- // -------------------------------------
const sal_uInt32 nDelCount = pNumFmtShell->GetUpdateDataCount(); const size_t nDelCount = pNumFmtShell->GetUpdateDataCount();
if ( nDelCount > 0 ) if ( nDelCount > 0 )
{ {
......
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
#include <svl/svstdarr.hxx> #include <svl/svstdarr.hxx>
#include <vector>
// forward --------------------------------------------------------------- // forward ---------------------------------------------------------------
class Color; class Color;
...@@ -183,7 +185,7 @@ public: ...@@ -183,7 +185,7 @@ public:
sal_Bool FindEntry( const String& rFmtString, sal_uInt32* pAt = NULL ); sal_Bool FindEntry( const String& rFmtString, sal_uInt32* pAt = NULL );
void ValidateNewEntries( sal_Bool bValidate = sal_True ) { bUndoAddList = !bValidate; } void ValidateNewEntries( sal_Bool bValidate = sal_True ) { bUndoAddList = !bValidate; }
sal_uInt32 GetUpdateDataCount() const; size_t GetUpdateDataCount() const;
void GetUpdateData( sal_uInt32* pDelArray, const sal_uInt32 nSize ); void GetUpdateData( sal_uInt32* pDelArray, const sal_uInt32 nSize );
void SetCurNumFmtKey( sal_uInt32 nNew ) { nCurFormatKey = nNew; } void SetCurNumFmtKey( sal_uInt32 nNew ) { nCurFormatKey = nNew; }
...@@ -228,9 +230,9 @@ private: ...@@ -228,9 +230,9 @@ private:
String aValStr; String aValStr;
double nValNum; double nValNum;
sal_Bool bUndoAddList; sal_Bool bUndoAddList;
SvULongs aAddList; std::vector<sal_uInt32> aAddList;
SvULongs aDelList; std::vector<sal_uInt32> aDelList;
SvULongs aCurEntryList; std::vector<sal_uInt32> aCurEntryList;
sal_uInt32 nInitFormatKey; sal_uInt32 nInitFormatKey;
sal_uInt32 nCurFormatKey; sal_uInt32 nCurFormatKey;
short nCurCategory; short nCurCategory;
......
This diff is collapsed.
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