Skip to content

C
core
Kaydet (Commit) 086aa1cf authored tarafından Luboš Luňák's avatar Luboš Luňák
Dosyalara gözat
Seçenekler

C++11: invalid string literal suffix 

so let's make the sal_intXY ugliness even a bit more ugly
üst cf25b76b
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
sw/source/core/text/xmldump.cxx
Dosyayı görüntüle @ 086aa1cf
...@@ -346,15 +346,15 @@ void SwFrm::dumpInfosAsXml( xmlTextWriterPtr writer ) ...@@ -346,15 +346,15 @@ void SwFrm::dumpInfosAsXml( xmlTextWriterPtr writer )
void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
{ {
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "ptr" ), "%p", this ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "ptr" ), "%p", this );
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "id" ), "%"SAL_PRIuUINT32, GetFrmId() ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "id" ), "%" SAL_PRIuUINT32, GetFrmId() );
if ( GetNext( ) ) if ( GetNext( ) )
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "next" ), "%"SAL_PRIuUINT32, GetNext()->GetFrmId() ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "next" ), "%" SAL_PRIuUINT32, GetNext()->GetFrmId() );
if ( GetPrev( ) ) if ( GetPrev( ) )
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "prev" ), "%"SAL_PRIuUINT32, GetPrev()->GetFrmId() ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "prev" ), "%" SAL_PRIuUINT32, GetPrev()->GetFrmId() );
if ( GetUpper( ) ) if ( GetUpper( ) )
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "upper" ), "%"SAL_PRIuUINT32, GetUpper()->GetFrmId() ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "upper" ), "%" SAL_PRIuUINT32, GetUpper()->GetFrmId() );
if ( GetLower( ) ) if ( GetLower( ) )
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "lower" ), "%"SAL_PRIuUINT32, GetLower()->GetFrmId() ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "lower" ), "%" SAL_PRIuUINT32, GetLower()->GetFrmId() );
if ( IsTxtFrm( ) ) if ( IsTxtFrm( ) )
{ {
SwTxtFrm *pTxtFrm = ( SwTxtFrm * ) this; SwTxtFrm *pTxtFrm = ( SwTxtFrm * ) this;
...@@ -390,30 +390,30 @@ void SwTxtFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) ...@@ -390,30 +390,30 @@ void SwTxtFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
{ {
SwFrm::dumpAsXmlAttributes( writer ); SwFrm::dumpAsXmlAttributes( writer );
if ( HasFollow() ) if ( HasFollow() )
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%"SAL_PRIuUINT32, GetFollow()->GetFrmId() ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%" SAL_PRIuUINT32, GetFollow()->GetFrmId() );
if (m_pPrecede != NULL) if (m_pPrecede != NULL)
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%"SAL_PRIuUINT32, static_cast<SwTxtFrm*>(m_pPrecede)->GetFrmId() ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%" SAL_PRIuUINT32, static_cast<SwTxtFrm*>(m_pPrecede)->GetFrmId() );
} }
void SwSectionFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) void SwSectionFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
{ {
SwFrm::dumpAsXmlAttributes( writer ); SwFrm::dumpAsXmlAttributes( writer );
if ( HasFollow() ) if ( HasFollow() )
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%"SAL_PRIuUINT32, GetFollow()->GetFrmId() ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%" SAL_PRIuUINT32, GetFollow()->GetFrmId() );
if (m_pPrecede != NULL) if (m_pPrecede != NULL)
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%"SAL_PRIuUINT32, static_cast<SwSectionFrm*>( m_pPrecede )->GetFrmId() ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%" SAL_PRIuUINT32, static_cast<SwSectionFrm*>( m_pPrecede )->GetFrmId() );
} }
void SwTabFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) void SwTabFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
{ {
SwFrm::dumpAsXmlAttributes( writer ); SwFrm::dumpAsXmlAttributes( writer );
if ( HasFollow() ) if ( HasFollow() )
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%"SAL_PRIuUINT32, GetFollow()->GetFrmId() ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%" SAL_PRIuUINT32, GetFollow()->GetFrmId() );
if (m_pPrecede != NULL) if (m_pPrecede != NULL)
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%"SAL_PRIuUINT32, static_cast<SwTabFrm*>( m_pPrecede )->GetFrmId() ); xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "precede" ), "%" SAL_PRIuUINT32, static_cast<SwTabFrm*>( m_pPrecede )->GetFrmId() );
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment