summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--xmloff/source/style/DashStyle.cxx10
-rw-r--r--xmloff/source/style/PageMasterExportPropMapper.cxx4
-rw-r--r--xmloff/source/style/PageMasterImportContext.cxx12
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_export.cxx6
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_export.hxx4
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_import.cxx8
-rw-r--r--xmlscript/source/xmlflat_imexp/xmlbas_import.hxx8
7 files changed, 26 insertions, 26 deletions
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index ecf8efab18a4..f15b7870dfbe 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -99,7 +99,7 @@ sal_Bool XMLDashStyleImport::importXML(
aLineDash.Distance = 20;
OUString aDisplayName;
- sal_Bool bIsRel = sal_False;
+ bool bIsRel = false;
SvXMLNamespaceMap& rNamespaceMap = rImport.GetNamespaceMap();
SvXMLUnitConverter& rUnitConverter = rImport.GetMM100UnitConverter();
@@ -143,7 +143,7 @@ sal_Bool XMLDashStyleImport::importXML(
{
if( rStrValue.indexOf( sal_Unicode('%') ) != -1 ) // its a percentage
{
- bIsRel = sal_True;
+ bIsRel = true;
::sax::Converter::convertPercent(aLineDash.DotLen, rStrValue);
}
else
@@ -162,7 +162,7 @@ sal_Bool XMLDashStyleImport::importXML(
{
if( rStrValue.indexOf( sal_Unicode('%') ) != -1 ) // its a percentage
{
- bIsRel = sal_True;
+ bIsRel = true;
::sax::Converter::convertPercent(aLineDash.DashLen, rStrValue);
}
else
@@ -177,7 +177,7 @@ sal_Bool XMLDashStyleImport::importXML(
{
if( rStrValue.indexOf( sal_Unicode('%') ) != -1 ) // its a percentage
{
- bIsRel = sal_True;
+ bIsRel = true;
::sax::Converter::convertPercent(aLineDash.Distance, rStrValue);
}
else
@@ -232,7 +232,7 @@ sal_Bool XMLDashStyleExport::exportXML(
{
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;
OUStringBuffer aOut;
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index b9da68a4783a..04faafe26d62 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star::beans;
using namespace ::comphelper;
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) &&
(rLine1.OuterLineWidth == rLine2.OuterLineWidth) &&
@@ -40,7 +40,7 @@ static inline sal_Bool lcl_HasSameLineWidth( const table::BorderLine2& rLine1, c
(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) &&
lcl_HasSameLineWidth( rLine1, rLine2 ) &&
diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx
index e817285f75ce..6f354b1b9993 100644
--- a/xmloff/source/style/PageMasterImportContext.cxx
+++ b/xmloff/source/style/PageMasterImportContext.cxx
@@ -88,8 +88,8 @@ SvXMLImportContext *PageStyleContext::CreateChildContext(
nFlag = CTF_PM_FOOTERFLAG;
sal_Int32 nStartIndex (-1);
sal_Int32 nEndIndex (-1);
- sal_Bool bFirst(sal_False);
- sal_Bool bEnd(sal_False);
+ bool bFirst(false);
+ bool bEnd(false);
sal_Int32 nIndex = 0;
while ( nIndex < rMapper->GetEntryCount() && !bEnd)
{
@@ -97,13 +97,13 @@ SvXMLImportContext *PageStyleContext::CreateChildContext(
{
if (!bFirst)
{
- bFirst = sal_True;
+ bFirst = true;
nStartIndex = nIndex;
}
}
else if (bFirst)
{
- bEnd = sal_True;
+ bEnd = true;
nEndIndex = nIndex;
}
nIndex++;
@@ -123,7 +123,7 @@ SvXMLImportContext *PageStyleContext::CreateChildContext(
{
const UniReference< XMLPropertySetMapper >& rMapper = xImpPrMap->getPropertySetMapper();
sal_Int32 nEndIndex (-1);
- sal_Bool bEnd(sal_False);
+ bool bEnd(false);
sal_Int32 nIndex = 0;
sal_Int16 nContextID;
while ( nIndex < rMapper->GetEntryCount() && !bEnd)
@@ -132,7 +132,7 @@ SvXMLImportContext *PageStyleContext::CreateChildContext(
if (nContextID && ((nContextID & CTF_PM_FLAGMASK) != XML_PM_CTF_START))
{
nEndIndex = nIndex;
- bEnd = sal_True;
+ bEnd = true;
}
nIndex++;
}
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
index 7bfb232e87bd..f033beb12e5b 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.cxx
@@ -100,7 +100,7 @@ namespace xmlscript
// XMLBasicExporterBase
- XMLBasicExporterBase::XMLBasicExporterBase( const Reference< XComponentContext >& rxContext, sal_Bool bOasis )
+ XMLBasicExporterBase::XMLBasicExporterBase( const Reference< XComponentContext >& rxContext, bool bOasis )
:m_xContext( rxContext )
,m_bOasis( bOasis )
{
@@ -407,7 +407,7 @@ sal_Bool XMLBasicExporterBase::filter( const Sequence< beans::PropertyValue >& /
// XMLBasicExporter
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 >& /
// XMLOasisBasicExporter
XMLOasisBasicExporter::XMLOasisBasicExporter( const Reference< XComponentContext >& rxContext )
- :XMLBasicExporterBase( rxContext, sal_True )
+ :XMLBasicExporterBase( rxContext, true )
{
}
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
index 1db194257d6f..aefe41975f40 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_export.hxx
@@ -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::xml::sax::XDocumentHandler > m_xHandler;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel;
- sal_Bool m_bOasis;
+ bool m_bOasis;
public:
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();
// XServiceInfo
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
index 94ecec326bd8..261a756fd017 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.cxx
@@ -406,7 +406,7 @@ void BasicElementBase::processingInstruction( const OUString& /*rTarget*/, const
// BasicImport
- BasicImport::BasicImport( const Reference< frame::XModel >& rxModel, sal_Bool bOasis )
+ BasicImport::BasicImport( const Reference< frame::XModel >& rxModel, bool bOasis )
:m_xModel( rxModel )
,m_bOasis( bOasis )
{
@@ -556,7 +556,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
// XMLBasicImporterBase
- XMLBasicImporterBase::XMLBasicImporterBase( const Reference< XComponentContext >& rxContext, sal_Bool bOasis )
+ XMLBasicImporterBase::XMLBasicImporterBase( const Reference< XComponentContext >& rxContext, bool bOasis )
:m_xContext( rxContext )
,m_bOasis( bOasis )
{
@@ -685,7 +685,7 @@ void BasicImport::setDocumentLocator( const Reference< xml::sax::XLocator >& /*x
// XMLBasicImporter
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
// XMLOasisBasicImporter
XMLOasisBasicImporter::XMLOasisBasicImporter( const Reference< XComponentContext >& rxContext )
- :XMLBasicImporterBase( rxContext, sal_True )
+ :XMLBasicImporterBase( rxContext, true )
{
}
diff --git a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
index 95e45ebd7d57..25be4b8516e0 100644
--- a/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
+++ b/xmlscript/source/xmlflat_imexp/xmlbas_import.hxx
@@ -195,10 +195,10 @@ namespace xmlscript
sal_Int32 XMLNS_UID;
sal_Int32 XMLNS_XLINK_UID;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel;
- sal_Bool m_bOasis;
+ bool m_bOasis;
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();
// XRoot
@@ -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::xml::sax::XDocumentHandler > m_xHandler;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel;
- sal_Bool m_bOasis;
+ bool m_bOasis;
public:
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();
// XServiceInfo
generated by cgit (git 2.34.1) at 2024-08-02 15:09:38 +0000