summaryrefslogtreecommitdiff
path: root/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 /xmloff
parentf907d740351886194bf2c9bcffceed22c4698ca5 (diff)
xmloff: sal_Bool->bool
Change-Id: I64c33ae4c157e270acac9a1f820d3e6272ba0bea
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/inc/XMLScriptExportHandler.hxx2
-rw-r--r--xmloff/inc/XMLStarBasicExportHandler.hxx2
-rw-r--r--xmloff/source/chart/PropertyMaps.cxx4
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx98
-rw-r--r--xmloff/source/chart/SchXMLTools.cxx10
-rw-r--r--xmloff/source/core/DomExport.cxx4
-rw-r--r--xmloff/source/core/XMLBase64Export.cxx3
-rw-r--r--xmloff/source/core/xmlcnimp.cxx12
-rw-r--r--xmloff/source/core/xmlexp.cxx128
-rw-r--r--xmloff/source/draw/XMLImageMapExport.cxx4
-rw-r--r--xmloff/source/draw/XMLNumberStyles.cxx4
-rw-r--r--xmloff/source/draw/animationexport.cxx16
-rw-r--r--xmloff/source/draw/animexp.cxx10
-rw-r--r--xmloff/source/draw/layerexp.cxx8
-rw-r--r--xmloff/source/draw/sdpropls.cxx2
-rw-r--r--xmloff/source/draw/sdxmlexp.cxx38
-rw-r--r--xmloff/source/draw/sdxmlexp_impl.hxx4
-rw-r--r--xmloff/source/draw/shapeexport.cxx144
-rw-r--r--xmloff/source/forms/elementexport.cxx14
-rw-r--r--xmloff/source/forms/officeforms.cxx2
-rw-r--r--xmloff/source/forms/propertyexport.cxx6
-rw-r--r--xmloff/source/meta/MetaExportComponent.cxx2
-rw-r--r--xmloff/source/meta/xmlmetae.cxx28
-rw-r--r--xmloff/source/meta/xmlversion.cxx4
-rw-r--r--xmloff/source/script/XMLScriptExportHandler.cxx4
-rw-r--r--xmloff/source/script/XMLStarBasicExportHandler.cxx4
-rw-r--r--xmloff/source/style/DashStyle.cxx2
-rw-r--r--xmloff/source/style/GradientStyle.cxx2
-rw-r--r--xmloff/source/style/HatchStyle.cxx2
-rw-r--r--xmloff/source/style/ImageStyle.cxx2
-rw-r--r--xmloff/source/style/MarkerStyle.cxx2
-rw-r--r--xmloff/source/style/TransGradientStyle.cxx2
-rw-r--r--xmloff/source/style/XMLBackgroundImageExport.cxx2
-rw-r--r--xmloff/source/style/XMLFontAutoStylePool.cxx4
-rw-r--r--xmloff/source/style/XMLFootnoteSeparatorExport.cxx2
-rw-r--r--xmloff/source/style/XMLPageExport.cxx6
-rw-r--r--xmloff/source/style/impastpl.cxx2
-rw-r--r--xmloff/source/style/styleexp.cxx4
-rw-r--r--xmloff/source/style/xmlaustp.cxx12
-rw-r--r--xmloff/source/style/xmlexppr.cxx10
-rw-r--r--xmloff/source/style/xmlnume.cxx12
-rw-r--r--xmloff/source/style/xmlnumfe.cxx48
-rw-r--r--xmloff/source/style/xmltabe.cxx4
-rw-r--r--xmloff/source/table/XMLTableExport.cxx12
-rw-r--r--xmloff/source/text/XMLAutoTextEventExport.cxx2
-rw-r--r--xmloff/source/text/XMLIndexMarkExport.cxx2
-rw-r--r--xmloff/source/text/XMLLineNumberingExport.cxx4
-rw-r--r--xmloff/source/text/XMLRedlineExport.cxx28
-rw-r--r--xmloff/source/text/XMLSectionExport.cxx34
-rw-r--r--xmloff/source/text/XMLSectionFootnoteConfigExport.cxx2
-rw-r--r--xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx4
-rw-r--r--xmloff/source/text/XMLTextColumnsExport.cxx6
-rw-r--r--xmloff/source/text/XMLTextMasterPageExport.cxx12
-rw-r--r--xmloff/source/text/txtdrope.cxx2
-rw-r--r--xmloff/source/text/txtflde.cxx48
-rw-r--r--xmloff/source/text/txtftne.cxx16
-rw-r--r--xmloff/source/text/txtparae.cxx104
-rw-r--r--xmloff/source/xforms/xformsexport.cxx16
58 files changed, 483 insertions, 484 deletions
diff --git a/xmloff/inc/XMLScriptExportHandler.hxx b/xmloff/inc/XMLScriptExportHandler.hxx
index cef00247ecc1..2e968374683f 100644
--- a/xmloff/inc/XMLScriptExportHandler.hxx
+++ b/xmloff/inc/XMLScriptExportHandler.hxx
@@ -45,7 +45,7 @@ public:
const OUString& rEventName,
::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue> & rValues,
- sal_Bool bUseWhitespace) SAL_OVERRIDE;
+ bool bUseWhitespace) SAL_OVERRIDE;
};
#endif
diff --git a/xmloff/inc/XMLStarBasicExportHandler.hxx b/xmloff/inc/XMLStarBasicExportHandler.hxx
index 97c47dfea81a..ef0caf2d7f49 100644
--- a/xmloff/inc/XMLStarBasicExportHandler.hxx
+++ b/xmloff/inc/XMLStarBasicExportHandler.hxx
@@ -49,7 +49,7 @@ public:
const OUString& rEventName,
::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue> & rValues,
- sal_Bool bUseWhitespace) SAL_OVERRIDE;
+ bool bUseWhitespace) SAL_OVERRIDE;
};
#endif
diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx
index 6b0ab11f983e..4359a812ad28 100644
--- a/xmloff/source/chart/PropertyMaps.cxx
+++ b/xmloff/source/chart/PropertyMaps.cxx
@@ -301,7 +301,7 @@ void XMLChartExportPropertyMapper::handleElementItem(
SvXMLElementExport aElem( mrExport,
getPropertySetMapper()->GetEntryNameSpace( nPropIndex ),
getPropertySetMapper()->GetEntryXMLName( nPropIndex ),
- sal_True, sal_True );
+ true, true );
// export as Base64 embedded graphic
// if embedding is on
@@ -322,7 +322,7 @@ void XMLChartExportPropertyMapper::handleElementItem(
SvXMLElementExport aElem( mrExport,
getPropertySetMapper()->GetEntryNameSpace( nPropIndex ),
getPropertySetMapper()->GetEntryXMLName( nPropIndex ),
- sal_True, sal_True );
+ true, true );
SchXMLTools::exportText( mrExport, aSeparator, true );
}
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 500a80eae493..859e4a5e6f5b 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -977,7 +977,7 @@ bool lcl_exportDomainForThisSequence( const Reference< chart2::data::XDataSequen
if( rFirstRangeForThisDomainIndex.isEmpty() || !aRange.equals(rFirstRangeForThisDomainIndex) )
{
rExport.AddAttribute( XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, aRange);
- SvXMLElementExport aDomain( rExport, XML_NAMESPACE_CHART, XML_DOMAIN, sal_True, sal_True );
+ SvXMLElementExport aDomain( rExport, XML_NAMESPACE_CHART, XML_DOMAIN, true, true );
bDomainExported = true;
}
@@ -1204,12 +1204,12 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
if ( bIncludeTable && (aNullDate.Day != 30 || aNullDate.Month != 12 || aNullDate.Year != 1899 ) )
{
- SvXMLElementExport aSet( mrExport, XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, sal_True, sal_True );
+ SvXMLElementExport aSet( mrExport, XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, true, true );
{
OUStringBuffer sBuffer;
::sax::Converter::convertDateTime(sBuffer, aNullDate, 0);
mrExport.AddAttribute( XML_NAMESPACE_TABLE,XML_DATE_VALUE,sBuffer.makeStringAndClear());
- SvXMLElementExport aNull( mrExport, XML_NAMESPACE_TABLE, XML_NULL_DATE, sal_True, sal_True );
+ SvXMLElementExport aNull( mrExport, XML_NAMESPACE_TABLE, XML_NULL_DATE, true, true );
}
}
@@ -1287,7 +1287,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
AddAutoStyleAttribute( aPropertyStates );
//element
- pElChart = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_CHART, sal_True, sal_True );
+ pElChart = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_CHART, true, true );
}
else // autostyles
{
@@ -1316,7 +1316,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
AddAutoStyleAttribute( aPropertyStates );
// element
- SvXMLElementExport aElTitle( mrExport, XML_NAMESPACE_CHART, XML_TITLE, sal_True, sal_True );
+ SvXMLElementExport aElTitle( mrExport, XML_NAMESPACE_CHART, XML_TITLE, true, true );
// content (text:p)
Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY );
@@ -1358,7 +1358,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
AddAutoStyleAttribute( aPropertyStates );
// element (has no subelements)
- SvXMLElementExport aElSubTitle( mrExport, XML_NAMESPACE_CHART, XML_SUBTITLE, sal_True, sal_True );
+ SvXMLElementExport aElSubTitle( mrExport, XML_NAMESPACE_CHART, XML_SUBTITLE, true, true );
// content (text:p)
Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY );
@@ -1447,7 +1447,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
AddAutoStyleAttribute( aPropertyStates );
// element
- SvXMLElementExport aLegend( mrExport, XML_NAMESPACE_CHART, XML_LEGEND, sal_True, sal_True );
+ SvXMLElementExport aLegend( mrExport, XML_NAMESPACE_CHART, XML_LEGEND, true, true );
}
else // autostyles
{
@@ -1555,10 +1555,10 @@ static void lcl_exportComplexLabel( const Sequence< uno::Any >& rComplexLabel, S
sal_Int32 nLength = rComplexLabel.getLength();
if( nLength<=1 )
return;
- SvXMLElementExport aTextList( rExport, XML_NAMESPACE_TEXT, XML_LIST, sal_True, sal_True );
+ SvXMLElementExport aTextList( rExport, XML_NAMESPACE_TEXT, XML_LIST, true, true );
for(sal_Int32 nN=0; nN<nLength; nN++)
{
- SvXMLElementExport aListItem( rExport, XML_NAMESPACE_TEXT, XML_LIST_ITEM, sal_True, sal_True );
+ SvXMLElementExport aListItem( rExport, XML_NAMESPACE_TEXT, XML_LIST_ITEM, true, true );
OUString aString;
if( !(rComplexLabel[nN]>>=aString) )
{
@@ -1587,7 +1587,7 @@ void SchXMLExportHelper_Impl::exportTable()
{
}
- SvXMLElementExport aTable( mrExport, XML_NAMESPACE_TABLE, XML_TABLE, sal_True, sal_True );
+ SvXMLElementExport aTable( mrExport, XML_NAMESPACE_TABLE, XML_TABLE, true, true );
bool bHasOwnData = false;
Reference< chart2::XChartDocument > xNewDoc( mrExport.GetModel(), uno::UNO_QUERY );
@@ -1619,11 +1619,11 @@ void SchXMLExportHelper_Impl::exportTable()
// declare columns
{
- SvXMLElementExport aHeaderColumns( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, sal_True, sal_True );
- SvXMLElementExport aHeaderColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True );
+ SvXMLElementExport aHeaderColumns( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, true, true );
+ SvXMLElementExport aHeaderColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true );
}
{
- SvXMLElementExport aColumns( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, sal_True, sal_True );
+ SvXMLElementExport aColumns( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, true, true );
sal_Int32 nNextIndex = 0;
for( size_t nN=0; nN< aData.aHiddenColumns.size(); nN++ )
@@ -1636,10 +1636,10 @@ void SchXMLExportHelper_Impl::exportTable()
if(nRepeat>1)
mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED,
OUString::number( nRepeat ));
- SvXMLElementExport aColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True );
+ SvXMLElementExport aColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true );
}
mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_VISIBILITY, GetXMLToken( XML_COLLAPSE ) );
- SvXMLElementExport aColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True );
+ SvXMLElementExport aColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true );
nNextIndex = nHiddenIndex+1;
}
@@ -1650,20 +1650,20 @@ void SchXMLExportHelper_Impl::exportTable()
if(nRepeat>1)
mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED,
OUString::number( nRepeat ));
- SvXMLElementExport aColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True );
+ SvXMLElementExport aColumn( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true );
}
}
// export rows with content
//export header row
{
- SvXMLElementExport aHeaderRows( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, sal_True, sal_True );
- SvXMLElementExport aRow( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, sal_True, sal_True );
+ SvXMLElementExport aHeaderRows( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, true, true );
+ SvXMLElementExport aRow( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, true, true );
//first one empty cell for the row descriptions
{
- SvXMLElementExport aEmptyCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True );
- SvXMLElementExport aEmptyParagraph( mrExport, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_True );
+ SvXMLElementExport aEmptyCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, true, true );
+ SvXMLElementExport aEmptyParagraph( mrExport, XML_NAMESPACE_TEXT, XML_P, true, true );
}
//export column descriptions
@@ -1700,7 +1700,7 @@ void SchXMLExportHelper_Impl::exportTable()
mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING );
}
- SvXMLElementExport aCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True );
+ SvXMLElementExport aCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, true, true );
exportText( *aIt );
if( nC < nComplexCount )
lcl_exportComplexLabel( rComplexColumnDescriptions[nC], mrExport );
@@ -1717,7 +1717,7 @@ void SchXMLExportHelper_Impl::exportTable()
// export value rows
{
- SvXMLElementExport aRows( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROWS, sal_True, sal_True );
+ SvXMLElementExport aRows( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROWS, true, true );
tStringVector::const_iterator aRowDescriptionsIter( aData.aRowDescriptions.begin());
const Sequence< Sequence< uno::Any > >& rComplexRowDescriptions = aData.aComplexRowDescriptions;
sal_Int32 nComplexCount = rComplexRowDescriptions.getLength();
@@ -1727,7 +1727,7 @@ void SchXMLExportHelper_Impl::exportTable()
; aRowIt != aData.aDataInRows.end()
; ++aRowIt, ++nC )
{
- SvXMLElementExport aRow( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, sal_True, sal_True );
+ SvXMLElementExport aRow( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, true, true );
//export row descriptions
{
@@ -1754,7 +1754,7 @@ void SchXMLExportHelper_Impl::exportTable()
mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING );
}
- SvXMLElementExport aCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True );
+ SvXMLElementExport aCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, true, true );
if( aRowDescriptionsIter != aData.aRowDescriptions.end())
{
exportText( *aRowDescriptionsIter );
@@ -1778,7 +1778,7 @@ void SchXMLExportHelper_Impl::exportTable()
msString = msStringBuffer.makeStringAndClear();
mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_FLOAT );
mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE, msString );
- SvXMLElementExport aCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True );
+ SvXMLElementExport aCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, true, true );
exportText( msString, false ); // do not convert tabs and lfs
if( ( !bHasOwnData && aDataRangeIter != aDataRangeEndIter ) &&
( mbRowSourceColumns || (aColIt == aRowIt->begin()) ) )
@@ -1960,7 +1960,7 @@ void SchXMLExportHelper_Impl::exportPlotArea(
}
// plot-area element
- pElPlotArea = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_PLOT_AREA, sal_True, sal_True );
+ pElPlotArea = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_PLOT_AREA, true, true );
//inner position rectangle element
exportCoordinateRegion( xDiagram );
@@ -2004,7 +2004,7 @@ void SchXMLExportHelper_Impl::exportPlotArea(
{
AddAutoStyleAttribute( aPropertyStates );
- SvXMLElementExport aGain( mrExport, XML_NAMESPACE_CHART, XML_STOCK_GAIN_MARKER, sal_True, sal_True );
+ SvXMLElementExport aGain( mrExport, XML_NAMESPACE_CHART, XML_STOCK_GAIN_MARKER, true, true );
}
else
{
@@ -2026,7 +2026,7 @@ void SchXMLExportHelper_Impl::exportPlotArea(
{
AddAutoStyleAttribute( aPropertyStates );
- SvXMLElementExport aGain( mrExport, XML_NAMESPACE_CHART, XML_STOCK_LOSS_MARKER, sal_True, sal_True );
+ SvXMLElementExport aGain( mrExport, XML_NAMESPACE_CHART, XML_STOCK_LOSS_MARKER, true, true );
}
else
{
@@ -2048,7 +2048,7 @@ void SchXMLExportHelper_Impl::exportPlotArea(
{
AddAutoStyleAttribute( aPropertyStates );
- SvXMLElementExport aGain( mrExport, XML_NAMESPACE_CHART, XML_STOCK_RANGE_LINE, sal_True, sal_True );
+ SvXMLElementExport aGain( mrExport, XML_NAMESPACE_CHART, XML_STOCK_RANGE_LINE, true, true );
}
else
{
@@ -2080,7 +2080,7 @@ void SchXMLExportHelper_Impl::exportPlotArea(
// add style name attribute
AddAutoStyleAttribute( aPropertyStates );
- SvXMLElementExport aWall( mrExport, XML_NAMESPACE_CHART, XML_WALL, sal_True, sal_True );
+ SvXMLElementExport aWall( mrExport, XML_NAMESPACE_CHART, XML_WALL, true, true );
}
else // autostyles
{
@@ -2106,7 +2106,7 @@ void SchXMLExportHelper_Impl::exportPlotArea(
// add style name attribute
AddAutoStyleAttribute( aPropertyStates );
- SvXMLElementExport aFloor( mrExport, XML_NAMESPACE_CHART, XML_FLOOR, sal_True, sal_True );
+ SvXMLElementExport aFloor( mrExport, XML_NAMESPACE_CHART, XML_FLOOR, true, true );
}
else // autostyles
{
@@ -2135,7 +2135,7 @@ void SchXMLExportHelper_Impl::exportCoordinateRegion( const uno::Reference< char
addPosition( awt::Point(aRect.X,aRect.Y) );
addSize( awt::Size(aRect.Width,aRect.Height) );
- SvXMLElementExport aCoordinateRegion( mrExport, XML_NAMESPACE_CHART_EXT, XML_COORDINATE_REGION, sal_True, sal_True );//#i100778# todo: change to chart namespace in future - dependent on fileformat
+ SvXMLElementExport aCoordinateRegion( mrExport, XML_NAMESPACE_CHART_EXT, XML_COORDINATE_REGION, true, true );//#i100778# todo: change to chart namespace in future - dependent on fileformat
}
namespace
@@ -2185,7 +2185,7 @@ void SchXMLExportHelper_Impl::exportDateScale( const Reference< beans::XProperty
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_MINOR_INTERVAL_UNIT, lcl_getTimeUnitToken( aInterval.TimeUnit ) );
}
- SvXMLElementExport aDateScale( mrExport, XML_NAMESPACE_CHART_EXT, XML_DATE_SCALE, sal_True, sal_True );//#i25706#todo: change namespace for next ODF version
+ SvXMLElementExport aDateScale( mrExport, XML_NAMESPACE_CHART_EXT, XML_DATE_SCALE, true, true );//#i25706#todo: change namespace for next ODF version
}
}
@@ -2206,7 +2206,7 @@ void SchXMLExportHelper_Impl::exportAxisTitle( const Reference< beans::XProperty
addPosition( xShape );
AddAutoStyleAttribute( aPropertyStates );
- SvXMLElementExport aTitle( mrExport, XML_NAMESPACE_CHART, XML_TITLE, sal_True, sal_True );
+ SvXMLElementExport aTitle( mrExport, XML_NAMESPACE_CHART, XML_TITLE, true, true );
// paragraph containing title
exportText( aText );
@@ -2227,7 +2227,7 @@ void SchXMLExportHelper_Impl::exportGrid( const Reference< beans::XPropertySet >
{
AddAutoStyleAttribute( aPropertyStates );
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_CLASS, bMajor ? XML_MAJOR : XML_MINOR );
- SvXMLElementExport aGrid( mrExport, XML_NAMESPACE_CHART, XML_GRID, sal_True, sal_True );
+ SvXMLElementExport aGrid( mrExport, XML_NAMESPACE_CHART, XML_GRID, true, true );
}
else
{
@@ -2309,7 +2309,7 @@ void SchXMLExportHelper_Impl::exportAxis(
bExportDateScale = lcl_exportAxisType( xChart2Axis, mrExport );
// open axis element
- pAxis = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_AXIS, sal_True, sal_True );
+ pAxis = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_AXIS, true, true );
}
else
{
@@ -2339,7 +2339,7 @@ void SchXMLExportHelper_Impl::exportAxis(
if( bExportContent && !rCategoriesRange.isEmpty() )
{
mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, rCategoriesRange );
- SvXMLElementExport aCategories( mrExport, XML_NAMESPACE_CHART, XML_CATEGORIES, sal_True, sal_True );
+ SvXMLElementExport aCategories( mrExport, XML_NAMESPACE_CHART, XML_CATEGORIES, true, true );
}
// grid
@@ -2737,7 +2737,7 @@ void SchXMLExportHelper_Impl::exportSeries(
XML_NAMESPACE_CHART, GetXMLToken( eCTToken )));
// open series element until end of for loop
- pSeries = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_SERIES, sal_True, sal_True );
+ pSeries = new SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_SERIES, true, true );
}
else // autostyles
{
@@ -2831,7 +2831,7 @@ void SchXMLExportHelper_Impl::exportSeries(
// add style name attribute
AddAutoStyleAttribute( aPropertyStates );
- SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_MEAN_VALUE, sal_True, sal_True );
+ SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_MEAN_VALUE, true, true );
}
else // autostyles
{
@@ -2890,7 +2890,7 @@ void SchXMLExportHelper_Impl::exportPropertyMapping(
lcl_ConvertRange(
xValues->getSourceRangeRepresentation(),
xNewDoc ));
- SvXMLElementExport( mrExport, XML_NAMESPACE_LO_EXT, XML_PROPERTY_MAPPING, sal_True, sal_True );
+ SvXMLElementExport( mrExport, XML_NAMESPACE_LO_EXT, XML_PROPERTY_MAPPING, true, true );
// register range for data table export
m_aDataSequencesToExport.push_back( tLabelValuesDataPair(
@@ -2984,7 +2984,7 @@ void SchXMLExportHelper_Impl::exportRegressionCurve(
AddAutoStyleAttribute( aPropertyStates );
}
- SvXMLElementExport aRegressionExport( mrExport, XML_NAMESPACE_CHART, XML_REGRESSION_CURVE, sal_True, sal_True );
+ SvXMLElementExport aRegressionExport( mrExport, XML_NAMESPACE_CHART, XML_REGRESSION_CURVE, true, true );
if( bExportEquation )
{
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DISPLAY_EQUATION, (bShowEquation ? XML_TRUE : XML_FALSE) );
@@ -3007,7 +3007,7 @@ void SchXMLExportHelper_Impl::exportRegressionCurve(
AddAutoStyleAttribute( aEquationPropertyStates );
}
- SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_EQUATION, sal_True, sal_True );
+ SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_EQUATION, true, true );
}
}
else // autostyles
@@ -3096,7 +3096,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const Reference<beans::XPropertySe
if( nCurrentVersion >= SvtSaveOptions::ODFVER_012 )
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DIMENSION, bYError ? XML_Y : XML_X );//#i114149#
- SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_ERROR_INDICATOR, sal_True, sal_True );
+ SvXMLElementExport( mrExport, XML_NAMESPACE_CHART, XML_ERROR_INDICATOR, true, true );
}
else // autostyles
{
@@ -3151,7 +3151,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_SECONDARY_Y );
else
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_PRIMARY_Y );
- SvXMLElementExport aOpenSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, sal_True, sal_True );
+ SvXMLElementExport aOpenSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, true, true );
// export empty data points
exportDataPoints( 0, nSeriesLength, xDiagram, bExportContent );
}
@@ -3168,7 +3168,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_SECONDARY_Y );
else
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_PRIMARY_Y );
- SvXMLElementExport aLowSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, sal_True, sal_True );
+ SvXMLElementExport aLowSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, true, true );
// export empty data points
exportDataPoints( 0, nSeriesLength, xDiagram, bExportContent );
}
@@ -3185,7 +3185,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_SECONDARY_Y );
else
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_PRIMARY_Y );
- SvXMLElementExport aHighSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, sal_True, sal_True );
+ SvXMLElementExport aHighSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, true, true );
// export empty data points
exportDataPoints( 0, nSeriesLength, xDiagram, bExportContent );
}
@@ -3202,7 +3202,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries(
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_SECONDARY_Y );
else
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_PRIMARY_Y );
- SvXMLElementExport aCloseSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, sal_True, sal_True );
+ SvXMLElementExport aCloseSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, true, true );
// export empty data points
exportDataPoints( 0, nSeriesLength, xDiagram, bExportContent );
}
@@ -3437,7 +3437,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_REPEATED,
OUString::number( ( aLastPoint.mnRepeat ) ));
- SvXMLElementExport aPointElem( mrExport, XML_NAMESPACE_CHART, XML_DATA_POINT, sal_True, sal_True );
+ SvXMLElementExport aPointElem( mrExport, XML_NAMESPACE_CHART, XML_DATA_POINT, true, true );
}
aLastPoint = aPoint;
}
@@ -3451,7 +3451,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_REPEATED,
OUString::number( ( aLastPoint.mnRepeat ) ));
- SvXMLElementExport aPointElem( mrExport, XML_NAMESPACE_CHART, XML_DATA_POINT, sal_True, sal_True );
+ SvXMLElementExport aPointElem( mrExport, XML_NAMESPACE_CHART, XML_DATA_POINT, true, true );
}
}
}
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx
index 06efa57c82f1..8e86b91a1fc0 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -530,7 +530,7 @@ void exportText( SvXMLExport& rExport, const OUString& rText, bool bConvertTabsL
{
SvXMLElementExport aPara( rExport, XML_NAMESPACE_TEXT,
::xmloff::token::GetXMLToken( ::xmloff::token::XML_P ),
- sal_True, sal_False );
+ true, false );
if( bConvertTabsLFs )
{
@@ -551,7 +551,7 @@ void exportText( SvXMLExport& rExport, const OUString& rText, bool bConvertTabsL
SvXMLElementExport aElem( rExport, XML_NAMESPACE_TEXT,
::xmloff::token::GetXMLToken( ::xmloff::token::XML_TAB_STOP ),
- sal_False, sal_False );
+ false, false );
}
break;
@@ -563,7 +563,7 @@ void exportText( SvXMLExport& rExport, const OUString& rText, bool bConvertTabsL
SvXMLElementExport aElem( rExport, XML_NAMESPACE_TEXT,
::xmloff::token::GetXMLToken( ::xmloff::token::XML_LINE_BREAK ),
- sal_False, sal_False );
+ false, false );
}
break;
}
@@ -598,10 +598,10 @@ void exportRangeToSomewhere( SvXMLExport& rExport, const OUString& rValue )
SvXMLElementExport aEmptyShapeGroup( rExport, XML_NAMESPACE_DRAW,
::xmloff::token::GetXMLToken( ::xmloff::token::XML_G ),
- sal_True, sal_False );
+ true, false );
SvXMLElementExport aDescription( rExport, XML_NAMESPACE_SVG,
::xmloff::token::GetXMLToken( ::xmloff::token::XML_DESC ),
- sal_True, sal_False );
+ true, false );
rExport.GetDocHandler()->characters( rValue );
}
diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx
index 78879f9afad9..87cc9393952e 100644
--- a/xmloff/source/core/DomExport.cxx
+++ b/xmloff/source/core/DomExport.cxx
@@ -256,12 +256,12 @@ void DomExport::element( const Reference<XElement>& xElement )
}
// write name
- mrExport.StartElement( qualifiedName( xElement ), sal_False );
+ mrExport.StartElement( qualifiedName( xElement ), false );
}
void DomExport::endElement( const Reference<XElement>& xElement )
{
- mrExport.EndElement( qualifiedName( xElement ), sal_False );
+ mrExport.EndElement( qualifiedName( xElement ), false );
popNamespace();
}
diff --git a/xmloff/source/core/XMLBase64Export.cxx b/xmloff/source/core/XMLBase64Export.cxx
index 7a5a2c29834c..3daf5efa29c3 100644
--- a/xmloff/source/core/XMLBase64Export.cxx
+++ b/xmloff/source/core/XMLBase64Export.cxx
@@ -72,8 +72,7 @@ sal_Bool XMLBase64Export::exportElement(
sal_uInt16 nNamespace,
enum ::xmloff::token::XMLTokenEnum eName )
{
- SvXMLElementExport aElem( GetExport(), nNamespace, eName, sal_True,
- sal_True );
+ SvXMLElementExport aElem( GetExport(), nNamespace, eName, true, true );
return exportXML( rIn );
}
diff --git a/xmloff/source/core/xmlcnimp.cxx b/xmloff/source/core/xmlcnimp.cxx
index 9e5796a5092c..c8b40f80dded 100644
--- a/xmloff/source/core/xmlcnimp.cxx
+++ b/xmloff/source/core/xmlcnimp.cxx
@@ -41,13 +41,13 @@ bool SvXMLAttrContainerData::operator ==( const SvXMLAttrContainerData& rCmp ) c
return ( *(rCmp.pimpl) == *(pimpl) );
}
-sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rLName,
+bool SvXMLAttrContainerData::AddAttr( const OUString& rLName,
const OUString& rValue )
{
return pimpl->AddAttr(rLName, rValue);
}
-sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix,
+bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix,
const OUString& rNamespace,
const OUString& rLName,
const OUString& rValue )
@@ -55,21 +55,21 @@ sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix,
return pimpl->AddAttr(rPrefix, rNamespace, rLName, rValue);
}
-sal_Bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix,
+bool SvXMLAttrContainerData::AddAttr( const OUString& rPrefix,
const OUString& rLName,
const OUString& rValue )
{
return pimpl->AddAttr(rPrefix, rLName, rValue);
}
-sal_Bool SvXMLAttrContainerData::SetAt( size_t i,
+bool SvXMLAttrContainerData::SetAt( size_t i,
const OUString& rLName,
const OUString& rValue )
{
return pimpl->SetAt(i, rLName, rValue);
}
-sal_Bool SvXMLAttrContainerData::SetAt( size_t i,
+bool SvXMLAttrContainerData::SetAt( size_t i,
const OUString& rPrefix,
const OUString& rNamespace,
const OUString& rLName,
@@ -78,7 +78,7 @@ sal_Bool SvXMLAttrContainerData::SetAt( size_t i,
return pimpl->SetAt(i, rPrefix, rNamespace, rLName, rValue);
}
-sal_Bool SvXMLAttrContainerData::SetAt( size_t i,
+bool SvXMLAttrContainerData::SetAt( size_t i,
const OUString& rPrefix,
const OUString& rLName,
const OUString& rValue )
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index b71b96d3fd66..da03b1859e33 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -243,11 +243,11 @@ public:
::comphelper::UnoInterfaceToUniqueIdentifierMapper maInterfaceToIdentifierMapper;
uno::Reference< uri::XUriReferenceFactory > mxUriReferenceFactory;
- OUString msPackageURI;
- OUString msPackageURIScheme;
+ OUString msPackageURI;
+ OUString msPackageURIScheme;
// Written OpenDocument file format doesn't fit to the created text document (#i69627#)
- sal_Bool mbOutlineStyleAsNormalListStyle;
- sal_Bool mbSaveBackwardCompatibleODF;
+ bool mbOutlineStyleAsNormalListStyle;
+ bool mbSaveBackwardCompatibleODF;
uno::Reference< embed::XStorage > mxTargetStorage;
@@ -267,8 +267,8 @@ public:
::std::auto_ptr< ::xmloff::RDFaExportHelper> mpRDFaHelper;
- sal_Bool mbExportTextNumberElement;
- sal_Bool mbNullDateInitialized;
+ bool mbExportTextNumberElement;
+ bool mbNullDateInitialized;
void SetSchemeOf( const OUString& rOrigFileName )
{
@@ -281,13 +281,13 @@ public:
SvXMLExport_Impl::SvXMLExport_Impl()
// Written OpenDocument file format doesn't fit to the created text document (#i69627#)
: mbOutlineStyleAsNormalListStyle( false )
- ,mbSaveBackwardCompatibleODF( sal_True )
+ ,mbSaveBackwardCompatibleODF( true )
,mStreamName()
,mNamespaceMaps()
,mDepth(0)
,mpRDFaHelper() // lazy
- ,mbExportTextNumberElement( sal_False )
- ,mbNullDateInitialized( sal_False )
+ ,mbExportTextNumberElement( false )
+ ,mbNullDateInitialized( false )
{
mxUriReferenceFactory = uri::UriReferenceFactory::create( comphelper::getProcessComponentContext() );
}
@@ -445,12 +445,12 @@ SvXMLExport::SvXMLExport(
mpEventExport( NULL ),
mpImageMapExport( NULL ),
mpXMLErrors( NULL ),
- mbExtended( sal_False ),
+ mbExtended( false ),
meClass( eClass ),
mnExportFlags( nExportFlags ),
mnErrorFlags( ERROR_NO ),
msWS( GetXMLToken(XML_WS) ),
- mbSaveLinkedSections(sal_True)
+ mbSaveLinkedSections(true)
{
SAL_WARN_IF( !xContext.is(), "xmloff.core", "got no service manager" );
_InitCtor();
@@ -476,12 +476,12 @@ SvXMLExport::SvXMLExport(
mpEventExport( NULL ),
mpImageMapExport( NULL ),
mpXMLErrors( NULL ),
- mbExtended( sal_False ),
+ mbExtended( false ),
meClass( XML_TOKEN_INVALID ),
mnExportFlags( 0 ),
mnErrorFlags( ERROR_NO ),
msWS( GetXMLToken(XML_WS) ),
- mbSaveLinkedSections(sal_True)
+ mbSaveLinkedSections(true)
{
SAL_WARN_IF( !xContext.is(), "xmloff.core", "got no service manager" );
mpImpl->SetSchemeOf( msOrigFileName );
@@ -515,12 +515,12 @@ SvXMLExport::SvXMLExport(
mpEventExport( NULL ),
mpImageMapExport( NULL ),
mpXMLErrors( NULL ),
- mbExtended( sal_False ),
+ mbExtended( false ),
meClass( XML_TOKEN_INVALID ),
mnExportFlags( 0 ),
mnErrorFlags( ERROR_NO ),
msWS( GetXMLToken(XML_WS) ),
- mbSaveLinkedSections(sal_True)
+ mbSaveLinkedSections(true)
{
SAL_WARN_IF(!xContext.is(), "xmloff.core", "got no service manager" );
mpImpl->SetSchemeOf( msOrigFileName );
@@ -1142,7 +1142,7 @@ void SvXMLExport::ImplExportSettings()
SvXMLElementExport aElem( *this,
nSettingsCount != 0,
XML_NAMESPACE_OFFICE, XML_SETTINGS,
- sal_True, sal_True );
+ true, true );
SettingsExportFacade aSettingsExportContext( *this );
XMLSettingsExportHelper aSettingsExportHelper( aSettingsExportContext );
@@ -1162,14 +1162,14 @@ void SvXMLExport::ImplExportSettings()
}
}
-void SvXMLExport::ImplExportStyles( sal_Bool )
+void SvXMLExport::ImplExportStyles( bool )
{
CheckAttrList();
{
// <style:styles>
SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_STYLES,
- sal_True, sal_True );
+ true, true );
_ExportStyles( false );
}
@@ -1192,7 +1192,7 @@ void SvXMLExport::ImplExportStyles( sal_Bool )
}
}
-void SvXMLExport::ImplExportAutoStyles( sal_Bool )
+void SvXMLExport::ImplExportAutoStyles( bool )
{
// transfer style names (+ families) FROM other components (if appropriate)
OUString sStyleNames( "StyleNames" );
@@ -1212,18 +1212,18 @@ void SvXMLExport::ImplExportAutoStyles( sal_Bool )
{
// <style:automatic-styles>
SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE,
- XML_AUTOMATIC_STYLES, sal_True, sal_True );
+ XML_AUTOMATIC_STYLES, true, true );
_ExportAutoStyles();
}
}
-void SvXMLExport::ImplExportMasterStyles( sal_Bool )
+void SvXMLExport::ImplExportMasterStyles( bool )
{
{
// <style:master-styles>
SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_MASTER_STYLES,
- sal_True, sal_True );
+ true, true );
_ExportMasterStyles();
}
@@ -1238,7 +1238,7 @@ void SvXMLExport::ImplExportContent()
{
SvXMLElementExport aElemrnt( *this, XML_NAMESPACE_OFFICE, XML_BODY,
- sal_True, sal_True );
+ true, true );
{
XMLTokenEnum eClass = meClass;
if( XML_TEXT_GLOBAL == eClass )
@@ -1253,7 +1253,7 @@ void SvXMLExport::ImplExportContent()
SetBodyAttributes();
SvXMLElementExport aElem( *this, meClass != XML_TOKEN_INVALID,
XML_NAMESPACE_OFFICE, eClass,
- sal_True, sal_True );
+ true, true );
_ExportContent();
}
@@ -1453,7 +1453,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
}
}
- SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, eRootService, sal_True, sal_True );
+ SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, eRootService, true, true );
// meta information
if( mnExportFlags & EXPORT_META )
@@ -1473,15 +1473,15 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
// styles
if( mnExportFlags & EXPORT_STYLES )
- ImplExportStyles( sal_False );
+ ImplExportStyles( false );
// autostyles
if( mnExportFlags & EXPORT_AUTOSTYLES )
- ImplExportAutoStyles( sal_False );
+ ImplExportAutoStyles( false );
// masterstyles
if( mnExportFlags & EXPORT_MASTERSTYLES )
- ImplExportMasterStyles( sal_False );
+ ImplExportMasterStyles( false );
// contnt
if( mnExportFlags & EXPORT_CONTENT )
@@ -1527,12 +1527,12 @@ void SvXMLExport::_ExportMeta()
} else {
// office:meta
SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_META,
- sal_True, sal_True );
+ true, true );
{
// BM: #i60323# export generator even if xInfoProp is empty (which is the
// case for charts). The generator does not depend on xInfoProp
SvXMLElementExport anElem( *this, XML_NAMESPACE_META, XML_GENERATOR,
- sal_True, sal_True );
+ true, true );
Characters(generator);
}
}
@@ -1540,7 +1540,7 @@ void SvXMLExport::_ExportMeta()
void SvXMLExport::_ExportScripts()
{
- SvXMLElementExport aElement( *this, XML_NAMESPACE_OFFICE, XML_SCRIPTS, sal_True, sal_True );
+ SvXMLElementExport aElement( *this, XML_NAMESPACE_OFFICE, XML_SCRIPTS, true, true );
// export Basic macros (only for FlatXML)
if ( mnExportFlags & EXPORT_EMBEDDED )
@@ -1549,7 +1549,7 @@ void SvXMLExport::_ExportScripts()
aValue += ":Basic";
AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, aValue );
- SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_SCRIPT, sal_True, sal_True );
+ SvXMLElementExport aElem( *this, XML_NAMESPACE_OFFICE, XML_SCRIPT, true, true );
// initialize Basic
if ( mxModel.is() )
@@ -1873,7 +1873,7 @@ sal_Int32 SvXMLExport::GetDocumentSpecificSettings( ::std::list< SettingsGroup >
return 0;
}
-void SvXMLExport::addDataStyle(const sal_Int32 nNumberFormat, sal_Bool /*bTimeFormat*/ )
+void SvXMLExport::addDataStyle(const sal_Int32 nNumberFormat, bool /*bTimeFormat*/ )
{
if(mpNumExport)
mpNumExport->SetUsed(nNumberFormat);
@@ -1894,7 +1894,7 @@ void SvXMLExport::exportAutoDataStyles()
mxFormExport->exportAutoControlNumberStyles();
}
-OUString SvXMLExport::getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool /*bTimeFormat*/ ) const
+OUString SvXMLExport::getDataStyleName(const sal_Int32 nNumberFormat, bool /*bTimeFormat*/ ) const
{
OUString sTemp;
if(mpNumExport)
@@ -1929,9 +1929,9 @@ OUString SvXMLExport::AddEmbeddedGraphicObject( const OUString& rGraphicObjectUR
return sRet;
}
-sal_Bool SvXMLExport::AddEmbeddedGraphicObjectAsBase64( const OUString& rGraphicObjectURL )
+bool SvXMLExport::AddEmbeddedGraphicObjectAsBase64( const OUString& rGraphicObjectURL )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( (getExportFlags() & EXPORT_EMBEDDED) != 0 &&
rGraphicObjectURL.startsWith( msGraphicObjectProtocol ) &&
@@ -1970,9 +1970,9 @@ OUString SvXMLExport::AddEmbeddedObject( const OUString& rEmbeddedObjectURL )
return sRet;
}
-sal_Bool SvXMLExport::AddEmbeddedObjectAsBase64( const OUString& rEmbeddedObjectURL )
+bool SvXMLExport::AddEmbeddedObjectAsBase64( const OUString& rEmbeddedObjectURL )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( (rEmbeddedObjectURL.startsWith( msEmbeddedObjectProtocol ) ||
rEmbeddedObjectURL.startsWith( msGraphicObjectProtocol ) ) &&
mxEmbeddedResolver.is() )
@@ -2115,7 +2115,7 @@ sal_Int64 SAL_CALL SvXMLExport::getSomething( const uno::Sequence< sal_Int8 >& r
return 0;
}
-sal_Bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp )
+bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp )
{
OUString sFilterService;
@@ -2142,7 +2142,7 @@ sal_Bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp )
SAL_WARN_IF( !sFilterService.getLength(), "xmloff.core", "no export filter for own object" );
if( sFilterService.isEmpty() )
- return sal_False;
+ return false;
Reference < XDocumentHandler > xHdl =
new XMLEmbeddedObjectExportFilter( mxHandler );
@@ -2155,7 +2155,7 @@ sal_Bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp )
UNO_QUERY);
SAL_WARN_IF( !xExporter.is(), "xmloff.core", "can't instantiate export filter component for own object" );
if( !xExporter.is() )
- return sal_False;
+ return false;
xExporter->setSourceDocument( rComp );
@@ -2202,14 +2202,14 @@ OUString SvXMLExport::GetRelativeReference(const OUString& rValue)
void SvXMLExport::StartElement(sal_uInt16 nPrefix,
enum ::xmloff::token::XMLTokenEnum eName,
- sal_Bool bIgnWSOutside )
+ bool bIgnWSOutside )
{
StartElement(_GetNamespaceMap().GetQNameByKey( nPrefix,
GetXMLToken(eName) ), bIgnWSOutside);
}
void SvXMLExport::StartElement(const OUString& rName,
- sal_Bool bIgnWSOutside )
+ bool bIgnWSOutside )
{
if ((mnErrorFlags & ERROR_DO_NOTHING) != ERROR_DO_NOTHING)
{
@@ -2263,14 +2263,14 @@ void SvXMLExport::Characters(const OUString& rChars)
void SvXMLExport::EndElement(sal_uInt16 nPrefix,
enum ::xmloff::token::XMLTokenEnum eName,
- sal_Bool bIgnWSInside )
+ bool bIgnWSInside )
{
EndElement(_GetNamespaceMap().GetQNameByKey( nPrefix, GetXMLToken(eName) ),
bIgnWSInside);
}
void SvXMLExport::EndElement(const OUString& rName,
- sal_Bool bIgnWSInside )
+ bool bIgnWSInside )
{
// decrement nesting depth counter & (maybe) restore namespace map
--mpImpl->mDepth;
@@ -2375,7 +2375,7 @@ void SvXMLExport::DisposingModel()
}
// Written OpenDocument file format doesn't fit to the created text document (#i69627#)
-sal_Bool SvXMLExport::writeOutlineStyleAsNormalListStyle() const
+bool SvXMLExport::writeOutlineStyleAsNormalListStyle() const
{
return mpImpl->mbOutlineStyleAsNormalListStyle;
}
@@ -2491,12 +2491,12 @@ SvXMLExport::AddAttributesRDFa(
mpImpl->mpRDFaHelper->AddRDFa(xMeta);
}
-sal_Bool SvXMLExport::exportTextNumberElement() const
+bool SvXMLExport::exportTextNumberElement() const
{
return mpImpl->mbExportTextNumberElement;
}
-sal_Bool SvXMLExport::SetNullDateOnUnitConverter()
+bool SvXMLExport::SetNullDateOnUnitConverter()
{
// if the null date has already been set, don't set it again (performance)
if (!mpImpl->mbNullDateInitialized)
@@ -2510,7 +2510,7 @@ sal_Bool SvXMLExport::SetNullDateOnUnitConverter()
void SvXMLElementExport::StartElement(
const sal_uInt16 nPrefixKey,
const OUString& rLName,
- const sal_Bool bIgnoreWhitespaceOutside )
+ const bool bIgnoreWhitespaceOutside )
{
maElementName = mrExport.GetNamespaceMap().GetQNameByKey(nPrefixKey, rLName);
mrExport.StartElement(maElementName, bIgnoreWhitespaceOutside);
@@ -2520,12 +2520,12 @@ SvXMLElementExport::SvXMLElementExport(
SvXMLExport& rExp,
sal_uInt16 nPrefixKey,
const sal_Char *pLName,
- sal_Bool bIWSOutside,
- sal_Bool bIWSInside )
+ bool bIWSOutside,
+ bool bIWSInside )
: mrExport( rExp )
, maElementName()
, mbIgnoreWhitespaceInside( bIWSInside )
- , mbDoSomething( sal_True )
+ , mbDoSomething( true )
{
const OUString sLName( OUString::createFromAscii( pLName ) );
StartElement( nPrefixKey, sLName, bIWSOutside );
@@ -2535,12 +2535,12 @@ SvXMLElementExport::SvXMLElementExport(
SvXMLExport& rExp,
sal_uInt16 nPrefixKey,
const OUString& rLName,
- sal_Bool bIWSOutside,
- sal_Bool bIWSInside )
+ bool bIWSOutside,
+ bool bIWSInside )
: mrExport( rExp )
, maElementName()
, mbIgnoreWhitespaceInside( bIWSInside )
- , mbDoSomething( sal_True )
+ , mbDoSomething( true )
{
StartElement( nPrefixKey, rLName, bIWSOutside );
}
@@ -2549,23 +2549,23 @@ SvXMLElementExport::SvXMLElementExport(
SvXMLExport& rExp,
sal_uInt16 nPrefixKey,
enum XMLTokenEnum eLName,
- sal_Bool bIWSOutside,
- sal_Bool bIWSInside )
+ bool bIWSOutside,
+ bool bIWSInside )
: mrExport( rExp )
, maElementName()
, mbIgnoreWhitespaceInside( bIWSInside )
- , mbDoSomething( sal_True )
+ , mbDoSomething( true )
{
StartElement( nPrefixKey, GetXMLToken(eLName), bIWSOutside );
}
SvXMLElementExport::SvXMLElementExport(
SvXMLExport& rExp,
- sal_Bool bDoSth,
+ bool bDoSth,
sal_uInt16 nPrefixKey,
enum XMLTokenEnum eLName,
- sal_Bool bIWSOutside,
- sal_Bool bIWSInside )
+ bool bIWSOutside,
+ bool bIWSInside )
: mrExport( rExp )
, maElementName()
, mbIgnoreWhitespaceInside( bIWSInside )
@@ -2578,12 +2578,12 @@ SvXMLElementExport::SvXMLElementExport(
SvXMLElementExport::SvXMLElementExport(
SvXMLExport& rExp,
const OUString& rQName,
- sal_Bool bIWSOutside,
- sal_Bool bIWSInside )
+ bool bIWSOutside,
+ bool bIWSInside )
: mrExport( rExp )
, maElementName()
, mbIgnoreWhitespaceInside( bIWSInside )
- , mbDoSomething( sal_True )
+ , mbDoSomething( true )
{
maElementName = rQName;
rExp.StartElement( rQName, bIWSOutside );
diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx
index 2a0bfbae72fd..73336d34fca5 100644
--- a/xmloff/source/draw/XMLImageMapExport.cxx
+++ b/xmloff/source/draw/XMLImageMapExport.cxx
@@ -240,7 +240,7 @@ void XMLImageMapExport::ExportMapEntry(
rPropertySet->getPropertyValue(msTitle) >>= sTitle;
if(!sTitle.isEmpty())
{
- SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SVG, XML_TITLE, mbWhiteSpace, sal_False);
+ SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SVG, XML_TITLE, mbWhiteSpace, false);
mrExport.Characters(sTitle);
}
@@ -249,7 +249,7 @@ void XMLImageMapExport::ExportMapEntry(
rPropertySet->getPropertyValue(msDescription) >>= sDescription;
if (!sDescription.isEmpty())
{
- SvXMLElementExport aDesc(mrExport, XML_NAMESPACE_SVG, XML_DESC, mbWhiteSpace, sal_False);
+ SvXMLElementExport aDesc(mrExport, XML_NAMESPACE_SVG, XML_DESC, mbWhiteSpace, false);
mrExport.Characters(sDescription);
}
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 15f0160b4edc..f88d09fa438c 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -329,7 +329,7 @@ static void SdXMLExportDataStyleNumber( SdXMLExport& rExport, SdXMLDataStyleNumb
rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_TEXTUAL, XML_TRUE );
}
- SvXMLElementExport aNumberStyle( rExport, XML_NAMESPACE_NUMBER, rElement.meNumberStyle, sal_True, sal_False );
+ SvXMLElementExport aNumberStyle( rExport, XML_NAMESPACE_NUMBER, rElement.meNumberStyle, true, false );
if( rElement.mpText )
{
OUString sAttrValue( OUString::createFromAscii( rElement.mpText ) );
@@ -353,7 +353,7 @@ static void SdXMLExportStyle( SdXMLExport& rExport, const SdXMLFixedDataStyle* p
rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_AUTOMATIC_ORDER, XML_TRUE );
}
- SvXMLElementExport aElement( rExport, XML_NAMESPACE_NUMBER, pStyle->mbDateStyle ? XML_DATE_STYLE : XML_TIME_STYLE, sal_True, sal_True );
+ SvXMLElementExport aElement( rExport, XML_NAMESPACE_NUMBER, pStyle->mbDateStyle ? XML_DATE_STYLE : XML_TIME_STYLE, true, true );
do
{
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 2fbcf17cc032..4284637f58f5 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -593,7 +593,7 @@ void AnimationsExporterImpl::exportTransitionNode()
convertTiming( sTmp, Any( aEvent ) );
mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_BEGIN, sTmp.makeStringAndClear() );
- SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_PAR, sal_True, sal_True );
+ SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_PAR, true, true );
if( nTransition != 0 )
{
@@ -627,13 +627,13 @@ void AnimationsExporterImpl::exportTransitionNode()
::sax::Converter::convertColor( sTmp, nFadeColor );
mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_FADECOLOR, sTmp.makeStringAndClear() );
}
- SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_TRANSITIONFILTER, sal_True, sal_True );
+ SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_TRANSITIONFILTER, true, true );
}
if( bStopSound )
{
mrExport.AddAttribute( XML_NAMESPACE_ANIMATION, XML_COMMAND, XML_STOP_AUDIO );
- SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_COMMAND, sal_True, sal_True );
+ SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_COMMAND, true, true );
}
else if( !sSoundURL.isEmpty())
{
@@ -644,7 +644,7 @@ void AnimationsExporterImpl::exportTransitionNode()
if( bLoopSound )
mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_REPEATCOUNT, XML_INDEFINITE );
- SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_AUDIO, sal_True, sal_True );
+ SvXMLElementExport aElement2( mrExport, XML_NAMESPACE_ANIMATION, XML_AUDIO, true, true );
}
}
}
@@ -1075,7 +1075,7 @@ void AnimationsExporterImpl::exportContainer( const Reference< XTimeContainer >&
OSL_FAIL( "xmloff::AnimationsExporterImpl::exportContainer(), invalid TimeContainerType!" );
return;
}
- SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, eElementToken, sal_True, sal_True );
+ SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, eElementToken, true, true );
if( nContainerNodeType == EffectNodeType::TIMING_ROOT )
exportTransitionNode();
@@ -1347,7 +1347,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
break;
}
- SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, eElementToken, sal_True, sal_True );
+ SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, eElementToken, true, true );
}
catch (const Exception&)
@@ -1379,7 +1379,7 @@ void AnimationsExporterImpl::exportAudio( const Reference< XAudio >& xAudio )
if( nEndAfterSlide != 0 )
mrExport.AddAttribute( );
*/
- SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_AUDIO, sal_True, sal_True );
+ SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_AUDIO, true, true );
}
catch (const Exception&)
@@ -1406,7 +1406,7 @@ void AnimationsExporterImpl::exportCommand( const Reference< XCommand >& xComman
// todo virtual ::com::sun::star::uno::Any SAL_CALL getParameter() throw (::com::sun::star::uno::RuntimeException) = 0;
- SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_COMMAND, sal_True, sal_True );
+ SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, XML_COMMAND, true, true );
}
catch (const Exception&)
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index 83aff726378b..14b50ad03b5e 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -438,7 +438,7 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport )
if( aIter != aEnd )
{
- SvXMLElementExport aElement( rExport, XML_NAMESPACE_PRESENTATION, XML_ANIMATIONS, sal_True, sal_True );
+ SvXMLElementExport aElement( rExport, XML_NAMESPACE_PRESENTATION, XML_ANIMATIONS, true, true );
do
{
@@ -455,7 +455,7 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport )
::sax::Converter::convertColor( sTmp, rEffect.maDimColor );
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_COLOR, sTmp.makeStringAndClear() );
- SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_DIM, sal_True, sal_True );
+ SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_DIM, true, true );
}
else if( rEffect.meKind == XMLE_PLAY )
{
@@ -465,7 +465,7 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport )
rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_SPEED, sTmp.makeStringAndClear() );
}
- SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_PLAY, sal_True, sal_True );
+ SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_PLAY, true, true );
}
else
{
@@ -515,7 +515,7 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport )
eLocalName = XML_HIDE_SHAPE;
}
- SvXMLElementExport aEle( rExport, XML_NAMESPACE_PRESENTATION, eLocalName, sal_True, sal_True );
+ SvXMLElementExport aEle( rExport, XML_NAMESPACE_PRESENTATION, eLocalName, true, true );
if( !rEffect.maSoundURL.isEmpty() )
{
rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, rExport.GetRelativeReference(rEffect.maSoundURL) );
@@ -525,7 +525,7 @@ void XMLAnimationsExporter::exportAnimations( SvXMLExport& rExport )
if( rEffect.mbPlayFull )
rExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PLAY_FULL, XML_TRUE );
- SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, sal_True, sal_True );
+ SvXMLElementExport aElem( rExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, true, true );
}
}
diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx
index 0231395e9484..e1a3727f97f0 100644
--- a/xmloff/source/draw/layerexp.cxx
+++ b/xmloff/source/draw/layerexp.cxx
@@ -59,7 +59,7 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport )
OUString sTmp;
- SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_LAYER_SET, sal_True, sal_True );
+ SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_LAYER_SET, true, true );
for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ )
{
@@ -70,13 +70,13 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport )
if(!sTmp.isEmpty())
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, sTmp );
- SvXMLElementExport aEle( rExport, XML_NAMESPACE_DRAW, XML_LAYER, sal_True, sal_True );
+ SvXMLElementExport aEle( rExport, XML_NAMESPACE_DRAW, XML_LAYER, true, true );
// title property (as <svg:title> element)
xLayer->getPropertyValue(strTitle) >>= sTmp;
if(!sTmp.isEmpty())
{
- SvXMLElementExport aEventElemt(rExport, XML_NAMESPACE_SVG, XML_TITLE, sal_True, sal_False);
+ SvXMLElementExport aEventElemt(rExport, XML_NAMESPACE_SVG, XML_TITLE, true, false);
rExport.Characters(sTmp);
}
@@ -84,7 +84,7 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport )
xLayer->getPropertyValue(strDescription) >>= sTmp;
if(!sTmp.isEmpty())
{
- SvXMLElementExport aDesc(rExport, XML_NAMESPACE_SVG, XML_DESC, sal_True, sal_False);
+ SvXMLElementExport aDesc(rExport, XML_NAMESPACE_SVG, XML_DESC, true, false);
rExport.Characters(sTmp);
}
}
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 9a400972ed4b..28fdee7dc4be 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -1736,7 +1736,7 @@ void XMLPageExportPropertyMapper::handleElementItem(
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_NEW );
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONREQUEST );
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, sal_True, sal_True );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, true, true );
}
}
break;
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index cd00dd42a5e8..cd6b4581e246 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -831,7 +831,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
AddAttribute(XML_NAMESPACE_STYLE, XML_NAME, pInfo->GetLayoutName());
// write draw-style attributes
- SvXMLElementExport aDSE(*this, XML_NAMESPACE_STYLE, XML_PRESENTATION_PAGE_LAYOUT, sal_True, sal_True);
+ SvXMLElementExport aDSE(*this, XML_NAMESPACE_STYLE, XML_PRESENTATION_PAGE_LAYOUT, true, true);
// write presentation placeholders
switch(pInfo->GetLayoutType())
@@ -1250,7 +1250,7 @@ void SdXMLExport::ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectan
AddAttribute(XML_NAMESPACE_SVG, XML_HEIGHT, aStr);
// write presentation-placeholder
- SvXMLElementExport aPPL(*this, XML_NAMESPACE_PRESENTATION, XML_PLACEHOLDER, sal_True, sal_True);
+ SvXMLElementExport aPPL(*this, XML_NAMESPACE_PRESENTATION, XML_PLACEHOLDER, true, true);
}
ImpXMLEXPPageMasterInfo* SdXMLExport::ImpGetOrCreatePageMasterInfo( Reference< XDrawPage > xMasterPage )
@@ -1348,7 +1348,7 @@ void SdXMLExport::ImpWritePageMasterInfos()
AddAttribute(XML_NAMESPACE_STYLE, XML_NAME, sString);
// write page-layout
- SvXMLElementExport aPME(*this, XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT, sal_True, sal_True);
+ SvXMLElementExport aPME(*this, XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT, true, true);
// prepare style:properties inside page-master
GetMM100UnitConverter().convertMeasureToXML(sStringBuffer,
@@ -1387,7 +1387,7 @@ void SdXMLExport::ImpWritePageMasterInfos()
AddAttribute(XML_NAMESPACE_STYLE, XML_PRINT_ORIENTATION, XML_LANDSCAPE);
// write style:properties
- SvXMLElementExport aPMF(*this, XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT_PROPERTIES, sal_True, sal_True);
+ SvXMLElementExport aPMF(*this, XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT_PROPERTIES, true, true);
}
}
}
@@ -1561,7 +1561,7 @@ void SdXMLExport::ImpWriteHeaderFooterDecls()
sBuffer.append( nIndex );
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_NAME, sBuffer.makeStringAndClear());
- SvXMLElementExport aElem(*this, XML_NAMESPACE_PRESENTATION, XML_HEADER_DECL, sal_True, sal_True);
+ SvXMLElementExport aElem(*this, XML_NAMESPACE_PRESENTATION, XML_HEADER_DECL, true, true);
Characters((*aIter));
}
}
@@ -1578,7 +1578,7 @@ void SdXMLExport::ImpWriteHeaderFooterDecls()
sBuffer.append( nIndex );
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_NAME, sBuffer.makeStringAndClear());
- SvXMLElementExport aElem(*this, XML_NAMESPACE_PRESENTATION, XML_FOOTER_DECL, sal_False, sal_False);
+ SvXMLElementExport aElem(*this, XML_NAMESPACE_PRESENTATION, XML_FOOTER_DECL, false, false);
Characters((*aIter));
}
}
@@ -1602,7 +1602,7 @@ void SdXMLExport::ImpWriteHeaderFooterDecls()
if( !rDecl.mbFixed )
AddAttribute( XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME, getDataStyleName( rDecl.mnFormat ) );
- SvXMLElementExport aElem(*this, XML_NAMESPACE_PRESENTATION, XML_DATE_TIME_DECL, sal_False, sal_False);
+ SvXMLElementExport aElem(*this, XML_NAMESPACE_PRESENTATION, XML_DATE_TIME_DECL, false, false);
if( rDecl.mbFixed )
Characters(rDecl.maStrText);
}
@@ -1890,7 +1890,7 @@ void SdXMLExport::_ExportContent()
}
// write page
- SvXMLElementExport aDPG(*this, XML_NAMESPACE_DRAW, XML_PAGE, sal_True, sal_True);
+ SvXMLElementExport aDPG(*this, XML_NAMESPACE_DRAW, XML_PAGE, true, true);
// write optional office:forms
exportFormsElement( xDrawPage );
@@ -1934,7 +1934,7 @@ void SdXMLExport::_ExportContent()
ImplExportHeaderFooterDeclAttributes( maDrawNotesPagesHeaderFooterSettings[nPageInd] );
// write presentation notes
- SvXMLElementExport aPSY(*this, XML_NAMESPACE_PRESENTATION, XML_NOTES, sal_True, sal_True);
+ SvXMLElementExport aPSY(*this, XML_NAMESPACE_PRESENTATION, XML_NOTES, true, true);
// write optional office:forms
exportFormsElement( xNotesPage );
@@ -2092,7 +2092,7 @@ void SdXMLExport::exportPresentationSettings()
if( bHasAttr || nShowCount != 0 )
{
- SvXMLElementExport aSettings(*this, XML_NAMESPACE_PRESENTATION, XML_SETTINGS, sal_True, sal_True);
+ SvXMLElementExport aSettings(*this, XML_NAMESPACE_PRESENTATION, XML_SETTINGS, true, true);
if( nShowCount == 0 )
return;
@@ -2128,7 +2128,7 @@ void SdXMLExport::exportPresentationSettings()
if( !sTmp.isEmpty() )
AddAttribute(XML_NAMESPACE_PRESENTATION, XML_PAGES, sTmp.makeStringAndClear() );
- SvXMLElementExport aShows(*this, XML_NAMESPACE_PRESENTATION, XML_SHOW, sal_True, sal_True);
+ SvXMLElementExport aShows(*this, XML_NAMESPACE_PRESENTATION, XML_SHOW, true, true);
}
}
}
@@ -2405,7 +2405,7 @@ void SdXMLExport::_ExportMasterStyles()
ImplExportHeaderFooterDeclAttributes( maHandoutPageHeaderFooterSettings );
// write masterpage
- SvXMLElementExport aMPG(*this, XML_NAMESPACE_STYLE, XML_HANDOUT_MASTER, sal_True, sal_True);
+ SvXMLElementExport aMPG(*this, XML_NAMESPACE_STYLE, XML_HANDOUT_MASTER, true, true);
// write graphic objects on this master page (if any)
Reference< drawing::XShapes > xShapes(xHandoutPage, UNO_QUERY);
@@ -2449,7 +2449,7 @@ void SdXMLExport::_ExportMasterStyles()
maMasterPagesStyleNames[nMPageId]);
// write masterpage
- SvXMLElementExport aMPG(*this, XML_NAMESPACE_STYLE, XML_MASTER_PAGE, sal_True, sal_True);
+ SvXMLElementExport aMPG(*this, XML_NAMESPACE_STYLE, XML_MASTER_PAGE, true, true);
// write optional office:forms
exportFormsElement( xMasterPage );
@@ -2479,7 +2479,7 @@ void SdXMLExport::_ExportMasterStyles()
}
// write presentation notes
- SvXMLElementExport aPSY(*this, XML_NAMESPACE_PRESENTATION, XML_NOTES, sal_True, sal_True);
+ SvXMLElementExport aPSY(*this, XML_NAMESPACE_PRESENTATION, XML_NOTES, true, true);
// write optional office:forms
exportFormsElement( xNotesPage );
@@ -2554,7 +2554,7 @@ void SdXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>&
}
}
-void SdXMLExport::addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat )
+void SdXMLExport::addDataStyle(const sal_Int32 nNumberFormat, bool bTimeFormat )
{
sal_Int32 nFormat = nNumberFormat;
if( (nNumberFormat > 1) && (nNumberFormat <= 0x0f) )
@@ -2594,7 +2594,7 @@ void SdXMLExport::exportAutoDataStyles()
GetFormExport()->exportAutoControlNumberStyles();
}
-OUString SdXMLExport::getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat ) const
+OUString SdXMLExport::getDataStyleName(const sal_Int32 nNumberFormat, bool bTimeFormat ) const
{
if( bTimeFormat )
{
@@ -2702,13 +2702,13 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage )
}
// annotation element + content
- SvXMLElementExport aElem(*this, XML_NAMESPACE_OFFICE_EXT, XML_ANNOTATION, sal_False, sal_True);
+ SvXMLElementExport aElem(*this, XML_NAMESPACE_OFFICE_EXT, XML_ANNOTATION, false, true);
// author
OUString aAuthor( xAnnotation->getAuthor() );
if( !aAuthor.isEmpty() )
{
- SvXMLElementExport aCreatorElem( *this, XML_NAMESPACE_DC, XML_CREATOR, sal_True, sal_False );
+ SvXMLElementExport aCreatorElem( *this, XML_NAMESPACE_DC, XML_CREATOR, true, false );
this->Characters(aAuthor);
}
@@ -2716,7 +2716,7 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage )
// date time
com::sun::star::util::DateTime aDate( xAnnotation->getDateTime() );
::sax::Converter::convertDateTime(sStringBuffer, aDate, 0, true);
- SvXMLElementExport aDateElem( *this, XML_NAMESPACE_DC, XML_DATE, sal_True, sal_False );
+ SvXMLElementExport aDateElem( *this, XML_NAMESPACE_DC, XML_DATE, true, false );
Characters(sStringBuffer.makeStringAndClear());
}
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx
index 93ba7251f306..581fdcbd93bc 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -193,10 +193,10 @@ public:
sal_Bool IsFamilyPresentationUsed() const { return mbFamilyPresentationUsed; }
void SetFamilyPresentationUsed() { mbFamilyPresentationUsed = sal_True; }
- virtual void addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ) SAL_OVERRIDE;
+ virtual void addDataStyle(const sal_Int32 nNumberFormat, bool bTimeFormat = false ) SAL_OVERRIDE;
virtual void exportDataStyles() SAL_OVERRIDE;
virtual void exportAutoDataStyles() SAL_OVERRIDE;
- virtual OUString getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat = sal_False ) const SAL_OVERRIDE;
+ virtual OUString getDataStyleName(const sal_Int32 nNumberFormat, bool bTimeFormat = false ) const SAL_OVERRIDE;
};
#endif // _SDXMLEXP_HXX
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index d43da5c4c9ee..78666097ecf1 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -581,7 +581,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sURL );
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
- mpHyperlinkElement.reset( new SvXMLElementExport(mrExport, XML_NAMESPACE_DRAW, XML_A, sal_True, sal_True) );
+ mpHyperlinkElement.reset( new SvXMLElementExport(mrExport, XML_NAMESPACE_DRAW, XML_A, true, true) );
}
}
}
@@ -1215,7 +1215,7 @@ void XMLShapeExport::ImpExportGluePoints( const uno::Reference< drawing::XShape
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_ESCAPE_DIRECTION, msBuffer.makeStringAndClear() );
}
- SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_DRAW, XML_GLUE_POINT, sal_True, sal_True);
+ SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_DRAW, XML_GLUE_POINT, true, true);
}
}
}
@@ -1586,7 +1586,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
if( ((nFound & FOUND_CLICKACTION) == 0) || (eClickAction == presentation::ClickAction_NONE) )
return;
- SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
+ SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, true, true);
enum XMLTokenEnum eStrAction;
@@ -1676,7 +1676,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_VERB, msBuffer.makeStringAndClear());
}
- SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_PRESENTATION, XML_EVENT_LISTENER, sal_True, sal_True);
+ SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_PRESENTATION, XML_EVENT_LISTENER, true, true);
if( eClickAction == presentation::ClickAction_VANISH || eClickAction == presentation::ClickAction_SOUND )
{
@@ -1689,7 +1689,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
if( nFound & FOUND_PLAYFULL && bPlayFull )
mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_PLAY_FULL, XML_TRUE );
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, sal_True, sal_True );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, true, true );
}
}
}
@@ -1697,7 +1697,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
{
if( nFound & FOUND_MACRO )
{
- SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
+ SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, true, true);
mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE,
mrExport.GetNamespaceMap().GetQNameByKey(
@@ -1722,14 +1722,14 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_MACRO_NAME, aStrMacro );
}
- SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
+ SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, true, true);
}
}
else if( aClickEventType == msScript )
{
if( nFound & FOUND_MACRO )
{
- SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, sal_True, sal_True);
+ SvXMLElementExport aEventsElemt(mrExport, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, true, true);
if ( nFound & FOUND_MACRO )
{
mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, mrExport.GetNamespaceMap().GetQNameByKey(
@@ -1740,7 +1740,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x
mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName );
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aStrMacro );
- SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, sal_True, sal_True);
+ SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, true, true);
}
}
}
@@ -1760,13 +1760,13 @@ void XMLShapeExport::ImpExportDescription( const uno::Reference< drawing::XShape
if(!aTitle.isEmpty())
{
- SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SVG, XML_TITLE, sal_True, sal_False);
+ SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SVG, XML_TITLE, true, false);
mrExport.Characters( aTitle );
}
if(!aDescription.isEmpty())
{
- SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SVG, XML_DESC, sal_True, sal_False );
+ SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SVG, XML_DESC, true, false );
mrExport.Characters( aDescription );
}
}
@@ -1782,8 +1782,8 @@ void XMLShapeExport::ImpExportGroupShape( const uno::Reference< drawing::XShape
if(xShapes.is() && xShapes->getCount())
{
// write group shape
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
- SvXMLElementExport aPGR(mrExport, XML_NAMESPACE_DRAW, XML_G, bCreateNewline, sal_True);
+ bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
+ SvXMLElementExport aPGR(mrExport, XML_NAMESPACE_DRAW, XML_G, bCreateNewline, true);
ImpExportDescription( xShape ); // #i68101#
ImpExportEvents( xShape );
@@ -1880,9 +1880,9 @@ void XMLShapeExport::ImpExportTextBoxShape(
if(bIsPresShape)
bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, aStr );
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
+ bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW,
- XML_FRAME, bCreateNewline, sal_True );
+ XML_FRAME, bCreateNewline, true );
// evtl. corner radius?
sal_Int32 nCornerRadius(0L);
@@ -1897,7 +1897,7 @@ void XMLShapeExport::ImpExportTextBoxShape(
{
// write text-box
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_TEXT_BOX, sal_True, sal_True);
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_TEXT_BOX, true, true);
if(!bIsEmptyPresObj)
ImpExportText( xShape );
}
@@ -1930,8 +1930,8 @@ void XMLShapeExport::ImpExportRectangleShape(
}
// write rectangle
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_RECT, bCreateNewline, sal_True);
+ bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_RECT, bCreateNewline, true);
ImpExportDescription( xShape ); // #i68101#
ImpExportEvents( xShape );
@@ -2042,8 +2042,8 @@ void XMLShapeExport::ImpExportLineShape(
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y2, aStr);
// write line
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_LINE, bCreateNewline, sal_True);
+ bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_LINE, bCreateNewline, true);
ImpExportDescription( xShape ); // #i68101#
ImpExportEvents( xShape );
@@ -2094,12 +2094,12 @@ void XMLShapeExport::ImpExportEllipseShape(
mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_END_ANGLE, sStringBuffer.makeStringAndClear() );
}
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
+ bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
// write ellipse or circle
SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW,
bCircle ? XML_CIRCLE : XML_ELLIPSE,
- bCreateNewline, sal_True);
+ bCreateNewline, true);
ImpExportDescription( xShape ); // #i68101#
ImpExportEvents( xShape );
@@ -2207,7 +2207,7 @@ void XMLShapeExport::ImpExportPolygonShape(
XML_NAMESPACE_DRAW,
eName,
bCreateNewline,
- sal_True);
+ true);
ImpExportDescription( xShape ); // #i68101#
ImpExportEvents( xShape );
@@ -2234,9 +2234,9 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
if(eShapeType == XmlShapeTypePresGraphicObjectShape)
bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_GRAPHIC) );
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
+ bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW,
- XML_FRAME, bCreateNewline, sal_True );
+ XML_FRAME, bCreateNewline, true );
const bool bSaveBackwardsCompatible = ( mrExport.getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE );
@@ -2301,7 +2301,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
}
{
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, sal_True, sal_True);
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, true, true);
if( !sImageURL.isEmpty() )
{
@@ -2332,7 +2332,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
// xlink:href for replacement, only written for Svg content
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, sal_True, sal_True);
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_IMAGE, true, true);
// optional office:binary-data
mrExport.AddEmbeddedGraphicObjectAsBase64(aReplacementUrl);
@@ -2381,8 +2381,8 @@ void XMLShapeExport::ImpExportControlShape(
}
}
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_CONTROL, bCreateNewline, sal_True);
+ bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_CONTROL, bCreateNewline, true);
ImpExportDescription( xShape ); // #i68101#
}
@@ -2596,8 +2596,8 @@ void XMLShapeExport::ImpExportConnectorShape(
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_VIEWBOX, aViewBox.GetExportString());
// write connector shape. Add Export later.
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_CONNECTOR, bCreateNewline, sal_True);
+ bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_CONNECTOR, bCreateNewline, true);
ImpExportDescription( xShape ); // #i68101#
ImpExportEvents( xShape );
@@ -2690,8 +2690,8 @@ void XMLShapeExport::ImpExportMeasureShape(
mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_Y2, aStr);
// write measure shape
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_MEASURE, bCreateNewline, sal_True);
+ bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_MEASURE, bCreateNewline, true);
ImpExportDescription( xShape ); // #i68101#
ImpExportEvents( xShape );
@@ -2726,11 +2726,11 @@ void XMLShapeExport::ImpExportOLE2Shape(
else if(eShapeType == XmlShapeTypePresSheetShape)
bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_TABLE) );
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
+ bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
sal_Bool bExportEmbedded(0 != (mrExport.getExportFlags() & EXPORT_EMBEDDED));
OUString sPersistName;
SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW,
- XML_FRAME, bCreateNewline, sal_True );
+ XML_FRAME, bCreateNewline, true );
const bool bSaveBackwardsCompatible = ( mrExport.getExportFlags() & EXPORT_SAVEBACKWARDCOMPATIBLE );
@@ -2807,7 +2807,7 @@ void XMLShapeExport::ImpExportOLE2Shape(
}
enum XMLTokenEnum eElem = sClassId.isEmpty() ? XML_OBJECT : XML_OBJECT_OLE ;
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, eElem, sal_True, sal_True );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, eElem, true, true );
if(bExportEmbedded && !bIsEmptyPresObj)
{
@@ -2847,7 +2847,7 @@ void XMLShapeExport::ImpExportOLE2Shape(
}
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_DRAW,
- XML_IMAGE, sal_False, sal_True );
+ XML_IMAGE, false, true );
if( bExportEmbedded )
GetExport().AddEmbeddedObjectAsBase64( sURL );
@@ -2890,8 +2890,8 @@ void XMLShapeExport::ImpExportPageShape(
}
// write Page shape
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PAGE_THUMBNAIL, bCreateNewline, sal_True);
+ bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PAGE_THUMBNAIL, bCreateNewline, true);
}
}
@@ -2927,14 +2927,14 @@ void XMLShapeExport::ImpExportCaptionShape(
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CAPTION_POINT_Y, msBuffer.makeStringAndClear() );
// write Caption shape. Add export later.
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
+ bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
sal_Bool bAnnotation( (nFeatures & SEF_EXPORT_ANNOTATION) == SEF_EXPORT_ANNOTATION );
SvXMLElementExport aObj( mrExport,
(bAnnotation ? XML_NAMESPACE_OFFICE
: XML_NAMESPACE_DRAW),
(bAnnotation ? XML_ANNOTATION : XML_CAPTION),
- bCreateNewline, sal_True );
+ bCreateNewline, true );
ImpExportDescription( xShape ); // #i68101#
ImpExportEvents( xShape );
@@ -2955,9 +2955,9 @@ void XMLShapeExport::ImpExportFrameShape(
// Transformation
ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
+ bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW,
- XML_FRAME, bCreateNewline, sal_True );
+ XML_FRAME, bCreateNewline, true );
// export frame url
OUString aStr;
@@ -2974,7 +2974,7 @@ void XMLShapeExport::ImpExportFrameShape(
// write floating frame
{
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_FLOATING_FRAME, sal_True, sal_True);
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_FLOATING_FRAME, true, true);
}
}
}
@@ -2989,9 +2989,9 @@ void XMLShapeExport::ImpExportAppletShape(
// Transformation
ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
+ bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW,
- XML_FRAME, bCreateNewline, sal_True );
+ XML_FRAME, bCreateNewline, true );
// export frame url
OUString aStr;
@@ -3017,7 +3017,7 @@ void XMLShapeExport::ImpExportAppletShape(
{
// write applet
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_APPLET, sal_True, sal_True);
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_APPLET, true, true);
// export parameters
uno::Sequence< beans::PropertyValue > aCommands;
@@ -3028,7 +3028,7 @@ void XMLShapeExport::ImpExportAppletShape(
aCommands[nIndex].Value >>= aStr;
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aCommands[nIndex].Name );
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, aStr );
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true );
}
}
}
@@ -3044,9 +3044,9 @@ void XMLShapeExport::ImpExportPluginShape(
// Transformation
ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
+ bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW,
- XML_FRAME, bCreateNewline, sal_True );
+ XML_FRAME, bCreateNewline, true );
// export plugin url
OUString aStr;
@@ -3063,7 +3063,7 @@ void XMLShapeExport::ImpExportPluginShape(
{
// write plugin
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PLUGIN, sal_True, sal_True);
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PLUGIN, true, true);
// export parameters
uno::Sequence< beans::PropertyValue > aCommands;
@@ -3074,7 +3074,7 @@ void XMLShapeExport::ImpExportPluginShape(
aCommands[nIndex].Value >>= aStr;
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aCommands[nIndex].Name );
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, aStr );
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true );
}
}
}
@@ -3168,9 +3168,9 @@ void XMLShapeExport::ImpExportMediaShape(
if(eShapeType == XmlShapeTypePresMediaShape)
ImpExportPresentationAttributes( xPropSet, GetXMLToken(XML_PRESENTATION_OBJECT) );
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
+ bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW,
- XML_FRAME, bCreateNewline, sal_True );
+ XML_FRAME, bCreateNewline, true );
// export media url
OUString aMediaURL;
@@ -3186,7 +3186,7 @@ void XMLShapeExport::ImpExportMediaShape(
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, OUString( "application/vnd.sun.star.media" ) );
// write plugin
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PLUGIN, !( nFeatures & SEF_EXPORT_NO_WS ), sal_True);
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DRAW, XML_PLUGIN, !( nFeatures & SEF_EXPORT_NO_WS ), true);
// export parameters
const OUString aFalseStr( "false" ), aTrueStr( "true" );
@@ -3196,21 +3196,21 @@ void XMLShapeExport::ImpExportMediaShape(
xPropSet->getPropertyValue( aLoopStr ) >>= bLoop;
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aLoopStr );
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, bLoop ? aTrueStr : aFalseStr );
- delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ) );
+ delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true ) );
sal_Bool bMute = false;
const OUString aMuteStr( "Mute" );
xPropSet->getPropertyValue( aMuteStr ) >>= bMute;
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aMuteStr );
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, bMute ? aTrueStr : aFalseStr );
- delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ) );
+ delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true ) );
sal_Int16 nVolumeDB = 0;
const OUString aVolumeDBStr( "VolumeDB" );
xPropSet->getPropertyValue("VolumeDB") >>= nVolumeDB;
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aVolumeDBStr );
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, OUString::number( nVolumeDB ) );
- delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ) );
+ delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true ) );
media::ZoomLevel eZoom;
const OUString aZoomStr( "Zoom" );
@@ -3235,7 +3235,7 @@ void XMLShapeExport::ImpExportMediaShape(
{
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aZoomStr );
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, aZoomValue );
- delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ) );
+ delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, false, true ) );
}
}
}
@@ -3257,7 +3257,7 @@ void XMLShapeExport::ImpExport3DSceneShape( const uno::Reference< drawing::XShap
// write 3DScene shape
sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
- SvXMLElementExport aOBJ( mrExport, XML_NAMESPACE_DR3D, XML_SCENE, bCreateNewline, sal_True);
+ SvXMLElementExport aOBJ( mrExport, XML_NAMESPACE_DR3D, XML_SCENE, bCreateNewline, true);
ImpExportDescription( xShape ); // #i68101#
ImpExportEvents( xShape );
@@ -3340,7 +3340,7 @@ void XMLShapeExport::ImpExport3DShape(
// write 3DCube shape
// #i123542# Do this *after* the attributes are added, else these will be lost since opening
// the scope will clear the global attribute list at the exporter
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_CUBE, sal_True, sal_True);
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_CUBE, true, true);
break;
}
@@ -3377,7 +3377,7 @@ void XMLShapeExport::ImpExport3DShape(
// write 3DSphere shape
// #i123542# Do this *after* the attributes are added, else these will be lost since opening
// the scope will clear the global attribute list at the exporter
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_SPHERE, sal_True, sal_True);
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_SPHERE, true, true);
break;
}
@@ -3427,12 +3427,12 @@ void XMLShapeExport::ImpExport3DShape(
if(eShapeType == XmlShapeTypeDraw3DLatheObject)
{
// write 3DLathe shape
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_ROTATE, sal_True, sal_True);
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_ROTATE, true, true);
}
else
{
// write 3DExtrude shape
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_EXTRUDE, sal_True, sal_True);
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_EXTRUDE, true, true);
}
break;
}
@@ -3611,7 +3611,7 @@ void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::s
nLamp == 1 ? XML_TRUE : XML_FALSE);
// write light entry
- SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_LIGHT, sal_True, sal_True);
+ SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_LIGHT, true, true);
}
}
@@ -3704,7 +3704,7 @@ void ImpExportEquations( SvXMLExport& rExport, const uno::Sequence< OUString >&
}
} while( nIndex != -1 );
rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_FORMULA, aStr );
- SvXMLElementExport aOBJ( rExport, XML_NAMESPACE_DRAW, XML_EQUATION, sal_True, sal_True );
+ SvXMLElementExport aOBJ( rExport, XML_NAMESPACE_DRAW, XML_EQUATION, true, true );
}
}
@@ -3845,7 +3845,7 @@ void ImpExportHandles( SvXMLExport& rExport, const uno::Sequence< beans::Propert
}
}
if ( bPosition )
- SvXMLElementExport aOBJ( rExport, XML_NAMESPACE_DRAW, XML_HANDLE, sal_True, sal_True );
+ SvXMLElementExport aOBJ( rExport, XML_NAMESPACE_DRAW, XML_HANDLE, true, true );
else
rExport.ClearAttrList();
}
@@ -4664,7 +4664,7 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport, const uno::Reference< bean
ImpExportEnhancedPath( rExport, aCoordinates, aSegments );
}
}
- SvXMLElementExport aOBJ( rExport, XML_NAMESPACE_DRAW, XML_ENHANCED_GEOMETRY, sal_True, sal_True );
+ SvXMLElementExport aOBJ( rExport, XML_NAMESPACE_DRAW, XML_ENHANCED_GEOMETRY, true, true );
if ( bEquations )
ImpExportEquations( rExport, aEquations );
if ( bHandles )
@@ -4701,8 +4701,8 @@ void XMLShapeExport::ImpExportCustomShape(
mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DATA, aStr );
}
}
- sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
- SvXMLElementExport aOBJ( mrExport, XML_NAMESPACE_DRAW, XML_CUSTOM_SHAPE, bCreateNewline, sal_True );
+ bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210#
+ SvXMLElementExport aOBJ( mrExport, XML_NAMESPACE_DRAW, XML_CUSTOM_SHAPE, bCreateNewline, true );
ImpExportDescription( xShape ); // #i68101#
ImpExportEvents( xShape );
ImpExportGluePoints( xShape );
@@ -4731,7 +4731,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape
const bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 );
const bool bExportEmbedded(0 != (mrExport.getExportFlags() & EXPORT_EMBEDDED));
- SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW, XML_FRAME, bCreateNewline, sal_True );
+ SvXMLElementExport aElement( mrExport, XML_NAMESPACE_DRAW, XML_FRAME, bCreateNewline, true );
// do not export in ODF 1.1 or older
if( mrExport.getDefaultVersion() >= SvtSaveOptions::ODFVER_012 )
@@ -4831,7 +4831,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape
mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
}
- SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_DRAW, XML_IMAGE, sal_False, sal_True );
+ SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_DRAW, XML_IMAGE, false, true );
if( bExportEmbedded )
{
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 75c9c9bf2697..19e32e0f2586 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -142,7 +142,7 @@ namespace xmloff
void OElementExport::implStartElement(const sal_Char* _pName)
{
- m_pXMLElement = new SvXMLElementExport(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, _pName, sal_True, sal_True);
+ m_pXMLElement = new SvXMLElementExport(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, _pName, true, true);
}
void OElementExport::implEndElement()
@@ -418,7 +418,7 @@ namespace xmloff
OAttributeMetaData::getCommonControlAttributeNamespace(CCA_LABEL),
OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL),
*pListItems);
- SvXMLElementExport aFormElement(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, "item", sal_True, sal_True);
+ SvXMLElementExport aFormElement(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, "item", true, true);
}
}
}
@@ -1352,7 +1352,7 @@ namespace xmloff
);
aDefaultSelection.erase(aDefaultSelectedPos);
}
- SvXMLElementExport aFormElement(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, "option", sal_True, sal_True);
+ SvXMLElementExport aFormElement(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, "option", true, true);
}
// There may be more "selected" or "default-selected" items than there are in the lists in real,
@@ -1395,7 +1395,7 @@ namespace xmloff
sTrue
);
}
- SvXMLElementExport aFormElement(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, "option", sal_True, sal_True);
+ SvXMLElementExport aFormElement(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, "option", true, true);
}
}
}
@@ -1408,8 +1408,8 @@ namespace xmloff
? new SvXMLElementExport(
m_rContext.getGlobalContext(),
XML_NAMESPACE_FORM,
- pOuterElementName, sal_True,
- sal_True)
+ pOuterElementName, true,
+ true)
: 0;
// add the attributes for the inner element
@@ -2069,7 +2069,7 @@ namespace xmloff
sPropValue);
if ( m_rContext.getGlobalContext().GetAttrList().getLength() )
{
- SvXMLElementExport aFormElement(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, xmloff::token::XML_CONNECTION_RESOURCE, sal_True, sal_True);
+ SvXMLElementExport aFormElement(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, xmloff::token::XML_CONNECTION_RESOURCE, true, true);
}
}
diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx
index 8e480e295179..b13528041d49 100644
--- a/xmloff/source/forms/officeforms.cxx
+++ b/xmloff/source/forms/officeforms.cxx
@@ -114,7 +114,7 @@ namespace xmloff
{
addModelAttributes(_rExp);
- m_pImplElement = new SvXMLElementExport(_rExp, XML_NAMESPACE_OFFICE, XML_FORMS, sal_True, sal_True);
+ m_pImplElement = new SvXMLElementExport(_rExp, XML_NAMESPACE_OFFICE, XML_FORMS, true, true);
}
OFormsRootExport::~OFormsRootExport( )
diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx
index 3943af21cc23..79bacd97d796 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -93,7 +93,7 @@ namespace xmloff
AddAttribute(XML_NAMESPACE_OFFICE, eValueAttName, sValue );
SvXMLElementExport aValueTag(
m_rContext.getGlobalContext(), XML_NAMESPACE_FORM,
- token::XML_LIST_VALUE, sal_True, sal_False);
+ token::XML_LIST_VALUE, true, false);
}
}
@@ -123,7 +123,7 @@ namespace xmloff
// now that we have the first sub-tag we need the form:properties element
if (!pPropertiesTag)
- pPropertiesTag = new SvXMLElementExport(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, token::XML_PROPERTIES, sal_True, sal_True);
+ pPropertiesTag = new SvXMLElementExport(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, token::XML_PROPERTIES, true, true);
// add the name attribute
AddAttribute(XML_NAMESPACE_FORM, token::XML_PROPERTY_NAME, *aProperty);
@@ -177,7 +177,7 @@ namespace xmloff
SvXMLElementExport aValueTag1(m_rContext.getGlobalContext(),
XML_NAMESPACE_FORM,
bIsSequence ? token::XML_LIST_PROPERTY
- : token::XML_PROPERTY, sal_True, sal_True);
+ : token::XML_PROPERTY, true, true);
if (!bIsSequence)
continue;
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index 4cca4e84aca0..7a94fdb030e4 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -152,7 +152,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum )
OUString::createFromAscii(pVersion) );
SvXMLElementExport aDocElem( *this, XML_NAMESPACE_OFFICE, XML_DOCUMENT_META,
- sal_True, sal_True );
+ true, true );
// NB: office:meta is now written by _ExportMeta
_ExportMeta();
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index 773056b0c0fd..f18dbb29afaf 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -75,7 +75,7 @@ void SvXMLMetaExport::SimpleStringElement( const OUString& rText,
{
if ( !rText.isEmpty() ) {
SvXMLElementExport aElem( mrExport, nNamespace, eElementName,
- sal_True, sal_False );
+ true, false );
mrExport.Characters( rText );
}
}
@@ -87,7 +87,7 @@ void SvXMLMetaExport::SimpleDateTimeElement( const util::DateTime & rDate,
OUString sValue = GetISODateTimeString( rDate );
if ( !sValue.isEmpty() ) {
SvXMLElementExport aElem( mrExport, nNamespace, eElementName,
- sal_True, sal_False );
+ true, false );
mrExport.Characters( sValue );
}
}
@@ -98,7 +98,7 @@ void SvXMLMetaExport::_MExport()
// generator
{
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_META, XML_GENERATOR,
- sal_True, sal_True );
+ true, true );
mrExport.Characters( ::utl::DocInfoHelper::GetGeneratorString() );
}
@@ -136,7 +136,7 @@ void SvXMLMetaExport::_MExport()
const uno::Sequence< OUString > keywords = mxDocProps->getKeywords();
for (sal_Int32 i = 0; i < keywords.getLength(); ++i) {
SvXMLElementExport aKwElem( mrExport, XML_NAMESPACE_META, XML_KEYWORD,
- sal_True, sal_False );
+ true, false );
mrExport.Characters( keywords[i] );
}
@@ -145,7 +145,7 @@ void SvXMLMetaExport::_MExport()
OUString sValue = LanguageTag( mxDocProps->getLanguage()).getBcp47( false);
if (!sValue.isEmpty()) {
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DC, XML_LANGUAGE,
- sal_True, sal_False );
+ true, false );
mrExport.Characters( sValue );
}
}
@@ -154,7 +154,7 @@ void SvXMLMetaExport::_MExport()
{
SvXMLElementExport aElem( mrExport,
XML_NAMESPACE_META, XML_EDITING_CYCLES,
- sal_True, sal_False );
+ true, false );
mrExport.Characters( OUString::number(
mxDocProps->getEditingCycles() ) );
}
@@ -165,7 +165,7 @@ void SvXMLMetaExport::_MExport()
sal_Int32 secs = mxDocProps->getEditingDuration();
SvXMLElementExport aElem( mrExport,
XML_NAMESPACE_META, XML_EDITING_DURATION,
- sal_True, sal_False );
+ true, false );
OUStringBuffer buf;
::sax::Converter::convertDuration(buf, util::Duration(
false, 0, 0, 0, secs/3600, (secs%3600)/60, secs%60, 0));
@@ -185,7 +185,7 @@ void SvXMLMetaExport::_MExport()
SvXMLElementExport aElem( mrExport,
XML_NAMESPACE_META,XML_HYPERLINK_BEHAVIOUR,
- sal_True, sal_False );
+ true, false );
}
// auto-reload
@@ -203,7 +203,7 @@ void SvXMLMetaExport::_MExport()
buf.makeStringAndClear());
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_META, XML_AUTO_RELOAD,
- sal_True, sal_False );
+ true, false );
}
// template
@@ -226,7 +226,7 @@ void SvXMLMetaExport::_MExport()
GetISODateTimeString( mxDocProps->getTemplateDate() ) );
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_META, XML_TEMPLATE,
- sal_True, sal_False );
+ true, false );
}
// user defined fields
@@ -245,7 +245,7 @@ void SvXMLMetaExport::_MExport()
mrExport.AddAttribute( XML_NAMESPACE_META, XML_VALUE_TYPE,
sType.makeStringAndClear() );
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_META,
- XML_USER_DEFINED, sal_True, sal_False );
+ XML_USER_DEFINED, true, false );
mrExport.Characters( sValueBuffer.makeStringAndClear() );
}
@@ -291,7 +291,7 @@ void SvXMLMetaExport::_MExport()
}
}
SvXMLElementExport aElem( mrExport,
- XML_NAMESPACE_META, XML_DOCUMENT_STATISTIC, sal_True, sal_True );
+ XML_NAMESPACE_META, XML_DOCUMENT_STATISTIC, true, true );
}
}
@@ -340,7 +340,7 @@ void SvXMLMetaExport::Export()
} else {
// office:meta
SvXMLElementExport aElem( mrExport, XML_NAMESPACE_OFFICE, XML_META,
- sal_True, sal_True );
+ true, true );
// fall back to using public interface of XDocumentProperties
_MExport();
}
@@ -457,7 +457,7 @@ SvXMLMetaExport::endElement(const OUString & i_rName)
return;
}
DBG_ASSERT( m_level >= 0, "SvXMLMetaExport: level error" );
- mrExport.EndElement(i_rName, sal_False);
+ mrExport.EndElement(i_rName, false);
}
void SAL_CALL
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index 7b346d9506df..edd693a3b764 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -71,7 +71,7 @@ sal_uInt32 XMLVersionListExport::exportDoc( enum ::xmloff::token::XMLTokenEnum )
{
// the following object will write all collected attributes in its dtor
- SvXMLElementExport aRoot( *this, XML_NAMESPACE_FRAMEWORK, xmloff::token::XML_VERSION_LIST, sal_True, sal_True );
+ SvXMLElementExport aRoot( *this, XML_NAMESPACE_FRAMEWORK, xmloff::token::XML_VERSION_LIST, true, true );
for ( sal_Int32 n=0; n<maVersions.getLength(); n++ )
{
@@ -92,7 +92,7 @@ sal_uInt32 XMLVersionListExport::exportDoc( enum ::xmloff::token::XMLTokenEnum )
AddAttribute( XML_NAMESPACE_DC, xmloff::token::XML_DATE_TIME, aDateStr );
// the following object will write all collected attributes in its dtor
- SvXMLElementExport aEntry( *this, XML_NAMESPACE_FRAMEWORK, xmloff::token::XML_VERSION_ENTRY, sal_True, sal_True );
+ SvXMLElementExport aEntry( *this, XML_NAMESPACE_FRAMEWORK, xmloff::token::XML_VERSION_ENTRY, true, true );
}
}
GetDocHandler()->endDocument();
diff --git a/xmloff/source/script/XMLScriptExportHandler.cxx b/xmloff/source/script/XMLScriptExportHandler.cxx
index 3be13878d09a..ab43ab281356 100644
--- a/xmloff/source/script/XMLScriptExportHandler.cxx
+++ b/xmloff/source/script/XMLScriptExportHandler.cxx
@@ -45,7 +45,7 @@ void XMLScriptExportHandler::Export(
SvXMLExport& rExport,
const OUString& rEventQName,
Sequence<PropertyValue> & rValues,
- sal_Bool bUseWhitespace)
+ bool bUseWhitespace)
{
rExport.AddAttribute(XML_NAMESPACE_SCRIPT, XML_LANGUAGE,
@@ -70,7 +70,7 @@ void XMLScriptExportHandler::Export(
SvXMLElementExport aEventElemt(rExport, XML_NAMESPACE_SCRIPT,
XML_EVENT_LISTENER,
- bUseWhitespace, sal_False);
+ bUseWhitespace, false);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/script/XMLStarBasicExportHandler.cxx b/xmloff/source/script/XMLStarBasicExportHandler.cxx
index 5127c1b6147f..3e18bbd40128 100644
--- a/xmloff/source/script/XMLStarBasicExportHandler.cxx
+++ b/xmloff/source/script/XMLStarBasicExportHandler.cxx
@@ -49,7 +49,7 @@ void XMLStarBasicExportHandler::Export(
SvXMLExport& rExport,
const OUString& rEventQName,
Sequence<PropertyValue> & rValues,
- sal_Bool bUseWhitespace)
+ bool bUseWhitespace)
{
rExport.AddAttribute(XML_NAMESPACE_SCRIPT, XML_LANGUAGE,
rExport.GetNamespaceMap().GetQNameByKey(
@@ -92,7 +92,7 @@ void XMLStarBasicExportHandler::Export(
SvXMLElementExport aEventElemt(rExport, XML_NAMESPACE_SCRIPT,
XML_EVENT_LISTENER,
- bUseWhitespace, sal_False);
+ bUseWhitespace, false);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx
index 3ba46fe8842d..efd388fb062c 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -309,7 +309,7 @@ bool XMLDashStyleExport::exportXML(
// do Write
SvXMLElementExport rElem( rExport,
XML_NAMESPACE_DRAW, XML_STROKE_DASH,
- sal_True, sal_False );
+ true, false );
}
}
return bRet;
diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx
index 2fed5d68c725..111b0dba135a 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -301,7 +301,7 @@ bool XMLGradientStyleExport::exportXML(
// Do Write
SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_GRADIENT,
- sal_True, sal_False );
+ true, false );
}
}
}
diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx
index 832d19774054..589c0e6e8b57 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -229,7 +229,7 @@ bool XMLHatchStyleExport::exportXML(
// Do Write
SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_HATCH,
- sal_True, sal_False );
+ true, false );
}
}
}
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index 0577fc922d86..5e355ff23f53 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -88,7 +88,7 @@ void XMLImageStyle::ImpExportXML( const OUString& rStrName, const uno::Any& rVal
}
// Do Write
- SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_FILL_IMAGE, sal_True, sal_True );
+ SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_FILL_IMAGE, true, true );
if( !sImageURL.isEmpty() )
{
diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx
index b07eb1067b35..acad58b5eb34 100644
--- a/xmloff/source/style/MarkerStyle.cxx
+++ b/xmloff/source/style/MarkerStyle.cxx
@@ -201,7 +201,7 @@ void XMLMarkerStyleExport::exportXML(
rExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, aPolygonString);
// Do Write
- SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_MARKER, sal_True, sal_False );
+ SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_MARKER, true, false );
}
}
}
diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx
index e2964647998f..1c66c25824ac 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -300,7 +300,7 @@ sal_Bool XMLTransGradientStyleExport::exportXML(
// Do Write
SvXMLElementExport rElem( rExport,
XML_NAMESPACE_DRAW, XML_OPACITY,
- sal_True, sal_False );
+ true, false );
}
}
}
diff --git a/xmloff/source/style/XMLBackgroundImageExport.cxx b/xmloff/source/style/XMLBackgroundImageExport.cxx
index 25dba04d75c3..d8578becd020 100644
--- a/xmloff/source/style/XMLBackgroundImageExport.cxx
+++ b/xmloff/source/style/XMLBackgroundImageExport.cxx
@@ -154,7 +154,7 @@ void XMLBackgroundImageExport::exportXML( const Any& rURL,
}
{
- SvXMLElementExport aElem( GetExport(), nPrefix, rLocalName, sal_True, sal_True );
+ SvXMLElementExport aElem( GetExport(), nPrefix, rLocalName, true, true );
if( !sURL.isEmpty() && GraphicLocation_NONE != ePos )
{
// optional office:binary-data
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index b83bf9cd4cc6..ff95ad6143e5 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -222,7 +222,7 @@ void XMLFontAutoStylePool::exportXML()
{
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_OFFICE,
XML_FONT_FACE_DECLS,
- sal_True, sal_True );
+ true, true );
Any aAny;
OUString sTmp;
XMLFontFamilyNamePropHdl aFamilyNameHdl;
@@ -268,7 +268,7 @@ void XMLFontAutoStylePool::exportXML()
SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_STYLE,
XML_FONT_FACE,
- sal_True, sal_True );
+ true, true );
if( tryToEmbedFonts )
{
diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
index 3dbfd9c82600..5404963d799c 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
@@ -179,7 +179,7 @@ void XMLFootnoteSeparatorExport::exportXML(
// line-style
SvXMLElementExport aElem(rExport, XML_NAMESPACE_STYLE,
- XML_FOOTNOTE_SEP, sal_True, sal_True);
+ XML_FOOTNOTE_SEP, true, true);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index 7335548eebda..973d648d9c73 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -141,7 +141,7 @@ bool XMLPageExport::exportStyle(
}
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
- XML_MASTER_PAGE, sal_True, sal_True );
+ XML_MASTER_PAGE, true, true );
exportMasterPageContent( xPropSet, false );
}
@@ -162,7 +162,7 @@ XMLPageExport::XMLPageExport( SvXMLExport& rExp ) :
xPageMasterPropSetMapper, rExp);
rExport.GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_PAGE_MASTER, OUString( XML_STYLE_FAMILY_PAGE_MASTER_NAME ),
- xPageMasterExportPropMapper, OUString( XML_STYLE_FAMILY_PAGE_MASTER_PREFIX ), sal_False );
+ xPageMasterExportPropMapper, OUString( XML_STYLE_FAMILY_PAGE_MASTER_PREFIX ), false );
Reference< XStyleFamiliesSupplier > xFamiliesSupp( GetExport().GetModel(),
UNO_QUERY );
@@ -252,7 +252,7 @@ void XMLPageExport::exportDefaultStyle()
//<style:default-page-layout>
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
XML_DEFAULT_PAGE_LAYOUT,
- sal_True, sal_True );
+ true, true );
xPageMasterExportPropMapper->exportXML( GetExport(), xPropStates,
XML_EXPORT_FLAG_IGN_WS );
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index c02315fa013d..2d954aa048c7 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -716,7 +716,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
SvXMLElementExport aElem( GetExport(),
XML_NAMESPACE_STYLE, sName,
- sal_True, sal_True );
+ true, true );
sal_Int32 nStart(-1);
sal_Int32 nEnd(-1);
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index 5af7c127907c..e37ba3288c51 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -312,7 +312,7 @@ bool XMLStyleExport::exportStyle(
{
// <style:style>
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, XML_STYLE,
- sal_True, sal_True );
+ true, true );
rPropMapper->SetStyleName( sName );
@@ -352,7 +352,7 @@ bool XMLStyleExport::exportDefaultStyle(
// <style:style>
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
XML_DEFAULT_STYLE,
- sal_True, sal_True );
+ true, true );
// <style:properties>
::std::vector< XMLPropertyState > xPropStates =
rPropMapper->FilterDefaults( xPropSet );
diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx
index 944caa0634bc..667643a5312d 100644
--- a/xmloff/source/style/xmlaustp.cxx
+++ b/xmloff/source/style/xmlaustp.cxx
@@ -240,7 +240,7 @@ void SvXMLAutoStylePoolP::exportStyleContent(
{
SvXMLElementExport aElem(
GetExport(), XML_NAMESPACE_STYLE, XML_HEADER_STYLE,
- sal_True, sal_True );
+ true, true );
rPropExp.exportXML(
GetExport(), rProperties,
@@ -251,7 +251,7 @@ void SvXMLAutoStylePoolP::exportStyleContent(
{
SvXMLElementExport aElem(
GetExport(), XML_NAMESPACE_STYLE, XML_FOOTER_STYLE,
- sal_True, sal_True );
+ true, true );
rPropExp.exportXML(
GetExport(), rProperties,
@@ -281,7 +281,7 @@ void SvXMLAutoStylePoolP::AddFamily(
const OUString& rStrName,
SvXMLExportPropertyMapper* pMapper,
const OUString& aStrPrefix,
- sal_Bool bAsFamily )
+ bool bAsFamily )
{
UniReference <SvXMLExportPropertyMapper> xTmp = pMapper;
AddFamily( nFamily, rStrName, xTmp, aStrPrefix, bAsFamily );
@@ -292,7 +292,7 @@ void SvXMLAutoStylePoolP::AddFamily(
const OUString& rStrName,
const UniReference < SvXMLExportPropertyMapper > & rMapper,
const OUString& rStrPrefix,
- sal_Bool bAsFamily )
+ bool bAsFamily )
{
pImpl->AddFamily( nFamily, rStrName, rMapper, rStrPrefix, bAsFamily );
}
@@ -350,12 +350,12 @@ OUString SvXMLAutoStylePoolP::Add( sal_Int32 nFamily,
return sName;
}
-sal_Bool SvXMLAutoStylePoolP::Add(OUString& rName, sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties )
+bool SvXMLAutoStylePoolP::Add(OUString& rName, sal_Int32 nFamily, const OUString& rParent, const ::std::vector< XMLPropertyState >& rProperties )
{
return pImpl->Add(rName, nFamily, rParent, rProperties);
}
-sal_Bool SvXMLAutoStylePoolP::AddNamed( const OUString& rName, sal_Int32 nFamily, const OUString& rParent,
+bool SvXMLAutoStylePoolP::AddNamed( const OUString& rName, sal_Int32 nFamily, const OUString& rParent,
const ::std::vector< XMLPropertyState >& rProperties )
{
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index 8c482294032d..b1a62832e66c 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -666,11 +666,11 @@ void SvXMLExportPropertyMapper::ContextFilter(
// 1.Number of elements equal ?
// 2.Index of each element equal ? (So I know whether the propertynames are the same)
// 3.Value of each element equal ?
-sal_Bool SvXMLExportPropertyMapper::Equals(
+bool SvXMLExportPropertyMapper::Equals(
const vector< XMLPropertyState >& aProperties1,
const vector< XMLPropertyState >& aProperties2 ) const
{
- sal_Bool bRet = sal_True;
+ bool bRet = true;
sal_uInt32 nCount = aProperties1.size();
if( nCount == aProperties2.size() )
@@ -699,13 +699,13 @@ sal_Bool SvXMLExportPropertyMapper::Equals(
}
}
else
- bRet = sal_False;
+ bRet = false;
nIndex++;
}
}
else
- bRet = sal_False;
+ bRet = false;
return bRet;
}
@@ -769,7 +769,7 @@ void SvXMLExportPropertyMapper::exportXML(
SvXMLElementExport aElem( rExport, XML_NAMESPACE_STYLE,
aPropTokens[i].eToken,
(nFlags & XML_EXPORT_FLAG_IGN_WS) != 0,
- sal_False );
+ false );
exportElementItems( rExport, rProperties, nFlags, aIndexArray );
}
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index eb90abc706a0..b3f21ecfcb72 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -351,7 +351,7 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel,
{
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, eElem,
- sal_True, sal_True );
+ true, true );
OUStringBuffer sBuffer;
if ( ePosAndSpaceMode == PositionAndSpaceMode::LABEL_WIDTH_AND_POSITION )
@@ -469,7 +469,7 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel,
{
SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_STYLE,
- XML_LIST_LEVEL_PROPERTIES, sal_True, sal_True );
+ XML_LIST_LEVEL_PROPERTIES, true, true );
/* Check, if properties for position-and-space-mode LABEL_ALIGNMENT
are allowed to be exported. (#i89178#)
@@ -519,7 +519,7 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel,
SvXMLElementExport aLabelAlignmentElement( GetExport(), XML_NAMESPACE_STYLE,
XML_LIST_LEVEL_LABEL_ALIGNMENT,
- sal_True, sal_True );
+ true, true );
}
}
@@ -605,7 +605,7 @@ void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel,
if( GetExport().GetAttrList().getLength() > 0 )
{
SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_STYLE,
- XML_TEXT_PROPERTIES, sal_True, sal_True );
+ XML_TEXT_PROPERTIES, true, true );
}
if( NumberingType::BITMAP == eType && !sImageURL.isEmpty() )
{
@@ -691,7 +691,7 @@ void SvxXMLNumRuleExport::exportNumberingRule(
{
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, XML_LIST_STYLE ,
- sal_True, sal_True );
+ true, true );
exportLevelStyles( rNumRule );
}
}
@@ -784,7 +784,7 @@ void SvxXMLNumRuleExport::exportOutline()
}
}
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
- XML_OUTLINE_STYLE, sal_True, sal_True );
+ XML_OUTLINE_STYLE, true, true );
exportLevelStyles( xNumRule, sal_True );
}
}
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 318d93bd8d05..7ea94fae4bbb 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -343,7 +343,7 @@ void SvXMLNumFmtExport::FinishTextElement_Impl()
if ( !sTextContent.isEmpty() )
{
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_TEXT,
- sal_True, sal_False );
+ true, false );
rExport.Characters( sTextContent.makeStringAndClear() );
}
}
@@ -358,7 +358,7 @@ void SvXMLNumFmtExport::WriteColorElement_Impl( const Color& rColor )
aColStr.makeStringAndClear() );
SvXMLElementExport aElem( rExport, XML_NAMESPACE_STYLE, XML_TEXT_PROPERTIES,
- sal_True, sal_False );
+ true, false );
}
void SvXMLNumFmtExport::WriteCurrencyElement_Impl( const OUString& rString,
@@ -379,7 +379,7 @@ void SvXMLNumFmtExport::WriteCurrencyElement_Impl( const OUString& rString,
SvXMLElementExport aElem( rExport,
XML_NAMESPACE_NUMBER, XML_CURRENCY_SYMBOL,
- sal_True, sal_False );
+ true, false );
rExport.Characters( rString );
}
@@ -388,7 +388,7 @@ void SvXMLNumFmtExport::WriteBooleanElement_Impl()
FinishTextElement_Impl();
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_BOOLEAN,
- sal_True, sal_False );
+ true, false );
}
void SvXMLNumFmtExport::WriteTextContentElement_Impl()
@@ -396,7 +396,7 @@ void SvXMLNumFmtExport::WriteTextContentElement_Impl()
FinishTextElement_Impl();
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_TEXT_CONTENT,
- sal_True, sal_False );
+ true, false );
}
// date elements
@@ -409,7 +409,7 @@ void SvXMLNumFmtExport::WriteDayElement_Impl( const OUString& rCalendar, sal_Boo
AddStyleAttr_Impl( bLong ); // adds to pAttrList
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_DAY,
- sal_True, sal_False );
+ true, false );
}
void SvXMLNumFmtExport::WriteMonthElement_Impl( const OUString& rCalendar, sal_Bool bLong, sal_Bool bText )
@@ -421,7 +421,7 @@ void SvXMLNumFmtExport::WriteMonthElement_Impl( const OUString& rCalendar, sal_B
AddTextualAttr_Impl( bText ); // adds to pAttrList
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_MONTH,
- sal_True, sal_False );
+ true, false );
}
void SvXMLNumFmtExport::WriteYearElement_Impl( const OUString& rCalendar, sal_Bool bLong )
@@ -432,7 +432,7 @@ void SvXMLNumFmtExport::WriteYearElement_Impl( const OUString& rCalendar, sal_Bo
AddStyleAttr_Impl( bLong ); // adds to pAttrList
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_YEAR,
- sal_True, sal_False );
+ true, false );
}
void SvXMLNumFmtExport::WriteEraElement_Impl( const OUString& rCalendar, sal_Bool bLong )
@@ -443,7 +443,7 @@ void SvXMLNumFmtExport::WriteEraElement_Impl( const OUString& rCalendar, sal_Boo
AddStyleAttr_Impl( bLong ); // adds to pAttrList
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_ERA,
- sal_True, sal_False );
+ true, false );
}
void SvXMLNumFmtExport::WriteDayOfWeekElement_Impl( const OUString& rCalendar, sal_Bool bLong )
@@ -454,7 +454,7 @@ void SvXMLNumFmtExport::WriteDayOfWeekElement_Impl( const OUString& rCalendar, s
AddStyleAttr_Impl( bLong ); // adds to pAttrList
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_DAY_OF_WEEK,
- sal_True, sal_False );
+ true, false );
}
void SvXMLNumFmtExport::WriteWeekElement_Impl( const OUString& rCalendar )
@@ -464,7 +464,7 @@ void SvXMLNumFmtExport::WriteWeekElement_Impl( const OUString& rCalendar )
AddCalendarAttr_Impl( rCalendar ); // adds to pAttrList
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_WEEK_OF_YEAR,
- sal_True, sal_False );
+ true, false );
}
void SvXMLNumFmtExport::WriteQuarterElement_Impl( const OUString& rCalendar, sal_Bool bLong )
@@ -475,7 +475,7 @@ void SvXMLNumFmtExport::WriteQuarterElement_Impl( const OUString& rCalendar, sal
AddStyleAttr_Impl( bLong ); // adds to pAttrList
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_QUARTER,
- sal_True, sal_False );
+ true, false );
}
// time elements
@@ -487,7 +487,7 @@ void SvXMLNumFmtExport::WriteHoursElement_Impl( sal_Bool bLong )
AddStyleAttr_Impl( bLong ); // adds to pAttrList
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_HOURS,
- sal_True, sal_False );
+ true, false );
}
void SvXMLNumFmtExport::WriteMinutesElement_Impl( sal_Bool bLong )
@@ -497,14 +497,14 @@ void SvXMLNumFmtExport::WriteMinutesElement_Impl( sal_Bool bLong )
AddStyleAttr_Impl( bLong ); // adds to pAttrList
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_MINUTES,
- sal_True, sal_False );
+ true, false );
}
void SvXMLNumFmtExport::WriteRepeatedElement_Impl( sal_Unicode nChar )
{
FinishTextElement_Impl();
SvXMLElementExport aElem( rExport, XML_NAMESPACE_LO_EXT, XML_FILL_CHARACTER,
- sal_True, sal_False );
+ true, false );
rExport.Characters( OUString( nChar ) );
}
@@ -520,7 +520,7 @@ void SvXMLNumFmtExport::WriteSecondsElement_Impl( sal_Bool bLong, sal_uInt16 nDe
}
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_SECONDS,
- sal_True, sal_False );
+ true, false );
}
void SvXMLNumFmtExport::WriteAMPMElement_Impl()
@@ -528,7 +528,7 @@ void SvXMLNumFmtExport::WriteAMPMElement_Impl()
FinishTextElement_Impl();
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_AM_PM,
- sal_True, sal_False );
+ true, false );
}
// numbers
@@ -581,7 +581,7 @@ void SvXMLNumFmtExport::WriteNumberElement_Impl(
}
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_NUMBER,
- sal_True, sal_True );
+ true, true );
// number:embedded-text as child elements
@@ -594,7 +594,7 @@ void SvXMLNumFmtExport::WriteNumberElement_Impl(
rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_POSITION,
OUString::number( pObj->nFormatPos ) );
SvXMLElementExport aChildElem( rExport, XML_NAMESPACE_NUMBER, XML_EMBEDDED_TEXT,
- sal_True, sal_False );
+ true, false );
// text as element content
OUString aContent( pObj->aText );
@@ -645,7 +645,7 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl(
SvXMLElementExport aElem( rExport,
XML_NAMESPACE_NUMBER, XML_SCIENTIFIC_NUMBER,
- sal_True, sal_False );
+ true, false );
}
void SvXMLNumFmtExport::WriteFractionElement_Impl(
@@ -688,7 +688,7 @@ void SvXMLNumFmtExport::WriteFractionElement_Impl(
}
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_FRACTION,
- sal_True, sal_False );
+ true, false );
}
// mapping (condition)
@@ -727,7 +727,7 @@ void SvXMLNumFmtExport::WriteMapElement_Impl( sal_Int32 nOp, double fLimit,
sPrefix ) ) );
SvXMLElementExport aElem( rExport, XML_NAMESPACE_STYLE, XML_MAP,
- sal_True, sal_False );
+ true, false );
}
}
@@ -1090,7 +1090,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
// The element
SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, eType,
- sal_True, sal_True );
+ true, true );
// color (properties element)
@@ -1565,7 +1565,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
{
// for an empty format, write an empty text element
SvXMLElementExport aTElem( rExport, XML_NAMESPACE_NUMBER, XML_TEXT,
- sal_True, sal_False );
+ true, false );
}
// mapping (conditions) must be last elements
diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx
index 6700aa6bcd7d..5c16c9d8b9b1 100644
--- a/xmloff/source/style/xmltabe.cxx
+++ b/xmloff/source/style/xmltabe.cxx
@@ -85,7 +85,7 @@ void SvxXMLTabStopExport::exportTabStop( const ::com::sun::star::style::TabStop*
}
SvXMLElementExport rElem( rExport, XML_NAMESPACE_STYLE, XML_TAB_STOP,
- sal_True, sal_True );
+ true, true );
}
@@ -112,7 +112,7 @@ void SvxXMLTabStopExport::Export( const uno::Any& rAny )
const sal_Int32 nTabs = aSeq.getLength();
SvXMLElementExport rElem( rExport, XML_NAMESPACE_STYLE, XML_TAB_STOPS,
- sal_True, sal_True );
+ true, true );
for( sal_Int32 nIndex = 0; nIndex < nTabs; nIndex++ )
{
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 966970290335..8a27e0576224 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -305,7 +305,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates )
const sal_Int32 rowCount = xIndexAccess->getCount();
const sal_Int32 columnCount = xIndexAccessCols->getCount();
- SvXMLElementExport tableElement( mrExport, XML_NAMESPACE_TABLE, XML_TABLE, sal_True, sal_True );
+ SvXMLElementExport tableElement( mrExport, XML_NAMESPACE_TABLE, XML_TABLE, true, true );
// export table columns
ExportTableColumns( xIndexAccessCols, pTableInfo );
@@ -332,7 +332,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates )
}
// write row element
- SvXMLElementExport tableRowElement( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, sal_True, sal_True );
+ SvXMLElementExport tableRowElement( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, true, true );
for ( sal_Int32 columnIndex = 0; columnIndex < columnCount; columnIndex++ )
{
@@ -375,7 +375,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates )
// TODO: All columns first have to be checked if some ones
// have identical properties. If yes, attr table:number-columns-repeated
// has to be written.
- SvXMLElementExport tableColumnElement( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True );
+ SvXMLElementExport tableColumnElement( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true );
}
}
}
@@ -425,7 +425,7 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates )
mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED, OUString::number( nRowSpan ) );
// <table:table-cell> or <table:covered-table-cell>
- SvXMLElementExport tableCellElement( mrExport, XML_NAMESPACE_TABLE, bIsMerged ? XML_COVERED_TABLE_CELL : XML_TABLE_CELL, sal_True, sal_True );
+ SvXMLElementExport tableCellElement( mrExport, XML_NAMESPACE_TABLE, bIsMerged ? XML_COVERED_TABLE_CELL : XML_TABLE_CELL, true, true );
// export cells text content
ImpExportText( xCell );
@@ -507,7 +507,7 @@ void XMLTableExport::exportTableTemplates()
Reference< XNameAccess > xStyleNames( xTableStyle, UNO_QUERY_THROW );
mrExport.AddAttribute(XML_NAMESPACE_TEXT, XML_STYLE_NAME, GetExport().EncodeStyleName( xTableStyle->getName() ) );
- SvXMLElementExport tableTemplate( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_TEMPLATE, sal_True, sal_True );
+ SvXMLElementExport tableTemplate( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_TEMPLATE, true, true );
const TableStyleElement* pElements = getTableStyleMap();
while( pElements->meElement != XML_TOKEN_END )
@@ -518,7 +518,7 @@ void XMLTableExport::exportTableTemplates()
if( xStyle.is() )
{
mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_STYLE_NAME, GetExport().EncodeStyleName( xStyle->getName() ) );
- SvXMLElementExport element( mrExport, XML_NAMESPACE_TABLE, pElements->meElement, sal_True, sal_True );
+ SvXMLElementExport element( mrExport, XML_NAMESPACE_TABLE, pElements->meElement, true, true );
}
}
catch(const Exception&)
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index dd60e4a33aa5..957ce88f3c0b 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -147,7 +147,7 @@ sal_uInt32 XMLAutoTextEventExport::exportDoc( enum XMLTokenEnum )
// container element
SvXMLElementExport aContainerElement(
*this, XML_NAMESPACE_OOO, XML_AUTO_TEXT_EVENTS,
- sal_True, sal_True);
+ true, true);
exportEvents();
}
diff --git a/xmloff/source/text/XMLIndexMarkExport.cxx b/xmloff/source/text/XMLIndexMarkExport.cxx
index 9283037ae606..620b1d731249 100644
--- a/xmloff/source/text/XMLIndexMarkExport.cxx
+++ b/xmloff/source/text/XMLIndexMarkExport.cxx
@@ -161,7 +161,7 @@ void XMLIndexMarkExport::ExportIndexMark(
SvXMLElementExport aElem(rExport,
XML_NAMESPACE_TEXT,
pElements[nElementNo],
- sal_False, sal_False);
+ false, false);
}
}
}
diff --git a/xmloff/source/text/XMLLineNumberingExport.cxx b/xmloff/source/text/XMLLineNumberingExport.cxx
index 58fc320efbbd..7e89f1c62b1b 100644
--- a/xmloff/source/text/XMLLineNumberingExport.cxx
+++ b/xmloff/source/text/XMLLineNumberingExport.cxx
@@ -172,7 +172,7 @@ void XMLLineNumberingExport::Export()
SvXMLElementExport aConfigElem(rExport, XML_NAMESPACE_TEXT,
XML_LINENUMBERING_CONFIGURATION,
- sal_True, sal_True);
+ true, true);
// line separator
aAny = xLineNumbering->getPropertyValue(sSeparatorText);
@@ -192,7 +192,7 @@ void XMLLineNumberingExport::Export()
SvXMLElementExport aSeparatorElem(rExport, XML_NAMESPACE_TEXT,
XML_LINENUMBERING_SEPARATOR,
- sal_True, sal_False);
+ true, false);
rExport.Characters(sSeparator);
}
}
diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx
index 4f87c3b1a30c..0c8f817ad80b 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -160,7 +160,7 @@ void XMLRedlineExport::ExportChangesList(
// changes container element
SvXMLElementExport aChanges(rExport, XML_NAMESPACE_TEXT,
XML_TRACKED_CHANGES,
- sal_True, sal_True);
+ true, true);
// iterate over changes list
for( ChangesListType::iterator aIter = pChangesList->begin();
@@ -234,7 +234,7 @@ void XMLRedlineExport::ExportChangesListElements()
// changes container element
SvXMLElementExport aChanges(rExport, XML_NAMESPACE_TEXT,
XML_TRACKED_CHANGES,
- sal_True, sal_True);
+ true, true);
// get enumeration and iterate over elements
Reference<XEnumeration> aEnum = aEnumAccess->createEnumeration();
@@ -355,7 +355,7 @@ void XMLRedlineExport::ExportChangeInline(
// export the element (no whitespace because we're in the text body)
SvXMLElementExport aChangeElem(rExport, XML_NAMESPACE_TEXT,
- eElement, sal_False, sal_False);
+ eElement, false, false);
}
}
@@ -374,7 +374,7 @@ void XMLRedlineExport::ExportChangedRegion(
// export change region element
SvXMLElementExport aChangedRegion(rExport, XML_NAMESPACE_TEXT,
- XML_CHANGED_REGION, sal_True, sal_True);
+ XML_CHANGED_REGION, true, true);
// scope for (first) change element
@@ -383,7 +383,7 @@ void XMLRedlineExport::ExportChangedRegion(
OUString sType;
aAny >>= sType;
SvXMLElementExport aChange(rExport, XML_NAMESPACE_TEXT,
- ConvertTypeName(sType), sal_True, sal_True);
+ ConvertTypeName(sType), true, true);
ExportChangeInfo(rPropSet);
@@ -416,7 +416,7 @@ void XMLRedlineExport::ExportChangedRegion(
// ExportChangeInfo(Sequence<PropertyValue>&).
SvXMLElementExport aSecondChangeElem(
rExport, XML_NAMESPACE_TEXT, XML_INSERTION,
- sal_True, sal_True);
+ true, true);
ExportChangeInfo(aSuccessorData);
}
@@ -466,7 +466,7 @@ void XMLRedlineExport::ExportChangeInfo(
{
SvXMLElementExport aChangeInfo(rExport, XML_NAMESPACE_OFFICE,
- XML_CHANGE_INFO, sal_True, sal_True);
+ XML_CHANGE_INFO, true, true);
Any aAny = rPropSet->getPropertyValue(sRedlineAuthor);
OUString sTmp;
@@ -474,8 +474,8 @@ void XMLRedlineExport::ExportChangeInfo(
if (!sTmp.isEmpty())
{
SvXMLElementExport aCreatorElem( rExport, XML_NAMESPACE_DC,
- XML_CREATOR, sal_True,
- sal_False );
+ XML_CREATOR, true,
+ false );
rExport.Characters(sTmp);
}
@@ -486,8 +486,8 @@ void XMLRedlineExport::ExportChangeInfo(
OUStringBuffer sBuf;
::sax::Converter::convertDateTime(sBuf, aDateTime, 0);
SvXMLElementExport aDateElem( rExport, XML_NAMESPACE_DC,
- XML_DATE, sal_True,
- sal_False );
+ XML_DATE, true,
+ false );
rExport.Characters(sBuf.makeStringAndClear());
}
@@ -542,7 +542,7 @@ void XMLRedlineExport::ExportChangeInfo(
// finally write element
SvXMLElementExport aChangeInfo(rExport, XML_NAMESPACE_OFFICE,
- XML_CHANGE_INFO, sal_True, sal_True);
+ XML_CHANGE_INFO, true, true);
WriteComment( sComment );
}
@@ -610,7 +610,7 @@ void XMLRedlineExport::ExportStartOrEndRedline(
rExport, XML_NAMESPACE_TEXT,
bIsCollapsed ? XML_CHANGE :
( bIsStart ? XML_CHANGE_START : XML_CHANGE_END ),
- sal_True, sal_True);
+ true, true);
}
}
@@ -655,7 +655,7 @@ void XMLRedlineExport::WriteComment(const OUString& rComment)
while (aEnumerator.getNextToken(aSubString))
{
SvXMLElementExport aParagraph(
- rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False);
+ rExport, XML_NAMESPACE_TEXT, XML_P, true, false);
rExport.Characters(aSubString);
}
}
diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx
index 604edec14c67..034e12eb5468 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -261,7 +261,7 @@ void XMLSectionExport::ExportSectionEnd(
{
// index end: close index body element
GetExport().EndElement( XML_NAMESPACE_TEXT, XML_INDEX_BODY,
- sal_True );
+ true );
GetExport().IgnorableWhitespace();
switch (MapSectionType(xIndex->getServiceName()))
@@ -316,7 +316,7 @@ void XMLSectionExport::ExportSectionEnd(
GetExport().CheckAttrList();
// element surrounded by whitespace
- GetExport().EndElement( XML_NAMESPACE_TEXT, eElement, sal_True);
+ GetExport().EndElement( XML_NAMESPACE_TEXT, eElement, true);
GetExport().IgnorableWhitespace();
}
else
@@ -378,7 +378,7 @@ void XMLSectionExport::ExportIndexHeaderStart(
GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME, xName->getName());
// format already handled -> export only start element
- GetExport().StartElement( XML_NAMESPACE_TEXT, XML_INDEX_TITLE, sal_True );
+ GetExport().StartElement( XML_NAMESPACE_TEXT, XML_INDEX_TITLE, true );
GetExport().IgnorableWhitespace();
}
@@ -472,7 +472,7 @@ void XMLSectionExport::ExportRegularSectionStart(
// export element
GetExport().IgnorableWhitespace();
- GetExport().StartElement( XML_NAMESPACE_TEXT, XML_SECTION, sal_True );
+ GetExport().StartElement( XML_NAMESPACE_TEXT, XML_SECTION, true );
// data source
// unfortunately, we have to test all relevant strings for non-zero length
@@ -508,7 +508,7 @@ void XMLSectionExport::ExportRegularSectionStart(
SvXMLElementExport aElem(GetExport(),
XML_NAMESPACE_TEXT, XML_SECTION_SOURCE,
- sal_True, sal_True);
+ true, true);
}
else
{
@@ -548,7 +548,7 @@ void XMLSectionExport::ExportRegularSectionStart(
SvXMLElementExport aElem(GetExport(),
XML_NAMESPACE_OFFICE,
- XML_DDE_SOURCE, sal_True, sal_True);
+ XML_DDE_SOURCE, true, true);
}
// else: no DDE data source
}
@@ -789,7 +789,7 @@ void XMLSectionExport::ExportBaseIndexStart(
// index Element start
GetExport().IgnorableWhitespace();
- GetExport().StartElement( XML_NAMESPACE_TEXT, eElement, sal_False );
+ GetExport().StartElement( XML_NAMESPACE_TEXT, eElement, false );
}
static const XMLTokenEnum aTypeSourceElementNameMap[] =
@@ -840,7 +840,7 @@ void XMLSectionExport::ExportBaseIndexSource(
GetXMLToken(
aTypeSourceElementNameMap[
eType - TEXT_SECTION_TYPE_TOC]),
- sal_True, sal_True);
+ true, true);
// scope for title template (all indices)
{
@@ -856,7 +856,7 @@ void XMLSectionExport::ExportBaseIndexSource(
SvXMLElementExport aHeaderTemplate(GetExport(),
XML_NAMESPACE_TEXT,
XML_INDEX_TITLE_TEMPLATE,
- sal_True, sal_False);
+ true, false);
// title as element content
aAny = rPropertySet->getPropertyValue(sTitle);
@@ -919,7 +919,7 @@ void XMLSectionExport::ExportBaseIndexBody(
// start surrounded by whitespace
GetExport().IgnorableWhitespace();
- GetExport().StartElement( XML_NAMESPACE_TEXT, XML_INDEX_BODY, sal_True );
+ GetExport().StartElement( XML_NAMESPACE_TEXT, XML_INDEX_BODY, true );
}
void XMLSectionExport::ExportTableAndIllustrationIndexSourceAttributes(
@@ -1097,7 +1097,7 @@ sal_Bool XMLSectionExport::ExportIndexTemplate(
SvXMLElementExport aLevelTemplate(GetExport(),
XML_NAMESPACE_TEXT,
GetXMLToken(eElementName),
- sal_True, sal_True);
+ true, true);
// export sequence
sal_Int32 nTemplateCount = rValues.getLength();
@@ -1536,7 +1536,7 @@ void XMLSectionExport::ExportIndexTemplateElement(
// export template
SvXMLElementExport aTemplateElement(GetExport(), XML_NAMESPACE_TEXT,
GetXMLToken(eElement),
- sal_True, sal_False)
+ true, false)
;
// entry text or span element: write text
@@ -1574,7 +1574,7 @@ void XMLSectionExport::ExportLevelParagraphStyles(
SvXMLElementExport aParaStyles(GetExport(),
XML_NAMESPACE_TEXT,
XML_INDEX_SOURCE_STYLES,
- sal_True, sal_True);
+ true, true);
// iterate over styles in this level
for(sal_Int32 nName = 0; nName < nNamesCount; nName++)
@@ -1588,7 +1588,7 @@ void XMLSectionExport::ExportLevelParagraphStyles(
SvXMLElementExport aParaStyle(GetExport(),
XML_NAMESPACE_TEXT,
XML_INDEX_SOURCE_STYLE,
- sal_True, sal_False);
+ true, false);
}
}
}
@@ -1695,7 +1695,7 @@ void XMLSectionExport::ExportBibliographyConfiguration(SvXMLExport& rExport)
// configuration element
SvXMLElementExport aElement(rExport, XML_NAMESPACE_TEXT,
XML_BIBLIOGRAPHY_CONFIGURATION,
- sal_True, sal_True);
+ true, true);
// sort keys
aAny = xPropSet->getPropertyValue(sSortKeys);
@@ -1736,7 +1736,7 @@ void XMLSectionExport::ExportBibliographyConfiguration(SvXMLExport& rExport)
SvXMLElementExport aKeyElem(rExport,
XML_NAMESPACE_TEXT, XML_SORT_KEY,
- sal_True, sal_True);
+ true, true);
}
}
}
@@ -1890,7 +1890,7 @@ void XMLSectionExport::ExportMasterDocHeadingDummies()
GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_LEVEL,
sTmp.makeStringAndClear() );
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, XML_H,
- sal_True, sal_False );
+ true, false );
}
}
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
index 4f5713a416a1..b025115f58d8 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
@@ -181,7 +181,7 @@ void XMLSectionFootnoteConfigExport::exportXML(
// and finally, the element
SvXMLElementExport rElem(rExport, XML_NAMESPACE_TEXT,
XML_NOTES_CONFIGURATION,
- sal_True, sal_True);
+ true, true);
}
}
diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
index 802fe5a1e05f..5792496b07de 100644
--- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
+++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
@@ -58,7 +58,7 @@ XMLTextCharStyleNamesElementExport::XMLTextCharStyleNamesElementExport(
{
rExport.AddAttribute( XML_NAMESPACE_TEXT, XML_STYLE_NAME,
rExport.EncodeStyleName( *pName ) );
- rExport.StartElement( aName, sal_False );
+ rExport.StartElement( aName, false );
++pName;
}
}
@@ -72,7 +72,7 @@ XMLTextCharStyleNamesElementExport::~XMLTextCharStyleNamesElementExport()
{
sal_Int32 i = nCount;
while( --i )
- rExport.EndElement( aName, sal_False );
+ rExport.EndElement( aName, false );
}
}
diff --git a/xmloff/source/text/XMLTextColumnsExport.cxx b/xmloff/source/text/XMLTextColumnsExport.cxx
index eea85b9e0006..1ced191e3ad2 100644
--- a/xmloff/source/text/XMLTextColumnsExport.cxx
+++ b/xmloff/source/text/XMLTextColumnsExport.cxx
@@ -87,7 +87,7 @@ void XMLTextColumnsExport::exportXML( const Any& rAny )
}
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE, XML_COLUMNS,
- sal_True, sal_True );
+ true, true );
if( xPropSet.is() )
{
@@ -159,7 +159,7 @@ void XMLTextColumnsExport::exportXML( const Any& rAny )
// style:column-sep
SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_STYLE,
XML_COLUMN_SEP,
- sal_True, sal_True );
+ true, true );
}
}
@@ -185,7 +185,7 @@ void XMLTextColumnsExport::exportXML( const Any& rAny )
// style:column
SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_STYLE, XML_COLUMN,
- sal_True, sal_True );
+ true, true );
pColumns++;
}
}
diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx
index 116cc6bd326b..2fdec0c4aac9 100644
--- a/xmloff/source/text/XMLTextMasterPageExport.cxx
+++ b/xmloff/source/text/XMLTextMasterPageExport.cxx
@@ -148,7 +148,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
XML_DISPLAY, XML_FALSE );
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
- XML_HEADER, sal_True, sal_True );
+ XML_HEADER, true, true );
exportHeaderFooterContent( xHeaderText, false );
}
@@ -158,7 +158,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
XML_DISPLAY, XML_FALSE );
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
- XML_HEADER_FIRST, sal_True, sal_True );
+ XML_HEADER_FIRST, true, true );
exportHeaderFooterContent( xHeaderTextFirst, false );
}
@@ -168,7 +168,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
XML_DISPLAY, XML_FALSE );
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
- XML_HEADER_LEFT, sal_True, sal_True );
+ XML_HEADER_LEFT, true, true );
exportHeaderFooterContent( xHeaderTextLeft, false );
}
@@ -196,7 +196,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
XML_DISPLAY, XML_FALSE );
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
- XML_FOOTER, sal_True, sal_True );
+ XML_FOOTER, true, true );
exportHeaderFooterContent( xFooterText, false );
}
@@ -206,7 +206,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
XML_DISPLAY, XML_FALSE );
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
- XML_FOOTER_FIRST, sal_True, sal_True );
+ XML_FOOTER_FIRST, true, true );
exportHeaderFooterContent( xFooterTextFirst, false );
}
@@ -216,7 +216,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
XML_DISPLAY, XML_FALSE );
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
- XML_FOOTER_LEFT, sal_True, sal_True );
+ XML_FOOTER_LEFT, true, true );
exportHeaderFooterContent( xFooterTextLeft, false );
}
}
diff --git a/xmloff/source/text/txtdrope.cxx b/xmloff/source/text/txtdrope.cxx
index 7fd49fb1c69f..48fbda969a3b 100644
--- a/xmloff/source/text/txtdrope.cxx
+++ b/xmloff/source/text/txtdrope.cxx
@@ -87,7 +87,7 @@ void XMLTextDropCapExport::exportXML( const Any& rAny,
}
SvXMLElementExport aElem( rExport, XML_NAMESPACE_STYLE, XML_DROP_CAP,
- sal_False, sal_False );
+ false, false );
}
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index a18f0e2e14ce..e5c3505f4fc1 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -1012,7 +1012,7 @@ void XMLTextFieldExport::ExportField(
}
SvXMLElementExport aHyperlink( GetExport(), bHasHyperlink,
XML_NAMESPACE_TEXT, XML_A,
- sal_False, sal_False );
+ false, false );
if( bHasHyperlink )
{
@@ -1045,7 +1045,7 @@ void XMLTextFieldExport::ExportField(
}
SvXMLElementExport aSpan( GetExport(), bHasStyle,
XML_NAMESPACE_TEXT, XML_SPAN,
- sal_False, sal_False);
+ false, false);
// finally, export the field itself
ExportFieldHelper( rTextField, xPropSet, xRangePropSet, nToken,
@@ -1685,7 +1685,7 @@ void XMLTextFieldExport::ExportFieldHelper(
sal_True, XML_NAMESPACE_OFFICE);
GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE );
SvXMLElementExport aUrlField(rExport, XML_NAMESPACE_TEXT, XML_A,
- sal_False, sal_False);
+ false, false);
GetExport().Characters(sPresentation);
break;
}
@@ -1729,15 +1729,15 @@ void XMLTextFieldExport::ExportFieldHelper(
if (!aName.isEmpty())
GetExport().AddAttribute(XML_NAMESPACE_OFFICE, XML_NAME, aName);
SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_OFFICE,
- XML_ANNOTATION, sal_False, sal_True);
+ XML_ANNOTATION, false, true);
// author
OUString aAuthor( GetStringProperty(sPropertyAuthor, rPropSet) );
if( !aAuthor.isEmpty() )
{
SvXMLElementExport aCreatorElem( GetExport(), XML_NAMESPACE_DC,
- XML_CREATOR, sal_True,
- sal_False );
+ XML_CREATOR, true,
+ false );
GetExport().Characters(aAuthor);
}
@@ -1747,8 +1747,8 @@ void XMLTextFieldExport::ExportFieldHelper(
OUStringBuffer aBuffer;
::sax::Converter::convertDateTime(aBuffer, aDate, 0, true);
SvXMLElementExport aDateElem( GetExport(), XML_NAMESPACE_DC,
- XML_DATE, sal_True,
- sal_False );
+ XML_DATE, true,
+ false );
GetExport().Characters(aBuffer.makeStringAndClear());
}
@@ -1759,8 +1759,8 @@ void XMLTextFieldExport::ExportFieldHelper(
if( !aInitials.isEmpty() )
{
SvXMLElementExport aCreatorElem( GetExport(), XML_NAMESPACE_LO_EXT,
- XML_SENDER_INITIALS, sal_True,
- sal_False );
+ XML_SENDER_INITIALS, true,
+ false );
GetExport().Characters(aInitials);
}
}
@@ -1826,7 +1826,7 @@ void XMLTextFieldExport::ExportFieldHelper(
GetStringProperty(sPropertyTooltip, rPropSet), true);
SvXMLElementExport aElem( GetExport(),
XML_NAMESPACE_TEXT, XML_DROPDOWN,
- sal_False, sal_False );
+ false, false );
ProcessStringSequence
(GetStringSequenceProperty( sPropertyItems, rPropSet ),
GetStringProperty( sPropertySelectedItem, rPropSet ) );
@@ -1837,19 +1837,19 @@ void XMLTextFieldExport::ExportFieldHelper(
case FIELD_ID_DRAW_HEADER:
{
- SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_PRESENTATION, XML_HEADER, sal_False, sal_False );
+ SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_PRESENTATION, XML_HEADER, false, false );
}
break;
case FIELD_ID_DRAW_FOOTER:
{
- SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_PRESENTATION, XML_FOOTER, sal_False, sal_False );
+ SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_PRESENTATION, XML_FOOTER, false, false );
}
break;
case FIELD_ID_DRAW_DATE_TIME:
{
- SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_PRESENTATION, XML_DATE_TIME, sal_False, sal_False );
+ SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_PRESENTATION, XML_DATE_TIME, false, false );
}
break;
@@ -1989,7 +1989,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
SvXMLElementExport aElem( GetExport(),
XML_NAMESPACE_TEXT,
XML_VARIABLE_DECLS,
- sal_True, sal_True );
+ true, true );
for (vector<OUString>::iterator aVarIter = aVarName.begin();
aVarIter != aVarName.end();
@@ -2048,7 +2048,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
SvXMLElementExport aElem( GetExport(),
XML_NAMESPACE_TEXT,
XML_SEQUENCE_DECLS,
- sal_True, sal_True );
+ true, true );
for (vector<OUString>::iterator aSeqIter = aSeqName.begin();
aSeqIter != aSeqName.end();
@@ -2090,7 +2090,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
SvXMLElementExport aElem( GetExport(),
XML_NAMESPACE_TEXT,
XML_USER_FIELD_DECLS,
- sal_True, sal_True );
+ true, true );
for (vector<OUString>::iterator aUserIter = aUserName.begin();
aUserIter != aUserName.end();
@@ -2141,7 +2141,7 @@ void XMLTextFieldExport::ExportFieldDeclarations(
SvXMLElementExport aElem( GetExport(),
XML_NAMESPACE_TEXT,
XML_DDE_CONNECTION_DECLS,
- sal_True, sal_True );
+ true, true );
for (vector<OUString>::iterator aDdeIter = aDdeName.begin();
aDdeIter != aDdeName.end();
@@ -2275,7 +2275,7 @@ void XMLTextFieldExport::ExportMacro(
// the element
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
- XML_EXECUTE_MACRO, sal_False, sal_False );
+ XML_EXECUTE_MACRO, false, false );
// the <office:events>-macro:
@@ -2347,7 +2347,7 @@ void XMLTextFieldExport::ExportMetaField(
}
SvXMLElementExport aElem( GetExport(), doExport,
- XML_NAMESPACE_TEXT, XML_META_FIELD, sal_False, sal_False );
+ XML_NAMESPACE_TEXT, XML_META_FIELD, false, false );
// recurse to export content
GetExport().GetTextParagraphExport()->
@@ -2562,7 +2562,7 @@ void XMLTextFieldExport::ProcessParagraphSequence(
while (aEnumerator.getNextToken(aSubString))
{
SvXMLElementExport aParagraph(
- GetExport(), XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False);
+ GetExport(), XML_NAMESPACE_TEXT, XML_P, true, false);
GetExport().Characters(aSubString);
}
}
@@ -2824,7 +2824,7 @@ void XMLTextFieldExport::ProcessStringSequence(
XML_CURRENT_SELECTED, XML_TRUE );
rExport.AddAttribute( XML_NAMESPACE_TEXT, XML_VALUE, pSequence[i] );
SvXMLElementExport aElement( rExport, XML_NAMESPACE_TEXT, XML_LABEL,
- sal_False, sal_False );
+ false, false );
}
}
@@ -2860,7 +2860,7 @@ void XMLTextFieldExport::ExportDataBaseElement(
sDataBaseName );
SvXMLElementExport aDataBaseElement( GetExport(),
XML_NAMESPACE_TEXT, eElementName,
- sal_False, sal_False );
+ false, false );
// write URL as children
if( !sDataBaseURL.isEmpty() )
@@ -2868,7 +2868,7 @@ void XMLTextFieldExport::ExportDataBaseElement(
rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sDataBaseURL );
SvXMLElementExport aDataSourceElement(
GetExport(), XML_NAMESPACE_FORM, XML_CONNECTION_RESOURCE,
- sal_False, sal_False );
+ false, false );
}
// write presentation
diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx
index 888efd782052..6637dd204702 100644
--- a/xmloff/source/text/txtftne.cxx
+++ b/xmloff/source/text/txtftne.cxx
@@ -110,7 +110,7 @@ void XMLTextParagraphExport::exportTextFootnote(
}
SvXMLElementExport aHyperlink( GetExport(), bHasHyperlink,
XML_NAMESPACE_TEXT, XML_A,
- sal_False, sal_False );
+ false, false );
if( bHasHyperlink )
{
@@ -136,7 +136,7 @@ void XMLTextParagraphExport::exportTextFootnote(
GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_STYLE_NAME,
GetExport().EncodeStyleName( sStyle ) );
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
- XML_SPAN, sal_False, sal_False );
+ XML_SPAN, false, false );
exportTextFootnoteHelper(xFootnote, xText, rText,
bAutoStyles, bIsEndnote, bIsProgress );
}
@@ -179,7 +179,7 @@ void XMLTextParagraphExport::exportTextFootnoteHelper(
: XML_FOOTNOTE ) );
SvXMLElementExport aNote(GetExport(), XML_NAMESPACE_TEXT,
- XML_NOTE, sal_False, sal_False);
+ XML_NOTE, false, false);
{
// handle label vs. automatic numbering
OUString sLabel = rFootnote->getLabel();
@@ -191,13 +191,13 @@ void XMLTextParagraphExport::exportTextFootnoteHelper(
// else: automatic numbering -> no attribute
SvXMLElementExport aCite(GetExport(), XML_NAMESPACE_TEXT,
- XML_NOTE_CITATION, sal_False, sal_False);
+ XML_NOTE_CITATION, false, false);
GetExport().Characters(rTextString);
}
{
SvXMLElementExport aBody(GetExport(), XML_NAMESPACE_TEXT,
- XML_NOTE_BODY, sal_False, sal_False);
+ XML_NOTE_BODY, false, false);
exportText(rText, bAutoStyles, bIsProgress, true );
}
}
@@ -345,7 +345,7 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper(
SvXMLElementExport aFootnoteConfigElement(
GetExport(), XML_NAMESPACE_TEXT,
XML_NOTES_CONFIGURATION,
- sal_True, sal_True);
+ true, true);
// two element for footnote content
if (!bIsEndnote)
@@ -360,7 +360,7 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper(
{
SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_TEXT,
XML_FOOTNOTE_CONTINUATION_NOTICE_FORWARD,
- sal_True, sal_False);
+ true, false);
GetExport().Characters(sTmp);
}
@@ -372,7 +372,7 @@ void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper(
{
SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_TEXT,
XML_FOOTNOTE_CONTINUATION_NOTICE_BACKWARD,
- sal_True, sal_False);
+ true, false);
GetExport().Characters(sTmp);
}
}
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 09c6b260cc09..7af9677ce874 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -440,8 +440,8 @@ void FieldParamExporter::ExportParameter(const OUString& sKey, const OUString& s
{
m_pExport->AddAttribute(XML_NAMESPACE_FIELD, XML_NAME, sKey);
m_pExport->AddAttribute(XML_NAMESPACE_FIELD, XML_VALUE, sValue);
- m_pExport->StartElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
- m_pExport->EndElement(XML_NAMESPACE_FIELD, XML_PARAM, sal_False);
+ m_pExport->StartElement(XML_NAMESPACE_FIELD, XML_PARAM, false);
+ m_pExport->EndElement(XML_NAMESPACE_FIELD, XML_PARAM, false);
}
void XMLTextParagraphExport::Add( sal_uInt16 nFamily,
@@ -833,7 +833,7 @@ void XMLTextParagraphExport::exportListChange(
{
OUString aElem(pListElements->back());
pListElements->pop_back();
- GetExport().EndElement(aElem, sal_True);
+ GetExport().EndElement(aElem, true);
}
// remove closed list from list stack
@@ -999,7 +999,7 @@ void XMLTextParagraphExport::exportListChange(
XML_NAMESPACE_TEXT,
GetXMLToken(eLName) ) );
GetExport().IgnorableWhitespace();
- GetExport().StartElement(aElem, sal_False);
+ GetExport().StartElement(aElem, false);
if(!pListElements)
pListElements = new std::vector<OUString>;
@@ -1039,7 +1039,7 @@ void XMLTextParagraphExport::exportListChange(
XML_NAMESPACE_TEXT,
GetXMLToken(eLName) ) );
GetExport().IgnorableWhitespace();
- GetExport().StartElement(aElem, sal_False);
+ GetExport().StartElement(aElem, false);
pListElements->push_back(aElem);
// export of <text:number> element for last opened <text:list-item>, if requested
@@ -1052,9 +1052,9 @@ void XMLTextParagraphExport::exportListChange(
XML_NAMESPACE_TEXT,
GetXMLToken(XML_NUMBER) ) );
GetExport().IgnorableWhitespace();
- GetExport().StartElement( aTextNumberElem, sal_False );
+ GetExport().StartElement( aTextNumberElem, false );
GetExport().Characters( rNextInfo.ListLabelString() );
- GetExport().EndElement( aTextNumberElem, sal_True );
+ GetExport().EndElement( aTextNumberElem, true );
}
--nListLevelsToBeOpened;
} while ( nListLevelsToBeOpened > 0 );
@@ -1075,7 +1075,7 @@ void XMLTextParagraphExport::exportListChange(
if (bEndElement)
{
// close previous list-item
- GetExport().EndElement(pListElements->back(), sal_True );
+ GetExport().EndElement(pListElements->back(), true );
pListElements->pop_back();
// Only for sub lists (#i103745#)
@@ -1083,9 +1083,9 @@ void XMLTextParagraphExport::exportListChange(
rNextInfo.GetLevel() != 1 )
{
// start new sub list respectively list on same list level
- GetExport().EndElement(pListElements->back(), sal_True );
+ GetExport().EndElement(pListElements->back(), true );
GetExport().IgnorableWhitespace();
- GetExport().StartElement(pListElements->back(), sal_False);
+ GetExport().StartElement(pListElements->back(), false);
}
// open new list-item
@@ -1121,7 +1121,7 @@ void XMLTextParagraphExport::exportListChange(
XML_NAMESPACE_TEXT,
GetXMLToken(XML_LIST_ITEM) ) );
GetExport().IgnorableWhitespace();
- GetExport().StartElement(aElem, sal_False );
+ GetExport().StartElement(aElem, false );
pListElements->push_back(aElem);
// export of <text:number> element for <text:list-item>, if requested
@@ -1133,9 +1133,9 @@ void XMLTextParagraphExport::exportListChange(
XML_NAMESPACE_TEXT,
GetXMLToken(XML_NUMBER) ) );
GetExport().IgnorableWhitespace();
- GetExport().StartElement( aTextNumberElem, sal_False );
+ GetExport().StartElement( aTextNumberElem, false );
GetExport().Characters( rNextInfo.ListLabelString() );
- GetExport().EndElement( aTextNumberElem, sal_True );
+ GetExport().EndElement( aTextNumberElem, true );
}
}
}
@@ -2168,7 +2168,7 @@ void XMLTextParagraphExport::exportParagraph(
enum XMLTokenEnum eElem =
0 < nOutlineLevel ? XML_H : XML_P;
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, eElem,
- sal_True, sal_False );
+ true, false );
if( bHasContentEnum )
bPrevCharIsSpace = !exportTextContentEnumeration(
xContentEnum, bAutoStyles, xSection,
@@ -2228,7 +2228,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
{
GetExport().AddAttribute(XML_NAMESPACE_OFFICE, XML_NAME, rName);
}
- SvXMLElementExport aElem( GetExport(), !bAutoStyles, XML_NAMESPACE_OFFICE, XML_ANNOTATION_END, sal_False, sal_False );
+ SvXMLElementExport aElem( GetExport(), !bAutoStyles, XML_NAMESPACE_OFFICE, XML_ANNOTATION_END, false, false );
}
else if( sType.equals( sFrame ) )
{
@@ -2304,12 +2304,12 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, xFormField->getFieldType());
}
- GetExport().StartElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_START, sal_False);
+ GetExport().StartElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_START, false);
if (xFormField.is())
{
FieldParamExporter(&GetExport(), xFormField->getParameters()).Export();
}
- GetExport().EndElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_START, sal_False);
+ GetExport().EndElement(XML_NAMESPACE_FIELD, XML_FIELDMARK_START, false);
}
/* The OpenDocument standard does not include support for TextMarks for now, so use bookmarks instead. */
else
@@ -2333,7 +2333,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
sName);
SvXMLElementExport aElem( GetExport(), !bAutoStyles,
XML_NAMESPACE_TEXT, XML_BOOKMARK_START,
- sal_False, sal_False );
+ false, false );
const OUString sFieldType = xFormField->getFieldType();
if (sFieldType == ODF_FORMTEXT)
{
@@ -2358,7 +2358,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
{
SvXMLElementExport aElem( GetExport(), !bAutoStyles,
XML_NAMESPACE_FIELD, XML_FIELDMARK_END,
- sal_False, sal_False );
+ false, false );
}
else
{
@@ -2381,7 +2381,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
sName);
SvXMLElementExport aElem( GetExport(), !bAutoStyles,
XML_NAMESPACE_TEXT, XML_BOOKMARK_END,
- sal_False, sal_False );
+ false, false );
}
}
}
@@ -2399,12 +2399,12 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
{
GetExport().AddAttribute(XML_NAMESPACE_FIELD, XML_TYPE, xFormField->getFieldType());
}
- GetExport().StartElement(XML_NAMESPACE_FIELD, XML_FIELDMARK, sal_False);
+ GetExport().StartElement(XML_NAMESPACE_FIELD, XML_FIELDMARK, false);
if (xFormField.is())
{
FieldParamExporter(&GetExport(), xFormField->getParameters()).Export();
}
- GetExport().EndElement(XML_NAMESPACE_FIELD, XML_FIELDMARK, sal_False);
+ GetExport().EndElement(XML_NAMESPACE_FIELD, XML_FIELDMARK, false);
}
else
{
@@ -2414,7 +2414,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME, xBookmark->getName());
SvXMLElementExport aElem( GetExport(), !bAutoStyles,
XML_NAMESPACE_TEXT, XML_BOOKMARK,
- sal_False, sal_False );
+ false, false );
}
}
}
@@ -2495,8 +2495,8 @@ void XMLTextParagraphExport::exportSoftPageBreak(
bool )
{
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
- XML_SOFT_PAGE_BREAK, sal_False,
- sal_False );
+ XML_SOFT_PAGE_BREAK, false,
+ false );
}
void XMLTextParagraphExport::exportTextMark(
@@ -2545,7 +2545,7 @@ void XMLTextParagraphExport::exportTextMark(
DBG_ASSERT(nElement <= 2, "illegal element number");
SvXMLElementExport aElem(GetExport(),
XML_NAMESPACE_TEXT, pElements[nElement],
- sal_False, sal_False);
+ false, false);
}
// else: no styles. (see above)
}
@@ -2854,13 +2854,13 @@ void XMLTextParagraphExport::exportAnyTextFrame(
GetExport().EncodeStyleName( sStyle ) );
{
SvXMLElementExport aElem( GetExport(), !sStyle.isEmpty(),
- XML_NAMESPACE_TEXT, XML_SPAN, sal_False, sal_False );
+ XML_NAMESPACE_TEXT, XML_SPAN, false, false );
{
SvXMLElementExport aElement( GetExport(),
FT_SHAPE != eType &&
addHyperlinkAttributes( xPropSet,
xPropState,xPropSetInfo ),
- XML_NAMESPACE_DRAW, XML_A, sal_False, sal_False );
+ XML_NAMESPACE_DRAW, XML_A, false, false );
switch( eType )
{
case FT_TEXT:
@@ -2912,7 +2912,7 @@ void XMLTextParagraphExport::_exportTextFrame(
addTextFrameAttributes(rPropSet, false, &aMinHeightValue, &sMinWidthValue);
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_DRAW,
- XML_FRAME, sal_False, sal_True );
+ XML_FRAME, false, true );
if( !aMinHeightValue.isEmpty() )
GetExport().AddAttribute( XML_NAMESPACE_FO, XML_MIN_HEIGHT,
@@ -2936,7 +2936,7 @@ void XMLTextParagraphExport::_exportTextFrame(
{
SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_DRAW,
- XML_TEXT_BOX, sal_True, sal_True );
+ XML_TEXT_BOX, true, true );
// frame bound frames
exportFramesBoundToFrame( xTxtFrame, bIsProgress );
@@ -3051,7 +3051,7 @@ void XMLTextParagraphExport::exportContour(
// write object now
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_DRAW, eElem,
- sal_True, sal_True );
+ true, true );
}
void XMLTextParagraphExport::_exportTextGraphic(
@@ -3086,7 +3086,7 @@ void XMLTextParagraphExport::_exportTextGraphic(
}
// original content
- SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_DRAW, XML_FRAME, sal_False, sal_True);
+ SvXMLElementExport aElem(GetExport(), XML_NAMESPACE_DRAW, XML_FRAME, false, true);
// replacement graphic for backwards compatibility, but
// only for SVG currently
@@ -3118,7 +3118,7 @@ void XMLTextParagraphExport::_exportTextGraphic(
{
SvXMLElementExport aElement( GetExport(), XML_NAMESPACE_DRAW,
- XML_IMAGE, sal_False, sal_True );
+ XML_IMAGE, false, true );
// optional office:binary-data
GetExport().AddEmbeddedGraphicObjectAsBase64( sOrigURL );
@@ -3139,7 +3139,7 @@ void XMLTextParagraphExport::_exportTextGraphic(
GetExport().AddAttribute(XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD);
// xlink:href for replacement, only written for Svg content
- SvXMLElementExport aElement(GetExport(), XML_NAMESPACE_DRAW, XML_IMAGE, sal_False, sal_True);
+ SvXMLElementExport aElement(GetExport(), XML_NAMESPACE_DRAW, XML_IMAGE, false, true);
// optional office:binary-data
GetExport().AddEmbeddedGraphicObjectAsBase64(sReplacementURL);
@@ -3199,7 +3199,7 @@ void XMLTextParagraphExport::exportTitleAndDescription(
if( !sObjTitle.isEmpty() )
{
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_SVG,
- XML_TITLE, sal_True, sal_False );
+ XML_TITLE, true, false );
GetExport().Characters( sObjTitle );
}
}
@@ -3212,7 +3212,7 @@ void XMLTextParagraphExport::exportTitleAndDescription(
if( !sObjDesc.isEmpty() )
{
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_SVG,
- XML_DESC, sal_True, sal_False );
+ XML_DESC, true, false );
GetExport().Characters( sObjDesc );
}
}
@@ -3349,11 +3349,11 @@ void XMLTextParagraphExport::exportTextRangeSpan(
GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_STYLE_NAME, GetExport().EncodeStyleName( sStyle ) );
}
{
- SvXMLElementExport aElement( GetExport(), !sStyle.isEmpty(), XML_NAMESPACE_TEXT, XML_SPAN, sal_False, sal_False );
+ SvXMLElementExport aElement( GetExport(), !sStyle.isEmpty(), XML_NAMESPACE_TEXT, XML_SPAN, false, false );
const OUString aText( rTextRange->getString() );
SvXMLElementExport aElem2( GetExport(), TEXT == openFieldMark,
XML_NAMESPACE_TEXT, XML_TEXT_INPUT,
- sal_False, sal_False );
+ false, false );
exportText( aText, rPrevCharIsSpace );
openFieldMark = NONE;
}
@@ -3389,7 +3389,7 @@ void XMLTextParagraphExport::exportTextRange(
if ( bHyperlink && bHyperlinkAttrsAdded )
{
- SvXMLElementExport aElem( GetExport(), sal_True, XML_NAMESPACE_TEXT, XML_A, sal_False, sal_False );
+ SvXMLElementExport aElem( GetExport(), true, XML_NAMESPACE_TEXT, XML_A, false, false );
// export events (if supported)
OUString sHyperLinkEvents(
@@ -3480,7 +3480,7 @@ void XMLTextParagraphExport::exportText( const OUString& rText,
}
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
- XML_S, sal_False, sal_False );
+ XML_S, false, false );
nSpaceChars = 0;
}
@@ -3494,15 +3494,15 @@ void XMLTextParagraphExport::exportText( const OUString& rText,
case 0x0009: // Tab
{
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
- XML_TAB, sal_False,
- sal_False );
+ XML_TAB, false,
+ false );
}
break;
case 0x000A: // LF
{
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
- XML_LINE_BREAK, sal_False,
- sal_False );
+ XML_LINE_BREAK, false,
+ false );
}
break;
}
@@ -3543,7 +3543,7 @@ void XMLTextParagraphExport::exportText( const OUString& rText,
}
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, XML_S,
- sal_False, sal_False );
+ false, false );
}
}
@@ -3570,7 +3570,7 @@ void XMLTextParagraphExport::exportTextDeclarations()
SvXMLElementExport aAutoMarkElement(
GetExport(), XML_NAMESPACE_TEXT,
XML_ALPHABETICAL_INDEX_AUTO_MARK_FILE,
- sal_True, sal_True );
+ true, true );
}
}
}
@@ -3686,10 +3686,10 @@ void XMLTextParagraphExport::exportRuby(
XML_STYLE_NAME, sStyleName);
// export <text:ruby> and <text:ruby-base> start elements
- GetExport().StartElement( XML_NAMESPACE_TEXT, XML_RUBY, sal_False);
+ GetExport().StartElement( XML_NAMESPACE_TEXT, XML_RUBY, false);
GetExport().ClearAttrList();
GetExport().StartElement( XML_NAMESPACE_TEXT, XML_RUBY_BASE,
- sal_False );
+ false );
bOpenRuby = true;
}
else
@@ -3703,7 +3703,7 @@ void XMLTextParagraphExport::exportRuby(
// close <text:ruby-base>
GetExport().EndElement(XML_NAMESPACE_TEXT, XML_RUBY_BASE,
- sal_False);
+ false);
// write the ruby text (with char style)
{
@@ -3714,13 +3714,13 @@ void XMLTextParagraphExport::exportRuby(
SvXMLElementExport aRubyElement(
GetExport(), XML_NAMESPACE_TEXT, XML_RUBY_TEXT,
- sal_False, sal_False);
+ false, false);
GetExport().Characters(sOpenRubyText);
}
// and finally, close the ruby
- GetExport().EndElement(XML_NAMESPACE_TEXT, XML_RUBY, sal_False);
+ GetExport().EndElement(XML_NAMESPACE_TEXT, XML_RUBY, false);
bOpenRuby = false;
}
}
@@ -3758,7 +3758,7 @@ void XMLTextParagraphExport::exportMeta(
}
SvXMLElementExport aElem( GetExport(), doExport,
- XML_NAMESPACE_TEXT, XML_META, sal_False, sal_False );
+ XML_NAMESPACE_TEXT, XML_META, false, false );
// recurse to export content
exportTextRangeEnumeration( xTextEnum, i_bAutoStyles, i_isProgress );
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index 7e0004768b61..1954b640a622 100644
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -169,7 +169,7 @@ void exportXFormsModel( SvXMLExport& rExport,
lcl_export( xModelPropSet, rExport, aXFormsModelTable );
SvXMLElementExport aModelElement( rExport, XML_NAMESPACE_XFORMS, XML_MODEL,
- sal_True, sal_True );
+ true, true );
// instances
Reference<XIndexAccess> xInstances( xModel->getInstances(),
@@ -241,7 +241,7 @@ void exportXFormsInstance( SvXMLExport& rExport,
rExport.AddAttribute( XML_NAMESPACE_NONE, XML_SRC, sURL );
SvXMLElementExport aElem( rExport, XML_NAMESPACE_XFORMS, XML_INSTANCE,
- sal_True, sal_True );
+ true, true );
rExport.IgnorableWhitespace();
if( xDoc.is() )
{
@@ -360,7 +360,7 @@ void exportXFormsBinding( SvXMLExport& rExport,
}
SvXMLElementExport aElement( rExport, XML_NAMESPACE_XFORMS, XML_BIND,
- sal_True, sal_True );
+ true, true );
}
@@ -393,7 +393,7 @@ void exportXFormsSubmission( SvXMLExport& rExport,
{
lcl_export( xSubmission, rExport, aXFormsSubmissionTable );
SvXMLElementExport aElement( rExport, XML_NAMESPACE_XFORMS, XML_SUBMISSION,
- sal_True, sal_True );
+ true, true );
}
@@ -458,7 +458,7 @@ static void lcl_exportDataTypeFacets( SvXMLExport& rExport,
rExport,
pCurrent->nNamespace,
static_cast<XMLTokenEnum>( pCurrent->nToken ),
- sal_True, sal_True );
+ true, true );
}
}
}
@@ -542,7 +542,7 @@ static void lcl_exportDataType( SvXMLExport& rExport,
rExport.AddAttribute( XML_NAMESPACE_NONE, XML_NAME, sName );
SvXMLElementExport aSimpleType( rExport,
XML_NAMESPACE_XSD, XML_SIMPLETYPE,
- sal_True, sal_True );
+ true, true );
// <xsd:restriction base="xsd:...">
rExport.AddAttribute( XML_NAMESPACE_NONE, XML_BASE,
@@ -550,7 +550,7 @@ static void lcl_exportDataType( SvXMLExport& rExport,
SvXMLElementExport aRestriction( rExport,
XML_NAMESPACE_XSD,
XML_RESTRICTION,
- sal_True, sal_True );
+ true, true );
// export facets
lcl_exportDataTypeFacets( rExport,
@@ -564,7 +564,7 @@ void exportXFormsSchemas( SvXMLExport& rExport,
// TODO: for now, we'll fake this...
{
SvXMLElementExport aSchemaElem( rExport, XML_NAMESPACE_XSD, XML_SCHEMA,
- sal_True, sal_True );
+ true, true );
// now get data type repositry, and export
Reference<XEnumerationAccess> xTypes( xModel->getDataTypeRepository(),