From f907d740351886194bf2c9bcffceed22c4698ca5 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 28 Mar 2014 14:13:18 +0200 Subject: xmloff: sal_Bool->bool Change-Id: Ib8c99a646923257647487cd7f121023876587cd2 --- sw/source/filter/xml/xmlexp.cxx | 2 +- sw/source/filter/xml/xmlfmt.cxx | 2 +- sw/source/filter/xml/xmlfmte.cxx | 4 ++-- sw/source/filter/xml/xmlimp.cxx | 4 ++-- sw/source/filter/xml/xmltble.cxx | 2 +- sw/source/filter/xml/xmltbli.cxx | 6 +++--- sw/source/filter/xml/xmltext.cxx | 2 +- sw/source/filter/xml/xmltexte.cxx | 2 +- sw/source/filter/xml/xmltexte.hxx | 2 +- sw/source/filter/xml/xmltexti.cxx | 16 ++++++++-------- sw/source/filter/xml/xmltexti.hxx | 17 ++++++++--------- 11 files changed, 29 insertions(+), 30 deletions(-) (limited to 'sw/source') diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index a07a142671a5..aa61ab751095 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -494,7 +494,7 @@ void SwXMLExport::_ExportContent() } } - GetTextParagraphExport()->exportTrackedChanges( sal_False ); + GetTextParagraphExport()->exportTrackedChanges( false ); GetTextParagraphExport()->exportTextDeclarations(); Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY ); Reference < XText > xText = xTextDoc->getText(); diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index cb7f02fcf3df..c1ff10f3fab2 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -809,7 +809,7 @@ SvXMLStyleContext *SwXMLStylesContext_Impl::CreateDefaultStyleStyleChildContext( case XML_STYLE_FAMILY_TABLE_ROW: pStyle = new XMLTextStyleContext( GetImport(), nPrefix, rLocalName, xAttrList, *this, nFamily, - sal_True ); + true ); break; case XML_STYLE_FAMILY_SD_GRAPHICS_ID: // There are no writer specific defaults for graphic styles! diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index 537ed00dfd69..c442fb3a31eb 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -198,12 +198,12 @@ void SwXMLExport::_ExportAutoStyles() // in single-stream case), then we can save ourselves a bit of // work and memory by not collecting field masters if( (getExportFlags() & EXPORT_STYLES ) == 0 ) - GetTextParagraphExport()->exportUsedDeclarations( sal_False ); + GetTextParagraphExport()->exportUsedDeclarations( false ); // exported in _ExportContent if( (getExportFlags() & EXPORT_CONTENT) != 0 ) { - GetTextParagraphExport()->exportTrackedChanges( sal_True ); + GetTextParagraphExport()->exportTrackedChanges( true ); Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY ); Reference < XText > xText = xTextDoc->getText(); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 60d7be7aea03..0215106ed8fb 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -294,7 +294,7 @@ SvXMLImportContext* SwXMLOfficeDocContext_Impl::CreateChildContext( { if ( rTokenMap.Get( nPrefix, rLocalName ) == XML_TOK_DOC_BODY ) { - GetImport().GetTextImport()->SetOutlineStyles( sal_True ); + GetImport().GetTextImport()->SetOutlineStyles( true ); } } @@ -849,7 +849,7 @@ void SwXMLImport::endDocument( void ) /* Was called too early. Moved from SwXMLBodyContext_Impl::EndElement */ - GetTextImport()->RedlineAdjustStartNodeCursor( sal_False ); + GetTextImport()->RedlineAdjustStartNodeCursor( false ); if( (getImportFlags() & IMPORT_CONTENT) != 0 || ((getImportFlags() & IMPORT_MASTERSTYLES) != 0 && IsStylesOnlyMode()) ) diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index cb110c5fe04d..57cb3c046d4d 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -1142,7 +1142,7 @@ void SwXMLExport::ExportTable( const SwTableNode& rTblNd ) void SwXMLTextParagraphExport::exportTable( const Reference < XTextContent > & rTextContent, - sal_Bool bAutoStyles, sal_Bool _bProgress ) + bool bAutoStyles, bool _bProgress ) { sal_Bool bOldShowProgress = ((SwXMLExport&)GetExport()).IsShowProgress(); ((SwXMLExport&)GetExport()).SetShowProgress( _bProgress ); diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 122cf5059879..259135e6550c 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -1412,7 +1412,7 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport, GetImport().GetTextImport()->SetCursor( xText->createTextCursor() ); // take care of open redlines for tables - GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(sal_True); + GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(true); } if( pXTable ) { @@ -1466,7 +1466,7 @@ SwXMLTableContext::~SwXMLTableContext() delete pRows; // close redlines on table end nodes - GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(sal_False); + GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(false); } SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, @@ -2875,7 +2875,7 @@ const SwStartNode *SwXMLTableContext::InsertTableSection( bFirstSection = false; OUString sStyleName("Standard"); GetImport().GetTextImport()->SetStyleAndAttrs( GetImport(), - GetImport().GetTextImport()->GetCursor(), sStyleName, sal_True ); + GetImport().GetTextImport()->GetCursor(), sStyleName, true ); } else { diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx index 4c2785be5045..f9721fafbd24 100644 --- a/sw/source/filter/xml/xmltext.cxx +++ b/sw/source/filter/xml/xmltext.cxx @@ -72,7 +72,7 @@ SvXMLImportContext *SwXMLBodyContentContext_Impl::CreateChildContext( void SwXMLBodyContentContext_Impl::EndElement() { /* Code moved to SwXMLOmport::endDocument */ - GetImport().GetTextImport()->SetOutlineStyles( sal_False ); + GetImport().GetTextImport()->SetOutlineStyles( false ); } SvXMLImportContext *SwXMLImport::CreateBodyContentContext( diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index f3a41311a1f5..baee89959802 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -455,7 +455,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( if( !sAutoStyle.isEmpty() ) rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE_NAME, sAutoStyle ); - addTextFrameAttributes( rPropSet, sal_False ); + addTextFrameAttributes( rPropSet, false ); SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_DRAW, XML_FRAME, sal_False, sal_True ); diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx index 99ff8608e618..e70204f7bf08 100644 --- a/sw/source/filter/xml/xmltexte.hxx +++ b/sw/source/filter/xml/xmltexte.hxx @@ -62,7 +62,7 @@ protected: virtual void exportTable( const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextContent > & rTextContent, - sal_Bool bAutoStyles, sal_Bool bProgress ) SAL_OVERRIDE; + bool bAutoStyles, bool bProgress ) SAL_OVERRIDE; public: SwXMLTextParagraphExport( diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index c3bc76b7a796..61c91fc16526 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -182,7 +182,7 @@ SvXMLImportContext *SwXMLTextImportHelper::CreateTableChildContext( (SwXMLImport&)rImport, nPrefix, rLocalName, xAttrList ); } -sal_Bool SwXMLTextImportHelper::IsInHeaderFooter() const +bool SwXMLTextImportHelper::IsInHeaderFooter() const { uno::Reference xCrsrTunnel( ((SwXMLTextImportHelper *)this)->GetCursor(), UNO_QUERY ); @@ -615,7 +615,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink( uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet( const OUString &rName, const OUString &rCode, - sal_Bool bMayScript, + bool bMayScript, const OUString& rHRef, sal_Int32 nWidth, sal_Int32 nHeight ) { @@ -959,7 +959,7 @@ void SwXMLTextImportHelper::RedlineAdd( const OUString& rAuthor, const OUString& rComment, const util::DateTime& rDateTime, - sal_Bool bMergeLastPara) + bool bMergeLastPara) { // create redline helper on demand OSL_ENSURE(NULL != pRedlineHelper, "helper should have been created in constructor"); @@ -984,8 +984,8 @@ uno::Reference SwXMLTextImportHelper::RedlineCreateText( void SwXMLTextImportHelper::RedlineSetCursor( const OUString& rId, - sal_Bool bStart, - sal_Bool bIsOutsideOfParagraph) + bool bStart, + bool bIsOutsideOfParagraph) { if (NULL != pRedlineHelper) { uno::Reference xTextRange( GetCursor()->getStart() ); @@ -996,7 +996,7 @@ void SwXMLTextImportHelper::RedlineSetCursor( } void SwXMLTextImportHelper::RedlineAdjustStartNodeCursor( - sal_Bool bStart) + bool bStart) { OUString rId = GetOpenRedlineId(); if ((NULL != pRedlineHelper) && !rId.isEmpty()) @@ -1008,13 +1008,13 @@ void SwXMLTextImportHelper::RedlineAdjustStartNodeCursor( // else: ignore redline (wasn't added before, or no open redline ID } -void SwXMLTextImportHelper::SetShowChanges( sal_Bool bShowChanges ) +void SwXMLTextImportHelper::SetShowChanges( bool bShowChanges ) { if ( NULL != pRedlineHelper ) pRedlineHelper->SetShowChanges( bShowChanges ); } -void SwXMLTextImportHelper::SetRecordChanges( sal_Bool bRecordChanges ) +void SwXMLTextImportHelper::SetRecordChanges( bool bRecordChanges ) { if ( NULL != pRedlineHelper ) pRedlineHelper->SetRecordChanges( bRecordChanges ); diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx index 1cd0357ce7d4..0d8adef943e9 100644 --- a/sw/source/filter/xml/xmltexti.hxx +++ b/sw/source/filter/xml/xmltexti.hxx @@ -66,7 +66,7 @@ public: createAndInsertApplet( const OUString &rName, const OUString &rCode, - sal_Bool bMayScript, + bool bMayScript, const OUString& rHRef, sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE; @@ -89,7 +89,7 @@ public: const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &rPropSet, ::std::map < const OUString, OUString > &rParamMap) SAL_OVERRIDE; - virtual sal_Bool IsInHeaderFooter() const SAL_OVERRIDE; + virtual bool IsInHeaderFooter() const SAL_OVERRIDE; // redlining helper methods // (here is the real implementation) @@ -99,7 +99,7 @@ public: const OUString& rAuthor, /// name of the author const OUString& rComment, /// redline comment const ::com::sun::star::util::DateTime& rDateTime, /// date+time - sal_Bool bMergeLastPara) SAL_OVERRIDE; /// merge last paragraph + bool bMergeLastPara) SAL_OVERRIDE; /// merge last paragraph virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor> RedlineCreateText( ::com::sun::star::uno::Reference< /// needed to get the document @@ -107,12 +107,11 @@ public: const OUString& rId) SAL_OVERRIDE; /// ID used to RedlineAdd() call virtual void RedlineSetCursor( const OUString& rId, /// ID used to RedlineAdd() call - sal_Bool bStart, /// start or end Cursor - sal_Bool bIsOutsideOfParagraph) SAL_OVERRIDE; - virtual void RedlineAdjustStartNodeCursor( - sal_Bool bStart) SAL_OVERRIDE; - virtual void SetShowChanges( sal_Bool bShowChanges ) SAL_OVERRIDE; - virtual void SetRecordChanges( sal_Bool bRecordChanges ) SAL_OVERRIDE; + bool bStart, /// start or end Cursor + bool bIsOutsideOfParagraph) SAL_OVERRIDE; + virtual void RedlineAdjustStartNodeCursor( bool bStart) SAL_OVERRIDE; + virtual void SetShowChanges( bool bShowChanges ) SAL_OVERRIDE; + virtual void SetRecordChanges( bool bRecordChanges ) SAL_OVERRIDE; virtual void SetChangesProtectionKey( const ::com::sun::star::uno::Sequence & rKey ) SAL_OVERRIDE; }; -- cgit v1.2.3