Kaydet (Commit) 0500f7bc authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:defaultparams

Change-Id: I0f5d4deb3d6f8445251867638a4ec812762ced56
üst 5fd044fc
...@@ -430,7 +430,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName( ...@@ -430,7 +430,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName(
OUString *pLocalName, OUString *pLocalName,
sal_uInt16 /*nIdxGuess*/) const sal_uInt16 /*nIdxGuess*/) const
{ {
return _GetKeyByAttrName( rAttrName, 0, pLocalName, 0 ); return _GetKeyByAttrName( rAttrName, 0, pLocalName );
} }
sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName( const OUString& rAttrName, sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName( const OUString& rAttrName,
......
...@@ -2231,8 +2231,7 @@ OUString SvXMLExport::GetRelativeReference(const OUString& rValue) ...@@ -2231,8 +2231,7 @@ OUString SvXMLExport::GetRelativeReference(const OUString& rValue)
//conversion for matching schemes only //conversion for matching schemes only
if( xUriRef->getScheme() == mpImpl->msPackageURIScheme ) if( xUriRef->getScheme() == mpImpl->msPackageURIScheme )
{ {
sValue = INetURLObject::GetRelURL( msOrigFileName, sValue, sValue = INetURLObject::GetRelURL( msOrigFileName, sValue );
INetURLObject::WAS_ENCODED, INetURLObject::DECODE_TO_IURI );
} }
} }
return sValue; return sValue;
......
...@@ -527,19 +527,19 @@ bool SvXMLUnitConverter::convertB3DVector( ::basegfx::B3DVector& rVector, const ...@@ -527,19 +527,19 @@ bool SvXMLUnitConverter::convertB3DVector( ::basegfx::B3DVector& rVector, const
rtl_math_ConversionStatus eStatus; rtl_math_ConversionStatus eStatus;
rVector.setX(::rtl::math::stringToDouble(aContentX, '.', rVector.setX(::rtl::math::stringToDouble(aContentX, '.',
',', &eStatus, NULL)); ',', &eStatus));
if( eStatus != rtl_math_ConversionStatus_Ok ) if( eStatus != rtl_math_ConversionStatus_Ok )
return false; return false;
rVector.setY(::rtl::math::stringToDouble(aContentY, '.', rVector.setY(::rtl::math::stringToDouble(aContentY, '.',
',', &eStatus, NULL)); ',', &eStatus));
if( eStatus != rtl_math_ConversionStatus_Ok ) if( eStatus != rtl_math_ConversionStatus_Ok )
return false; return false;
rVector.setZ(::rtl::math::stringToDouble(aContentZ, '.', rVector.setZ(::rtl::math::stringToDouble(aContentZ, '.',
',', &eStatus, NULL)); ',', &eStatus));
return ( eStatus == rtl_math_ConversionStatus_Ok ); return ( eStatus == rtl_math_ConversionStatus_Ok );
......
...@@ -144,7 +144,7 @@ void GetDoublePercentage( std::vector< com::sun::star::beans::PropertyValue >& r ...@@ -144,7 +144,7 @@ void GetDoublePercentage( std::vector< com::sun::star::beans::PropertyValue >& r
{ {
rtl_math_ConversionStatus eStatus; rtl_math_ConversionStatus eStatus;
double fAttrDouble = ::rtl::math::stringToDouble( rValue, double fAttrDouble = ::rtl::math::stringToDouble( rValue,
'.', ',', &eStatus, NULL ); '.', ',', &eStatus );
if ( eStatus == rtl_math_ConversionStatus_Ok ) if ( eStatus == rtl_math_ConversionStatus_Ok )
{ {
beans::PropertyValue aProp; beans::PropertyValue aProp;
......
...@@ -1528,7 +1528,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress ) ...@@ -1528,7 +1528,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
{ {
Reference<XTextContent> xTxtCntnt(xTextFramesEnum->nextElement(), UNO_QUERY); Reference<XTextContent> xTxtCntnt(xTextFramesEnum->nextElement(), UNO_QUERY);
if(xTxtCntnt.is()) if(xTxtCntnt.is())
exportTextFrame(xTxtCntnt, bAutoStyles, bIsProgress, bExportContent, 0); exportTextFrame(xTxtCntnt, bAutoStyles, bIsProgress, bExportContent);
} }
// Export graphic objects: // Export graphic objects:
...@@ -1538,7 +1538,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress ) ...@@ -1538,7 +1538,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
{ {
Reference<XTextContent> xTxtCntnt(xGraphicsEnum->nextElement(), UNO_QUERY); Reference<XTextContent> xTxtCntnt(xGraphicsEnum->nextElement(), UNO_QUERY);
if(xTxtCntnt.is()) if(xTxtCntnt.is())
exportTextGraphic(xTxtCntnt, true, 0); exportTextGraphic(xTxtCntnt, true);
} }
// Export embedded objects: // Export embedded objects:
...@@ -1548,7 +1548,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress ) ...@@ -1548,7 +1548,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
{ {
Reference<XTextContent> xTxtCntnt(xEmbeddedsEnum->nextElement(), UNO_QUERY); Reference<XTextContent> xTxtCntnt(xEmbeddedsEnum->nextElement(), UNO_QUERY);
if(xTxtCntnt.is()) if(xTxtCntnt.is())
exportTextEmbedded(xTxtCntnt, true, 0); exportTextEmbedded(xTxtCntnt, true);
} }
// Export shapes: // Export shapes:
...@@ -1561,7 +1561,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress ) ...@@ -1561,7 +1561,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
{ {
Reference<XServiceInfo> xServiceInfo(xTxtCntnt, UNO_QUERY); Reference<XServiceInfo> xServiceInfo(xTxtCntnt, UNO_QUERY);
if( xServiceInfo->supportsService(sShapeService)) if( xServiceInfo->supportsService(sShapeService))
exportShape(xTxtCntnt, true, 0); exportShape(xTxtCntnt, true);
} }
} }
...@@ -2147,7 +2147,7 @@ void XMLTextParagraphExport::exportParagraph( ...@@ -2147,7 +2147,7 @@ void XMLTextParagraphExport::exportParagraph(
if( bHasContentEnum ) if( bHasContentEnum )
exportTextContentEnumeration( exportTextContentEnumeration(
xContentEnum, bAutoStyles, xSection, xContentEnum, bAutoStyles, xSection,
bIsProgress, true, 0 ); bIsProgress );
if ( bHasPortions ) if ( bHasPortions )
exportTextRangeEnumeration( xTextEnum, bAutoStyles, bIsProgress ); exportTextRangeEnumeration( xTextEnum, bAutoStyles, bIsProgress );
} }
......
...@@ -141,13 +141,13 @@ void XMLTextParagraphExport::exportTextStyles( bool bUsed, bool bProg ) ...@@ -141,13 +141,13 @@ void XMLTextParagraphExport::exportTextStyles( bool bUsed, bool bProg )
} }
} }
exportStyleFamily( "ParagraphStyles", GetXMLToken(XML_PARAGRAPH), GetParaPropMapper(), 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(), exportStyleFamily( "CharacterStyles", GetXMLToken(XML_TEXT), GetTextPropMapper(),
bUsed, XML_STYLE_FAMILY_TEXT_TEXT ); bUsed, XML_STYLE_FAMILY_TEXT_TEXT );
// get shape export to make sure the frame family is added correctly. // get shape export to make sure the frame family is added correctly.
GetExport().GetShapeExport(); GetExport().GetShapeExport();
exportStyleFamily( "FrameStyles", OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), GetFramePropMapper(), 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 ); exportNumStyles( bUsed );
if( !IsBlockMode() ) if( !IsBlockMode() )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment