summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-14 11:21:35 +0200
committerNoel Grandin <noel@peralex.com>2015-08-14 11:21:35 +0200
commit33fe6b93114964c7578f34df28211d846966a5a4 (patch)
treef1e495a00877a28aecf92434dbd5420808134dc0 /sc/source
parentfef9472dcc89688c89b15b997857abb94cb22f47 (diff)
loplugin: defaultparams
Change-Id: Id5cdb8516db9e9017de06c3ab6e25f272c945677
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/filter/excel/excrecds.cxx2
-rw-r--r--sc/source/filter/excel/expop2.cxx2
-rw-r--r--sc/source/filter/excel/xeformula.cxx2
-rw-r--r--sc/source/filter/excel/xltools.cxx2
-rw-r--r--sc/source/filter/html/htmlexp.cxx4
-rw-r--r--sc/source/filter/html/htmlpars.cxx2
-rw-r--r--sc/source/filter/lotus/tool.cxx18
-rw-r--r--sc/source/filter/oox/biffinputstream.cxx2
-rw-r--r--sc/source/filter/oox/drawingfragment.cxx2
-rw-r--r--sc/source/filter/oox/formulabuffer.cxx4
-rw-r--r--sc/source/filter/oox/workbookhelper.cxx2
-rw-r--r--sc/source/filter/orcus/interface.cxx4
-rw-r--r--sc/source/filter/qpro/qpro.cxx2
-rw-r--r--sc/source/filter/rtf/expbase.cxx2
-rw-r--r--sc/source/filter/starcalc/scflt.cxx8
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx3
-rw-r--r--sc/source/filter/xml/xmlcoli.cxx2
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx11
-rw-r--r--sc/source/filter/xml/xmlrowi.cxx2
-rw-r--r--sc/source/filter/xml/xmlstyli.cxx2
-rw-r--r--sc/source/filter/xml/xmltabi.cxx2
21 files changed, 39 insertions, 41 deletions
diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index 5df0787b4768..aa6c06208266 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -1011,7 +1011,7 @@ void ExcAutoFilterRecs::AddObjRecs()
{
XclObj* pObjRec = new XclObjDropDown( GetObjectManager(), aAddr, IsFiltered( nObj ) );
GetObjectManager().AddObj( pObjRec );
- aAddr.IncCol( 1 );
+ aAddr.IncCol();
}
}
}
diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx
index f9726f642403..b81e5d0eb154 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -93,7 +93,7 @@ FltError ExportBiff5::Write()
if ( SvtFilterOptions::Get().IsEnableCalcPreview() )
{
std::shared_ptr<GDIMetaFile> xMetaFile =
- pDocShell->GetPreviewMetaFile (false);
+ pDocShell->GetPreviewMetaFile();
uno::Sequence<sal_uInt8> metaFile(
sfx2::convertMetaFile(xMetaFile.get()));
sfx2::SaveOlePropertySet(xDocProps, xRootStrg, &metaFile);
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 2f1c6222415b..511c6435e3a2 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -1644,7 +1644,7 @@ void XclExpFmlaCompImpl::AppendDefaultParam( XclExpFuncData& rFuncData )
// Do not write the OOXML <definedName> element for new _xlfn.
// prefixed functions.
if (GetOutput() == EXC_OUTPUT_XML_2007)
- AppendNameToken( 0, 0); // dummy to keep parameter count valid
+ AppendNameToken( 0 ); // dummy to keep parameter count valid
else
AppendMacroCallToken( rFuncData.GetExtFuncData() );
}
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index 4dde77c93c87..ddf0e615afe9 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -690,7 +690,7 @@ const OUString XclTools::maSbMacroSuffix( "?language=Basic&location=document" );
OUString XclTools::GetSbMacroUrl( const OUString& rMacroName, SfxObjectShell* pDocShell )
{
OSL_ENSURE( !rMacroName.isEmpty(), "XclTools::GetSbMacroUrl - macro name is empty" );
- ::ooo::vba::MacroResolvedInfo aMacroInfo = ::ooo::vba::resolveVBAMacro( pDocShell, rMacroName, false );
+ ::ooo::vba::MacroResolvedInfo aMacroInfo = ::ooo::vba::resolveVBAMacro( pDocShell, rMacroName );
if( aMacroInfo.mbFound )
return ::ooo::vba::makeMacroURL( aMacroInfo.msResolvedMacro );
return OUString();
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 94c1cc069408..fef9390872a8 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -437,7 +437,7 @@ const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab )
// remember defaults for compare in WriteCell
if ( !aHTMLStyle.bInitialized )
{
- pStylePool->SetSearchMask( SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL );
+ pStylePool->SetSearchMask( SFX_STYLE_FAMILY_PARA );
pStyleSheet = pStylePool->Find(
ScGlobal::GetRscString(STR_STYLENAME_STANDARD),
SFX_STYLE_FAMILY_PARA );
@@ -460,7 +460,7 @@ const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab )
// Page style sheet printer settings, e.g. for background graphics.
// There's only one background graphic in HTML!
- pStylePool->SetSearchMask( SFX_STYLE_FAMILY_PAGE, SFXSTYLEBIT_ALL );
+ pStylePool->SetSearchMask( SFX_STYLE_FAMILY_PAGE );
pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nTab ), SFX_STYLE_FAMILY_PAGE );
OSL_ENSURE( pStyleSheet, "PageStyle not found! :-(" );
if (!pStyleSheet)
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 178796b4cefc..2559f13094bc 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1987,7 +1987,7 @@ ScHTMLSize ScHTMLTable::GetSpan( const ScHTMLPos& rCellPos ) const
ScHTMLTable* ScHTMLTable::FindNestedTable( ScHTMLTableId nTableId ) const
{
- return mxNestedTables.get() ? mxNestedTables->FindTable( nTableId, true ) : 0;
+ return mxNestedTables.get() ? mxNestedTables->FindTable( nTableId ) : 0;
}
void ScHTMLTable::PutItem( const SfxPoolItem& rItem )
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index 6bc124c37484..aec53f3d5542 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -190,49 +190,49 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt )
nIndex1 = pFormTable->GetStandardFormat(
css::util::NumberFormat::NUMBER, eLanguage );
aFormString = pFormTable->GenerateFormat(nIndex1,
- eLanguage, false, false, nL, 1);
+ eLanguage, false, false, nL);
break;
case 0x01: // scientific notation
//fExponent;nL;
nIndex1 = pFormTable->GetStandardFormat(
css::util::NumberFormat::SCIENTIFIC, eLanguage );
aFormString = pFormTable->GenerateFormat(nIndex1,
- eLanguage, false, false, nL, 1);
+ eLanguage, false, false, nL);
break;
case 0x02: // currency
//fMoney;nL;
nIndex1 = pFormTable->GetStandardFormat(
css::util::NumberFormat::CURRENCY, eLanguage );
aFormString = pFormTable->GenerateFormat(nIndex1,
- eLanguage, false, false, nL, 1);
+ eLanguage, false, false, nL);
break;
case 0x03: // percentage
//fPercent;nL;
nIndex1 = pFormTable->GetStandardFormat(
css::util::NumberFormat::PERCENT, eLanguage );
aFormString = pFormTable->GenerateFormat(nIndex1,
- eLanguage, false, false, nL, 1);
+ eLanguage, false, false, nL);
break;
case 0x04: // Decimal
//fStandard;nL;
nIndex1 = pFormTable->GetStandardFormat(
css::util::NumberFormat::NUMBER, eLanguage );
aFormString = pFormTable->GenerateFormat(nIndex1,
- eLanguage, true, false, nL, 1);
+ eLanguage, true, false, nL);
break;
case 0x05: // unspecified
//fStandard;nL;
nIndex1 = pFormTable->GetStandardFormat(
css::util::NumberFormat::NUMBER, eLanguage );
aFormString = pFormTable->GenerateFormat(nIndex1,
- eLanguage, false, false, nL, 1);
+ eLanguage, false, false, nL);
break;
case 0x06: // unspecified
//fStandard;nL;
nIndex1 = pFormTable->GetStandardFormat(
css::util::NumberFormat::NUMBER, eLanguage );
aFormString = pFormTable->GenerateFormat(nIndex1,
- eLanguage, false, false, nL, 1);
+ eLanguage, false, false, nL);
nIndex1 = 0;
break;
case 0x07: // Special format
@@ -243,14 +243,14 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt )
nIndex1 = pFormTable->GetStandardFormat(
css::util::NumberFormat::NUMBER, eLanguage );
aFormString = pFormTable->GenerateFormat(nIndex1,
- eLanguage, false, true, nSt, 1);
+ eLanguage, false, true, nSt);
break;
case 0x01: // general Format
//fStandard;nSt;
nIndex1 = pFormTable->GetStandardFormat(
css::util::NumberFormat::NUMBER, eLanguage );
aFormString = pFormTable->GenerateFormat(nIndex1,
- eLanguage, false, false, nSt, 1);
+ eLanguage, false, false, nSt);
break;
case 0x02: // Date: Day, Month, Year
//fDate;dfDayMonthYearLong;
diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx
index 49450cf52f2d..ab49d5fe0c41 100644
--- a/sc/source/filter/oox/biffinputstream.cxx
+++ b/sc/source/filter/oox/biffinputstream.cxx
@@ -386,7 +386,7 @@ void BiffInputStream::setupRecord()
mbHasComplRec = !mbCont;
mbEof = !isInRecord();
// enable decoder in new record
- enableDecoder( true );
+ enableDecoder();
}
void BiffInputStream::restartRecord( bool bInvalidateRecSize )
diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx
index d1824eccf04e..c97da72b5f02 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -689,7 +689,7 @@ sal_uInt32 VmlDrawing::convertControlTextColor( const OUString& rTextColor ) con
sal_Int32 nColorToken = AttributeConversion::decodeToken( rTextColor );
sal_Int32 nRgbValue = Color::getVmlPresetColor( nColorToken, API_RGB_TRANSPARENT );
if( nRgbValue == API_RGB_TRANSPARENT )
- nRgbValue = rGraphicHelper.getSystemColor( nColorToken, API_RGB_TRANSPARENT );
+ nRgbValue = rGraphicHelper.getSystemColor( nColorToken );
if( nRgbValue != API_RGB_TRANSPARENT )
return OleHelper::encodeOleColor( nRgbValue );
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index 189017d65196..39a7d3e4b7fe 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -158,7 +158,7 @@ void applySharedFormulas(
if (it->maCellValue.isEmpty())
{
// No cached cell value. Mark it for re-calculation.
- pCell->SetDirty(true);
+ pCell->SetDirty();
continue;
}
@@ -172,7 +172,7 @@ void applySharedFormulas(
break;
default:
// Mark it for re-calculation.
- pCell->SetDirty(true);
+ pCell->SetDirty();
}
}
}
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index afe9efeb8d6a..5b01085c9a31 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -511,7 +511,7 @@ Reference< XStyle > WorkbookGlobals::createStyleObject( OUString& orStyleName, b
{
Reference< XNameContainer > xStylesNC( getStyleFamily( bPageStyle ), UNO_SET_THROW );
xStyle.set( mrBaseFilter.getModelFactory()->createInstance( bPageStyle ? maPageStyleServ : maCellStyleServ ), UNO_QUERY_THROW );
- orStyleName = ContainerHelper::insertByUnusedName( xStylesNC, orStyleName, ' ', Any( xStyle ), false );
+ orStyleName = ContainerHelper::insertByUnusedName( xStylesNC, orStyleName, ' ', Any( xStyle ) );
}
catch( Exception& )
{
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index 82b8f9e4f704..d897143a91c9 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -361,7 +361,7 @@ void ScOrcusSheet::set_shared_formula(
cellInserted();
// For now, orcus doesn't support setting cached result. Mark it for re-calculation.
- pCell->SetDirty(true);
+ pCell->SetDirty();
}
void ScOrcusSheet::set_shared_formula(
@@ -384,7 +384,7 @@ void ScOrcusSheet::set_shared_formula(os::row_t row, os::col_t col, size_t sinde
cellInserted();
// For now, orcus doesn't support setting cached result. Mark it for re-calculation.
- pCell->SetDirty(true);
+ pCell->SetDirty();
}
void ScOrcusSheet::set_array_formula(
diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx
index 8195b82efb89..1ca679cd1885 100644
--- a/sc/source/filter/qpro/qpro.cxx
+++ b/sc/source/filter/qpro/qpro.cxx
@@ -165,7 +165,7 @@ FltError ScQProReader::import( ScDocument *pDoc )
OUString aName;
aName += OUString( sal_Unicode( 'A' + nTab ) );
if (!nTab)
- pDoc->RenameTab( nTab, aName, false, false);
+ pDoc->RenameTab( nTab, aName, false );
else
pDoc->InsertTab( nTab, aName );
}
diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx
index 83f66fde09a5..acfee57d5389 100644
--- a/sc/source/filter/rtf/expbase.cxx
+++ b/sc/source/filter/rtf/expbase.cxx
@@ -41,7 +41,7 @@ bool ScExportBase::GetDataArea( SCTAB nTab, SCCOL& nStartCol,
SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const
{
pDoc->GetDataStart( nTab, nStartCol, nStartRow );
- pDoc->GetPrintArea( nTab, nEndCol, nEndRow, true );
+ pDoc->GetPrintArea( nTab, nEndCol, nEndRow );
return TrimDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow );
}
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 9dc3b4376a90..d4285239eb9d 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -1430,10 +1430,10 @@ void Sc10Import::LoadTables()
aSc30ViewOpt.SetOption( VOPT_NULLVALS, IS_SET(dfZerro,Display) );
aSc30ViewOpt.SetOption( VOPT_SYNTAX, IS_SET(dfSyntax,Display) );
aSc30ViewOpt.SetOption( VOPT_NOTES, IS_SET(dfNoteMark,Display) );
- aSc30ViewOpt.SetOption( VOPT_VSCROLL, true );
- aSc30ViewOpt.SetOption( VOPT_HSCROLL, true );
- aSc30ViewOpt.SetOption( VOPT_TABCONTROLS, true );
- aSc30ViewOpt.SetOption( VOPT_OUTLINER, true );
+ aSc30ViewOpt.SetOption( VOPT_VSCROLL );
+ aSc30ViewOpt.SetOption( VOPT_HSCROLL );
+ aSc30ViewOpt.SetOption( VOPT_TABCONTROLS );
+ aSc30ViewOpt.SetOption( VOPT_OUTLINER );
aSc30ViewOpt.SetOption( VOPT_GRID, IS_SET(dfGrid,Display) );
// VOPT_HEADER is set in LoadViewColRowBar()
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index c128183ab26c..d4085ef455ea 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -1101,8 +1101,7 @@ bool transformURL(const OUString& rOldURL, OUString& rNewURL, ScDocument* pDoc)
{
// URL has to be decoded for escaped characters (%20)
OUString aURL = INetURLObject::decode( rOldURL,
- INetURLObject::DECODE_WITH_CHARSET,
- RTL_TEXTENCODING_UTF8 );
+ INetURLObject::DECODE_WITH_CHARSET );
OUString aAddressString = aURL.copy(1);
ScRange aRange;
diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx
index 86227a593df7..956de1c60c87 100644
--- a/sc/source/filter/xml/xmlcoli.cxx
+++ b/sc/source/filter/xml/xmlcoli.cxx
@@ -287,7 +287,7 @@ void ScXMLTableColsContext::EndElement()
{
ScOutlineArray& rColArray = pOutlineTable->GetColArray();
bool bResized;
- rColArray.Insert(static_cast<SCCOL>(nGroupStartCol), static_cast<SCCOL>(nGroupEndCol), bResized, !bGroupDisplay, true);
+ rColArray.Insert(static_cast<SCCOL>(nGroupStartCol), static_cast<SCCOL>(nGroupEndCol), bResized, !bGroupDisplay);
}
}
}
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index a208c38318df..93ab35583aa3 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -931,7 +931,7 @@ void ScXMLExport::ExportExternalRefCacheStyles()
if (GetAutoStylePool()->Add(aName, XML_STYLE_FAMILY_TABLE_CELL, aDefaultStyle, aProps))
{
OUString* pTemp(new OUString(aName));
- if (!pCellStyles->AddStyleName(pTemp, nIndex, true))
+ if (!pCellStyles->AddStyleName(pTemp, nIndex))
delete pTemp;
}
else
@@ -1247,7 +1247,7 @@ void ScXMLExport::ExportCellTextAutoStyles(sal_Int32 nTable)
std::vector<XMLPropertyState> aPropStates;
toXMLPropertyStates(aPropStates, rSecAttrs, xMapper, rAttrMap);
if (!aPropStates.empty())
- xStylePool->Add(XML_STYLE_FAMILY_TEXT_TEXT, OUString(), aPropStates, false);
+ xStylePool->Add(XML_STYLE_FAMILY_TEXT_TEXT, OUString(), aPropStates);
}
}
@@ -1619,7 +1619,7 @@ void ScXMLExport::FillColumnRowGroups()
{
if (pDoc)
{
- ScOutlineTable* pOutlineTable = pDoc->GetOutlineTable( static_cast<SCTAB>(nCurrentTable), false );
+ ScOutlineTable* pOutlineTable = pDoc->GetOutlineTable( static_cast<SCTAB>(nCurrentTable) );
if(pOutlineTable)
{
ScOutlineArray& rCols(pOutlineTable->GetColArray());
@@ -4378,7 +4378,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
}
else
AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::number(pFormatData->mpLowerLimit->GetValue()));
- AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*pFormatData->mpLowerLimit, true));
+ AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*pFormatData->mpLowerLimit));
SvXMLElementExport aElementDataBarEntryLower(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true);
}
@@ -4866,8 +4866,7 @@ void ScXMLExport::CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uIn
// there aren't existing ones for the prefix used by the
// attibutes
_GetNamespaceMap().Add( rPrefix,
- pUnknown->GetNamespace( nIdx ),
- XML_NAMESPACE_UNKNOWN );
+ pUnknown->GetNamespace( nIdx ) );
}
nIdx = pUnknown->GetNextNamespaceIndex( nIdx );
}
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index 7af34aa1dd16..bf0565dd3ec9 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -334,7 +334,7 @@ void ScXMLTableRowsContext::EndElement()
ScOutlineTable* pOutlineTable(pDoc->GetOutlineTable(nSheet, true));
ScOutlineArray& rRowArray(pOutlineTable->GetRowArray());
bool bResized;
- rRowArray.Insert(static_cast<SCROW>(nGroupStartRow), static_cast<SCROW>(nGroupEndRow), bResized, !bGroupDisplay, true);
+ rRowArray.Insert(static_cast<SCROW>(nGroupStartRow), static_cast<SCROW>(nGroupEndRow), bResized, !bGroupDisplay);
}
}
}
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 34753622e38f..28f31c555912 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -505,7 +505,7 @@ void XMLTableStyleContext::ApplyCondFormat( const uno::Sequence<table::CellRange
{
table::CellRangeAddress aAddress = xCellRanges[i];
ScRange aRange( aAddress.StartColumn, aAddress.StartRow, aAddress.Sheet, aAddress.EndColumn, aAddress.EndRow, aAddress.Sheet );
- aRangeList.Join( aRange, false );
+ aRangeList.Join( aRange );
}
ScDocument* pDoc = GetScImport().GetDocument();
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index 02421d872fec..fb8ea43bba95 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -369,7 +369,7 @@ void ScXMLTableContext::EndElement()
// Sheet has "print entire sheet" option by default. Remove it.
pDoc->ClearPrintRanges(nCurTab);
- ScOutlineTable* pOutlineTable(pDoc->GetOutlineTable(nCurTab, false));
+ ScOutlineTable* pOutlineTable(pDoc->GetOutlineTable(nCurTab));
if (pOutlineTable)
{
ScOutlineArray& rColArray(pOutlineTable->GetColArray());