summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-03-08 11:42:22 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-03-08 11:42:22 +0100
commit895494f2323308df44f6546026f7ed5463b26631 (patch)
treecc233ad55e0e400b57708465bea95f282b63a51e /sw
parent6f20dd1815c633c371aa69ffd696e620b0bc8657 (diff)
Some more long -> WW8_CP (to avoid loplugin:loopvartoosmall)
Change-Id: Icdf00da8e627d5e3a671acd17af58734873f4bdb
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx10
-rw-r--r--sw/source/filter/ww8/ww8par.hxx2
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 7ab52cf733cb..e0c5fd60a36f 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -505,7 +505,7 @@ void SwWW8ImplReader::InsertTxbxStyAttrs( SfxItemSet& rS, sal_uInt16 nColl )
}
-static void lcl_StripFields(OUString &rString, long &rNewStartCp)
+static void lcl_StripFields(OUString &rString, WW8_CP &rNewStartCp)
{
sal_Int32 nStartPos = 0;
for (;;)
@@ -561,7 +561,7 @@ public:
// InsertAttrsAsDrawingAttrs() sets attributes between StartCp and EndCp.
// Style attributes are set as hard, paragraph and character attributes.
-void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
+void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP nStartCp, WW8_CP nEndCp,
ManTypes eType, bool bONLYnPicLocFc)
{
/*
@@ -735,7 +735,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
aIter->GetEndPos()-nStartCp));
OUString aString(m_pDrawEditEngine->GetText(aSel));
const sal_Int32 nOrigLen = aString.getLength();
- long nDummy(0);
+ WW8_CP nDummy(0);
lcl_StripFields(aString, nDummy);
sal_Int32 nChanged;
@@ -964,7 +964,7 @@ OutlinerParaObject* SwWW8ImplReader::ImportAsOutliner(OUString &rString, WW8_CP
m_pDrawEditEngine->SetParaAttribs(0, m_pDrawEditEngine->GetEmptyItemSet());
// Strip out fields, leaving the result
- long nDummy(0);
+ WW8_CP nDummy(0);
lcl_StripFields(rString, nDummy);
// Strip out word's special characters for the simple string
rString = rString.replaceAll("\x01", "");
@@ -1006,7 +1006,7 @@ void SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
const OUString aOrigString(aString);
if( bTextWasRead )
{
- long nNewStartCp = nStartCp;
+ WW8_CP nNewStartCp = nStartCp;
lcl_StripFields(aString, nNewStartCp);
if (aString.getLength()!=1)
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 748e5ae2fabe..0e35089a8eb7 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1557,7 +1557,7 @@ private:
SdrObject *ReadArc(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
SdrObject *ReadPolyLine(WW8_DPHEAD* pHd, SfxAllItemSet &rSet);
void InsertTxbxStyAttrs( SfxItemSet& rS, sal_uInt16 nColl );
- void InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp, ManTypes eType, bool bONLYnPicLocFc=false);
+ void InsertAttrsAsDrawingAttrs(WW8_CP nStartCp, WW8_CP nEndCp, ManTypes eType, bool bONLYnPicLocFc=false);
bool GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp, sal_uInt16 nTxBxS,
sal_uInt16 nSequence);