summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-20 11:47:26 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-20 11:47:26 +0200
commit0500f7bcc868a6c9c5373e48f9e0b17328929433 (patch)
tree13bdf5cb4569c2661e78cf591d92505b09d69f24 /xmloff
parent5fd044fc61271e744b9a443002d95db9e99ca903 (diff)
loplugin:defaultparams
Change-Id: I0f5d4deb3d6f8445251867638a4ec812762ced56
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/core/nmspmap.cxx2
-rw-r--r--xmloff/source/core/xmlexp.cxx3
-rw-r--r--xmloff/source/core/xmluconv.cxx6
-rw-r--r--xmloff/source/draw/ximpcustomshape.cxx2
-rw-r--r--xmloff/source/text/txtparae.cxx10
-rw-r--r--xmloff/source/text/txtstyle.cxx4
6 files changed, 13 insertions, 14 deletions
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index c05fd934d954..77fe129e1587 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -430,7 +430,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName(
OUString *pLocalName,
sal_uInt16 /*nIdxGuess*/) const
{
- return _GetKeyByAttrName( rAttrName, 0, pLocalName, 0 );
+ return _GetKeyByAttrName( rAttrName, 0, pLocalName );
}
sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName( const OUString& rAttrName,
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 505e52ca1972..705fd4f3835a 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -2231,8 +2231,7 @@ OUString SvXMLExport::GetRelativeReference(const OUString& rValue)
//conversion for matching schemes only
if( xUriRef->getScheme() == mpImpl->msPackageURIScheme )
{
- sValue = INetURLObject::GetRelURL( msOrigFileName, sValue,
- INetURLObject::WAS_ENCODED, INetURLObject::DECODE_TO_IURI );
+ sValue = INetURLObject::GetRelURL( msOrigFileName, sValue );
}
}
return sValue;
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index bbca3fe41d2f..27562d63e362 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -527,19 +527,19 @@ bool SvXMLUnitConverter::convertB3DVector( ::basegfx::B3DVector& rVector, const
rtl_math_ConversionStatus eStatus;
rVector.setX(::rtl::math::stringToDouble(aContentX, '.',
- ',', &eStatus, NULL));
+ ',', &eStatus));
if( eStatus != rtl_math_ConversionStatus_Ok )
return false;
rVector.setY(::rtl::math::stringToDouble(aContentY, '.',
- ',', &eStatus, NULL));
+ ',', &eStatus));
if( eStatus != rtl_math_ConversionStatus_Ok )
return false;
rVector.setZ(::rtl::math::stringToDouble(aContentZ, '.',
- ',', &eStatus, NULL));
+ ',', &eStatus));
return ( eStatus == rtl_math_ConversionStatus_Ok );
diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx
index e7516973d8f2..5bb006cf9720 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -144,7 +144,7 @@ void GetDoublePercentage( std::vector< com::sun::star::beans::PropertyValue >& r
{
rtl_math_ConversionStatus eStatus;
double fAttrDouble = ::rtl::math::stringToDouble( rValue,
- '.', ',', &eStatus, NULL );
+ '.', ',', &eStatus );
if ( eStatus == rtl_math_ConversionStatus_Ok )
{
beans::PropertyValue aProp;
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index dcad869b969e..fdca9f6e9097 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -1528,7 +1528,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
{
Reference<XTextContent> xTxtCntnt(xTextFramesEnum->nextElement(), UNO_QUERY);
if(xTxtCntnt.is())
- exportTextFrame(xTxtCntnt, bAutoStyles, bIsProgress, bExportContent, 0);
+ exportTextFrame(xTxtCntnt, bAutoStyles, bIsProgress, bExportContent);
}
// Export graphic objects:
@@ -1538,7 +1538,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
{
Reference<XTextContent> xTxtCntnt(xGraphicsEnum->nextElement(), UNO_QUERY);
if(xTxtCntnt.is())
- exportTextGraphic(xTxtCntnt, true, 0);
+ exportTextGraphic(xTxtCntnt, true);
}
// Export embedded objects:
@@ -1548,7 +1548,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
{
Reference<XTextContent> xTxtCntnt(xEmbeddedsEnum->nextElement(), UNO_QUERY);
if(xTxtCntnt.is())
- exportTextEmbedded(xTxtCntnt, true, 0);
+ exportTextEmbedded(xTxtCntnt, true);
}
// Export shapes:
@@ -1561,7 +1561,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
{
Reference<XServiceInfo> xServiceInfo(xTxtCntnt, UNO_QUERY);
if( xServiceInfo->supportsService(sShapeService))
- exportShape(xTxtCntnt, true, 0);
+ exportShape(xTxtCntnt, true);
}
}
@@ -2147,7 +2147,7 @@ void XMLTextParagraphExport::exportParagraph(
if( bHasContentEnum )
exportTextContentEnumeration(
xContentEnum, bAutoStyles, xSection,
- bIsProgress, true, 0 );
+ bIsProgress );
if ( bHasPortions )
exportTextRangeEnumeration( xTextEnum, bAutoStyles, bIsProgress );
}
diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx
index 4ccef23b62af..877efefc2d82 100644
--- a/xmloff/source/text/txtstyle.cxx
+++ b/xmloff/source/text/txtstyle.cxx
@@ -141,13 +141,13 @@ void XMLTextParagraphExport::exportTextStyles( bool bUsed, bool bProg )
}
}
exportStyleFamily( "ParagraphStyles", GetXMLToken(XML_PARAGRAPH), GetParaPropMapper(),
- bUsed, XML_STYLE_FAMILY_TEXT_PARAGRAPH, 0);
+ bUsed, XML_STYLE_FAMILY_TEXT_PARAGRAPH);
exportStyleFamily( "CharacterStyles", GetXMLToken(XML_TEXT), GetTextPropMapper(),
bUsed, XML_STYLE_FAMILY_TEXT_TEXT );
// get shape export to make sure the frame family is added correctly.
GetExport().GetShapeExport();
exportStyleFamily( "FrameStyles", OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), GetFramePropMapper(),
- bUsed, XML_STYLE_FAMILY_TEXT_FRAME, 0);
+ bUsed, XML_STYLE_FAMILY_TEXT_FRAME);
exportNumStyles( bUsed );
if( !IsBlockMode() )
{