[Libreoffice-commits] .: sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 6 03:43:09 PST 2012
sw/source/filter/ww8/docxattributeoutput.cxx | 14 ++--
sw/source/filter/ww8/rtfexport.cxx | 3
sw/source/filter/ww8/writerwordglue.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 4 -
sw/source/filter/ww8/wrtw8nds.cxx | 28 ++++----
sw/source/filter/ww8/wrtww8gr.cxx | 4 -
sw/source/filter/ww8/ww8atr.cxx | 92 +++++++++++++--------------
sw/source/filter/ww8/ww8par5.cxx | 8 +-
sw/source/filter/ww8/ww8scan.cxx | 2
sw/source/filter/ww8/ww8scan.hxx | 7 --
10 files changed, 78 insertions(+), 86 deletions(-)
New commits:
commit 4839c0ab201fd4dd7b32a5d6c9f6e202a88ad09d
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Thu Dec 6 12:41:46 2012 +0100
sw: kill RTL_CONSTASCII_STRINGPARAM and friends in ww8 filters
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index b4dbee9..8414e60 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -847,9 +847,9 @@ void DocxAttributeOutput::EndField_Impl( FieldInfos& rInfos )
m_pSerializer->endElementNS( XML_w, XML_r );
rInfos.sCmd = FieldString( ww::eREF );
- rInfos.sCmd.APPEND_CONST_ASC( "\"" );
+ rInfos.sCmd.AppendAscii( "\"" );
rInfos.sCmd += m_sFieldBkm;
- rInfos.sCmd.APPEND_CONST_ASC( "\" " );
+ rInfos.sCmd.AppendAscii( "\" " );
// Clean the field bookmark data to avoid infinite loop
m_sFieldBkm = String( );
@@ -1166,16 +1166,16 @@ bool DocxAttributeOutput::AnalyzeURL( const String& rUrl, const String& rTarget,
else
{
String sFld( FieldString( ww::eHYPERLINK ) );
- sFld.APPEND_CONST_ASC( "\"" );
+ sFld.AppendAscii( "\"" );
sURL.Insert( sFld, 0 );
sURL += '\"';
}
if ( sMark.Len() )
- ( ( sURL.APPEND_CONST_ASC( " \\l \"" ) ) += sMark ) += '\"';
+ ( ( sURL.AppendAscii( " \\l \"" ) ) += sMark ) += '\"';
if ( rTarget.Len() )
- ( sURL.APPEND_CONST_ASC( " \\n " ) ) += rTarget;
+ ( sURL.AppendAscii( " \\n " ) ) += rTarget;
}
*pLinkURL = sURL;
@@ -3545,9 +3545,9 @@ void DocxAttributeOutput::RefField( const SwField& rFld, const String& rRef )
if ( nType == RES_GETEXPFLD )
{
String sCmd = FieldString( ww::eREF );
- sCmd.APPEND_CONST_ASC( "\"" );
+ sCmd.AppendAscii( "\"" );
sCmd += rRef;
- sCmd.APPEND_CONST_ASC( "\" " );
+ sCmd.AppendAscii( "\" " );
m_rExport.OutputField( &rFld, ww::eREF, sCmd );
}
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 8259d59..0d874d8 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -245,8 +245,7 @@ void RtfExport::WriteRevTab()
return;
// RTF always seems to use Unknown as the default first entry
- String sUnknown(RTL_CONSTASCII_USTRINGPARAM("Unknown"));
- GetRedline(sUnknown);
+ GetRedline(OUString("Unknown"));
for( sal_uInt16 i = 0; i < pDoc->GetRedlineTbl().size(); ++i )
{
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index 9a843dd..3ae8a1c 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -46,7 +46,7 @@
#include <breakit.hxx> //pBreakIt
#include <i18npool/mslangid.hxx>
-#define ASSIGN_CONST_ASC(s) AssignAscii(RTL_CONSTASCII_STRINGPARAM(s))
+#define ASSIGN_CONST_ASC(s) AssignAscii(s)
namespace myImplHelpers
{
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 6262238..719d8e6 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2844,9 +2844,9 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrObject *pOb
Set_UInt32(pData,nObjId );
String sFld(FieldString(ww::eCONTROL));
- sFld.APPEND_CONST_ASC("Forms.");
+ sFld.AppendAscii("Forms.");
sFld += sName;
- sFld.APPEND_CONST_ASC(".1 \\s ");
+ sFld.AppendAscii(".1 \\s ");
rWW8Wrt.OutputField(0, ww::eCONTROL, sFld,
WRITEFIELD_START|WRITEFIELD_CMD_START|WRITEFIELD_CMD_END);
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 9320e70..aabd3f3 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -627,7 +627,7 @@ const SfxPoolItem& SwWW8AttrIter::GetItem(sal_uInt16 nWhich) const
void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, xub_StrLen /*nPos*/, const SwFmtRuby& rRuby )
{
String aStr( FieldString( ww::eEQ ) );
- aStr.APPEND_CONST_ASC( "\\* jc" );
+ aStr.AppendAscii( "\\* jc" );
sal_Int32 nJC = 0;
sal_Char cDirective = 0;
switch ( rRuby.GetAdjustment() )
@@ -701,17 +701,17 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, xub_StrLen /*nPos*/,
}
nHeight = (nHeight + 5)/10;
- aStr.APPEND_CONST_ASC( " \\* \"Font:" );
+ aStr.AppendAscii( " \\* \"Font:" );
aStr.Append( sFamilyName );
- aStr.APPEND_CONST_ASC( "\" \\* hps" );
+ aStr.AppendAscii( "\" \\* hps" );
aStr += String::CreateFromInt32( nHeight );
- aStr.APPEND_CONST_ASC( " \\o" );
+ aStr.AppendAscii( " \\o" );
if ( cDirective )
{
- aStr.APPEND_CONST_ASC( "\\a" );
+ aStr.AppendAscii( "\\a" );
aStr.Append( cDirective );
}
- aStr.APPEND_CONST_ASC( "(\\s\\up " );
+ aStr.AppendAscii( "(\\s\\up " );
if ( pBreakIt->GetBreakIter().is() )
@@ -728,13 +728,13 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, xub_StrLen /*nPos*/,
aStr += String::CreateFromInt32(nHeight);
aStr += '(';
aStr += rRuby.GetText();
- aStr.APPEND_CONST_ASC( ")" );
+ aStr.AppendAscii( ")" );
// The parameter separator depends on the FIB.lid
if ( m_rWW8Export.pFib->getNumDecimalSep() == '.' )
- aStr.APPEND_CONST_ASC( "," );
+ aStr.AppendAscii( "," );
else
- aStr.APPEND_CONST_ASC( ";" );
+ aStr.AppendAscii( ";" );
m_rWW8Export.OutputField( 0, ww::eEQ, aStr,
WRITEFIELD_START | WRITEFIELD_CMD_START );
@@ -820,16 +820,16 @@ bool WW8AttributeOutput::AnalyzeURL( const String& rUrl, const String& rTarget,
else
{
String sFld( FieldString( ww::eHYPERLINK ) );
- sFld.APPEND_CONST_ASC( "\"" );
+ sFld.AppendAscii( "\"" );
sURL.Insert( sFld, 0 );
sURL += '\"';
}
if ( sMark.Len() )
- ( ( sURL.APPEND_CONST_ASC( " \\l \"" ) ) += sMark ) += '\"';
+ ( ( sURL.AppendAscii( " \\l \"" ) ) += sMark ) += '\"';
if ( rTarget.Len() )
- ( sURL.APPEND_CONST_ASC( " \\n " ) ) += rTarget;
+ ( sURL.AppendAscii( " \\n " ) ) += rTarget;
*pLinkURL = sURL;
*pMark = sMark;
@@ -1097,7 +1097,7 @@ void AttributeOutputBase::TOXMark( const SwTxtNode& rNode, const SwTOXMark& rAtt
break;
case TOX_USER:
- ( sTxt.APPEND_CONST_ASC( "\" \\f \"" ) )
+ ( sTxt.AppendAscii( "\" \\f \"" ) )
+= (sal_Char)( 'A' + GetExport( ).GetId( *rAttr.GetTOXType() ) );
// fall through - no break;
case TOX_CONTENT:
@@ -1108,7 +1108,7 @@ void AttributeOutputBase::TOXMark( const SwTxtNode& rNode, const SwTOXMark& rAtt
if (nLvl > WW8ListManager::nMaxLevel)
nLvl = WW8ListManager::nMaxLevel;
- ((sTxt.APPEND_CONST_ASC( "\" \\l " ))
+ ((sTxt.AppendAscii( "\" \\l " ))
+= String::CreateFromInt32( nLvl )) += ' ';
}
break;
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 41ff61f..778f2f6 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -393,7 +393,7 @@ void WW8Export::OutGrf(const sw::Frame &rFrame)
if ( pGrfNd && pGrfNd->IsLinkedFile() )
{
String sStr( FieldString(ww::eINCLUDEPICTURE) );
- sStr.APPEND_CONST_ASC(" \"");
+ sStr.AppendAscii(" \"");
{
if ( pGrfNd )
{
@@ -402,7 +402,7 @@ void WW8Export::OutGrf(const sw::Frame &rFrame)
sStr += aFileURL;
}
}
- sStr.APPEND_CONST_ASC("\" \\d");
+ sStr.AppendAscii("\" \\d");
OutputField( 0, ww::eINCLUDEPICTURE, sStr,
WRITEFIELD_START | WRITEFIELD_CMD_START | WRITEFIELD_CMD_END );
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 4825310..b45ee1a 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -884,7 +884,7 @@ String MSWordExportBase::GetBookmarkName( sal_uInt16 nTyp, const rtl::OUString*
case REF_SETREFATTR:
if ( pName )
{
- sRet.APPEND_CONST_ASC( "Ref_" );
+ sRet.AppendAscii( "Ref_" );
sRet += *pName;
}
break;
@@ -897,11 +897,11 @@ String MSWordExportBase::GetBookmarkName( sal_uInt16 nTyp, const rtl::OUString*
case REF_OUTLINE:
break; // ???
case REF_FOOTNOTE:
- sRet.APPEND_CONST_ASC( "_RefF" );
+ sRet.AppendAscii( "_RefF" );
sRet += String::CreateFromInt32( nSeqNo );
break;
case REF_ENDNOTE:
- sRet.APPEND_CONST_ASC( "_RefE" );
+ sRet.AppendAscii( "_RefE" );
sRet += String::CreateFromInt32( nSeqNo );
break;
}
@@ -1907,9 +1907,9 @@ void WW8Export::OutputField( const SwField* pFld, ww::eField eFldType,
void WW8Export::StartCommentOutput(const String& rName)
{
String sStr(FieldString(ww::eQUOTE));
- sStr.APPEND_CONST_ASC("[");
+ sStr.AppendAscii("[");
sStr += rName;
- sStr.APPEND_CONST_ASC("] ");
+ sStr.AppendAscii("] ");
OutputField(0, ww::eQUOTE, sStr, WRITEFIELD_START | WRITEFIELD_CMD_START);
}
@@ -1917,7 +1917,7 @@ void WW8Export::EndCommentOutput(const String& rName)
{
String sStr(rtl::OUString(" ["));
sStr += rName;
- sStr.APPEND_CONST_ASC("] ");
+ sStr.AppendAscii("] ");
OutputField(0, ww::eQUOTE, sStr, WRITEFIELD_CMD_END | WRITEFIELD_END |
WRITEFIELD_CLOSE);
}
@@ -2036,10 +2036,10 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
sStr = FieldString(eCode);
if (pTOX->GetTOXForm().IsCommaSeparated())
- sStr.APPEND_CONST_ASC("\\r ");
+ sStr.AppendAscii("\\r ");
if (nsSwTOIOptions::TOI_ALPHA_DELIMITTER & pTOX->GetOptions())
- sStr.APPEND_CONST_ASC("\\h \"A\" ");
+ sStr.AppendAscii("\\h \"A\" ");
{
String aFillTxt;
@@ -2055,7 +2055,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
else
aFillTxt.Erase();
}
- sStr.APPEND_CONST_ASC("\\e \"");
+ sStr.AppendAscii("\\e \"");
sStr += aFillTxt;
sStr.AppendAscii(sEntryEnd);
}
@@ -2068,17 +2068,17 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
{
sStr = FieldString(eCode);
- sStr.APPEND_CONST_ASC("\\c \"");
+ sStr.AppendAscii("\\c \"");
sStr += pTOX->GetSequenceName();
sStr.AppendAscii(sEntryEnd);
String aTxt;
int nRet = ::lcl_CheckForm( pTOX->GetTOXForm(), 1, aTxt );
if (1 == nRet)
- sStr.APPEND_CONST_ASC("\\n ");
+ sStr.AppendAscii("\\n ");
else if( 3 == nRet || 4 == nRet )
{
- sStr.APPEND_CONST_ASC("\\p \"");
+ sStr.AppendAscii("\\p \"");
sStr += aTxt;
sStr.AppendAscii(sEntryEnd);
}
@@ -2096,7 +2096,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
if( nsSwTOXElement::TOX_MARK & pTOX->GetCreateType() )
{
- sStr.APPEND_CONST_ASC( "\\f " );
+ sStr.AppendAscii( "\\f " );
if( TOX_USER == pTOX->GetType() )
{
@@ -2115,7 +2115,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
if (nTmpLvl > WW8ListManager::nMaxLevel)
nTmpLvl = WW8ListManager::nMaxLevel;
- sStr.APPEND_CONST_ASC( "\\o \"1-" );
+ sStr.AppendAscii( "\\o \"1-" );
sStr += String::CreateFromInt32( nTmpLvl );
sStr.AppendAscii(sEntryEnd);
@@ -2173,7 +2173,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
if (nMaxMSAutoEvaluate > WW8ListManager::nMaxLevel)
nMaxMSAutoEvaluate = WW8ListManager::nMaxLevel;
- sStr.APPEND_CONST_ASC( "\\o \"1-" );
+ sStr.AppendAscii( "\\o \"1-" );
sStr += String::CreateFromInt32( nMaxMSAutoEvaluate );
sStr.AppendAscii(sEntryEnd);
}
@@ -2264,7 +2264,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
{
if (WW8ListManager::nMaxLevel < nNoPgEnd)
nNoPgEnd = WW8ListManager::nMaxLevel;
- sStr.APPEND_CONST_ASC( "\\n " );
+ sStr.AppendAscii( "\\n " );
sStr += String::CreateFromInt32( nNoPgStt );
sStr += '-';
sStr += String::CreateFromInt32( nNoPgEnd );
@@ -2272,7 +2272,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
}
if( bOnlyText )
{
- sStr.APPEND_CONST_ASC( "\\p \"" );
+ sStr.AppendAscii( "\\p \"" );
sStr += aFillTxt;
sStr.AppendAscii(sEntryEnd);
}
@@ -2280,13 +2280,13 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
if( sTOption.Len() )
{
- sStr.APPEND_CONST_ASC( "\\t \"" );
+ sStr.AppendAscii( "\\t \"" );
sStr += sTOption;
sStr.AppendAscii(sEntryEnd);
}
if (lcl_IsHyperlinked(pTOX->GetTOXForm(), nTOXLvl))
- sStr.APPEND_CONST_ASC("\\h");
+ sStr.AppendAscii("\\h");
}
break;
}
@@ -2334,9 +2334,9 @@ bool MSWordExportBase::GetNumberFmt(const SwField& rFld, String& rStr)
{
sw::ms::SwapQuotesInField(sFmt);
- rStr.APPEND_CONST_ASC( "\\@\"" );
+ rStr.AppendAscii( "\\@\"" );
rStr += sFmt;
- rStr.APPEND_CONST_ASC( "\" " );
+ rStr.AppendAscii( "\" " );
bHasFmt = true;
}
}
@@ -2349,23 +2349,23 @@ void AttributeOutputBase::GetNumberPara( String& rStr, const SwField& rFld )
{
case SVX_NUM_CHARS_UPPER_LETTER:
case SVX_NUM_CHARS_UPPER_LETTER_N:
- rStr.APPEND_CONST_ASC( "\\*ALPHABETIC ");
+ rStr.AppendAscii( "\\*ALPHABETIC ");
break;
case SVX_NUM_CHARS_LOWER_LETTER:
case SVX_NUM_CHARS_LOWER_LETTER_N:
- rStr.APPEND_CONST_ASC("\\*alphabetic ");
+ rStr.AppendAscii("\\*alphabetic ");
break;
case SVX_NUM_ROMAN_UPPER:
- rStr.APPEND_CONST_ASC("\\*ROMAN ");
+ rStr.AppendAscii("\\*ROMAN ");
break;
case SVX_NUM_ROMAN_LOWER:
- rStr.APPEND_CONST_ASC("\\*roman ");
+ rStr.AppendAscii("\\*roman ");
break;
default:
OSL_ENSURE(rFld.GetFormat() == SVX_NUM_ARABIC,
"Unknown numbering type exported as default\n");
case SVX_NUM_ARABIC:
- rStr.APPEND_CONST_ASC("\\*Arabic ");
+ rStr.AppendAscii("\\*Arabic ");
break;
case SVX_NUM_PAGEDESC:
//Nothing, use word's default
@@ -2490,9 +2490,9 @@ bool WW8AttributeOutput::DropdownField( const SwField* pFld )
void WW8AttributeOutput::RefField( const SwField &rFld, const String &rRef)
{
String sStr( FieldString( ww::eREF ) );
- sStr.APPEND_CONST_ASC( "\"" );
+ sStr.AppendAscii( "\"" );
sStr += rRef;
- sStr.APPEND_CONST_ASC( "\" " );
+ sStr.AppendAscii( "\" " );
m_rWW8Export.OutputField( &rFld, ww::eREF, sStr, WRITEFIELD_START |
WRITEFIELD_CMD_START | WRITEFIELD_CMD_END );
String sVar = lcl_GetExpandedField( rFld );
@@ -2543,9 +2543,9 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
if (nsSwGetSetExpType::GSE_SEQ == nSubType)
{
sStr = FieldString(ww::eSEQ);
- sStr.APPEND_CONST_ASC("\"");
+ sStr.AppendAscii("\"");
sStr += pFld->GetTyp()->GetName();
- sStr.APPEND_CONST_ASC( "\" " );
+ sStr.AppendAscii( "\" " );
GetNumberPara( sStr, *pFld );
GetExport().OutputField(pFld, ww::eSEQ, sStr);
@@ -2559,11 +2559,11 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
if (pSet->GetInputFlag())
{
sStr = FieldString(ww::eASK);
- sStr.APPEND_CONST_ASC("\"");
+ sStr.AppendAscii("\"");
sStr += pSet->GetPar1();
- sStr.APPEND_CONST_ASC( "\" " );
+ sStr.AppendAscii( "\" " );
sStr += pSet->GetPromptText();
- sStr.APPEND_CONST_ASC( " \\d " );
+ sStr.AppendAscii( " \\d " );
sStr += rVar;
eFieldNo = ww::eASK;
}
@@ -2571,9 +2571,9 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
{
sStr = FieldString(ww::eSET);
sStr += pSet->GetPar1();
- sStr.APPEND_CONST_ASC(" \"");
+ sStr.AppendAscii(" \"");
sStr += rVar;
- sStr.APPEND_CONST_ASC("\" ");
+ sStr.AppendAscii("\" ");
eFieldNo = ww::eSET;
bShowAsWell = (nSubType & nsSwExtendedSubType::SUB_INVISIBLE) ? false : true;
}
@@ -2594,7 +2594,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
case RES_FILENAMEFLD:
sStr = FieldString(ww::eFILENAME);
if (pFld->GetFormat() == FF_PATHNAME)
- sStr.APPEND_CONST_ASC("\\p ");
+ sStr.AppendAscii("\\p ");
GetExport().OutputField(pFld, ww::eFILENAME, sStr);
break;
case RES_DBNAMEFLD:
@@ -2782,7 +2782,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
{
sStr = FieldString(ww::eFILLIN);
- sStr.APPEND_CONST_ASC("\"");
+ sStr.AppendAscii("\"");
sStr += pFld->GetPar2();
sStr += '\"';
@@ -2814,13 +2814,13 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
switch (pFld->GetFormat())
{
case REF_NUMBER:
- sStr.APPEND_CONST_ASC(" \\r");
+ sStr.AppendAscii(" \\r");
break;
case REF_NUMBER_NO_CONTEXT:
- sStr.APPEND_CONST_ASC(" \\n");
+ sStr.AppendAscii(" \\n");
break;
case REF_NUMBER_FULL_CONTEXT:
- sStr.APPEND_CONST_ASC(" \\w");
+ sStr.AppendAscii(" \\w");
break;
}
break;
@@ -2851,15 +2851,15 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
switch (pFld->GetFormat())
{
case REF_UPDOWN:
- sStr.APPEND_CONST_ASC(" \\p");
+ sStr.AppendAscii(" \\p");
break;
case REF_CHAPTER:
- sStr.APPEND_CONST_ASC(" \\n");
+ sStr.AppendAscii(" \\n");
break;
default:
break;
}
- sStr.APPEND_CONST_ASC(" \\h "); // insert hyperlink
+ sStr.AppendAscii(" \\h "); // insert hyperlink
GetExport().OutputField(pFld, eFld, sStr);
}
else
@@ -2899,17 +2899,17 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
*/
xub_StrLen nAbove = (pFld->GetPar1().getLength()+1)/2;
sStr = FieldString(ww::eEQ);
- sStr.APPEND_CONST_ASC("\\o (\\s\\up ");
+ sStr.AppendAscii("\\o (\\s\\up ");
sStr += String::CreateFromInt32(nHeight/2);
sStr.Append('(');
sStr += String(pFld->GetPar1(),0,nAbove);
- sStr.APPEND_CONST_ASC("), \\s\\do ");
+ sStr.AppendAscii("), \\s\\do ");
sStr += String::CreateFromInt32(nHeight/5);
sStr.Append('(');
sStr += String(pFld->GetPar1(),nAbove,pFld->GetPar1().getLength()-nAbove);
- sStr.APPEND_CONST_ASC("))");
+ sStr.AppendAscii("))");
GetExport().OutputField(pFld, ww::eEQ, sStr);
}
break;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 1f4d9e8..3b490a0 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -608,11 +608,11 @@ short SwWW8ImplReader::GetTimeDatePara(String& rStr, sal_uInt32& rFormat,
case ww::ePRINTDATE:
case ww::eSAVEDATE:
sParams = GetWordDefaultDateStringAsUS(pFormatter, rLang);
- sParams.APPEND_CONST_ASC(" HH:MM:SS AM/PM");
+ sParams.AppendAscii(" HH:MM:SS AM/PM");
bHasTime = true;
break;
case ww::eCREATEDATE:
- sParams.ASSIGN_CONST_ASC("DD/MM/YYYY HH:MM:SS");
+ sParams.AssignAscii("DD/MM/YYYY HH:MM:SS");
bHasTime = true;
break;
default:
@@ -1483,7 +1483,7 @@ eF_ResT SwWW8ImplReader::Read_F_InputVar( WW8FieldDesc* pF, String& rStr )
if (aDef.Len())
{
if (aQ.Len())
- aQ.APPEND_CONST_ASC(" - ");
+ aQ.AppendAscii(" - ");
aQ.Append(aDef);
}
@@ -3475,7 +3475,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, String& rStr )
break;
case 'n':
- sTarget.ASSIGN_CONST_ASC( "_blank" );
+ sTarget.AssignAscii( "_blank" );
bOptions = true;
break;
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index e9ef6f8..7a204dd 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -6350,7 +6350,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib& rFib )
&& !p->sFontname.EqualsAscii("Symbol")
)
{
- p->sFontname.APPEND_CONST_ASC(";Symbol");
+ p->sFontname.AppendAscii(";Symbol");
}
}
pVer6 = (WW8_FFN_Ver6*)( ((sal_uInt8*)pVer6) + pVer6->cbFfnM1 + 1 );
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 84112df..8f681d8 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -38,13 +38,6 @@
#include <unomid.h>
-#define APPEND_CONST_ASC(s) AppendAscii(RTL_CONSTASCII_STRINGPARAM(s))
-#define ASSIGN_CONST_ASC(s) AssignAscii(RTL_CONSTASCII_STRINGPARAM(s))
-#define CREATE_CONST_ASC(s) String::CreateFromAscii( \
- RTL_CONSTASCII_STRINGPARAM(s))
-
-
-
//--Line below which the code has meaningful comments
//Commonly used string literals for stream and storage names in word docs
More information about the Libreoffice-commits
mailing list