summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-28 10:53:57 +0200
committerNoel Grandin <noel@peralex.com>2014-03-31 12:37:25 +0200
commitc98a7eec7f24db4e3e7741a52463fca10156ecaf (patch)
tree4178645d542257d622b0ece8b15936cd88febbaf /xmloff
parentddb07081da099a392b1cdcbb8716afb6af43e006 (diff)
xmloff: sal_Bool->bool
Change-Id: I1c97da5b7bbac348150399afbf386613433e5551
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx2
-rw-r--r--xmloff/inc/XMLLineNumberingImportContext.hxx2
-rw-r--r--xmloff/source/core/nmspmap.cxx48
-rw-r--r--xmloff/source/draw/XMLGraphicsDefaultStyle.cxx2
-rw-r--r--xmloff/source/forms/formlayerexport.cxx2
-rw-r--r--xmloff/source/style/numehelp.cxx60
-rw-r--r--xmloff/source/style/prstylei.cxx4
-rw-r--r--xmloff/source/style/xmlnumfi.cxx6
-rw-r--r--xmloff/source/style/xmlstyle.cxx4
-rw-r--r--xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx2
-rw-r--r--xmloff/source/text/XMLLineNumberingImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLSectionExport.cxx2
-rw-r--r--xmloff/source/text/XMLSectionImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextShapeStyleContext.cxx2
-rw-r--r--xmloff/source/text/txtflde.cxx2
-rw-r--r--xmloff/source/text/txtfldi.cxx8
-rw-r--r--xmloff/source/text/txtstyli.cxx2
-rw-r--r--xmloff/source/text/txtvfldi.cxx4
-rw-r--r--xmloff/source/transform/TransformerBase.cxx4
19 files changed, 80 insertions, 80 deletions
diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
index b5f095c454e9..f0c4dc4f188e 100644
--- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
+++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
@@ -83,7 +83,7 @@ protected:
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE;
- virtual void CreateAndInsert( sal_Bool bOverwrite ) SAL_OVERRIDE;
+ virtual void CreateAndInsert( bool bOverwrite ) SAL_OVERRIDE;
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix,
diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx
index 6f80607819f3..fbfa477df39c 100644
--- a/xmloff/inc/XMLLineNumberingImportContext.hxx
+++ b/xmloff/inc/XMLLineNumberingImportContext.hxx
@@ -102,7 +102,7 @@ protected:
enum LineNumberingToken eToken,
const OUString& sValue);
- virtual void CreateAndInsert(sal_Bool bOverwrite) SAL_OVERRIDE;
+ virtual void CreateAndInsert(bool bOverwrite) SAL_OVERRIDE;
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix,
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 1be82e1bf7db..000b3f04e8f2 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -189,7 +189,7 @@ OUString SvXMLNamespaceMap::GetAttrNameByKey( sal_uInt16 nKey ) const
OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
const OUString& rLocalName,
- sal_Bool bCache) const
+ bool bCache) const
{
// We always want to return at least the rLocalName...
@@ -271,7 +271,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName(
const OUString& rAttrName,
OUString *pLocalName,
- sal_Bool bCache) const
+ bool bCache) const
{
return _GetKeyByAttrName( rAttrName, 0, pLocalName, 0, bCache );
}
@@ -280,7 +280,7 @@ sal_uInt16 SvXMLNamespaceMap::_GetKeyByAttrName( const OUString& rAttrName,
OUString *pPrefix,
OUString *pLocalName,
OUString *pNamespace,
- sal_Bool bCache) const
+ bool bCache) const
{
sal_uInt16 nKey = XML_NAMESPACE_UNKNOWN;
@@ -379,10 +379,10 @@ sal_uInt16 SvXMLNamespaceMap::GetNextIndex( sal_uInt16 nOldIdx ) const
return (++aIter == aNameMap.end()) ? USHRT_MAX : (*aIter).second->nKey;
}
-sal_Bool SvXMLNamespaceMap::AddAtIndex( sal_uInt16 /*nIdx*/, const OUString& rPrefix,
+bool SvXMLNamespaceMap::AddAtIndex( sal_uInt16 /*nIdx*/, const OUString& rPrefix,
const OUString& rName, sal_uInt16 nKey )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( XML_NAMESPACE_UNKNOWN == nKey )
nKey = GetKeyByName( rName );
@@ -392,7 +392,7 @@ sal_Bool SvXMLNamespaceMap::AddAtIndex( sal_uInt16 /*nIdx*/, const OUString& rPr
if( XML_NAMESPACE_NONE != nKey && ! ( aNameHash.count ( rPrefix ) ) )
{
_Add( rPrefix, rName, nKey );
- bRet = sal_True;
+ bRet = true;
}
return bRet;
}
@@ -442,16 +442,16 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName( const OUString& rAttrName,
return _GetKeyByAttrName ( rAttrName, pPrefix, pLocalName, pNamespace );
}
-sal_Bool SvXMLNamespaceMap::NormalizeURI( OUString& rName )
+bool SvXMLNamespaceMap::NormalizeURI( OUString& rName )
{
// try OASIS + W3 URI normalization
- sal_Bool bSuccess = NormalizeOasisURN( rName );
+ bool bSuccess = NormalizeOasisURN( rName );
if( ! bSuccess )
bSuccess = NormalizeW3URI( rName );
return bSuccess;
}
-sal_Bool SvXMLNamespaceMap::NormalizeW3URI( OUString& rName )
+bool SvXMLNamespaceMap::NormalizeW3URI( OUString& rName )
{
// check if URI matches:
// http://www.w3.org/[0-9]*/[:letter:]*
@@ -459,7 +459,7 @@ sal_Bool SvXMLNamespaceMap::NormalizeW3URI( OUString& rName )
// For the following WG/standards names:
// - xforms
- sal_Bool bSuccess = sal_False;
+ bool bSuccess = false;
const OUString sURIPrefix = GetXMLToken( XML_URI_W3_PREFIX );
if( rName.startsWith( sURIPrefix ) )
{
@@ -469,13 +469,13 @@ sal_Bool SvXMLNamespaceMap::NormalizeW3URI( OUString& rName )
{
// found W3 prefix, and xforms suffix
rName = GetXMLToken( XML_N_XFORMS_1_0 );
- bSuccess = sal_True;
+ bSuccess = true;
}
}
return bSuccess;
}
-sal_Bool SvXMLNamespaceMap::NormalizeOasisURN( OUString& rName )
+bool SvXMLNamespaceMap::NormalizeOasisURN( OUString& rName )
{
// #i38644#
// we exported the wrong namespace for smil, so we correct this here on load
@@ -483,18 +483,18 @@ sal_Bool SvXMLNamespaceMap::NormalizeOasisURN( OUString& rName )
if( IsXMLToken( rName, ::xmloff::token::XML_N_SVG ) )
{
rName = GetXMLToken( ::xmloff::token::XML_N_SVG_COMPAT );
- return sal_True;
+ return true;
}
else if( IsXMLToken( rName, ::xmloff::token::XML_N_FO ) )
{
rName = GetXMLToken( ::xmloff::token::XML_N_FO_COMPAT );
- return sal_True;
+ return true;
}
else if( IsXMLToken( rName, ::xmloff::token::XML_N_SMIL ) ||
IsXMLToken( rName, ::xmloff::token::XML_N_SMIL_OLD ) )
{
rName = GetXMLToken( ::xmloff::token::XML_N_SMIL_COMPAT );
- return sal_True;
+ return true;
}
@@ -507,45 +507,45 @@ sal_Bool SvXMLNamespaceMap::NormalizeOasisURN( OUString& rName )
// :urn:oasis:names:tc.*
const OUString& rOasisURN = GetXMLToken( XML_URN_OASIS_NAMES_TC );
if( !rName.startsWith( rOasisURN ) )
- return sal_False;
+ return false;
// :urn:oasis:names:tc:.*
sal_Int32 nPos = rOasisURN.getLength();
if( nPos >= nNameLen || rName[nPos] != ':' )
- return sal_False;
+ return false;
// :urn:oasis:names:tc:[^:]:.*
sal_Int32 nTCIdStart = nPos+1;
sal_Int32 nTCIdEnd = rName.indexOf( ':', nTCIdStart );
if( -1 == nTCIdEnd )
- return sal_False;
+ return false;
// :urn:oasis:names:tc:[^:]:xmlns.*
nPos = nTCIdEnd + 1;
OUString sTmp( rName.copy( nPos ) );
const OUString& rXMLNS = GetXMLToken( XML_XMLNS );
if( !sTmp.startsWith( rXMLNS ) )
- return sal_False;
+ return false;
// :urn:oasis:names:tc:[^:]:xmlns:.*
nPos += rXMLNS.getLength();
if( nPos >= nNameLen || rName[nPos] != ':' )
- return sal_False;
+ return false;
// :urn:oasis:names:tc:[^:]:xmlns:[^:]*:.*
nPos = rName.indexOf( ':', nPos+1 );
if( -1 == nPos )
- return sal_False;
+ return false;
// :urn:oasis:names:tc:[^:]:xmlns:[^:]*:[^:][^:][^:][^:]*
sal_Int32 nVersionStart = nPos+1;
if( nVersionStart+2 >= nNameLen ||
-1 != rName.indexOf( ':', nVersionStart ) )
- return sal_False;
+ return false;
// :urn:oasis:names:tc:[^:]:xmlns:[^:]*:1\.[^:][^:]*
if( rName[nVersionStart] != '1' || rName[nVersionStart+1] != '.' )
- return sal_False;
+ return false;
// replace [tcid] with current TCID and version with current version.
@@ -554,7 +554,7 @@ sal_Bool SvXMLNamespaceMap::NormalizeOasisURN( OUString& rName )
rName.copy( nTCIdEnd, nVersionStart-nTCIdEnd ) +
GetXMLToken( XML_1_0 );
- return sal_True;
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index aae02d40bae9..88abaa8ca675 100644
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -45,7 +45,7 @@ using ::xmloff::token::XML_PARAGRAPH_PROPERTIES;
TYPEINIT1( XMLGraphicsDefaultStyle, XMLPropStyleContext );
XMLGraphicsDefaultStyle::XMLGraphicsDefaultStyle( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList, SvXMLStylesContext& rStyles )
-: XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, sal_True )
+: XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, true )
{
}
diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx
index 4900ca9dbb42..f0cba0b96101 100644
--- a/xmloff/source/forms/formlayerexport.cxx
+++ b/xmloff/source/forms/formlayerexport.cxx
@@ -55,7 +55,7 @@ namespace xmloff
m_pImpl = NULL;
}
- sal_Bool OFormLayerXMLExport::seekPage(const Reference< XDrawPage >& _rxDrawPage)
+ bool OFormLayerXMLExport::seekPage(const Reference< XDrawPage >& _rxDrawPage)
{
return m_pImpl->seekPage(_rxDrawPage);
}
diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx
index b7bd42c83ad2..6f00634c3d41 100644
--- a/xmloff/source/style/numehelp.cxx
+++ b/xmloff/source/style/numehelp.cxx
@@ -103,9 +103,9 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp
const sal_Int16 nTypeKey,
const double& rValue,
const OUString& rCurrency,
- sal_Bool bExportValue)
+ bool bExportValue)
{
- sal_Bool bWasSetTypeAttribute = sal_False;
+ bool bWasSetTypeAttribute = false;
switch(nTypeKey & ~util::NumberFormat::DEFINED)
{
case 0:
@@ -116,7 +116,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp
if (!bWasSetTypeAttribute)
{
rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_FLOAT);
- bWasSetTypeAttribute = sal_True;
+ bWasSetTypeAttribute = true;
}
} // No Break
case util::NumberFormat::PERCENT:
@@ -124,7 +124,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp
if (!bWasSetTypeAttribute)
{
rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_PERCENTAGE);
- bWasSetTypeAttribute = sal_True;
+ bWasSetTypeAttribute = true;
}
} // No Break
case util::NumberFormat::CURRENCY:
@@ -134,7 +134,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp
rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_CURRENCY);
if (!rCurrency.isEmpty())
rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_CURRENCY, rCurrency);
- bWasSetTypeAttribute = sal_True;
+ bWasSetTypeAttribute = true;
}
if (bExportValue)
@@ -152,7 +152,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp
if (!bWasSetTypeAttribute)
{
rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_DATE);
- bWasSetTypeAttribute = sal_True;
+ bWasSetTypeAttribute = true;
}
if (bExportValue)
{
@@ -170,7 +170,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp
if (!bWasSetTypeAttribute)
{
rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TIME);
- bWasSetTypeAttribute = sal_True;
+ bWasSetTypeAttribute = true;
}
if (bExportValue)
{
@@ -185,7 +185,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp
if (!bWasSetTypeAttribute)
{
rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_BOOLEAN);
- bWasSetTypeAttribute = sal_True;
+ bWasSetTypeAttribute = true;
}
if (bExportValue)
{
@@ -218,7 +218,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp
if (!bWasSetTypeAttribute)
{
rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_FLOAT);
- bWasSetTypeAttribute = sal_True;
+ bWasSetTypeAttribute = true;
if (bExportValue)
{
OUString sValue( ::rtl::math::doubleToUString( rValue,
@@ -232,7 +232,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp
}
}
-sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& sCurrencySymbol,
+bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& sCurrencySymbol,
uno::Reference <util::XNumberFormatsSupplier>& xNumberFormatsSupplier)
{
if (xNumberFormatsSupplier.is())
@@ -256,7 +256,7 @@ sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int3
sCurrencySymbol = "EUR";
}
}
- return sal_True;
+ return true;
}
}
catch ( uno::Exception& )
@@ -265,11 +265,11 @@ sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int3
}
}
}
- return sal_False;
+ return false;
}
-sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNumberFormat, sal_Bool& bIsStandard,
+sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNumberFormat, bool& bIsStandard,
uno::Reference <util::XNumberFormatsSupplier>& xNumberFormatsSupplier)
{
if (xNumberFormatsSupplier.is())
@@ -297,9 +297,9 @@ sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNu
}
void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(SvXMLExport& rXMLExport,
- const sal_Int32 nNumberFormat, const double& rValue, sal_Bool bExportValue)
+ const sal_Int32 nNumberFormat, const double& rValue, bool bExportValue)
{
- sal_Bool bIsStandard;
+ bool bIsStandard;
sal_Int16 nTypeKey = GetCellType(nNumberFormat, bIsStandard, rXMLExport.GetNumberFormatsSupplier());
OUString sCurrency;
if ((nTypeKey & ~util::NumberFormat::DEFINED) == util::NumberFormat::CURRENCY)
@@ -309,7 +309,7 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(SvXMLExpor
void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(SvXMLExport& rXMLExport,
const OUString& rValue, const OUString& rCharacters,
- sal_Bool bExportValue, sal_Bool bExportTypeAttribute)
+ bool bExportValue, bool bExportTypeAttribute)
{
if (bExportTypeAttribute)
rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING);
@@ -317,7 +317,7 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(SvXMLExpor
rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_STRING_VALUE, rValue);
}
-sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& rCurrencySymbol)
+bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int32 nNumberFormat, OUString& rCurrencySymbol)
{
if (!xNumberFormats.is() && pExport && pExport->GetNumberFormatsSupplier().is())
xNumberFormats.set(pExport->GetNumberFormatsSupplier()->getNumberFormats());
@@ -340,7 +340,7 @@ sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int3
rCurrencySymbol = "EUR";
}
}
- return sal_True;
+ return true;
}
}
catch ( uno::Exception& )
@@ -348,7 +348,7 @@ sal_Bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int3
OSL_FAIL("Numberformat not found");
}
}
- return sal_False;
+ return false;
}
sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNumberFormat, bool& bIsStandard)
@@ -383,12 +383,12 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
const sal_Int16 nTypeKey,
const double& rValue,
const OUString& rCurrency,
- sal_Bool bExportValue, sal_uInt16 nNamespace)
+ bool bExportValue, sal_uInt16 nNamespace)
{
if (!pExport)
return;
- sal_Bool bWasSetTypeAttribute = sal_False;
+ bool bWasSetTypeAttribute = false;
OUString sAttrValType = pExport->GetNamespaceMap().GetQNameByKey( nNamespace, GetXMLToken(XML_VALUE_TYPE));
switch(nTypeKey & ~util::NumberFormat::DEFINED)
{
@@ -400,7 +400,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
if (!bWasSetTypeAttribute)
{
pExport->AddAttribute(sAttrValType, XML_FLOAT);
- bWasSetTypeAttribute = sal_True;
+ bWasSetTypeAttribute = true;
}
} // No Break
case util::NumberFormat::PERCENT:
@@ -408,7 +408,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
if (!bWasSetTypeAttribute)
{
pExport->AddAttribute(sAttrValType, XML_PERCENTAGE);
- bWasSetTypeAttribute = sal_True;
+ bWasSetTypeAttribute = true;
}
} // No Break
case util::NumberFormat::CURRENCY:
@@ -418,7 +418,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
pExport->AddAttribute(sAttrValType, XML_CURRENCY);
if (!rCurrency.isEmpty())
pExport->AddAttribute(sAttrCurrency, rCurrency);
- bWasSetTypeAttribute = sal_True;
+ bWasSetTypeAttribute = true;
}
if (bExportValue)
@@ -436,7 +436,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
if (!bWasSetTypeAttribute)
{
pExport->AddAttribute(sAttrValType, XML_DATE);
- bWasSetTypeAttribute = sal_True;
+ bWasSetTypeAttribute = true;
}
if (bExportValue)
{
@@ -454,7 +454,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
if (!bWasSetTypeAttribute)
{
pExport->AddAttribute(sAttrValType, XML_TIME);
- bWasSetTypeAttribute = sal_True;
+ bWasSetTypeAttribute = true;
}
if (bExportValue)
{
@@ -469,7 +469,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
if (!bWasSetTypeAttribute)
{
pExport->AddAttribute(sAttrValType, XML_BOOLEAN);
- bWasSetTypeAttribute = sal_True;
+ bWasSetTypeAttribute = true;
}
if (bExportValue)
{
@@ -502,7 +502,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
if (!bWasSetTypeAttribute)
{
pExport->AddAttribute(sAttrValType, XML_FLOAT);
- bWasSetTypeAttribute = sal_True;
+ bWasSetTypeAttribute = true;
if (bExportValue)
{
OUString sValue( ::rtl::math::doubleToUString( rValue,
@@ -517,7 +517,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(
}
void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(
- const sal_Int32 nNumberFormat, const double& rValue, sal_Bool bExportValue,
+ const sal_Int32 nNumberFormat, const double& rValue, bool bExportValue,
sal_uInt16 nNamespace, bool bExportCurrencySymbol)
{
if (pExport)
@@ -537,7 +537,7 @@ void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(
void XMLNumberFormatAttributesExportHelper::SetNumberFormatAttributes(
const OUString& rValue, const OUString& rCharacters,
- sal_Bool bExportValue, sal_Bool bExportTypeAttribute,
+ bool bExportValue, bool bExportTypeAttribute,
sal_uInt16 nNamespace)
{
if (pExport)
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 805da8573fbf..3b0538de3421 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -66,7 +66,7 @@ XMLPropStyleContext::XMLPropStyleContext( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
const Reference< XAttributeList > & xAttrList,
SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
- sal_Bool bDefault )
+ bool bDefault )
: SvXMLStyleContext( rImport, nPrfx, rLName, xAttrList, nFamily, bDefault )
, msIsPhysical( "IsPhysical" )
, msFollowStyle( "FollowStyle" )
@@ -170,7 +170,7 @@ Reference < XStyle > XMLPropStyleContext::Create()
typedef ::std::set < OUString > PropertyNameSet;
-void XMLPropStyleContext::CreateAndInsert( sal_Bool bOverwrite )
+void XMLPropStyleContext::CreateAndInsert( bool bOverwrite )
{
if( ((SvXMLStylesContext *)&mxStyles)->IsAutomaticStyle()
&& ( GetFamily() == XML_STYLE_FAMILY_TEXT_TEXT || GetFamily() == XML_STYLE_FAMILY_TEXT_PARAGRAPH ) )
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 1c2cc33ad207..a09911e17557 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -1513,7 +1513,7 @@ sal_Int32 SvXMLNumFormatContext::GetKey()
{
// reset bRemoveAfterUse before CreateAndInsert, so AddKey is called without bRemoveAfterUse set
bRemoveAfterUse = sal_False;
- CreateAndInsert(sal_True);
+ CreateAndInsert(true);
return nKey;
}
}
@@ -1526,7 +1526,7 @@ sal_Int32 SvXMLNumFormatContext::PrivateGetKey()
return nKey;
else
{
- CreateAndInsert(sal_True);
+ CreateAndInsert(true);
return nKey;
}
}
@@ -1550,7 +1550,7 @@ sal_Int32 SvXMLNumFormatContext::CreateAndInsert( com::sun::star::uno::Reference
return nKey;
}
-void SvXMLNumFormatContext::CreateAndInsert(sal_Bool /*bOverwrite*/)
+void SvXMLNumFormatContext::CreateAndInsert(bool /*bOverwrite*/)
{
if (!(nKey > -1))
CreateAndInsert(pData->GetNumberFormatter());
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 1598118e248e..0ad232b35482 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -185,7 +185,7 @@ void SvXMLStyleContext::SetDefaults()
{
}
-void SvXMLStyleContext::CreateAndInsert( sal_Bool /*bOverwrite*/ )
+void SvXMLStyleContext::CreateAndInsert( bool /*bOverwrite*/ )
{
}
@@ -848,7 +848,7 @@ void SvXMLStylesContext::CopyAutoStylesToDoc()
pStyle->GetFamily() != XML_STYLE_FAMILY_TEXT_PARAGRAPH &&
pStyle->GetFamily() != XML_STYLE_FAMILY_TABLE_CELL ) )
continue;
- pStyle->CreateAndInsert( sal_False );
+ pStyle->CreateAndInsert( false );
}
}
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index 6779741fdfc3..f8c003991c73 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -221,7 +221,7 @@ SvXMLImportContext *XMLIndexBibliographyConfigurationContext::CreateChildContext
xAttrList);
}
-void XMLIndexBibliographyConfigurationContext::CreateAndInsert(sal_Bool)
+void XMLIndexBibliographyConfigurationContext::CreateAndInsert(bool)
{
// (code almost the same as export...)
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index 8b1a67c8e387..4c3ade8961e7 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -210,7 +210,7 @@ void XMLLineNumberingImportContext::ProcessAttribute(
}
}
-void XMLLineNumberingImportContext::CreateAndInsert(sal_Bool)
+void XMLLineNumberingImportContext::CreateAndInsert(bool)
{
// insert and block mode is handled in insertStyleFamily
diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx
index c2bad9924f61..604edec14c67 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -432,7 +432,7 @@ void XMLSectionExport::ExportRegularSectionStart(
{
OUString sQValue =
GetExport().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_OOOW,
- sCond, sal_False );
+ sCond, false );
GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_CONDITION, sQValue);
eDisplay = XML_CONDITION;
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index 831de766b062..2128cf154bd6 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -277,7 +277,7 @@ void XMLSectionImportContext::ProcessAttributes(
{
OUString sTmp;
sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
- _GetKeyByAttrName( sAttr, &sTmp, sal_False );
+ _GetKeyByAttrName( sAttr, &sTmp, false );
if( XML_NAMESPACE_OOOW == nPrefix )
{
sCond = sTmp;
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index b75d5e5f1f76..25d9a4ad2c6f 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -199,7 +199,7 @@ SvXMLImportContext *XMLTextShapeStyleContext::CreateChildContext(
return pContext;
}
-void XMLTextShapeStyleContext::CreateAndInsert( sal_Bool bOverwrite )
+void XMLTextShapeStyleContext::CreateAndInsert( bool bOverwrite )
{
XMLShapeStyleContext::CreateAndInsert( bOverwrite );
Reference < XStyle > xStyle = GetStyle();
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 1649300ed4fb..3aa1691bf4d0 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -2489,7 +2489,7 @@ void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName,
sal_uInt16 nPrefix)
{
OUString sQValue =
- GetExport().GetNamespaceMap().GetQNameByKey( nValuePrefix, sValue, sal_False );
+ GetExport().GetNamespaceMap().GetQNameByKey( nValuePrefix, sValue, false );
ProcessString( eName, sQValue, bOmitEmpty, nPrefix );
}
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 31a4a979ccc2..ec52fbb33b56 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -1459,7 +1459,7 @@ void XMLDatabaseNextImportContext::ProcessAttribute(
{
OUString sTmp;
sal_uInt16 nPrefix = GetImport().GetNamespaceMap()._GetKeyByAttrName(
- sAttrValue, &sTmp, sal_False );
+ sAttrValue, &sTmp, false );
if( XML_NAMESPACE_OOOW == nPrefix )
{
sCondition = sTmp;
@@ -2029,7 +2029,7 @@ void XMLHiddenParagraphImportContext::ProcessAttribute(
{
OUString sTmp;
sal_uInt16 nPrefix = GetImport().GetNamespaceMap()._GetKeyByAttrName(
- sAttrValue, &sTmp, sal_False );
+ sAttrValue, &sTmp, false );
if( XML_NAMESPACE_OOOW == nPrefix )
{
sCondition = sTmp;
@@ -2094,7 +2094,7 @@ void XMLConditionalTextImportContext::ProcessAttribute(
{
OUString sTmp;
sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
- _GetKeyByAttrName( sAttrValue, &sTmp, sal_False );
+ _GetKeyByAttrName( sAttrValue, &sTmp, false );
if( XML_NAMESPACE_OOOW == nPrefix )
{
sCondition = sTmp;
@@ -2179,7 +2179,7 @@ void XMLHiddenTextImportContext::ProcessAttribute(
{
OUString sTmp;
sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
- _GetKeyByAttrName( sAttrValue, &sTmp, sal_False );
+ _GetKeyByAttrName( sAttrValue, &sTmp, false );
if( XML_NAMESPACE_OOOW == nPrefix )
{
sCondition = sTmp;
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index 4388a72a373e..34ad344c355b 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -200,7 +200,7 @@ SvXMLImportContext *XMLTextStyleContext::CreateChildContext(
return pContext;
}
-void XMLTextStyleContext::CreateAndInsert( sal_Bool bOverwrite )
+void XMLTextStyleContext::CreateAndInsert( bool bOverwrite )
{
XMLPropStyleContext::CreateAndInsert( bOverwrite );
Reference < XStyle > xStyle = GetStyle();
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index cf2d43c9f0a0..c1832e65d009 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -162,7 +162,7 @@ void XMLVarFieldImportContext::ProcessAttribute(
{
OUString sTmp;
sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
- _GetKeyByAttrName( sAttrValue, &sTmp, sal_False );
+ _GetKeyByAttrName( sAttrValue, &sTmp, false );
if( XML_NAMESPACE_OOOW == nPrefix )
{
sFormula = sTmp;
@@ -1386,7 +1386,7 @@ void XMLValueImportHelper::ProcessAttribute(
{
OUString sTmp;
sal_uInt16 nPrefix = rImport.GetNamespaceMap().
- _GetKeyByAttrName( sAttrValue, &sTmp, sal_False );
+ _GetKeyByAttrName( sAttrValue, &sTmp, false );
if( XML_NAMESPACE_OOOW == nPrefix )
{
sFormula = sTmp;
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 875eeb37033b..0ad4b9a0d82b 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -1231,7 +1231,7 @@ sal_Bool XMLTransformerBase::NegPercent( OUString& rValue )
sal_Bool XMLTransformerBase::AddNamespacePrefix( OUString& rName,
sal_uInt16 nPrefix ) const
{
- rName = GetNamespaceMap().GetQNameByKey( nPrefix, rName, sal_False );
+ rName = GetNamespaceMap().GetQNameByKey( nPrefix, rName, false );
return sal_True;
}
@@ -1240,7 +1240,7 @@ sal_Bool XMLTransformerBase::RemoveNamespacePrefix( OUString& rName,
{
OUString aLocalName;
sal_uInt16 nPrefix =
- GetNamespaceMap()._GetKeyByAttrName( rName, &aLocalName, sal_False );
+ GetNamespaceMap()._GetKeyByAttrName( rName, &aLocalName, false );
sal_Bool bRet = XML_NAMESPACE_UNKNOWN != nPrefix &&
(USHRT_MAX == nPrefixOnly || nPrefix == nPrefixOnly);
if( bRet )