summaryrefslogtreecommitdiff
path: root/include/xmloff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-28 16:28:51 +0200
committerNoel Grandin <noel@peralex.com>2014-03-31 12:39:02 +0200
commit6ac6fb820f9e12649507cb5233c3b1727d67f2fd (patch)
treee9cf0ecee233a800c73a356677b0921c1c04d25c /include/xmloff
parentf907d740351886194bf2c9bcffceed22c4698ca5 (diff)
xmloff: sal_Bool->bool
Change-Id: I64c33ae4c157e270acac9a1f820d3e6272ba0bea
Diffstat (limited to 'include/xmloff')
-rw-r--r--include/xmloff/xmlaustp.hxx8
-rw-r--r--include/xmloff/xmlcnimp.hxx12
-rw-r--r--include/xmloff/xmlevent.hxx2
-rw-r--r--include/xmloff/xmlexp.hxx56
-rw-r--r--include/xmloff/xmlexppr.hxx2
5 files changed, 40 insertions, 40 deletions
diff --git a/include/xmloff/xmlaustp.hxx b/include/xmloff/xmlaustp.hxx
index 8459c2b6820a..55cb05d52bf3 100644
--- a/include/xmloff/xmlaustp.hxx
+++ b/include/xmloff/xmlaustp.hxx
@@ -77,10 +77,10 @@ public:
if bAsFamily is sal_False, the family name is used as element name
*/
// TODO: Remove this ugly method as soon as possible
- void AddFamily( sal_Int32 nFamily, const OUString& rStrName, SvXMLExportPropertyMapper* pMapper, const OUString& aStrPrefix, sal_Bool bAsFamily = sal_True );
+ void AddFamily( sal_Int32 nFamily, const OUString& rStrName, SvXMLExportPropertyMapper* pMapper, const OUString& aStrPrefix, bool bAsFamily = true );
void AddFamily( sal_Int32 nFamily, const OUString& rStrName,
const UniReference< SvXMLExportPropertyMapper >& rMapper,
- const OUString& rStrPrefix, sal_Bool bAsFamily = sal_True );
+ const OUString& rStrPrefix, bool bAsFamily = true );
void SetFamilyPropSetMapper( sal_Int32 nFamily,
const UniReference< SvXMLExportPropertyMapper >& rMapper );
@@ -100,10 +100,10 @@ public:
/// Add an item set to the pool and return its generated name.
OUString Add( sal_Int32 nFamily, const ::std::vector< XMLPropertyState >& rProperties );
OUString Add( sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties, bool bDontSeek = false );
- sal_Bool Add( OUString& rName, sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties );
+ bool Add( OUString& rName, sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties );
/// Add an item set with a pre-defined name (needed for saving sheets separately in Calc).
- sal_Bool AddNamed( const OUString& rName, sal_Int32 nFamily, const OUString& rParent,
+ bool AddNamed( const OUString& rName, sal_Int32 nFamily, const OUString& rParent,
const ::std::vector< XMLPropertyState >& rProperties );
/// Find an item set's name.
diff --git a/include/xmloff/xmlcnimp.hxx b/include/xmloff/xmlcnimp.hxx
index f6ef3fe09590..70825653f2b8 100644
--- a/include/xmloff/xmlcnimp.hxx
+++ b/include/xmloff/xmlcnimp.hxx
@@ -38,10 +38,10 @@ public:
bool operator ==( const SvXMLAttrContainerData& rCmp ) const;
- sal_Bool AddAttr( const OUString& rLName, const OUString& rValue );
- sal_Bool AddAttr( const OUString& rPrefix, const OUString& rNamespace,
+ bool AddAttr( const OUString& rLName, const OUString& rValue );
+ bool AddAttr( const OUString& rPrefix, const OUString& rNamespace,
const OUString& rLName, const OUString& rValue );
- sal_Bool AddAttr( const OUString& rPrefix,
+ bool AddAttr( const OUString& rPrefix,
const OUString& rLName,
const OUString& rValue );
@@ -56,12 +56,12 @@ public:
const OUString& GetNamespace( sal_uInt16 i ) const;
const OUString& GetPrefix( sal_uInt16 i ) const;
- sal_Bool SetAt( size_t i,
+ bool SetAt( size_t i,
const OUString& rLName, const OUString& rValue );
- sal_Bool SetAt( size_t i,
+ bool SetAt( size_t i,
const OUString& rPrefix, const OUString& rNamespace,
const OUString& rLName, const OUString& rValue );
- sal_Bool SetAt( size_t i,
+ bool SetAt( size_t i,
const OUString& rPrefix,
const OUString& rLName,
const OUString& rValue );
diff --git a/include/xmloff/xmlevent.hxx b/include/xmloff/xmlevent.hxx
index 70de54525d28..261c89a5715a 100644
--- a/include/xmloff/xmlevent.hxx
+++ b/include/xmloff/xmlevent.hxx
@@ -98,7 +98,7 @@ public:
const OUString& rEventQName, /// the XML name of the event
::com::sun::star::uno::Sequence< /// the values for the event
::com::sun::star::beans::PropertyValue> & rValues,
- sal_Bool bUseWhitespace) = 0; /// create whitespace around elements?
+ bool bUseWhitespace) = 0; /// create whitespace around elements?
};
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index ed7571f33ceb..7c7eef29fe12 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -143,7 +143,7 @@ class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6<
XMLImageMapExport* mpImageMapExport;
XMLErrors* mpXMLErrors;
- sal_Bool mbExtended; // Does document contain extens.
+ bool mbExtended; // Does document contain extens.
const enum ::xmloff::token::XMLTokenEnum meClass;
SAL_DLLPRIVATE void _InitCtor();
@@ -163,10 +163,10 @@ private:
SAL_DLLPRIVATE void ImplExportMeta(); // <office:meta>
SAL_DLLPRIVATE void ImplExportSettings(); // <office:settings>
- SAL_DLLPRIVATE void ImplExportStyles( sal_Bool bUsed ); // <office:styles>
- SAL_DLLPRIVATE void ImplExportAutoStyles( sal_Bool bUsed );
+ SAL_DLLPRIVATE void ImplExportStyles( bool bUsed ); // <office:styles>
+ SAL_DLLPRIVATE void ImplExportAutoStyles( bool bUsed );
// <office:automatic-styles>
- SAL_DLLPRIVATE void ImplExportMasterStyles( sal_Bool bUsed );
+ SAL_DLLPRIVATE void ImplExportMasterStyles( bool bUsed );
// <office:master-styles>
SAL_DLLPRIVATE void ImplExportContent(); // <office:body>
virtual void SetBodyAttributes();
@@ -210,10 +210,10 @@ protected:
// This method must be overloaded to export the content of <office:body>.
virtual void _ExportContent() = 0;
- void SetExtended( sal_Bool bSet=sal_True ) { mbExtended = bSet; }
+ void SetExtended( bool bSet=true ) { mbExtended = bSet; }
// save linked sections? (may be false in global documents)
- sal_Bool mbSaveLinkedSections;
+ bool mbSaveLinkedSections;
virtual XMLTextParagraphExport* CreateTextParagraphExport();
virtual XMLShapeExport* CreateShapeExport();
@@ -417,10 +417,10 @@ public:
// Export the document.
virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID );
- virtual void addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False );
+ virtual void addDataStyle(const sal_Int32 nNumberFormat, bool bTimeFormat = false );
virtual void exportDataStyles();
virtual void exportAutoDataStyles();
- virtual OUString getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ) const;
+ virtual OUString getDataStyleName(const sal_Int32 nNumberFormat, bool bTimeFormat = false ) const;
sal_Int32 dataStyleForceSystemLanguage(sal_Int32 nFormat) const;
virtual void exportAnnotationMeta( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape);
@@ -475,24 +475,24 @@ public:
OUString AddEmbeddedGraphicObject(
const OUString& rGraphicObjectURL );
- sal_Bool AddEmbeddedGraphicObjectAsBase64(
+ bool AddEmbeddedGraphicObjectAsBase64(
const OUString& rGraphicObjectURL );
OUString AddEmbeddedObject(
const OUString& rEmbeddedObjectURL );
- sal_Bool AddEmbeddedObjectAsBase64(
+ bool AddEmbeddedObjectAsBase64(
const OUString& rEmbeddedObjectURL );
OUString EncodeStyleName( const OUString& rName,
sal_Bool *pEncoded=0 ) const;
// save linked sections?
- inline sal_Bool IsSaveLinkedSections() { return mbSaveLinkedSections; }
+ inline bool IsSaveLinkedSections() { return mbSaveLinkedSections; }
// get export flags
sal_uInt16 getExportFlags() const { return mnExportFlags; }
- sal_Bool ExportEmbeddedOwnObject(
+ bool ExportEmbeddedOwnObject(
::com::sun::star::uno::Reference<
::com::sun::star::lang::XComponent >& rComp );
@@ -501,15 +501,15 @@ public:
// methods for accessing the document handler and handling SAX errors
void StartElement(sal_uInt16 nPrefix,
enum ::xmloff::token::XMLTokenEnum eName,
- sal_Bool bIgnWSOutside );
+ bool bIgnWSOutside );
void StartElement(const OUString& rName,
- sal_Bool bIgnWSOutside );
+ bool bIgnWSOutside );
void Characters(const OUString& rChars);
void EndElement(sal_uInt16 nPrefix,
enum ::xmloff::token::XMLTokenEnum eName,
- sal_Bool bIgnWSInside );
+ bool bIgnWSInside );
void EndElement(const OUString& rName,
- sal_Bool bIgnWSInside );
+ bool bIgnWSInside );
void IgnorableWhitespace();
/**
@@ -548,7 +548,7 @@ public:
}
// Written OpenDocument file format doesn't fit to the created text document (#i69627#)
- sal_Bool writeOutlineStyleAsNormalListStyle() const;
+ bool writeOutlineStyleAsNormalListStyle() const;
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetTargetStorage();
@@ -572,10 +572,10 @@ public:
void AddAttributesRDFa( ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextContent> const & i_xTextContent);
- sal_Bool exportTextNumberElement() const;
+ bool exportTextNumberElement() const;
/// set null date from model to unit converter, if not already done
- sal_Bool SetNullDateOnUnitConverter();
+ bool SetNullDateOnUnitConverter();
};
inline UniReference< XMLTextParagraphExport > SvXMLExport::GetTextParagraphExport()
@@ -656,14 +656,14 @@ class XMLOFF_DLLPUBLIC SvXMLElementExport
{
SvXMLExport& mrExport;
OUString maElementName;
- const sal_Bool mbIgnoreWhitespaceInside :1;
- const sal_Bool mbDoSomething :1;
+ const bool mbIgnoreWhitespaceInside :1;
+ const bool mbDoSomething :1;
SAL_DLLPRIVATE
void StartElement(
const sal_uInt16 nPrefix,
const OUString& rName,
- const sal_Bool bIgnoreWhitespaceOutside );
+ const bool bIgnoreWhitespaceOutside );
public:
@@ -671,21 +671,21 @@ public:
// of the XMLExport instance attached.
SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefix,
const sal_Char *pName,
- sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside );
+ bool bIgnWSOutside, bool bIgnWSInside );
SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefix,
const OUString& rName,
- sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside );
+ bool bIgnWSOutside, bool bIgnWSInside );
SvXMLElementExport( SvXMLExport& rExp, sal_uInt16 nPrefix,
enum ::xmloff::token::XMLTokenEnum eName,
- sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside );
+ bool bIgnWSOutside, bool bIgnWSInside );
SvXMLElementExport( SvXMLExport& rExp, const OUString& rQName,
- sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside );
+ bool bIgnWSOutside, bool bIgnWSInside );
// Thes constructors do nothing if bDoSomething is not set
- SvXMLElementExport( SvXMLExport& rExp, sal_Bool bDoSomething,
+ SvXMLElementExport( SvXMLExport& rExp, bool bDoSomething,
sal_uInt16 nPrefix,
enum ::xmloff::token::XMLTokenEnum eName,
- sal_Bool bIgnWSOutside, sal_Bool bIgnWSInside );
+ bool bIgnWSOutside, bool bIgnWSInside );
// The destructor prints an end tag.
~SvXMLElementExport();
diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx
index 3ce2f34a1fbd..7a1f655e62f0 100644
--- a/include/xmloff/xmlexppr.hxx
+++ b/include/xmloff/xmlexppr.hxx
@@ -122,7 +122,7 @@ public:
{ return _Filter(rPropSet, true, bEnableFoFontFamily); }
/** Compare to arrays of XMLPropertyState */
- sal_Bool Equals( const ::std::vector< XMLPropertyState >& aProperties1,
+ bool Equals( const ::std::vector< XMLPropertyState >& aProperties1,
const ::std::vector< XMLPropertyState >& aProperties2 ) const;
/** fills the given attribute list with the items in the given set */