diff options
| author | Noel Grandin <noel@peralex.com> | 2012-06-21 16:11:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-06-25 20:13:15 +0200 |
| commit | 95515561b317f7ffed6f6576f7c19fa80e546a29 (patch) | |
| tree | bcc01f3150775269e3534dd092bd19675952cb41 /sw | |
| parent | Convert GetPageObjs and SetPageObjsNewPages from Svptrarr to std::vector (diff) | |
| download | core-95515561b317f7ffed6f6576f7c19fa80e546a29.tar.gz core-95515561b317f7ffed6f6576f7c19fa80e546a29.zip | |
Clean up usage of aChrSetArr std::vector, no point in not being type-safe
Change-Id: Ifdd8e209b708804ca99c67033bbe016726d6e004
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 261e7bfa38d1..92a4604f7d9b 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -891,7 +891,7 @@ void MSWord_SdrAttrIter::NextPara( sal_uInt16 nPar ) rtl_TextEncoding MSWord_SdrAttrIter::GetNextCharSet() const { if( !aChrSetArr.empty() ) - return (rtl_TextEncoding)aChrSetArr[ aChrSetArr.size() - 1 ]; + return aChrSetArr.back(); return eNdChrSet; } diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 39213626e991..4e32acd684b3 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -1375,7 +1375,7 @@ private: const SfxItemPool* pEditPool; std::vector<EECharAttrib> aTxtAtrArr; SvPtrarr aChrTxtAtrArr; - std::vector<sal_uInt16> aChrSetArr; + std::vector<rtl_TextEncoding> aChrSetArr; sal_uInt16 nPara; xub_StrLen nAktSwPos; xub_StrLen nTmpSwPos; // for HasItem() |