diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-08-11 16:08:32 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-08-11 16:08:32 +0200 |
commit | 525d784796f89c31ec3e41b199c26a6e0444e329 (patch) | |
tree | 6bc8d71ca232ead5e6785f5e32ba73e4d446c04e /xmloff | |
parent | d9baa2b06e7349fce55cb706563c3017f33c01e0 (diff) |
-Werror,-Wundefined-bool-conversion
Change-Id: Icf4a55f7e76a723014a7b8b5f6b9350db7370dd9
Diffstat (limited to 'xmloff')
22 files changed, 40 insertions, 40 deletions
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index dc461e8df8f8..54cf3e45c505 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -1940,7 +1940,7 @@ namespace xmloff SvXMLImportContext* OFormImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const OUString& _rLocalName) { - OSL_ENSURE( !this, "illegal call to OFormImport::implCreateControlWrapper" ); + OSL_ENSURE( false, "illegal call to OFormImport::implCreateControlWrapper" ); return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName ); } diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx index 0b4c0868c3ea..ac90a0b31fcd 100644 --- a/xmloff/source/style/xmlbahdl.cxx +++ b/xmloff/source/style/xmlbahdl.cxx @@ -812,13 +812,13 @@ XMLCompareOnlyPropHdl::~XMLCompareOnlyPropHdl() bool XMLCompareOnlyPropHdl::importXML( const OUString&, Any&, const SvXMLUnitConverter& ) const { - DBG_ASSERT( !this, "importXML called for compare-only-property" ); + DBG_ASSERT( false, "importXML called for compare-only-property" ); return false; } bool XMLCompareOnlyPropHdl::exportXML( OUString&, const Any&, const SvXMLUnitConverter& ) const { - DBG_ASSERT( !this, "exportXML called for compare-only-property" ); + DBG_ASSERT( false, "exportXML called for compare-only-property" ); return false; } diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index 6f62661696b3..22cfe8aab264 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -490,7 +490,7 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray( catch( UnknownPropertyException& ) { // might be a problem of getImplemenetationId - OSL_ENSURE( !this, "unknown property in getPropertyValue" ); + OSL_ENSURE( false, "unknown property in getPropertyValue" ); } } @@ -649,7 +649,7 @@ vector<XMLPropertyState> SvXMLExportPropertyMapper::_Filter( catch( UnknownPropertyException& ) { // might be a problem of getImplemenetationId - OSL_ENSURE( !this, "unknown property in getPropertyStates" ); + OSL_ENSURE( false, "unknown property in getPropertyStates" ); } } diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index a542676188fb..949acaca789a 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -3153,14 +3153,14 @@ void XMLTextParagraphExport::_exportTextGraphic( void XMLTextParagraphExport::_collectTextEmbeddedAutoStyles(const Reference < XPropertySet > & ) { - DBG_ASSERT( !this, "no API implementation avialable" ); + DBG_ASSERT( false, "no API implementation avialable" ); } void XMLTextParagraphExport::_exportTextEmbedded( const Reference < XPropertySet > &, const Reference < XPropertySetInfo > & ) { - DBG_ASSERT( !this, "no API implementation avialable" ); + DBG_ASSERT( false, "no API implementation avialable" ); } void XMLTextParagraphExport::exportEvents( const Reference < XPropertySet > & rPropSet ) diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index ed63824e6d6e..4cecc1bc01d0 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -300,7 +300,7 @@ bool XMLDropCapPropHdl_Impl::importXML( Any&, const SvXMLUnitConverter& ) const { - DBG_ASSERT( !this, "drop caps are an element import property" ); + DBG_ASSERT( false, "drop caps are an element import property" ); return false; } @@ -309,7 +309,7 @@ bool XMLDropCapPropHdl_Impl::exportXML( const Any&, const SvXMLUnitConverter& ) const { - DBG_ASSERT( !this, "drop caps are an element export property" ); + DBG_ASSERT( false, "drop caps are an element export property" ); return false; } @@ -707,7 +707,7 @@ bool XMLTextColumnsPropertyHandler::importXML( Any&, const SvXMLUnitConverter& ) const { - DBG_ASSERT( !this, "columns are an element import property" ); + DBG_ASSERT( false, "columns are an element import property" ); return false; } @@ -716,7 +716,7 @@ bool XMLTextColumnsPropertyHandler::exportXML( const Any&, const SvXMLUnitConverter& ) const { - DBG_ASSERT( !this, "columns are an element export property" ); + DBG_ASSERT( false, "columns are an element export property" ); return false; } @@ -758,7 +758,7 @@ bool XMLHoriMirrorPropHdl_Impl::exportXML( const Any&, const SvXMLUnitConverter& ) const { - DBG_ASSERT( !this, "HorMirror properyt shouldn't be exported" ); + DBG_ASSERT( false, "HorMirror properyt shouldn't be exported" ); return false; } diff --git a/xmloff/source/transform/ChartOASISTContext.cxx b/xmloff/source/transform/ChartOASISTContext.cxx index 1311a3e38368..3ec0748bccb8 100644 --- a/xmloff/source/transform/ChartOASISTContext.cxx +++ b/xmloff/source/transform/ChartOASISTContext.cxx @@ -111,7 +111,7 @@ void XMLChartOASISTransformerContext::StartElement( } break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } diff --git a/xmloff/source/transform/ChartOOoTContext.cxx b/xmloff/source/transform/ChartOOoTContext.cxx index bd92e1ff4227..d35328ae6a38 100644 --- a/xmloff/source/transform/ChartOOoTContext.cxx +++ b/xmloff/source/transform/ChartOOoTContext.cxx @@ -116,7 +116,7 @@ void XMLChartOOoTransformerContext::StartElement( --nAttrCount; break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } diff --git a/xmloff/source/transform/ControlOASISTContext.cxx b/xmloff/source/transform/ControlOASISTContext.cxx index e04f3314fd7d..0f1b36114fb8 100644 --- a/xmloff/source/transform/ControlOASISTContext.cxx +++ b/xmloff/source/transform/ControlOASISTContext.cxx @@ -132,7 +132,7 @@ void XMLControlOASISTransformerContext::StartElement( } break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } diff --git a/xmloff/source/transform/CreateElemTContext.cxx b/xmloff/source/transform/CreateElemTContext.cxx index 09d3b8d78a63..e999997bcc6f 100644 --- a/xmloff/source/transform/CreateElemTContext.cxx +++ b/xmloff/source/transform/CreateElemTContext.cxx @@ -101,7 +101,7 @@ void XMLCreateElemTransformerContext::StartElement( } break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } diff --git a/xmloff/source/transform/DlgOASISTContext.cxx b/xmloff/source/transform/DlgOASISTContext.cxx index fab011d327a4..6bf2a171dd2a 100644 --- a/xmloff/source/transform/DlgOASISTContext.cxx +++ b/xmloff/source/transform/DlgOASISTContext.cxx @@ -90,7 +90,7 @@ void XMLDlgOASISTransformerContext::StartElement( } break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx index e3107abc953d..a1eb86abc8bb 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -194,7 +194,7 @@ void XMLEventOOoTransformerContext::StartElement( case XML_ATACTION_COPY: break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx index 50e61c759de6..d4d4021b5833 100644 --- a/xmloff/source/transform/FormPropOASISTContext.cxx +++ b/xmloff/source/transform/FormPropOASISTContext.cxx @@ -160,7 +160,7 @@ void XMLFormPropOASISTransformerContext::StartElement( --nAttrCount; break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx index 83c1b8c53956..47b2df1268da 100644 --- a/xmloff/source/transform/FormPropOOoTContext.cxx +++ b/xmloff/source/transform/FormPropOOoTContext.cxx @@ -245,7 +245,7 @@ void XMLFormPropOOoTransformerContext::StartElement( --nAttrCount; break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } diff --git a/xmloff/source/transform/FrameOASISTContext.cxx b/xmloff/source/transform/FrameOASISTContext.cxx index 7cffc2adce0b..10755f980020 100644 --- a/xmloff/source/transform/FrameOASISTContext.cxx +++ b/xmloff/source/transform/FrameOASISTContext.cxx @@ -157,7 +157,7 @@ XMLTransformerContext *XMLFrameOASISTransformerContext::CreateChildContext( } break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } diff --git a/xmloff/source/transform/FrameOOoTContext.cxx b/xmloff/source/transform/FrameOOoTContext.cxx index daaa221f5c33..b7f8f82f9b0f 100644 --- a/xmloff/source/transform/FrameOOoTContext.cxx +++ b/xmloff/source/transform/FrameOOoTContext.cxx @@ -90,7 +90,7 @@ void XMLFrameOOoTransformerContext::StartElement( --nAttrCount; break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } @@ -128,7 +128,7 @@ XMLTransformerContext *XMLFrameOOoTransformerContext::CreateChildContext( nPrefix, rLocalName, rQName, rAttrList ); break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx index 7a5381cc0252..d14a1bee7d8c 100644 --- a/xmloff/source/transform/MergeElemTContext.cxx +++ b/xmloff/source/transform/MergeElemTContext.cxx @@ -267,7 +267,7 @@ XMLTransformerContext *XMLMergeElemTransformerContext::CreateChildContext( } break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } @@ -299,7 +299,7 @@ XMLTransformerContext *XMLMergeElemTransformerContext::CreateChildContext( } break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 890a5f06b58c..1568bb20111e 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1383,7 +1383,7 @@ void XMLTabStopOOoTContext_Impl::StartElement( } break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } @@ -1461,7 +1461,7 @@ void XMLTrackedChangesOOoTContext_Impl::StartElement( } else { - OSL_ENSURE( !this, "RedineProtectionKey is missing" ); + OSL_ENSURE( false, "RedineProtectionKey is missing" ); } } break; @@ -1588,7 +1588,7 @@ XMLTransformerContext *OOo2OasisTransformer::CreateUserDefinedContext( case XML_ETACTION_TABLE: return new XMLTableOOoTransformerContext_Impl( *this, rQName ); default: - OSL_ENSURE( !this, "no user defined context found!" ); + OSL_ENSURE( false, "no user defined context found!" ); } // default is copying diff --git a/xmloff/source/transform/PersMixedContentTContext.cxx b/xmloff/source/transform/PersMixedContentTContext.cxx index f2d42397b3c5..fbde8c279dd4 100644 --- a/xmloff/source/transform/PersMixedContentTContext.cxx +++ b/xmloff/source/transform/PersMixedContentTContext.cxx @@ -66,19 +66,19 @@ XMLTransformerContext *XMLPersTextTContext_Impl::CreateChildContext( const OUString&, const Reference< XAttributeList >& ) { - OSL_ENSURE( !this, "illegal call to CreateChildContext" ); + OSL_ENSURE( false, "illegal call to CreateChildContext" ); return 0; } void XMLPersTextTContext_Impl::StartElement( const Reference< XAttributeList >& ) { - OSL_ENSURE( !this, "illegal call to StartElement" ); + OSL_ENSURE( false, "illegal call to StartElement" ); } void XMLPersTextTContext_Impl::EndElement() { - OSL_ENSURE( !this, "illegal call to EndElement" ); + OSL_ENSURE( false, "illegal call to EndElement" ); } bool XMLPersTextTContext_Impl::IsPersistent() const diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index e01e342835f5..7e3415efa1c9 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -554,7 +554,7 @@ void XMLPropertiesTContext_Impl::StartElement( } break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } @@ -896,7 +896,7 @@ void XMLStyleOASISTContext::StartElement( } break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index e8b225adc5a7..b66077ef83dd 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -960,7 +960,7 @@ void XMLPropertiesOOoTContext_Impl::StartElement( } break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } @@ -1091,7 +1091,7 @@ XMLTransformerContext *XMLStyleOOoTContext::CreateChildContext( { if( aPropTypes[m_eFamily][0] == XML_PROP_TYPE_END ) { - OSL_ENSURE( !this, "unexpected properties element" ); + OSL_ENSURE( false, "unexpected properties element" ); pContext = m_bPersistent ? XMLPersElemContentTContext::CreateChildContext( nPrefix, rLocalName, rQName, rAttrList ) @@ -1269,7 +1269,7 @@ void XMLStyleOOoTContext::StartElement( } break; default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index f17501ef148e..513692f05757 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -167,7 +167,7 @@ XMLTransformerContext *XMLTransformerBase::CreateContext( sal_uInt16 nPrefix, return new XMLMergeElemTransformerContext( *this, rQName, static_cast< sal_uInt16 >( (*aIter).second.m_nParam1 ) ); default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } } @@ -879,7 +879,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( } default: - OSL_ENSURE( !this, "unknown action" ); + OSL_ENSURE( false, "unknown action" ); break; } diff --git a/xmloff/source/transform/TransformerContext.cxx b/xmloff/source/transform/TransformerContext.cxx index 3cd09b34f3be..5d07cae6a237 100644 --- a/xmloff/source/transform/TransformerContext.cxx +++ b/xmloff/source/transform/TransformerContext.cxx @@ -89,12 +89,12 @@ bool XMLTransformerContext::IsPersistent() const void XMLTransformerContext::Export() { - OSL_ENSURE( !this, "context is not persistent" ); + OSL_ENSURE( false, "context is not persistent" ); } void XMLTransformerContext::ExportContent() { - OSL_ENSURE( !this, "context is not persistent" ); + OSL_ENSURE( false, "context is not persistent" ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |