diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-18 13:38:01 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-18 14:17:29 +0100 |
| commit | bcfc9fc3bb3ebc8c6c88349e1c0c530208949e70 (patch) | |
| tree | 8ee7ef5dc17e3f6ddaf3634f635b424b2ce87227 | |
| parent | 15a2cdb68eb1e6696cf5b33d2a05a325216e0b85 (diff) | |
WaE: make sw msvc2008 warnings free
Change-Id: I348a59b3c1b060a084680328aa07089b3c7ccc66
| -rw-r--r-- | sw/source/core/doc/doctxm.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/dialog/wordcountdialog.cxx | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 8244b2dfa21c..426ecf83d3a9 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -986,7 +986,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr, // Generate: Evaluate Form and insert the place holder for the // page number. If it is a TOX_INDEX and the SwForm IsCommaSeparated() // then a range of entries must be generated into one paragraph - sal_uInt16 nRange = 1; + size_t nRange = 1; if(TOX_INDEX == SwTOXBase::GetType() && GetTOXForm().IsCommaSeparated() && aSortArr[nCnt]->GetType() == TOX_SORT_INDEX) @@ -1878,7 +1878,7 @@ void SwTOXBaseSection::UpdatePageNum() GetOptions() : 0, GetSortAlgorithm() ); - for( sal_uInt16 nCnt = 0; nCnt < aSortArr.size(); ++nCnt ) + for( size_t nCnt = 0; nCnt < aSortArr.size(); ++nCnt ) { // Loop over all SourceNodes std::vector<sal_uInt16> aNums; // the PageNumber diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index f5b1c3b98824..967733d628f0 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -104,7 +104,13 @@ SwWordCountFloatDlg::SwWordCountFloatDlg(SfxBindings* _pBindings, Window *pParent, SfxChildWinInfo* pInfo) : SfxModelessDialog(_pBindings, pChild, pParent, SW_RES(DLG_WORDCOUNT)), +#if defined _MSC_VER +#pragma warning (disable : 4355) +#endif aDlg(this) +#if defined _MSC_VER +#pragma warning (default : 4355) +#endif { FreeResource(); Initialize(pInfo); |