[Libreoffice-commits] core.git: include/oox oox/source sd/source sw/source
Stephan Bergmann
sbergman at redhat.com
Sat Mar 25 12:51:42 UTC 2017
include/oox/export/utils.hxx | 2
oox/source/export/chartexport.cxx | 62 +++++++--------
oox/source/export/drawingml.cxx | 106 +++++++++++++--------------
oox/source/export/shapes.cxx | 60 +++++++--------
sd/source/filter/eppt/pptx-epptooxml.cxx | 42 +++++-----
sw/source/filter/ww8/docxattributeoutput.cxx | 10 +-
sw/source/filter/ww8/docxsdrexport.cxx | 10 +-
7 files changed, 145 insertions(+), 147 deletions(-)
New commits:
commit 4b788a12380518e31a9064d5839f4880d3f36874
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Mar 25 10:33:14 2017 +0100
There should be no need to distinguish between I32S and I64S
...after 64b993e046f23baaacaff1572b7d2a816588b5ef "finish deprecation of
O(U)String::valueOf()" replaced OString::valueOf with OString::number in their
bodies. (Change done in preparation of teaching loplugin:redundantcast about
C-style casts in macro bodies.)
Change-Id: Ifbb4725c496eed18a926fbabeaf4691ac98d9c5e
Reviewed-on: https://gerrit.libreoffice.org/35678
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx
index 599e45ee55f8..8e5b814dd908 100644
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -24,8 +24,6 @@
#include <rtl/textenc.h>
#include <sal/types.h>
-#define I32S(x) OString::number( (sal_Int32) x ).getStr()
-#define I64S(x) OString::number( (sal_Int64) x ).getStr()
#define IS(x) OString::number( x ).getStr()
#define BS(x) (x ? "1":"0")
#define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr()
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index bddb3c3a2f7a..2de77698daa4 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -527,7 +527,7 @@ void ChartExport::WriteChartObj( const Reference< XShape >& xShape, sal_Int32 nC
sal_Int32 nID = GetChartID();
pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
- XML_id, I32S( nID ),
+ XML_id, IS( nID ),
XML_name, USS( sName ),
FSEND );
@@ -1562,7 +1562,7 @@ void ChartExport::exportBarChart( const Reference< chart2::XChartType >& xChartT
{
sal_Int32 nGapWidth = aBarPositionSequence[0];
pFS->singleElement( FSNS( XML_c, XML_gapWidth ),
- XML_val, I32S( nGapWidth ),
+ XML_val, IS( nGapWidth ),
FSEND );
}
}
@@ -1604,7 +1604,7 @@ void ChartExport::exportBarChart( const Reference< chart2::XChartType >& xChartT
{
sal_Int32 nOverlap = aBarPositionSequence[0];
pFS->singleElement( FSNS( XML_c, XML_overlap ),
- XML_val, I32S( nOverlap ),
+ XML_val, IS( nOverlap ),
FSEND );
}
}
@@ -1649,7 +1649,7 @@ void ChartExport::exportDoughnutChart( const Reference< chart2::XChartType >& xC
//FIXME: holeSize
sal_Int32 nHoleSize = 50;
pFS->singleElement( FSNS( XML_c, XML_holeSize ),
- XML_val, I32S( nHoleSize ),
+ XML_val, IS( nHoleSize ),
FSEND );
pFS->endElement( FSNS( XML_c, XML_doughnutChart ) );
@@ -1901,7 +1901,7 @@ void ChartExport::exportUpDownBars( const Reference< chart2::XChartType >& xChar
// TODO: gapWidth
sal_Int32 nGapWidth = 150;
pFS->singleElement( FSNS( XML_c, XML_gapWidth ),
- XML_val, I32S( nGapWidth ),
+ XML_val, IS( nGapWidth ),
FSEND );
Reference< beans::XPropertySet > xChartPropSet = xChartPropProvider->getUpBar();
@@ -2056,10 +2056,10 @@ void ChartExport::exportSeries( const Reference<chart2::XChartType>& xChartType,
// TODO: idx and order
pFS->singleElement( FSNS( XML_c, XML_idx ),
- XML_val, I32S(mnSeriesCount),
+ XML_val, IS(mnSeriesCount),
FSEND );
pFS->singleElement( FSNS( XML_c, XML_order ),
- XML_val, I32S(mnSeriesCount++),
+ XML_val, IS(mnSeriesCount++),
FSEND );
// export label
@@ -2106,7 +2106,7 @@ void ChartExport::exportSeries( const Reference<chart2::XChartType>& xChartType,
sal_Int32 nOffset = 0;
mAny >>= nOffset;
pFS->singleElement( FSNS( XML_c, XML_explosion ),
- XML_val, I32S( nOffset ),
+ XML_val, IS( nOffset ),
FSEND );
}
break;
@@ -2238,10 +2238,10 @@ void ChartExport::exportCandleStickSeries(
// TODO: idx and order
// idx attribute should start from 1 and not from 0.
pFS->singleElement( FSNS( XML_c, XML_idx ),
- XML_val, I32S(idx+1),
+ XML_val, IS(idx+1),
FSEND );
pFS->singleElement( FSNS( XML_c, XML_order ),
- XML_val, I32S(idx+1),
+ XML_val, IS(idx+1),
FSEND );
// export label
@@ -2326,12 +2326,12 @@ void ChartExport::exportSeriesCategory( const Reference< chart2::data::XDataSequ
pFS->startElement( FSNS( XML_c, XML_strCache ),
FSEND );
pFS->singleElement( FSNS( XML_c, XML_ptCount ),
- XML_val, I32S( ptCount ),
+ XML_val, IS( ptCount ),
FSEND );
for( sal_Int32 i = 0; i < ptCount; i++ )
{
pFS->startElement( FSNS( XML_c, XML_pt ),
- XML_idx, I32S( i ),
+ XML_idx, IS( i ),
FSEND );
pFS->startElement( FSNS( XML_c, XML_v ),
FSEND );
@@ -2374,7 +2374,7 @@ void ChartExport::exportSeriesValues( const Reference< chart2::data::XDataSequen
pFS->writeEscaped( "General" );
pFS->endElement( FSNS( XML_c, XML_formatCode ) );
pFS->singleElement( FSNS( XML_c, XML_ptCount ),
- XML_val, I32S( ptCount ),
+ XML_val, IS( ptCount ),
FSEND );
bool bIsNumberValue = true;
@@ -2387,7 +2387,7 @@ void ChartExport::exportSeriesValues( const Reference< chart2::data::XDataSequen
for( sal_Int32 i = 0; i < ptCount; i++ )
{
pFS->startElement( FSNS( XML_c, XML_pt ),
- XML_idx, I32S( i ),
+ XML_idx, IS( i ),
FSEND );
pFS->startElement( FSNS( XML_c, XML_v ),
FSEND );
@@ -2641,7 +2641,7 @@ void ChartExport::_exportAxis(
pFS->startElement( FSNS( XML_c, nAxisType ),
FSEND );
pFS->singleElement( FSNS( XML_c, XML_axId ),
- XML_val, I32S( rAxisIdPair.nAxisId ),
+ XML_val, IS( rAxisIdPair.nAxisId ),
FSEND );
pFS->startElement( FSNS( XML_c, XML_scaling ),
@@ -2657,7 +2657,7 @@ void ChartExport::_exportAxis(
// default value is 10?
sal_Int32 nLogBase = 10;
pFS->singleElement( FSNS( XML_c, XML_logBase ),
- XML_val, I32S( nLogBase ),
+ XML_val, IS( nLogBase ),
FSEND );
}
}
@@ -2839,7 +2839,7 @@ void ChartExport::_exportAxis(
exportTextProps(xAxisProp);
pFS->singleElement( FSNS( XML_c, XML_crossAx ),
- XML_val, I32S( rAxisIdPair.nCrossAx ),
+ XML_val, IS( rAxisIdPair.nCrossAx ),
FSEND );
// crosses & crossesAt
@@ -2902,7 +2902,7 @@ void ChartExport::_exportAxis(
// FIXME: seems not support? lblOffset
sal_Int32 nLblOffset = 100;
pFS->singleElement( FSNS( XML_c, XML_lblOffset ),
- XML_val, I32S( nLblOffset ),
+ XML_val, IS( nLblOffset ),
FSEND );
}
@@ -3147,7 +3147,7 @@ void ChartExport::exportDataLabels(
// Individual label property that overwrites the baseline.
pFS->startElement(FSNS(XML_c, XML_dLbl), FSEND);
- pFS->singleElement(FSNS(XML_c, XML_idx), XML_val, I32S(nIdx), FSEND);
+ pFS->singleElement(FSNS(XML_c, XML_idx), XML_val, IS(nIdx), FSEND);
writeLabelProperties(pFS, xLabelPropSet, aParam);
pFS->endElement(FSNS(XML_c, XML_dLbl));
}
@@ -3215,7 +3215,7 @@ void ChartExport::exportDataPoints(
pFS->startElement( FSNS( XML_c, XML_dPt ),
FSEND );
pFS->singleElement( FSNS( XML_c, XML_idx ),
- XML_val, I32S(nElement),
+ XML_val, IS(nElement),
FSEND );
exportShapeProps( xPropSet );
@@ -3235,10 +3235,10 @@ void ChartExport::exportAxesId(bool bPrimaryAxes)
maAxes.push_back( AxisIdPair( eYAxis, nAxisIdy, nAxisIdx ) );
FSHelperPtr pFS = GetFS();
pFS->singleElement( FSNS( XML_c, XML_axId ),
- XML_val, I32S( nAxisIdx ),
+ XML_val, IS( nAxisIdx ),
FSEND );
pFS->singleElement( FSNS( XML_c, XML_axId ),
- XML_val, I32S( nAxisIdy ),
+ XML_val, IS( nAxisIdy ),
FSEND );
if (mbHasZAxis)
{
@@ -3249,7 +3249,7 @@ void ChartExport::exportAxesId(bool bPrimaryAxes)
maAxes.push_back( AxisIdPair( AXIS_PRIMARY_Z, nAxisIdz, nAxisIdy ) );
}
pFS->singleElement( FSNS( XML_c, XML_axId ),
- XML_val, I32S( nAxisIdz ),
+ XML_val, IS( nAxisIdz ),
FSEND );
}
}
@@ -3361,7 +3361,7 @@ void ChartExport::exportTrendlines( const Reference< chart2::XDataSeries >& xSer
sal_Int32 aDegree = 2;
xProperties->getPropertyValue( "PolynomialDegree") >>= aDegree;
pFS->singleElement( FSNS( XML_c, XML_order ),
- XML_val, I32S(aDegree),
+ XML_val, IS(aDegree),
FSEND );
}
else if( aService == "com.sun.star.chart2.MovingAverageRegressionCurve" )
@@ -3374,7 +3374,7 @@ void ChartExport::exportTrendlines( const Reference< chart2::XDataSeries >& xSer
xProperties->getPropertyValue( "MovingAveragePeriod") >>= aPeriod;
pFS->singleElement( FSNS( XML_c, XML_period ),
- XML_val, I32S(aPeriod),
+ XML_val, IS(aPeriod),
FSEND );
}
else
@@ -3509,7 +3509,7 @@ void ChartExport::exportMarker(const Reference< chart2::XDataSeries >& xSeries)
//the value is always 1 less than the actual value.
nSize = std::min<sal_Int32>( 72, std::max<sal_Int32>( 2, nSize ) );
pFS->singleElement( FSNS( XML_c, XML_size),
- XML_val, I32S(nSize),
+ XML_val, IS(nSize),
FSEND );
pFS->startElement( FSNS( XML_c, XML_spPr ),
@@ -3556,7 +3556,7 @@ void ChartExport::exportFirstSliceAng( )
// convert to ooxml angle
nStartingAngle = (450 - nStartingAngle ) % 360;
pFS->singleElement( FSNS( XML_c, XML_firstSliceAng ),
- XML_val, I32S( nStartingAngle ),
+ XML_val, IS( nStartingAngle ),
FSEND );
}
@@ -3725,7 +3725,7 @@ void ChartExport::exportView3D()
nRotationX += 360; // X rotation (map Chart2 [-179,180] to OOXML [-90..90])
}
pFS->singleElement( FSNS( XML_c, XML_rotX ),
- XML_val, I32S( nRotationX ),
+ XML_val, IS( nRotationX ),
FSEND );
}
// rotY
@@ -3740,7 +3740,7 @@ void ChartExport::exportView3D()
// convert to ooxml angle
nStartingAngle = (450 - nStartingAngle ) % 360;
pFS->singleElement( FSNS( XML_c, XML_rotY ),
- XML_val, I32S( nStartingAngle ),
+ XML_val, IS( nStartingAngle ),
FSEND );
}
else
@@ -3751,7 +3751,7 @@ void ChartExport::exportView3D()
if( nRotationY < 0 )
nRotationY += 360;
pFS->singleElement( FSNS( XML_c, XML_rotY ),
- XML_val, I32S( nRotationY ),
+ XML_val, IS( nRotationY ),
FSEND );
}
}
@@ -3773,7 +3773,7 @@ void ChartExport::exportView3D()
// map Chart2 [0,100] to OOXML [0..200]
nPerspective *= 2;
pFS->singleElement( FSNS( XML_c, XML_perspective ),
- XML_val, I32S( nPerspective ),
+ XML_val, IS( nPerspective ),
FSEND );
}
pFS->endElement( FSNS( XML_c, XML_view3D ) );
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index b33f150224d1..43b7c0369210 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -239,7 +239,7 @@ void DrawingML::WriteColorTransformations( const Sequence< PropertyValue >& aTra
if( nToken != XML_TOKEN_INVALID && aTransformations[i].Value.hasValue() )
{
sal_Int32 nValue = aTransformations[i].Value.get<sal_Int32>();
- mpFS->singleElementNS( XML_a, nToken, XML_val, I32S( nValue ), FSEND );
+ mpFS->singleElementNS( XML_a, nToken, XML_val, IS( nValue ), FSEND );
}
}
}
@@ -333,7 +333,7 @@ void DrawingML::WriteSolidFill( const Reference< XPropertySet >& rXPropSet )
void DrawingML::WriteGradientStop( sal_uInt16 nStop, sal_uInt32 nColor )
{
mpFS->startElementNS( XML_a, XML_gs,
- XML_pos, I32S( nStop * 1000 ),
+ XML_pos, IS( nStop * 1000 ),
FSEND );
WriteColor( nColor );
mpFS->endElementNS( XML_a, XML_gs );
@@ -450,7 +450,7 @@ void DrawingML::WriteGrabBagGradientFill( const Sequence< PropertyValue >& aGrad
mpFS->endElementNS( XML_a, XML_gsLst );
mpFS->singleElementNS( XML_a, XML_lin,
- XML_ang, I32S( ( ( ( 3600 - rGradient.Angle + 900 ) * 6000 ) % 21600000 ) ),
+ XML_ang, IS( ( ( ( 3600 - rGradient.Angle + 900 ) * 6000 ) % 21600000 ) ),
FSEND );
}
@@ -465,7 +465,7 @@ void DrawingML::WriteGradientFill( awt::Gradient rGradient )
WriteGradientStop( 100, ColorWithIntensity( rGradient.EndColor, rGradient.EndIntensity ) );
mpFS->endElementNS( XML_a, XML_gsLst );
mpFS->singleElementNS( XML_a, XML_lin,
- XML_ang, I32S( ( ( ( 3600 - rGradient.Angle + 900 ) * 6000 ) % 21600000 ) ),
+ XML_ang, IS( ( ( ( 3600 - rGradient.Angle + 900 ) * 6000 ) % 21600000 ) ),
FSEND );
break;
@@ -476,7 +476,7 @@ void DrawingML::WriteGradientFill( awt::Gradient rGradient )
WriteGradientStop( 100, ColorWithIntensity( rGradient.EndColor, rGradient.EndIntensity ) );
mpFS->endElementNS( XML_a, XML_gsLst );
mpFS->singleElementNS( XML_a, XML_lin,
- XML_ang, I32S( ( ( ( 3600 - rGradient.Angle + 900 ) * 6000 ) % 21600000 ) ),
+ XML_ang, IS( ( ( ( 3600 - rGradient.Angle + 900 ) * 6000 ) % 21600000 ) ),
FSEND );
break;
@@ -662,7 +662,7 @@ void DrawingML::WriteOutline( const Reference<XPropertySet>& rXPropSet )
mpFS->startElementNS( XML_a, XML_ln,
XML_cap, cap,
XML_w, nLineWidth > 1 && nStyleLineWidth != nLineWidth ?
- I64S( oox::drawingml::convertHmmToEmu( nLineWidth ) ) :nullptr,
+ IS( oox::drawingml::convertHmmToEmu( nLineWidth ) ) :nullptr,
FSEND );
if( bColorSet )
@@ -987,8 +987,8 @@ OUString DrawingML::WriteBlip( const Reference< XPropertySet >& rXPropSet, const
if( nBright || nContrast )
{
mpFS->singleElementNS( XML_a, XML_lum,
- XML_bright, nBright ? I32S( nBright*1000 ) : nullptr,
- XML_contrast, nContrast ? I32S( nContrast*1000 ) : nullptr,
+ XML_bright, nBright ? IS( nBright*1000 ) : nullptr,
+ XML_contrast, nContrast ? IS( nContrast*1000 ) : nullptr,
FSEND );
}
WriteArtisticEffect( rXPropSet );
@@ -1114,10 +1114,10 @@ void DrawingML::WriteSrcRect( const Reference< XPropertySet >& rXPropSet, const
if ( (0 != aGraphicCropStruct.Left) || (0 != aGraphicCropStruct.Top) || (0 != aGraphicCropStruct.Right) || (0 != aGraphicCropStruct.Bottom) )
{
mpFS->singleElementNS( XML_a, XML_srcRect,
- XML_l, I32S(rtl::math::round(static_cast<double>(aGraphicCropStruct.Left) * 100000 / aOriginalSize.Width())),
- XML_t, I32S(rtl::math::round(static_cast<double>(aGraphicCropStruct.Top) * 100000 / aOriginalSize.Height())),
- XML_r, I32S(rtl::math::round(static_cast<double>(aGraphicCropStruct.Right) * 100000 / aOriginalSize.Width())),
- XML_b, I32S(rtl::math::round(static_cast<double>(aGraphicCropStruct.Bottom) * 100000 / aOriginalSize.Height())),
+ XML_l, IS(rtl::math::round(static_cast<double>(aGraphicCropStruct.Left) * 100000 / aOriginalSize.Width())),
+ XML_t, IS(rtl::math::round(static_cast<double>(aGraphicCropStruct.Top) * 100000 / aOriginalSize.Height())),
+ XML_r, IS(rtl::math::round(static_cast<double>(aGraphicCropStruct.Right) * 100000 / aOriginalSize.Width())),
+ XML_b, IS(rtl::math::round(static_cast<double>(aGraphicCropStruct.Bottom) * 100000 / aOriginalSize.Height())),
FSEND );
}
}
@@ -1137,10 +1137,10 @@ void DrawingML::WriteStretch( const css::uno::Reference< css::beans::XPropertySe
{
Size aOriginalSize( GraphicObject::CreateGraphicObjectFromURL( rURL ).GetPrefSize() );
mpFS->singleElementNS( XML_a, XML_fillRect,
- XML_l, I32S(((aGraphicCropStruct.Left) * 100000)/aOriginalSize.Width()),
- XML_t, I32S(((aGraphicCropStruct.Top) * 100000)/aOriginalSize.Height()),
- XML_r, I32S(((aGraphicCropStruct.Right) * 100000)/aOriginalSize.Width()),
- XML_b, I32S(((aGraphicCropStruct.Bottom) * 100000)/aOriginalSize.Height()),
+ XML_l, IS(((aGraphicCropStruct.Left) * 100000)/aOriginalSize.Width()),
+ XML_t, IS(((aGraphicCropStruct.Top) * 100000)/aOriginalSize.Height()),
+ XML_r, IS(((aGraphicCropStruct.Right) * 100000)/aOriginalSize.Width()),
+ XML_b, IS(((aGraphicCropStruct.Bottom) * 100000)/aOriginalSize.Height()),
FSEND );
bCrop = true;
}
@@ -1160,7 +1160,7 @@ void DrawingML::WriteTransformation( const Rectangle& rRect,
mpFS->startElementNS( nXmlNamespace, XML_xfrm,
XML_flipH, bFlipH ? "1" : nullptr,
XML_flipV, bFlipV ? "1" : nullptr,
- XML_rot, (nRotation % 21600000) ? I32S( nRotation ) : nullptr,
+ XML_rot, (nRotation % 21600000) ? IS( nRotation ) : nullptr,
FSEND );
sal_Int32 nLeft = rRect.Left();
@@ -1934,13 +1934,13 @@ void DrawingML::WriteLinespacing( LineSpacing& rSpacing )
if( rSpacing.Mode == LineSpacingMode::PROP )
{
mpFS->singleElementNS( XML_a, XML_spcPct,
- XML_val, I32S( ((sal_Int32)rSpacing.Height)*1000 ),
+ XML_val, IS( ((sal_Int32)rSpacing.Height)*1000 ),
FSEND );
}
else
{
mpFS->singleElementNS( XML_a, XML_spcPts,
- XML_val, I32S( rSpacing.Height ),
+ XML_val, IS( rSpacing.Height ),
FSEND );
}
}
@@ -1996,17 +1996,17 @@ void DrawingML::WriteParagraphProperties( const Reference< XTextContent >& rPara
{
if (nParaLeftMargin) // For Paragraph
mpFS->startElementNS( XML_a, XML_pPr,
- XML_lvl, nLevel > 0 ? I32S( nLevel ) : nullptr,
- XML_marL, nParaLeftMargin > 0 ? I32S( oox::drawingml::convertHmmToEmu( nParaLeftMargin ) ) : nullptr,
- XML_indent, nParaFirstLineIndent ? I32S( oox::drawingml::convertHmmToEmu( nParaFirstLineIndent ) ) : nullptr,
+ XML_lvl, nLevel > 0 ? IS( nLevel ) : nullptr,
+ XML_marL, nParaLeftMargin > 0 ? IS( oox::drawingml::convertHmmToEmu( nParaLeftMargin ) ) : nullptr,
+ XML_indent, nParaFirstLineIndent ? IS( oox::drawingml::convertHmmToEmu( nParaFirstLineIndent ) ) : nullptr,
XML_algn, GetAlignment( nAlignment ),
XML_rtl, bRtl ? BS(bRtl) : nullptr,
FSEND );
else
mpFS->startElementNS( XML_a, XML_pPr,
- XML_lvl, nLevel > 0 ? I32S( nLevel ) : nullptr,
- XML_marL, nLeftMargin > 0 ? I32S( oox::drawingml::convertHmmToEmu( nLeftMargin ) ) : nullptr,
- XML_indent, nLineIndentation ? I32S( oox::drawingml::convertHmmToEmu( nLineIndentation ) ) : nullptr,
+ XML_lvl, nLevel > 0 ? IS( nLevel ) : nullptr,
+ XML_marL, nLeftMargin > 0 ? IS( oox::drawingml::convertHmmToEmu( nLeftMargin ) ) : nullptr,
+ XML_indent, nLineIndentation ? IS( oox::drawingml::convertHmmToEmu( nLineIndentation ) ) : nullptr,
XML_algn, GetAlignment( nAlignment ),
XML_rtl, bRtl ? BS(bRtl) : nullptr,
FSEND );
@@ -2024,7 +2024,7 @@ void DrawingML::WriteParagraphProperties( const Reference< XTextContent >& rPara
mpFS->startElementNS( XML_a, XML_spcBef, FSEND );
{
mpFS->singleElementNS( XML_a, XML_spcPts,
- XML_val, I32S( std::lround( nParaTopMargin / 25.4 * 72 ) ),
+ XML_val, IS( std::lround( nParaTopMargin / 25.4 * 72 ) ),
FSEND );
}
mpFS->endElementNS( XML_a, XML_spcBef );
@@ -2035,7 +2035,7 @@ void DrawingML::WriteParagraphProperties( const Reference< XTextContent >& rPara
mpFS->startElementNS( XML_a, XML_spcAft, FSEND );
{
mpFS->singleElementNS( XML_a, XML_spcPts,
- XML_val, I32S( std::lround( nParaBottomMargin / 25.4 * 72 ) ),
+ XML_val, IS( std::lround( nParaBottomMargin / 25.4 * 72 ) ),
FSEND );
}
mpFS->endElementNS( XML_a, XML_spcAft );
@@ -2455,8 +2455,8 @@ bool DrawingML::WriteCustomGeometry( const Reference< XShape >& rXShape )
if ( aPathSize.hasElements() )
{
mpFS->startElementNS( XML_a, XML_path,
- XML_w, I64S( aPathSize[0].Width ),
- XML_h, I64S( aPathSize[0].Height ),
+ XML_w, IS( aPathSize[0].Width ),
+ XML_h, IS( aPathSize[0].Height ),
FSEND );
}
else
@@ -2481,8 +2481,8 @@ bool DrawingML::WriteCustomGeometry( const Reference< XShape >& rXShape )
nYMax = nCandidate;
}
mpFS->startElementNS( XML_a, XML_path,
- XML_w, I64S( nXMax - nXMin ),
- XML_h, I64S( nYMax - nYMin ),
+ XML_w, IS( nXMax - nXMin ),
+ XML_h, IS( nYMax - nYMin ),
FSEND );
}
@@ -2507,8 +2507,8 @@ bool DrawingML::WriteCustomGeometry( const Reference< XShape >& rXShape )
aPairs[nPairIndex].Second.Value >>= nY;
mpFS->singleElementNS( XML_a, XML_pt,
- XML_x, I64S(nX),
- XML_y, I64S(nY),
+ XML_x, IS(nX),
+ XML_y, IS(nY),
FSEND );
mpFS->endElementNS( XML_a, XML_moveTo );
@@ -2524,8 +2524,8 @@ bool DrawingML::WriteCustomGeometry( const Reference< XShape >& rXShape )
aPairs[nPairIndex].Second.Value >>= nY;
mpFS->singleElementNS( XML_a, XML_pt,
- XML_x, I64S(nX),
- XML_y, I64S(nY),
+ XML_x, IS(nX),
+ XML_y, IS(nY),
FSEND );
mpFS->endElementNS( XML_a, XML_lnTo );
nPairIndex++;
@@ -2541,8 +2541,8 @@ bool DrawingML::WriteCustomGeometry( const Reference< XShape >& rXShape )
aPairs[nPairIndex+l].Second.Value >>= nY;
mpFS->singleElementNS( XML_a, XML_pt,
- XML_x, I64S( nX ),
- XML_y, I64S( nY ),
+ XML_x, IS( nX ),
+ XML_y, IS( nY ),
FSEND );
}
@@ -2580,8 +2580,8 @@ bool DrawingML::WriteCustomGeometry( const Reference< XShape >& rXShape )
aPairs[nPairIndex+l].Second.Value >>= nY;
mpFS->singleElementNS( XML_a, XML_pt,
- XML_x, I64S( nX ),
- XML_y, I64S( nY ),
+ XML_x, IS( nX ),
+ XML_y, IS( nY ),
FSEND );
}
@@ -2635,8 +2635,8 @@ void DrawingML::WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon )
// Put all polygons of rPolyPolygon in the same path elemnt
// to subtract the overlapped areas.
mpFS->startElementNS( XML_a, XML_path,
- XML_w, I64S( aRect.GetWidth() ),
- XML_h, I64S( aRect.GetHeight() ),
+ XML_w, IS( aRect.GetWidth() ),
+ XML_h, IS( aRect.GetHeight() ),
FSEND );
for( sal_uInt16 i = 0; i < rPolyPolygon.Count(); i ++ )
@@ -2649,8 +2649,8 @@ void DrawingML::WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon )
mpFS->startElementNS( XML_a, XML_moveTo, FSEND );
mpFS->singleElementNS( XML_a, XML_pt,
- XML_x, I64S( rPoly[ 0 ].X() - aRect.Left() ),
- XML_y, I64S( rPoly[ 0 ].Y() - aRect.Top() ),
+ XML_x, IS( rPoly[ 0 ].X() - aRect.Left() ),
+ XML_y, IS( rPoly[ 0 ].Y() - aRect.Top() ),
FSEND );
mpFS->endElementNS( XML_a, XML_moveTo );
@@ -2669,8 +2669,8 @@ void DrawingML::WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon )
for( sal_uInt8 k = 0; k <= 2; ++k )
{
mpFS->singleElementNS( XML_a, XML_pt,
- XML_x, I64S( rPoly[j+k].X() - aRect.Left() ),
- XML_y, I64S( rPoly[j+k].Y() - aRect.Top() ),
+ XML_x, IS( rPoly[j+k].X() - aRect.Left() ),
+ XML_y, IS( rPoly[j+k].Y() - aRect.Top() ),
FSEND );
}
@@ -2682,8 +2682,8 @@ void DrawingML::WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon )
{
mpFS->startElementNS( XML_a, XML_lnTo, FSEND );
mpFS->singleElementNS( XML_a, XML_pt,
- XML_x, I64S( rPoly[j].X() - aRect.Left() ),
- XML_y, I64S( rPoly[j].Y() - aRect.Top() ),
+ XML_x, IS( rPoly[j].X() - aRect.Left() ),
+ XML_y, IS( rPoly[j].Y() - aRect.Top() ),
FSEND );
mpFS->endElementNS( XML_a, XML_lnTo );
}
@@ -2701,15 +2701,15 @@ void DrawingML::WriteConnectorConnections( EscherConnectorListEntry& rConnectorE
if( nStartID != -1 )
{
mpFS->singleElementNS( XML_a, XML_stCxn,
- XML_id, I32S( nStartID ),
- XML_idx, I64S( rConnectorEntry.GetConnectorRule( true ) ),
+ XML_id, IS( nStartID ),
+ XML_idx, IS( rConnectorEntry.GetConnectorRule( true ) ),
FSEND );
}
if( nEndID != -1 )
{
mpFS->singleElementNS( XML_a, XML_endCxn,
- XML_id, I32S( nEndID ),
- XML_idx, I64S( rConnectorEntry.GetConnectorRule( false ) ),
+ XML_id, IS( nEndID ),
+ XML_idx, IS( rConnectorEntry.GetConnectorRule( false ) ),
FSEND );
}
}
@@ -2804,14 +2804,14 @@ void DrawingML::WriteStyleProperties( sal_Int32 nTokenId, const Sequence< Proper
else if( aProperties[i].Name == "Transformations" )
aProperties[i].Value >>= aTransformations;
}
- mpFS->startElementNS( XML_a, nTokenId, XML_idx, I32S( nIdx ), FSEND );
+ mpFS->startElementNS( XML_a, nTokenId, XML_idx, IS( nIdx ), FSEND );
WriteColor( sSchemeClr, aTransformations );
mpFS->endElementNS( XML_a, nTokenId );
}
else
{
// write mock <a:*Ref> tag
- mpFS->singleElementNS( XML_a, nTokenId, XML_idx, I32S( 0 ), FSEND );
+ mpFS->singleElementNS( XML_a, nTokenId, XML_idx, IS( 0 ), FSEND );
}
}
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index b8e8bdf7012a..048e9247adec 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -450,7 +450,7 @@ ShapeExport& ShapeExport::WritePolyPolygonShape( const Reference< XShape >& xSha
{
pFS->startElementNS( mnXmlNamespace, XML_nvSpPr, FSEND );
pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
- XML_id, I32S( GetNewShapeID( xShape ) ),
+ XML_id, IS( GetNewShapeID( xShape ) ),
XML_name, IDS( Freeform ),
FSEND );
}
@@ -763,7 +763,7 @@ ShapeExport& ShapeExport::WriteCustomShape( const Reference< XShape >& xShape )
}
pFS->startElementNS( mnXmlNamespace, XML_nvSpPr, FSEND );
pFS->startElementNS( mnXmlNamespace, XML_cNvPr,
- XML_id, I32S( GetNewShapeID( xShape ) ),
+ XML_id, IS( GetNewShapeID( xShape ) ),
XML_name, IDS( CustomShape ),
XML_hidden, isVisible ? nullptr : "1",
FSEND );
@@ -1012,7 +1012,7 @@ ShapeExport& ShapeExport::WriteEllipseShape( const Reference< XShape >& xShape )
{
pFS->startElementNS( mnXmlNamespace, XML_nvSpPr, FSEND );
pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
- XML_id, I32S( GetNewShapeID( xShape ) ),
+ XML_id, IS( GetNewShapeID( xShape ) ),
XML_name, IDS( Ellipse ),
FSEND );
pFS->singleElementNS( mnXmlNamespace, XML_cNvSpPr, FSEND );
@@ -1099,7 +1099,7 @@ void ShapeExport::WriteGraphicObjectShapePart( const Reference< XShape >& xShape
mAny >>= sDescr;
pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
- XML_id, I32S( GetNewShapeID( xShape ) ),
+ XML_id, IS( GetNewShapeID( xShape ) ),
XML_name, bHaveName ? USS( sName ) : OString( "Picture " + OString::number( mnPictureIdMax++ )).getStr(),
XML_descr, bHaveDesc ? USS( sDescr ) : nullptr,
FSEND );
@@ -1208,7 +1208,7 @@ ShapeExport& ShapeExport::WriteConnectorShape( const Reference< XShape >& xShape
// non visual shape properties
pFS->startElementNS( mnXmlNamespace, XML_nvCxnSpPr, FSEND );
pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
- XML_id, I32S( GetNewShapeID( xShape ) ),
+ XML_id, IS( GetNewShapeID( xShape ) ),
XML_name, IDS( Line ),
FSEND );
// non visual connector shape drawing properties
@@ -1261,7 +1261,7 @@ ShapeExport& ShapeExport::WriteLineShape( const Reference< XShape >& xShape )
{
pFS->startElementNS( mnXmlNamespace, XML_nvSpPr, FSEND );
pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
- XML_id, I32S( GetNewShapeID( xShape ) ),
+ XML_id, IS( GetNewShapeID( xShape ) ),
XML_name, IDS( Line ),
FSEND );
}
@@ -1297,7 +1297,7 @@ ShapeExport& ShapeExport::WriteLineShape( const Reference< XShape >& xShape )
ShapeExport& ShapeExport::WriteNonVisualDrawingProperties( const Reference< XShape >& xShape, const char* pName )
{
GetFS()->singleElementNS( mnXmlNamespace, XML_cNvPr,
- XML_id, I32S( GetNewShapeID( xShape ) ),
+ XML_id, IS( GetNewShapeID( xShape ) ),
XML_name, pName,
FSEND );
@@ -1338,7 +1338,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( const Reference< XShape >& xShape
pFS->singleElementNS( mnXmlNamespace, XML_cNvSpPr, FSEND );
pFS->startElementNS( mnXmlNamespace, XML_nvSpPr, FSEND );
pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
- XML_id, I32S( GetNewShapeID( xShape ) ),
+ XML_id, IS( GetNewShapeID( xShape ) ),
XML_name, IDS( Rectangle ),
FSEND );
pFS->singleElementNS( mnXmlNamespace, XML_cNvSpPr, FSEND );
@@ -1485,7 +1485,7 @@ void ShapeExport::WriteTable( const Reference< XShape >& rXShape )
sal_Int32 nWidth(0);
xColPropSet->getPropertyValue( "Width" ) >>= nWidth;
- mpFS->singleElementNS( XML_a, XML_gridCol, XML_w, I64S(oox::drawingml::convertHmmToEmu(nWidth)), FSEND );
+ mpFS->singleElementNS( XML_a, XML_gridCol, XML_w, IS(oox::drawingml::convertHmmToEmu(nWidth)), FSEND );
}
mpFS->endElementNS( XML_a, XML_tblGrid );
@@ -1501,7 +1501,7 @@ void ShapeExport::WriteTable( const Reference< XShape >& rXShape )
xRowPropSet->getPropertyValue( "Height" ) >>= nRowHeight;
- mpFS->startElementNS( XML_a, XML_tr, XML_h, I64S( oox::drawingml::convertHmmToEmu( nRowHeight ) ), FSEND );
+ mpFS->startElementNS( XML_a, XML_tr, XML_h, IS( oox::drawingml::convertHmmToEmu( nRowHeight ) ), FSEND );
for( sal_Int32 nColumn = 0; nColumn < nColumnCount; nColumn++ )
{
Reference< XMergeableCell > xCell( xTable->getCellByPosition( nColumn, nRow ),
@@ -1515,8 +1515,8 @@ void ShapeExport::WriteTable( const Reference< XShape >& rXShape )
{
// having both : horizontal and vertical merge
mpFS->startElementNS(XML_a, XML_tc, XML_gridSpan,
- I32S(xCell->getColumnSpan()),
- XML_rowSpan, I32S(xCell->getRowSpan()),
+ IS(xCell->getColumnSpan()),
+ XML_rowSpan, IS(xCell->getRowSpan()),
FSEND);
// since, XMergeableCell doesn't have the information about
// cell having hMerge or vMerge.
@@ -1538,7 +1538,7 @@ void ShapeExport::WriteTable( const Reference< XShape >& rXShape )
{
// having : horizontal merge
mpFS->startElementNS(XML_a, XML_tc, XML_gridSpan,
- I32S(xCell->getColumnSpan()), FSEND);
+ IS(xCell->getColumnSpan()), FSEND);
for(sal_Int32 columnIndex = nColumn; columnIndex < nColumn + xCell->getColumnSpan(); ++columnIndex) {
sal_Int32 transposeIndexForMergeCell = (nRow*nColumnCount) + columnIndex;
mergedCellMap[transposeIndexForMergeCell] =
@@ -1549,7 +1549,7 @@ void ShapeExport::WriteTable( const Reference< XShape >& rXShape )
{
// having : vertical merge
mpFS->startElementNS(XML_a, XML_tc, XML_rowSpan,
- I32S(xCell->getRowSpan()), FSEND);
+ IS(xCell->getRowSpan()), FSEND);
for(sal_Int32 rowIndex = nRow; rowIndex < nRow + xCell->getRowSpan(); ++rowIndex) {
sal_Int32 transposeIndexForMergeCell = (rowIndex*nColumnCount) + nColumn;
@@ -1585,15 +1585,15 @@ void ShapeExport::WriteTable( const Reference< XShape >& rXShape )
{
// vMerge and has gridSpan
mpFS->startElementNS( XML_a, XML_tc,
- XML_vMerge, I32S(1),
- XML_gridSpan, I32S(xCell->getColumnSpan()),
+ XML_vMerge, IS(1),
+ XML_gridSpan, IS(xCell->getColumnSpan()),
FSEND );
}
else
{
// only vMerge
mpFS->startElementNS( XML_a, XML_tc,
- XML_vMerge, I32S(1), FSEND );
+ XML_vMerge, IS(1), FSEND );
}
}
else if(nRow == parentRowIndex)
@@ -1603,23 +1603,23 @@ void ShapeExport::WriteTable( const Reference< XShape >& rXShape )
{
// hMerge and has rowspan
mpFS->startElementNS( XML_a, XML_tc,
- XML_hMerge, I32S(1),
- XML_rowSpan, I32S(xCell->getRowSpan()),
+ XML_hMerge, IS(1),
+ XML_rowSpan, IS(xCell->getRowSpan()),
FSEND );
}
else
{
// only hMerge
mpFS->startElementNS( XML_a, XML_tc,
- XML_hMerge, I32S(1), FSEND );
+ XML_hMerge, IS(1), FSEND );
}
}
else
{
// has hMerge and vMerge
mpFS->startElementNS( XML_a, XML_tc,
- XML_vMerge, I32S(1),
- XML_hMerge, I32S(1),
+ XML_vMerge, IS(1),
+ XML_hMerge, IS(1),
FSEND );
}
}
@@ -1660,8 +1660,8 @@ void ShapeExport::WriteTableCellProperties(const Reference< XPropertySet>& xCell
aRightMargin >>= nRightMargin;
mpFS->startElementNS( XML_a, XML_tcPr,
- XML_marL, nLeftMargin > 0 ? I32S( oox::drawingml::convertHmmToEmu( nLeftMargin ) ) : nullptr,
- XML_marR, nRightMargin > 0 ? I32S( oox::drawingml::convertHmmToEmu( nRightMargin ) ): nullptr,
+ XML_marL, nLeftMargin > 0 ? IS( oox::drawingml::convertHmmToEmu( nLeftMargin ) ) : nullptr,
+ XML_marR, nRightMargin > 0 ? IS( oox::drawingml::convertHmmToEmu( nRightMargin ) ): nullptr,
FSEND );
// Write background fill for table cell.
@@ -1688,7 +1688,7 @@ void ShapeExport::WriteTableCellBorders(const Reference< XPropertySet>& xCellPro
if(nLeftBorder > 0)
{
- mpFS->startElementNS( XML_a, XML_lnL, XML_w, I32S(nLeftBorder), FSEND );
+ mpFS->startElementNS( XML_a, XML_lnL, XML_w, IS(nLeftBorder), FSEND );
DrawingML::WriteSolidFill(aLeftBorderColor);
mpFS->endElementNS( XML_a, XML_lnL );
}
@@ -1702,7 +1702,7 @@ void ShapeExport::WriteTableCellBorders(const Reference< XPropertySet>& xCellPro
if(nRightBorder > 0)
{
- mpFS->startElementNS( XML_a, XML_lnR, XML_w, I32S(nRightBorder), FSEND);
+ mpFS->startElementNS( XML_a, XML_lnR, XML_w, IS(nRightBorder), FSEND);
DrawingML::WriteSolidFill(aRightBorderColor);
mpFS->endElementNS( XML_a, XML_lnR);
}
@@ -1716,7 +1716,7 @@ void ShapeExport::WriteTableCellBorders(const Reference< XPropertySet>& xCellPro
if(nTopBorder > 0)
{
- mpFS->startElementNS( XML_a, XML_lnT, XML_w, I32S(nTopBorder), FSEND);
+ mpFS->startElementNS( XML_a, XML_lnT, XML_w, IS(nTopBorder), FSEND);
DrawingML::WriteSolidFill(aTopBorderColor);
mpFS->endElementNS( XML_a, XML_lnT);
}
@@ -1730,7 +1730,7 @@ void ShapeExport::WriteTableCellBorders(const Reference< XPropertySet>& xCellPro
if(nBottomBorder > 0)
{
- mpFS->startElementNS( XML_a, XML_lnB, XML_w, I32S(nBottomBorder), FSEND);
+ mpFS->startElementNS( XML_a, XML_lnB, XML_w, IS(nBottomBorder), FSEND);
DrawingML::WriteSolidFill(aBottomBorderColor);
mpFS->endElementNS( XML_a, XML_lnB);
}
@@ -1745,7 +1745,7 @@ ShapeExport& ShapeExport::WriteTableShape( const Reference< XShape >& xShape )
pFS->startElementNS( mnXmlNamespace, XML_nvGraphicFramePr, FSEND );
pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
- XML_id, I32S( GetNewShapeID( xShape ) ),
+ XML_id, IS( GetNewShapeID( xShape ) ),
XML_name, IDS(Table),
FSEND );
@@ -1994,7 +1994,7 @@ ShapeExport& ShapeExport::WriteOLE2Shape( const Reference< XShape >& xShape )
mpFS->startElementNS( mnXmlNamespace, XML_nvGraphicFramePr, FSEND );
mpFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
- XML_id, I32S( GetNewShapeID( xShape ) ),
+ XML_id, IS( GetNewShapeID( xShape ) ),
XML_name, IDS(Object),
FSEND );
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index c3d296878ab3..a4762d404daa 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -652,7 +652,7 @@ void PowerPointExport::WriteTransition( const FSHelperPtr& pFS )
pFS->startElementNS(XML_p, XML_transition,
XML_spd, speed,
- XML_advTm, advanceTiming != -1 ? I32S( advanceTiming*1000 ) : nullptr,
+ XML_advTm, advanceTiming != -1 ? IS( advanceTiming*1000 ) : nullptr,
FSEND );
if (nTransition14)
@@ -678,7 +678,7 @@ void PowerPointExport::WriteTransition( const FSHelperPtr& pFS )
pFS->startElementNS(XML_p, XML_transition,
XML_spd, speed,
- XML_advTm, advanceTiming != -1 ? I32S( advanceTiming*1000 ) : nullptr,
+ XML_advTm, advanceTiming != -1 ? IS( advanceTiming*1000 ) : nullptr,
FSEND );
if (!bOOXmlSpecificTransition)
@@ -826,7 +826,7 @@ void PowerPointExport::WriteAnimateValues( const FSHelperPtr& pFS, const Referen
if( aValues[ i ].hasValue() ) {
pFS->startElementNS( XML_p, XML_tav,
XML_fmla, sFormula.isEmpty() ? nullptr : USS( sFormula ),
- XML_tm, I32S( ( sal_Int32 )( aKeyTimes[ i ]*100000.0 ) ),
+ XML_tm, IS( ( sal_Int32 )( aKeyTimes[ i ]*100000.0 ) ),
FSEND );
pFS->startElementNS( XML_p, XML_val, FSEND );
ValuePair aPair;
@@ -892,13 +892,13 @@ void PowerPointExport::WriteAnimationTarget( const FSHelperPtr& pFS, const Any&
if( rXShape.is() ) {
pFS->startElementNS( XML_p, XML_tgtEl, FSEND );
pFS->startElementNS( XML_p, XML_spTgt,
- XML_spid, I32S( ShapeExport::GetShapeID( rXShape, &maShapeMap ) ),
+ XML_spid, IS( ShapeExport::GetShapeID( rXShape, &maShapeMap ) ),
FSEND );
if( bParagraphTarget ) {
pFS->startElementNS( XML_p, XML_txEl, FSEND );
pFS->singleElementNS( XML_p, XML_pRg,
- XML_st, I32S( nBegin ),
- XML_end, I32S( nEnd ),
+ XML_st, IS( nBegin ),
+ XML_end, IS( nEnd ),
FSEND );
pFS->endElementNS( XML_p, XML_txEl );
}
@@ -992,11 +992,11 @@ void PowerPointExport::WriteAnimationCondition( const FSHelperPtr& pFS, const ch
if( bHasFDelay || pDelay || pEvent ) {
if( !pEvent )
pFS->singleElementNS( XML_p, XML_cond,
- XML_delay, bHasFDelay ? I64S( (sal_uInt32) (fDelay*1000.0) ) : pDelay,
+ XML_delay, bHasFDelay ? IS( (sal_uInt32) (fDelay*1000.0) ) : pDelay,
FSEND );
else {
pFS->startElementNS( XML_p, XML_cond,
- XML_delay, bHasFDelay ? I64S( (sal_uInt32) (fDelay*1000.0) ) : pDelay,
+ XML_delay, bHasFDelay ? IS( (sal_uInt32) (fDelay*1000.0) ) : pDelay,
XML_evt, pEvent,
FSEND );
@@ -1214,14 +1214,14 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( const FSHelperPtr& pF
}
pFS->startElementNS( XML_p, XML_cTn,
- XML_id, I64S( mnAnimationNodeIdMax ++ ),
- XML_dur, fDuration != 0 ? I32S( (sal_Int32) ( fDuration * 1000.0 ) ) : pDuration,
+ XML_id, IS( mnAnimationNodeIdMax ++ ),
+ XML_dur, fDuration != 0 ? IS( (sal_Int32) ( fDuration * 1000.0 ) ) : pDuration,
XML_restart, pRestart,
XML_nodeType, pNodeType,
XML_fill, pFill,
XML_presetClass, pPresetClass,
- XML_presetID, bPresetId ? I64S( nPresetId ) : nullptr,
- XML_presetSubtype, bPresetSubType ? I64S( nPresetSubType ) : nullptr,
+ XML_presetID, bPresetId ? IS( nPresetId ) : nullptr,
+ XML_presetSubtype, bPresetSubType ? IS( nPresetSubType ) : nullptr,
FSEND );
aAny = rXNode->getBegin();
@@ -1414,11 +1414,11 @@ void PowerPointExport::WriteAuthors()
for( const AuthorsMap::value_type& i : maAuthors ) {
pFS->singleElementNS( XML_p, XML_cmAuthor,
- XML_id, I32S( i.second.nId ),
+ XML_id, IS( i.second.nId ),
XML_name, USS( i.first ),
XML_initials, USS( lcl_GetInitials( i.first ) ),
- XML_lastIdx, I32S( i.second.nLastIndex ),
- XML_clrIdx, I32S( i.second.nId ),
+ XML_lastIdx, IS( i.second.nLastIndex ),
+ XML_clrIdx, IS( i.second.nId ),
FSEND );
}
@@ -1473,14 +1473,14 @@ bool PowerPointExport::WriteComments( sal_uInt32 nPageNum )
snprintf(cDateTime, 31, "%02d-%02d-%02dT%02d:%02d:%02d.%09" SAL_PRIuUINT32, aDateTime.Year, aDateTime.Month, aDateTime.Day, aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.NanoSeconds);
pFS->startElementNS( XML_p, XML_cm,
- XML_authorId, I32S( nId ),
+ XML_authorId, IS( nId ),
XML_dt, cDateTime,
- XML_idx, I32S( nLastIndex ),
+ XML_idx, IS( nLastIndex ),
FSEND );
pFS->singleElementNS( XML_p, XML_pos,
- XML_x, I64S( ( (sal_Int64) ( 57600*aRealPoint2D.X + 1270 )/2540.0 ) ),
- XML_y, I64S( ( (sal_Int64) ( 57600*aRealPoint2D.Y + 1270 )/2540.0 ) ),
+ XML_x, IS( ( (sal_Int64) ( 57600*aRealPoint2D.X + 1270 )/2540.0 ) ),
+ XML_y, IS( ( (sal_Int64) ( 57600*aRealPoint2D.Y + 1270 )/2540.0 ) ),
FSEND );
pFS->startElementNS( XML_p, XML_text,
@@ -1520,7 +1520,7 @@ void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNu
.makeStringAndClear() );
mPresentationFS->singleElementNS( XML_p, XML_sldId,
- XML_id, I32S( GetNewSlideId() ),
+ XML_id, IS( GetNewSlideId() ),
FSNS( XML_r, XML_id ), USS( sRelId ),
FSEND );
@@ -1651,7 +1651,7 @@ void PowerPointExport::AddLayoutIdAndRelation( const FSHelperPtr& pFS, sal_Int32
.makeStringAndClear() );
pFS->singleElementNS( XML_p, XML_sldLayoutId,
- XML_id, I64S( GetNewSlideMasterId() ),
+ XML_id, IS( GetNewSlideMasterId() ),
FSNS( XML_r, XML_id ), USS( sRelId ),
FSEND );
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 88acbf8b93e7..9224c902c0df 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4190,10 +4190,10 @@ void DocxAttributeOutput::WriteSrcRect(const SdrObject* pSdrObj, const SwFrameFo
double bottom = nCropB * heightMultiplier;
m_pSerializer->singleElementNS( XML_a, XML_srcRect,
- XML_l, I32S(left),
- XML_t, I32S(top),
- XML_r, I32S(right),
- XML_b, I32S(bottom),
+ XML_l, IS(left),
+ XML_t, IS(top),
+ XML_r, IS(right),
+ XML_b, IS(bottom),
FSEND );
}
}
@@ -4522,7 +4522,7 @@ void DocxAttributeOutput::WritePostponedChart()
docPr Id should be unique, ensuring the same here.
*/
m_pSerializer->singleElementNS( XML_wp, XML_docPr,
- XML_id, I32S( m_anchorId++ ),
+ XML_id, IS( m_anchorId++ ),
XML_name, USS( sName ),
FSEND );
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 4426227871b2..78798095dfcb 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -623,9 +623,9 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons
OString aWidth(OString::number(TwipsToEMU(cx)));
//we explicitly check the converted EMU value for the range as mentioned in above comment.
- aWidth = (aWidth.toInt64() > 0 ? (aWidth.toInt64() > MAX_INTEGER_VALUE ? I64S(MAX_INTEGER_VALUE) : aWidth.getStr()): "0");
+ aWidth = (aWidth.toInt64() > 0 ? (aWidth.toInt64() > MAX_INTEGER_VALUE ? IS(MAX_INTEGER_VALUE) : aWidth.getStr()): "0");
OString aHeight(OString::number(TwipsToEMU(cy)));
- aHeight = (aHeight.toInt64() > 0 ? (aHeight.toInt64() > MAX_INTEGER_VALUE ? I64S(MAX_INTEGER_VALUE) : aHeight.getStr()): "0");
+ aHeight = (aHeight.toInt64() > 0 ? (aHeight.toInt64() > MAX_INTEGER_VALUE ? IS(MAX_INTEGER_VALUE) : aHeight.getStr()): "0");
m_pImpl->m_pSerializer->singleElementNS(XML_wp, XML_extent,
XML_cx, aWidth,
@@ -1550,8 +1550,8 @@ void DocxSdrExport::writeDMLTextFrame(ww8::Frame* pParentFrame, int nAnchorId, b
{
//not the first in the chain, so write the tag as linkedTxbx
pFS->singleElementNS(XML_wps, XML_linkedTxbx,
- XML_id, I32S(linkedTextboxesIter->second.nId),
- XML_seq, I32S(linkedTextboxesIter->second.nSeq),
+ XML_id, IS(linkedTextboxesIter->second.nId),
+ XML_seq, IS(linkedTextboxesIter->second.nSeq),
FSEND);
/* no text content should be added to this tag,
since the textbox is linked, the entire content
@@ -1565,7 +1565,7 @@ void DocxSdrExport::writeDMLTextFrame(ww8::Frame* pParentFrame, int nAnchorId, b
to this block*/
//since the text box is linked, it needs an id.
pFS->startElementNS(XML_wps, XML_txbx,
- XML_id, I32S(linkedTextboxesIter->second.nId),
+ XML_id, IS(linkedTextboxesIter->second.nId),
FSEND);
isTxbxLinked = true ;
}
More information about the Libreoffice-commits
mailing list