summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-01 14:05:37 +0200
committerNoel Grandin <noel@peralex.com>2014-04-03 09:17:51 +0200
commite8f4a2541bf5e38b953f04cee0e447a40d25950f (patch)
treee2725d9d59df226e2ad7722fc7c50ddbd67b8317 /include
parent22472e093dc107d01b6d8db1187bfc6bb2c9e80c (diff)
oox: sal_Bool->bool
Change-Id: I50788585dbcc489325dc9536a8e4d974a710e30d
Diffstat (limited to 'include')
-rw-r--r--include/oox/export/chartexport.hxx16
-rw-r--r--include/oox/export/drawingml.hxx12
-rw-r--r--include/oox/export/shapes.hxx4
-rw-r--r--include/oox/export/vmlexport.hxx4
4 files changed, 18 insertions, 18 deletions
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx
index b95fc5859c34..54e28020e812 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -90,7 +90,7 @@ private:
com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > mxNewDiagram;
// members filled by InitRangeSegmentationProperties (retrieved from DataProvider)
- sal_Bool mbHasCategoryLabels; //if the categories are only automatically generated this will be false
+ bool mbHasCategoryLabels; //if the categories are only automatically generated this will be false
OUString msChartAddress;
::com::sun::star::uno::Sequence< sal_Int32 > maSequenceMapping;
@@ -98,8 +98,8 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > mxCategoriesValues;
AxisVector maAxes;
- sal_Bool mbHasZAxis;
- sal_Bool mbIs3DChart;
+ bool mbHasZAxis;
+ bool mbIs3DChart;
private:
@@ -110,8 +110,8 @@ private:
void _ExportContent();
void exportChartSpace( com::sun::star::uno::Reference<
- com::sun::star::chart::XChartDocument > rChartDoc,
- sal_Bool bIncludeTable );
+ com::sun::star::chart::XChartDocument > rChartDoc,
+ bool bIncludeTable );
void exportChart( com::sun::star::uno::Reference<
com::sun::star::chart::XChartDocument > rChartDoc );
void exportExternalData( com::sun::star::uno::Reference<
@@ -146,7 +146,7 @@ private:
const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries > > & aSeriesSeq,
- sal_Bool bJapaneseCandleSticks, sal_Int32& nAttachedAxis );
+ bool bJapaneseCandleSticks, sal_Int32& nAttachedAxis );
void exportSeriesText(
const com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xValueSeq );
void exportSeriesCategory(
@@ -160,7 +160,7 @@ private:
void exportDataLabels(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesProperties,
sal_Int32 nSeriesLength );
- void exportGrouping( sal_Bool isBar = sal_False );
+ void exportGrouping( bool isBar = false );
void exportTrendlines( ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > xSeries );
void exportMarker();
void exportSmooth();
@@ -181,7 +181,7 @@ private:
AxisIdPair aAxisIdPair );
void exportAxesId( sal_Int32 nAttachedAxis );
void exportView3D();
- sal_Bool isDeep3dChart();
+ bool isDeep3dChart();
public:
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index b2c8d764b9ef..3efcf93bbcb6 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -99,7 +99,7 @@ protected:
bool GetPropertyAndState( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > rXPropState,
const OUString& aName, ::com::sun::star::beans::PropertyState& eState );
- const char* GetFieldType( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun, sal_Bool& bIsField );
+ const char* GetFieldType( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun, bool& bIsField );
/// If bRelPathToMedia is true add "../" to image folder path while adding the image relationship
@@ -126,7 +126,7 @@ public:
void WriteColor( const OUString& sColorSchemeName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aTransformations );
void WriteColorTransformations( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aTransformations );
void WriteGradientStop( sal_uInt16 nStop, sal_uInt32 nColor );
- void WriteLineArrow( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, sal_Bool bLineStart );
+ void WriteLineArrow( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, bool bLineStart );
void WriteConnectorConnections( EscherConnectorListEntry& rConnectorEntry, sal_Int32 nStartID, sal_Int32 nEndID );
void WriteSolidFill( sal_uInt32 nColor, sal_Int32 nAlpha = MAX_PERCENT );
@@ -156,9 +156,9 @@ public:
void WriteBlipMode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, const OUString& rURL );
void WriteShapeTransformation( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rXShape,
- sal_Int32 nXmlNamespace, sal_Bool bFlipH = false, sal_Bool bFlipV = false, sal_Bool bSuppressRotation = false );
+ sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = false, bool bSuppressRotation = false );
void WriteTransformation( const Rectangle& rRectangle,
- sal_Int32 nXmlNamespace, sal_Bool bFlipH = false, sal_Bool bFlipV = false, sal_Int32 nRotation = 0 );
+ sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = false, sal_Int32 nRotation = 0 );
void WriteText( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > rXIface, bool bBodyPr = true, bool bText = true, sal_Int32 nXmlNamespace = 0);
void WriteParagraph( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > rParagraph );
@@ -166,10 +166,10 @@ public:
void WriteParagraphNumbering( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet,
sal_Int16 nLevel );
void WriteRun( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun );
- void WriteRunProperties( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rRun, sal_Bool bIsField );
+ void WriteRunProperties( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rRun, bool bIsField );
void WritePresetShape( const char* pShape );
- void WritePresetShape( const char* pShape, MSO_SPT eShapeType, sal_Bool bPredefinedHandlesUsed, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, const ::com::sun::star::beans::PropertyValue& rProp );
+ void WritePresetShape( const char* pShape, MSO_SPT eShapeType, bool bPredefinedHandlesUsed, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, const ::com::sun::star::beans::PropertyValue& rProp );
void WritePolyPolygon( const PolyPolygon& rPolyPolygon );
void WriteFill( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropSet );
void WriteShapeStyle( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index bfcaaf713113..c7f8d159eb04 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -79,10 +79,10 @@ public:
ShapeExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, ShapeHashMap* pShapeMap = NULL, ::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX, DMLTextExport* pTextExport = 0 );
virtual ~ShapeExport() {}
- static sal_Bool NonEmptyText( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xIface );
+ static bool NonEmptyText( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xIface );
virtual ShapeExport&
- WriteBezierShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, sal_Bool bClosed );
+ WriteBezierShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape, bool bClosed );
virtual ShapeExport&
WriteClosedBezierShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape );
virtual ShapeExport&
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index 420725c72199..3a7049e65d6c 100644
--- a/include/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
@@ -88,7 +88,7 @@ public:
/// Call this when you need to export the object as VML.
sal_uInt32 AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri = -1,
sal_Int16 eVOri = -1, sal_Int16 eHRel = -1,
- sal_Int16 eVRel = -1, const Point* pNdTopLeft = 0, const sal_Bool bOOxmlExport = false );
+ sal_Int16 eVRel = -1, const Point* pNdTopLeft = 0, const bool bOOxmlExport = false );
virtual void AddSdrObjectVMLObject( const SdrObject& rObj) SAL_OVERRIDE;
static bool IsWaterMarkShape(const OUString& rStr);
protected:
@@ -133,7 +133,7 @@ private:
void AddLineDimensions( const Rectangle& rRectangle );
/// Add position and size to the OStringBuffer.
- void AddRectangleDimensions( OStringBuffer& rBuffer, const Rectangle& rRectangle, sal_Bool rbAbsolutePos = true );
+ void AddRectangleDimensions( OStringBuffer& rBuffer, const Rectangle& rRectangle, bool rbAbsolutePos = true );
};
} // namespace vml