sw/source/core/text/xmldump.cxx | 22 +++++++++++----------- vcl/inc/unx/saldata.hxx | 1 - vcl/unx/generic/window/salframe.cxx | 1 + 3 files changed, 12 insertions(+), 12 deletions(-)
New commits: commit 086aa1cf2ab5017e2313aea6ffd84585fe6a4a43 Author: LuboÅ¡ LuÅák <l.lu...@suse.cz> Date: Tue Mar 20 08:53:19 2012 +0100 C++11: invalid string literal suffix so let's make the sal_intXY ugliness even a bit more ugly diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx index 18b92e7..7df0ec8 100644 --- a/sw/source/core/text/xmldump.cxx +++ b/sw/source/core/text/xmldump.cxx @@ -346,15 +346,15 @@ void SwFrm::dumpInfosAsXml( xmlTextWriterPtr writer ) void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) { 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( ) ) - xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "next" ), "%"SAL_PRIuUINT32, GetNext()->GetFrmId() ); + xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "next" ), "%" SAL_PRIuUINT32, GetNext()->GetFrmId() ); if ( GetPrev( ) ) - xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "prev" ), "%"SAL_PRIuUINT32, GetPrev()->GetFrmId() ); + xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "prev" ), "%" SAL_PRIuUINT32, GetPrev()->GetFrmId() ); if ( GetUpper( ) ) - xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "upper" ), "%"SAL_PRIuUINT32, GetUpper()->GetFrmId() ); + xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "upper" ), "%" SAL_PRIuUINT32, GetUpper()->GetFrmId() ); if ( GetLower( ) ) - xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "lower" ), "%"SAL_PRIuUINT32, GetLower()->GetFrmId() ); + xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "lower" ), "%" SAL_PRIuUINT32, GetLower()->GetFrmId() ); if ( IsTxtFrm( ) ) { SwTxtFrm *pTxtFrm = ( SwTxtFrm * ) this; @@ -390,30 +390,30 @@ void SwTxtFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer ) { SwFrm::dumpAsXmlAttributes( writer ); if ( HasFollow() ) - xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%"SAL_PRIuUINT32, GetFollow()->GetFrmId() ); + xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%" SAL_PRIuUINT32, GetFollow()->GetFrmId() ); 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 ) { SwFrm::dumpAsXmlAttributes( writer ); if ( HasFollow() ) - xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%"SAL_PRIuUINT32, GetFollow()->GetFrmId() ); + xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%" SAL_PRIuUINT32, GetFollow()->GetFrmId() ); 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 ) { SwFrm::dumpAsXmlAttributes( writer ); if ( HasFollow() ) - xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%"SAL_PRIuUINT32, GetFollow()->GetFrmId() ); + xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( "follow" ), "%" SAL_PRIuUINT32, GetFollow()->GetFrmId() ); 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: */ commit cf25b76b685ae8b74310f001798876651e89e51a Author: LuboÅ¡ LuÅák <l.lu...@suse.cz> Date: Tue Mar 20 08:44:11 2012 +0100 move #include from .h to the one .cxx where it is needed diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx index 591f4f6..121bdd0 100644 --- a/vcl/inc/unx/saldata.hxx +++ b/vcl/inc/unx/saldata.hxx @@ -30,7 +30,6 @@ #define _SV_SALDATA_HXX // -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#include <signal.h> #include <unx/salunx.h> #include <vcl/salgtype.hxx> #include <unx/salstd.hxx> diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 0cebdbc..43f6acd 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -27,6 +27,7 @@ ************************************************************************/ +#include <signal.h> #include <string.h> #include <stdio.h> #include <stdlib.h>
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits