summaryrefslogtreecommitdiff
path: root/sc/source/filter
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-19 17:50:50 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-19 17:50:50 +0200
commitbbc6414be17799b90ef84b1cecab76ee10dede9b (patch)
treee9c2b2b32110f721a76a0893c388a49eca67e3b3 /sc/source/filter
parentd14b6230ded413be419591b929beed58fc1bbc77 (diff)
loplugin:defaultparams
Change-Id: I9bfa7be4a8035d6dfbd0bd13505ba13c3d085455
Diffstat (limited to 'sc/source/filter')
-rw-r--r--sc/source/filter/excel/xechart.cxx2
-rw-r--r--sc/source/filter/html/htmlexp.cxx4
-rw-r--r--sc/source/filter/oox/pagesettings.cxx8
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx2
4 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index 1cc23139673e..e3c18f02e7e0 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -1181,7 +1181,7 @@ void XclExpChText::ConvertTitle( Reference< XTitle > xTitle, sal_uInt16 nTarget,
{
case EXC_CHOBJLINK_TITLE: SetFutureRecordContext( EXC_CHFRBLOCK_TEXT_TITLE ); break;
case EXC_CHOBJLINK_YAXIS: SetFutureRecordContext( EXC_CHFRBLOCK_TEXT_AXISTITLE, 1 ); break;
- case EXC_CHOBJLINK_XAXIS: SetFutureRecordContext( EXC_CHFRBLOCK_TEXT_AXISTITLE, 0 ); break;
+ case EXC_CHOBJLINK_XAXIS: SetFutureRecordContext( EXC_CHFRBLOCK_TEXT_AXISTITLE ); break;
case EXC_CHOBJLINK_ZAXIS: SetFutureRecordContext( EXC_CHFRBLOCK_TEXT_AXISTITLE, 2 ); break;
}
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index f274326bd9c8..215da0534bcd 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -618,7 +618,7 @@ void ScHTMLExport::WriteBody()
{
aGrfNm = URIHelper::SmartRel2Abs(
INetURLObject(aBaseURL),
- aGrfNm, URIHelper::GetMaybeFileHdl(), true, false);
+ aGrfNm, URIHelper::GetMaybeFileHdl());
if ( HasCId() )
MakeCIdURL( aGrfNm );
aLink = aGrfNm;
@@ -637,7 +637,7 @@ void ScHTMLExport::WriteBody()
else
aGrfNm = URIHelper::SmartRel2Abs(
INetURLObject(aBaseURL),
- aGrfNm, URIHelper::GetMaybeFileHdl(), true, false);
+ aGrfNm, URIHelper::GetMaybeFileHdl());
aLink = aGrfNm;
}
if( !aLink.isEmpty() )
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index 07afbe37bc14..3e9c17e7934f 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -157,10 +157,10 @@ void PageSettings::importPageSetup( const Relations& rRelations, const Attribute
maModel.mnPaperSize = rAttribs.getInteger( XML_paperSize, 1 );
aStr = rAttribs.getString ( XML_paperWidth, OUString() );
::sax::Converter::convertMeasure(
- maModel.mnPaperWidth, aStr, util::MeasureUnit::MM_100TH);
+ maModel.mnPaperWidth, aStr);
aStr = rAttribs.getString ( XML_paperHeight, OUString() );
::sax::Converter::convertMeasure(
- maModel.mnPaperHeight, aStr, util::MeasureUnit::MM_100TH );
+ maModel.mnPaperHeight, aStr );
maModel.mnCopies = rAttribs.getInteger( XML_copies, 1 );
maModel.mnScale = rAttribs.getInteger( XML_scale, 100 );
maModel.mnFirstPage = rAttribs.getInteger( XML_firstPageNumber, 1 );
@@ -185,10 +185,10 @@ void PageSettings::importChartPageSetup( const Relations& rRelations, const Attr
maModel.mnPaperSize = rAttribs.getInteger( XML_paperSize, 1 );
aStr = rAttribs.getString ( XML_paperWidth, OUString() );
::sax::Converter::convertMeasure(
- maModel.mnPaperWidth, aStr, util::MeasureUnit::MM_100TH );
+ maModel.mnPaperWidth, aStr );
aStr = rAttribs.getString ( XML_paperHeight, OUString() );
::sax::Converter::convertMeasure(
- maModel.mnPaperHeight, aStr, util::MeasureUnit::MM_100TH );
+ maModel.mnPaperHeight, aStr );
maModel.mnCopies = rAttribs.getInteger( XML_copies, 1 );
maModel.mnFirstPage = rAttribs.getInteger( XML_firstPageNumber, 1 );
maModel.mnHorPrintRes = rAttribs.getInteger( XML_horizontalDpi, 600 );
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 9ec4c0c41f41..0853d35b61e1 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3092,7 +3092,7 @@ void ScXMLExport::WriteCell(ScMyCell& aCell, sal_Int32 nEqualCellCount)
OUString sFormattedString(lcl_GetFormattedString(pDoc, aCell.maCellAddress));
OUString sCellString = aCell.maBaseCell.getString(pDoc);
GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
- sCellString, sFormattedString, true, true);
+ sCellString, sFormattedString);
if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
GetNumberFormatAttributesExportHelper()->SetNumberFormatAttributes(
sCellString, sFormattedString, false, true, XML_NAMESPACE_CALC_EXT);