diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2012-10-25 21:02:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-28 18:09:02 +0000 |
| commit | 9e716494a8f7a1ffbfd519ffc388df0226f4046f (patch) | |
| tree | 99e4fdb269c6d0ea2d8082b88fabc59713062b28 /sw | |
| parent | 1d1bab408421030cb260d67a519d478db87bdff5 (diff) | |
fix some VS 2010 specific issues
Change-Id: Iae27a96c1e2ed72d2744fcbe100d6ada7dc41c82
Reviewed-on: https://gerrit.libreoffice.org/914
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/doc.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/txtnode/thints.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/unocore/unoportenum.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 2cf0fe988d98..bfdfca27403c 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -1632,7 +1632,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting( // just one page is special ... if ( 1 == aVec.size() ) - aVec.insert( aVec.begin() + 1, 0 ); // insert a second empty page + aVec.insert( aVec.begin() + 1, (SwPageFrm *)0 ); // insert a second empty page else { // now extend the number of pages to fit a multiple of 4 diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 947ed83cc024..8d179e3a87b1 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -2122,7 +2122,7 @@ lcl_CollectHintSpans(const SwpHints& i_rHints, const sal_uInt16 nLength, { // insert dummy span covering the gap o_rSpanMap.insert(AttrSpanMap_t::value_type( - AttrSpan_t(nLastEnd, aSpan.first), 0)); + AttrSpan_t(nLastEnd, aSpan.first), (const SwTxtAttr *)0)); } nLastEnd = aSpan.second; @@ -2133,7 +2133,7 @@ lcl_CollectHintSpans(const SwpHints& i_rHints, const sal_uInt16 nLength, if (nLastEnd != nLength && nLength != 0) { o_rSpanMap.insert( - AttrSpanMap_t::value_type(AttrSpan_t(nLastEnd, nLength), 0)); + AttrSpanMap_t::value_type(AttrSpan_t(nLastEnd, nLength), (const SwTxtAttr *)0)); } } diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 86b60f639395..f3e9ac9deb67 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -1108,7 +1108,7 @@ lcl_CreatePortions( lcl_FillSoftPageBreakArray(*pUnoCrsr, SoftPageBreaks); PortionStack_t PortionStack; - PortionStack.push( PortionList_t(&i_rPortions, 0) ); + PortionStack.push( PortionList_t(&i_rPortions, (const SwTxtAttr *)0) ); bool bAtEnd( false ); while (!bAtEnd) // every iteration consumes at least current character! |