Kaydet (Commit) c5c4ab6c authored tarafından Takeshi Abe's avatar Takeshi Abe

sal_Bool to bool

Change-Id: I390b6b0d8e1c143a0d2e8f4f0a1ec80c2924942c
üst 982f75e2
...@@ -99,7 +99,7 @@ sal_Bool XMLDashStyleImport::importXML( ...@@ -99,7 +99,7 @@ sal_Bool XMLDashStyleImport::importXML(
aLineDash.Distance = 20; aLineDash.Distance = 20;
OUString aDisplayName; OUString aDisplayName;
sal_Bool bIsRel = sal_False; bool bIsRel = false;
SvXMLNamespaceMap& rNamespaceMap = rImport.GetNamespaceMap(); SvXMLNamespaceMap& rNamespaceMap = rImport.GetNamespaceMap();
SvXMLUnitConverter& rUnitConverter = rImport.GetMM100UnitConverter(); SvXMLUnitConverter& rUnitConverter = rImport.GetMM100UnitConverter();
...@@ -143,7 +143,7 @@ sal_Bool XMLDashStyleImport::importXML( ...@@ -143,7 +143,7 @@ sal_Bool XMLDashStyleImport::importXML(
{ {
if( rStrValue.indexOf( sal_Unicode('%') ) != -1 ) // its a percentage if( rStrValue.indexOf( sal_Unicode('%') ) != -1 ) // its a percentage
{ {
bIsRel = sal_True; bIsRel = true;
::sax::Converter::convertPercent(aLineDash.DotLen, rStrValue); ::sax::Converter::convertPercent(aLineDash.DotLen, rStrValue);
} }
else else
...@@ -162,7 +162,7 @@ sal_Bool XMLDashStyleImport::importXML( ...@@ -162,7 +162,7 @@ sal_Bool XMLDashStyleImport::importXML(
{ {
if( rStrValue.indexOf( sal_Unicode('%') ) != -1 ) // its a percentage if( rStrValue.indexOf( sal_Unicode('%') ) != -1 ) // its a percentage
{ {
bIsRel = sal_True; bIsRel = true;
::sax::Converter::convertPercent(aLineDash.DashLen, rStrValue); ::sax::Converter::convertPercent(aLineDash.DashLen, rStrValue);
} }
else else
...@@ -177,7 +177,7 @@ sal_Bool XMLDashStyleImport::importXML( ...@@ -177,7 +177,7 @@ sal_Bool XMLDashStyleImport::importXML(
{ {
if( rStrValue.indexOf( sal_Unicode('%') ) != -1 ) // its a percentage if( rStrValue.indexOf( sal_Unicode('%') ) != -1 ) // its a percentage
{ {
bIsRel = sal_True; bIsRel = true;
::sax::Converter::convertPercent(aLineDash.Distance, rStrValue); ::sax::Converter::convertPercent(aLineDash.Distance, rStrValue);
} }
else else
...@@ -232,7 +232,7 @@ sal_Bool XMLDashStyleExport::exportXML( ...@@ -232,7 +232,7 @@ sal_Bool XMLDashStyleExport::exportXML(
{ {
if( rValue >>= aLineDash ) if( rValue >>= aLineDash )
{ {
sal_Bool bIsRel = aLineDash.Style == drawing::DashStyle_RECTRELATIVE || aLineDash.Style == drawing::DashStyle_ROUNDRELATIVE; bool bIsRel = aLineDash.Style == drawing::DashStyle_RECTRELATIVE || aLineDash.Style == drawing::DashStyle_ROUNDRELATIVE;
OUString aStrValue; OUString aStrValue;
OUStringBuffer aOut; OUStringBuffer aOut;
......
...@@ -32,7 +32,7 @@ using namespace ::com::sun::star::beans; ...@@ -32,7 +32,7 @@ using namespace ::com::sun::star::beans;
using namespace ::comphelper; using namespace ::comphelper;
using namespace ::xmloff::token; using namespace ::xmloff::token;
static inline sal_Bool lcl_HasSameLineWidth( const table::BorderLine2& rLine1, const table::BorderLine2& rLine2 ) static inline bool lcl_HasSameLineWidth( const table::BorderLine2& rLine1, const table::BorderLine2& rLine2 )
{ {
return (rLine1.InnerLineWidth == rLine2.InnerLineWidth) && return (rLine1.InnerLineWidth == rLine2.InnerLineWidth) &&
(rLine1.OuterLineWidth == rLine2.OuterLineWidth) && (rLine1.OuterLineWidth == rLine2.OuterLineWidth) &&
...@@ -40,7 +40,7 @@ static inline sal_Bool lcl_HasSameLineWidth( const table::BorderLine2& rLine1, c ...@@ -40,7 +40,7 @@ static inline sal_Bool lcl_HasSameLineWidth( const table::BorderLine2& rLine1, c
(rLine1.LineWidth == rLine2.LineWidth); (rLine1.LineWidth == rLine2.LineWidth);
} }
inline sal_Bool operator==( const table::BorderLine2& rLine1, const table::BorderLine2& rLine2 ) inline bool operator==( const table::BorderLine2& rLine1, const table::BorderLine2& rLine2 )
{ {
return (rLine1.Color == rLine2.Color) && return (rLine1.Color == rLine2.Color) &&
lcl_HasSameLineWidth( rLine1, rLine2 ) && lcl_HasSameLineWidth( rLine1, rLine2 ) &&
......
...@@ -88,8 +88,8 @@ SvXMLImportContext *PageStyleContext::CreateChildContext( ...@@ -88,8 +88,8 @@ SvXMLImportContext *PageStyleContext::CreateChildContext(
nFlag = CTF_PM_FOOTERFLAG; nFlag = CTF_PM_FOOTERFLAG;
sal_Int32 nStartIndex (-1); sal_Int32 nStartIndex (-1);
sal_Int32 nEndIndex (-1); sal_Int32 nEndIndex (-1);
sal_Bool bFirst(sal_False); bool bFirst(false);
sal_Bool bEnd(sal_False); bool bEnd(false);
sal_Int32 nIndex = 0; sal_Int32 nIndex = 0;
while ( nIndex < rMapper->GetEntryCount() && !bEnd) while ( nIndex < rMapper->GetEntryCount() && !bEnd)
{ {
...@@ -97,13 +97,13 @@ SvXMLImportContext *PageStyleContext::CreateChildContext( ...@@ -97,13 +97,13 @@ SvXMLImportContext *PageStyleContext::CreateChildContext(
{ {
if (!bFirst) if (!bFirst)
{ {
bFirst = sal_True; bFirst = true;
nStartIndex = nIndex; nStartIndex = nIndex;
} }
} }
else if (bFirst) else if (bFirst)
{ {
bEnd = sal_True; bEnd = true;
nEndIndex = nIndex; nEndIndex = nIndex;
} }
nIndex++; nIndex++;
...@@ -123,7 +123,7 @@ SvXMLImportContext *PageStyleContext::CreateChildContext( ...@@ -123,7 +123,7 @@ SvXMLImportContext *PageStyleContext::CreateChildContext(
{ {
const UniReference< XMLPropertySetMapper >& rMapper = xImpPrMap->getPropertySetMapper(); const UniReference< XMLPropertySetMapper >& rMapper = xImpPrMap->getPropertySetMapper();
sal_Int32 nEndIndex (-1); sal_Int32 nEndIndex (-1);
sal_Bool bEnd(sal_False); bool bEnd(false);
sal_Int32 nIndex = 0; sal_Int32 nIndex = 0;
sal_Int16 nContextID; sal_Int16 nContextID;
while ( nIndex < rMapper->GetEntryCount() && !bEnd) while ( nIndex < rMapper->GetEntryCount() && !bEnd)
...@@ -132,7 +132,7 @@ SvXMLImportContext *PageStyleContext::CreateChildContext( ...@@ -132,7 +132,7 @@ SvXMLImportContext *PageStyleContext::CreateChildContext(
if (nContextID && ((nContextID & CTF_PM_FLAGMASK) != XML_PM_CTF_START)) if (nContextID && ((nContextID & CTF_PM_FLAGMASK) != XML_PM_CTF_START))
{ {
nEndIndex = nIndex; nEndIndex = nIndex;
bEnd = sal_True; bEnd = true;
} }
nIndex++; nIndex++;
} }
......
...@@ -100,7 +100,7 @@ namespace xmlscript ...@@ -100,7 +100,7 @@ namespace xmlscript
// XMLBasicExporterBase // XMLBasicExporterBase
XMLBasicExporterBase::XMLBasicExporterBase( const Reference< XComponentContext >& rxContext, sal_Bool bOasis ) XMLBasicExporterBase::XMLBasicExporterBase( const Reference< XComponentContext >& rxContext, bool bOasis )
:m_xContext( rxContext ) :m_xContext( rxContext )
,m_bOasis( bOasis ) ,m_bOasis( bOasis )
{ {
...@@ -407,7 +407,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& / ...@@ -407,7 +407,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
// XMLBasicExporter // XMLBasicExporter
XMLBasicExporter::XMLBasicExporter( const Reference< XComponentContext >& rxContext ) XMLBasicExporter::XMLBasicExporter( const Reference< XComponentContext >& rxContext )
:XMLBasicExporterBase( rxContext, sal_False ) :XMLBasicExporterBase( rxContext, false )
{ {
} }
...@@ -430,7 +430,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& / ...@@ -430,7 +430,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
// XMLOasisBasicExporter // XMLOasisBasicExporter
XMLOasisBasicExporter::XMLOasisBasicExporter( const Reference< XComponentContext >& rxContext ) XMLOasisBasicExporter::XMLOasisBasicExporter( const Reference< XComponentContext >& rxContext )
:XMLBasicExporterBase( rxContext, sal_True ) :XMLBasicExporterBase( rxContext, true )
{ {
} }
......
...@@ -46,11 +46,11 @@ namespace xmlscript ...@@ -46,11 +46,11 @@ namespace xmlscript
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xHandler; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xHandler;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel;
sal_Bool m_bOasis; bool m_bOasis;
public: public:
XMLBasicExporterBase( XMLBasicExporterBase(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, sal_Bool bOasis ); const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, bool bOasis );
virtual ~XMLBasicExporterBase(); virtual ~XMLBasicExporterBase();
// XServiceInfo // XServiceInfo
......
...@@ -406,7 +406,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const ...@@ -406,7 +406,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
// BasicImport // BasicImport
BasicImport::BasicImport( const Reference< frame::XModel >& rxModel, sal_Bool bOasis ) BasicImport::BasicImport( const Reference< frame::XModel >& rxModel, bool bOasis )
:m_xModel( rxModel ) :m_xModel( rxModel )
,m_bOasis( bOasis ) ,m_bOasis( bOasis )
{ {
...@@ -556,7 +556,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x ...@@ -556,7 +556,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
// XMLBasicImporterBase // XMLBasicImporterBase
XMLBasicImporterBase::XMLBasicImporterBase( const Reference< XComponentContext >& rxContext, sal_Bool bOasis ) XMLBasicImporterBase::XMLBasicImporterBase( const Reference< XComponentContext >& rxContext, bool bOasis )
:m_xContext( rxContext ) :m_xContext( rxContext )
,m_bOasis( bOasis ) ,m_bOasis( bOasis )
{ {
...@@ -685,7 +685,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x ...@@ -685,7 +685,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
// XMLBasicImporter // XMLBasicImporter
XMLBasicImporter::XMLBasicImporter( const Reference< XComponentContext >& rxContext ) XMLBasicImporter::XMLBasicImporter( const Reference< XComponentContext >& rxContext )
:XMLBasicImporterBase( rxContext, sal_False ) :XMLBasicImporterBase( rxContext, false )
{ {
} }
...@@ -708,7 +708,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x ...@@ -708,7 +708,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
// XMLOasisBasicImporter // XMLOasisBasicImporter
XMLOasisBasicImporter::XMLOasisBasicImporter( const Reference< XComponentContext >& rxContext ) XMLOasisBasicImporter::XMLOasisBasicImporter( const Reference< XComponentContext >& rxContext )
:XMLBasicImporterBase( rxContext, sal_True ) :XMLBasicImporterBase( rxContext, true )
{ {
} }
......
...@@ -195,10 +195,10 @@ namespace xmlscript ...@@ -195,10 +195,10 @@ namespace xmlscript
sal_Int32 XMLNS_UID; sal_Int32 XMLNS_UID;
sal_Int32 XMLNS_XLINK_UID; sal_Int32 XMLNS_XLINK_UID;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel;
sal_Bool m_bOasis; bool m_bOasis;
public: public:
BasicImport( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, sal_Bool bOasis ); BasicImport( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, bool bOasis );
virtual ~BasicImport(); virtual ~BasicImport();
// XRoot // XRoot
...@@ -232,11 +232,11 @@ namespace xmlscript ...@@ -232,11 +232,11 @@ namespace xmlscript
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xHandler; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xHandler;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel;
sal_Bool m_bOasis; bool m_bOasis;
public: public:
XMLBasicImporterBase( XMLBasicImporterBase(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, sal_Bool bOasis ); const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, bool bOasis );
virtual ~XMLBasicImporterBase(); virtual ~XMLBasicImporterBase();
// XServiceInfo // XServiceInfo
......
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