diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-07 16:52:06 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-08 12:02:36 +0000 |
| commit | e73b23562911c15e9996eea70d3aff4983a2018c (patch) | |
| tree | 2982c0dfc0d121d9be5192acca84eb49289e4670 /sw/source/filter/ww8/ww8atr.cxx | |
| parent | STATE_CHANGE_FORMAT is an unused state now (diff) | |
| download | core-e73b23562911c15e9996eea70d3aff4983a2018c.tar.gz core-e73b23562911c15e9996eea70d3aff4983a2018c.zip | |
tidy up WW8FormulaControl, with knock on results elsewhere
Diffstat (limited to 'sw/source/filter/ww8/ww8atr.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 79deb333a8fc..c8f005b43ad4 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -857,7 +857,7 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF pOutFmtNode = pOldMod; } -bool MSWordExportBase::HasRefToObject( sal_uInt16 nTyp, const String* pName, sal_uInt16 nSeqNo ) +bool MSWordExportBase::HasRefToObject( sal_uInt16 nTyp, const rtl::OUString* pName, sal_uInt16 nSeqNo ) { const SwTxtNode* pNd; @@ -893,7 +893,7 @@ bool MSWordExportBase::HasRefToObject( sal_uInt16 nTyp, const String* pName, sal return false; } -String MSWordExportBase::GetBookmarkName( sal_uInt16 nTyp, const String* pName, sal_uInt16 nSeqNo ) +String MSWordExportBase::GetBookmarkName( sal_uInt16 nTyp, const rtl::OUString* pName, sal_uInt16 nSeqNo ) { String sRet; switch ( nTyp ) @@ -2911,7 +2911,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField ) font size and fill in the defaults as up == half the font size and down == a fifth the font size */ - xub_StrLen nAbove = (pFld->GetPar1().Len()+1)/2; + xub_StrLen nAbove = (pFld->GetPar1().getLength()+1)/2; sStr = FieldString(ww::eEQ); sStr.APPEND_CONST_ASC("\\o (\\s\\up "); sStr += String::CreateFromInt32(nHeight/2); @@ -2922,7 +2922,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField ) sStr += String::CreateFromInt32(nHeight/5); sStr.Append('('); - sStr += String(pFld->GetPar1(),nAbove,pFld->GetPar1().Len()-nAbove); + sStr += String(pFld->GetPar1(),nAbove,pFld->GetPar1().getLength()-nAbove); sStr.APPEND_CONST_ASC("))"); GetExport().OutputField(pFld, ww::eEQ, sStr); } |