summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-02-13 10:51:01 +0200
committerNoel Grandin <noel@peralex.com>2014-02-14 14:15:14 +0200
commitfd3c9e16e1bf0db8cf8d549b864ae35f9ec3aa1e (patch)
tree6481c52876bb9315568c0f4b47037250d4b2ae4a
parentc6a526b20f6cf0738831ba38f93028cbc97e160f (diff)
sal_Bool->bool
Change-Id: Ia453c7868e030e3f10a7f69c1e2d28244758fdef
-rw-r--r--include/xmloff/XMLPageExport.hxx2
-rw-r--r--include/xmloff/XMLTextMasterPageExport.hxx4
-rw-r--r--sc/source/filter/xml/XMLTableMasterPageExport.cxx30
-rw-r--r--sc/source/filter/xml/XMLTableMasterPageExport.hxx6
-rw-r--r--xmloff/source/style/XMLPageExport.cxx6
-rw-r--r--xmloff/source/text/XMLTextMasterPageExport.cxx28
6 files changed, 38 insertions, 38 deletions
diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx
index 4aa19cb4e869..a9da8ec368a9 100644
--- a/include/xmloff/XMLPageExport.hxx
+++ b/include/xmloff/XMLPageExport.hxx
@@ -79,7 +79,7 @@ protected:
virtual void exportMasterPageContent(
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > & rPropSet,
- sal_Bool bAutoStyles );
+ bool bAutoStyles );
sal_Bool exportStyle(
const ::com::sun::star::uno::Reference<
diff --git a/include/xmloff/XMLTextMasterPageExport.hxx b/include/xmloff/XMLTextMasterPageExport.hxx
index 3d07964dfb29..495db63884ba 100644
--- a/include/xmloff/XMLTextMasterPageExport.hxx
+++ b/include/xmloff/XMLTextMasterPageExport.hxx
@@ -51,12 +51,12 @@ protected:
virtual void exportHeaderFooterContent(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XText >& rText,
- sal_Bool bAutoStyles, sal_Bool bExportParagraph = sal_True );
+ bool bAutoStyles, bool bExportParagraph = true );
virtual void exportMasterPageContent(
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > & rPropSet,
- sal_Bool bAutoStyles );
+ bool bAutoStyles );
public:
XMLTextMasterPageExport( SvXMLExport& rExp );
diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx
index dcec6c88c0f6..bac0f2949e74 100644
--- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx
+++ b/sc/source/filter/xml/XMLTableMasterPageExport.cxx
@@ -44,7 +44,7 @@ XMLTableMasterPageExport::~XMLTableMasterPageExport()
void XMLTableMasterPageExport::exportHeaderFooterContent(
const Reference< XText >& rText,
- sal_Bool bAutoStyles, sal_Bool bProgress )
+ bool bAutoStyles, bool bProgress )
{
OSL_ENSURE( rText.is(), "There is the text" );
@@ -60,7 +60,7 @@ void XMLTableMasterPageExport::exportHeaderFooterContent(
void XMLTableMasterPageExport::exportHeaderFooter(const com::sun::star::uno::Reference < com::sun::star::sheet::XHeaderFooterContent >& xHeaderFooter,
const XMLTokenEnum aName,
- const sal_Bool bDisplay)
+ const bool bDisplay)
{
if( xHeaderFooter.is() )
{
@@ -107,7 +107,7 @@ void XMLTableMasterPageExport::exportHeaderFooter(const com::sun::star::uno::Ref
void XMLTableMasterPageExport::exportMasterPageContent(
const Reference < XPropertySet > & rPropSet,
- sal_Bool bAutoStyles )
+ bool bAutoStyles )
{
Reference < sheet::XHeaderFooterContent > xHeader(rPropSet->getPropertyValue( OUString( SC_UNO_PAGE_RIGHTHDRCON ) ), uno::UNO_QUERY);
@@ -121,27 +121,27 @@ void XMLTableMasterPageExport::exportMasterPageContent(
{
if( xHeader.is() )
{
- exportHeaderFooterContent( xHeader->getCenterText(), sal_True, false );
- exportHeaderFooterContent( xHeader->getLeftText(), sal_True, false );
- exportHeaderFooterContent( xHeader->getRightText(), sal_True, false );
+ exportHeaderFooterContent( xHeader->getCenterText(), true, false );
+ exportHeaderFooterContent( xHeader->getLeftText(), true, false );
+ exportHeaderFooterContent( xHeader->getRightText(), true, false );
}
if( xHeaderLeft.is())
{
- exportHeaderFooterContent( xHeaderLeft->getCenterText(), sal_True, false );
- exportHeaderFooterContent( xHeaderLeft->getLeftText(), sal_True, false );
- exportHeaderFooterContent( xHeaderLeft->getRightText(), sal_True, false );
+ exportHeaderFooterContent( xHeaderLeft->getCenterText(), true, false );
+ exportHeaderFooterContent( xHeaderLeft->getLeftText(), true, false );
+ exportHeaderFooterContent( xHeaderLeft->getRightText(), true, false );
}
if( xFooter.is() )
{
- exportHeaderFooterContent( xFooter->getCenterText(), sal_True, false );
- exportHeaderFooterContent( xFooter->getLeftText(), sal_True, false );
- exportHeaderFooterContent( xFooter->getRightText(), sal_True, false );
+ exportHeaderFooterContent( xFooter->getCenterText(), true, false );
+ exportHeaderFooterContent( xFooter->getLeftText(), true, false );
+ exportHeaderFooterContent( xFooter->getRightText(), true, false );
}
if( xFooterLeft.is())
{
- exportHeaderFooterContent( xFooterLeft->getCenterText(), sal_True, false );
- exportHeaderFooterContent( xFooterLeft->getLeftText(), sal_True, false );
- exportHeaderFooterContent( xFooterLeft->getRightText(), sal_True, false );
+ exportHeaderFooterContent( xFooterLeft->getCenterText(), true, false );
+ exportHeaderFooterContent( xFooterLeft->getLeftText(), true, false );
+ exportHeaderFooterContent( xFooterLeft->getRightText(), true, false );
}
}
else
diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.hxx b/sc/source/filter/xml/XMLTableMasterPageExport.hxx
index 17b9a463024a..92849f757b26 100644
--- a/sc/source/filter/xml/XMLTableMasterPageExport.hxx
+++ b/sc/source/filter/xml/XMLTableMasterPageExport.hxx
@@ -35,18 +35,18 @@ class XMLTableMasterPageExport : public XMLTextMasterPageExport
{
void exportHeaderFooter(const com::sun::star::uno::Reference < com::sun::star::sheet::XHeaderFooterContent >& xHeaderFooter,
const xmloff::token::XMLTokenEnum aName,
- const sal_Bool bDisplay);
+ const bool bDisplay);
protected:
virtual void exportHeaderFooterContent(
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XText >& rText,
- sal_Bool bAutoStyles, sal_Bool bProgress );
+ bool bAutoStyles, bool bProgress );
virtual void exportMasterPageContent(
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > & rPropSet,
- sal_Bool bAutoStyles );
+ bool bAutoStyles );
public:
XMLTableMasterPageExport( ScXMLExport& rExp );
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index 62b767779f86..b095ee6b6df2 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -74,7 +74,7 @@ void XMLPageExport::collectPageMasterAutoStyle(
void XMLPageExport::exportMasterPageContent(
const Reference < XPropertySet > &,
- sal_Bool /*bAutoStyles*/ )
+ bool /*bAutoStyles*/ )
{
}
@@ -102,7 +102,7 @@ sal_Bool XMLPageExport::exportStyle(
aEntry.sStyleName = rStyle->getName();
aNameVector.push_back( aEntry );
- exportMasterPageContent( xPropSet, sal_True );
+ exportMasterPageContent( xPropSet, true );
}
else
{
@@ -143,7 +143,7 @@ sal_Bool XMLPageExport::exportStyle(
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
XML_MASTER_PAGE, sal_True, sal_True );
- exportMasterPageContent( xPropSet, sal_False );
+ exportMasterPageContent( xPropSet, false );
}
return sal_True;
diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx
index b82cace5934d..8f452940b86d 100644
--- a/xmloff/source/text/XMLTextMasterPageExport.cxx
+++ b/xmloff/source/text/XMLTextMasterPageExport.cxx
@@ -56,7 +56,7 @@ XMLTextMasterPageExport::~XMLTextMasterPageExport()
void XMLTextMasterPageExport::exportHeaderFooterContent(
const Reference< XText >& rText,
- sal_Bool bAutoStyles, sal_Bool bExportParagraph )
+ bool bAutoStyles, bool bExportParagraph )
{
DBG_ASSERT( rText.is(), "There is the text" );
@@ -79,7 +79,7 @@ void XMLTextMasterPageExport::exportHeaderFooterContent(
void XMLTextMasterPageExport::exportMasterPageContent(
const Reference < XPropertySet > & rPropSet,
- sal_Bool bAutoStyles )
+ bool bAutoStyles )
{
Any aAny;
@@ -110,17 +110,17 @@ void XMLTextMasterPageExport::exportMasterPageContent(
if( bAutoStyles )
{
if( xHeaderText.is() )
- exportHeaderFooterContent( xHeaderText, sal_True );
+ exportHeaderFooterContent( xHeaderText, true );
if( xHeaderTextFirst.is() && xHeaderTextFirst != xHeaderText )
- exportHeaderFooterContent( xHeaderTextFirst, sal_True );
+ exportHeaderFooterContent( xHeaderTextFirst, true );
if( xHeaderTextLeft.is() && xHeaderTextLeft != xHeaderText )
- exportHeaderFooterContent( xHeaderTextLeft, sal_True );
+ exportHeaderFooterContent( xHeaderTextLeft, true );
if( xFooterText.is() )
- exportHeaderFooterContent( xFooterText, sal_True );
+ exportHeaderFooterContent( xFooterText, true );
if( xFooterTextFirst.is() && xFooterTextFirst != xFooterText )
- exportHeaderFooterContent( xFooterTextFirst, sal_True );
+ exportHeaderFooterContent( xFooterTextFirst, true );
if( xFooterTextLeft.is() && xFooterTextLeft != xFooterText )
- exportHeaderFooterContent( xFooterTextLeft, sal_True );
+ exportHeaderFooterContent( xFooterTextLeft, true );
}
else
{
@@ -149,7 +149,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
XML_DISPLAY, XML_FALSE );
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
XML_HEADER, sal_True, sal_True );
- exportHeaderFooterContent( xHeaderText, sal_False );
+ exportHeaderFooterContent( xHeaderText, false );
}
if( xHeaderTextFirst.is() && xHeaderTextFirst != xHeaderText )
@@ -159,7 +159,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
XML_DISPLAY, XML_FALSE );
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
XML_HEADER_FIRST, sal_True, sal_True );
- exportHeaderFooterContent( xHeaderTextFirst, sal_False );
+ exportHeaderFooterContent( xHeaderTextFirst, false );
}
if( xHeaderTextLeft.is() && xHeaderTextLeft != xHeaderText )
@@ -169,7 +169,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
XML_DISPLAY, XML_FALSE );
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
XML_HEADER_LEFT, sal_True, sal_True );
- exportHeaderFooterContent( xHeaderTextLeft, sal_False );
+ exportHeaderFooterContent( xHeaderTextLeft, false );
}
aAny = rPropSet->getPropertyValue( sFooterOn );
@@ -197,7 +197,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
XML_DISPLAY, XML_FALSE );
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
XML_FOOTER, sal_True, sal_True );
- exportHeaderFooterContent( xFooterText, sal_False );
+ exportHeaderFooterContent( xFooterText, false );
}
if( xFooterTextFirst.is() && xFooterTextFirst != xFooterText )
@@ -207,7 +207,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
XML_DISPLAY, XML_FALSE );
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
XML_FOOTER_FIRST, sal_True, sal_True );
- exportHeaderFooterContent( xFooterTextFirst, sal_False );
+ exportHeaderFooterContent( xFooterTextFirst, false );
}
if( xFooterTextLeft.is() && xFooterTextLeft != xFooterText )
@@ -217,7 +217,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
XML_DISPLAY, XML_FALSE );
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
XML_FOOTER_LEFT, sal_True, sal_True );
- exportHeaderFooterContent( xFooterTextLeft, sal_False );
+ exportHeaderFooterContent( xFooterTextLeft, false );
}
}
}