[Libreoffice-commits] core.git: sc/source
Noel Grandin
noel at peralex.com
Wed Mar 2 09:23:34 UTC 2016
sc/source/filter/excel/frmbase.cxx | 89 +++-------
sc/source/filter/excel/xeformula.cxx | 16 -
sc/source/filter/excel/xehelper.cxx | 10 -
sc/source/filter/excel/xestream.cxx | 13 -
sc/source/filter/excel/xestring.cxx | 4
sc/source/filter/excel/xestyle.cxx | 4
sc/source/filter/excel/xiescher.cxx | 4
sc/source/filter/excel/xistyle.cxx | 9 -
sc/source/filter/excel/xladdress.cxx | 14 -
sc/source/filter/ftools/fapihelper.cxx | 5
sc/source/filter/html/htmlexp.cxx | 35 +--
sc/source/filter/inc/addressconverter.hxx | 8
sc/source/filter/inc/biffinputstream.hxx | 2
sc/source/filter/inc/fapihelper.hxx | 2
sc/source/filter/inc/formel.hxx | 7
sc/source/filter/inc/htmlexp.hxx | 2
sc/source/filter/inc/htmlpars.hxx | 2
sc/source/filter/inc/lotform.hxx | 3
sc/source/filter/inc/qproform.hxx | 3
sc/source/filter/inc/richstring.hxx | 7
sc/source/filter/inc/sheetdatabuffer.hxx | 5
sc/source/filter/inc/stylesbuffer.hxx | 30 +--
sc/source/filter/inc/xehelper.hxx | 8
sc/source/filter/inc/xestream.hxx | 3
sc/source/filter/inc/xestring.hxx | 6
sc/source/filter/inc/xestyle.hxx | 3
sc/source/filter/inc/xiescher.hxx | 4
sc/source/filter/inc/xistyle.hxx | 3
sc/source/filter/inc/xladdress.hxx | 4
sc/source/filter/lotus/lotform.cxx | 3
sc/source/filter/oox/addressconverter.cxx | 20 +-
sc/source/filter/oox/biffinputstream.cxx | 4
sc/source/filter/oox/richstring.cxx | 7
sc/source/filter/oox/sheetdatabuffer.cxx | 16 -
sc/source/filter/oox/stylesbuffer.cxx | 18 --
sc/source/filter/qpro/qpro.cxx | 2
sc/source/filter/qpro/qproform.cxx | 2
sc/source/filter/xml/XMLConverter.cxx | 25 +-
sc/source/filter/xml/XMLConverter.hxx | 15 -
sc/source/filter/xml/xmlimprt.cxx | 4
sc/source/filter/xml/xmlimprt.hxx | 2
sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx | 5
sc/source/ui/dbgui/csvcontrol.cxx | 4
sc/source/ui/docshell/dbdocimp.cxx | 55 ++----
sc/source/ui/docshell/docsh.cxx | 61 +++---
sc/source/ui/drawfunc/drawsh.cxx | 11 -
sc/source/ui/drawfunc/futext3.cxx | 3
sc/source/ui/inc/TableFillingAndNavigationTools.hxx | 2
sc/source/ui/inc/anyrefdg.hxx | 2
sc/source/ui/inc/cbutton.hxx | 5
sc/source/ui/inc/csvcontrol.hxx | 5
sc/source/ui/inc/dbdocfun.hxx | 3
sc/source/ui/inc/dbfunc.hxx | 11 -
sc/source/ui/inc/docsh.hxx | 2
sc/source/ui/inc/drawsh.hxx | 6
sc/source/ui/inc/drawview.hxx | 2
sc/source/ui/inc/futext.hxx | 2
sc/source/ui/inc/output.hxx | 2
sc/source/ui/inc/reffact.hxx | 2
sc/source/ui/inc/tabview.hxx | 3
sc/source/ui/inc/viewfunc.hxx | 30 +--
sc/source/ui/miscdlgs/anyrefdg.cxx | 5
sc/source/ui/undo/undocell.cxx | 4
sc/source/ui/vba/vbaname.cxx | 18 --
sc/source/ui/vba/vbaname.hxx | 4
sc/source/ui/vba/vbarange.cxx | 8
sc/source/ui/view/dbfunc.cxx | 10 -
sc/source/ui/view/dbfunc3.cxx | 12 -
sc/source/ui/view/drawview.cxx | 3
sc/source/ui/view/output.cxx | 4
sc/source/ui/view/reffact.cxx | 15 -
sc/source/ui/view/tabview4.cxx | 4
sc/source/ui/view/viewfun2.cxx | 24 +-
sc/source/ui/view/viewfun4.cxx | 14 -
sc/source/ui/view/viewfunc.cxx | 37 ++--
75 files changed, 336 insertions(+), 465 deletions(-)
New commits:
commit e09df5a70a57c06b2be846ca673dcc8b4f003918
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 2 11:22:45 2016 +0200
loplugin:unuseddefaultparams in sc (part1)
Change-Id: Ie7c23bfee7cb6c73e455a47801f7eb1b481a8cf0
diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx
index c31d2f8..fd1c4d7 100644
--- a/sc/source/filter/excel/frmbase.cxx
+++ b/sc/source/filter/excel/frmbase.cxx
@@ -29,25 +29,18 @@ _ScRangeListTabs::~_ScRangeListTabs()
{
}
-void _ScRangeListTabs::Append( const ScAddress& aSRD, SCTAB nTab, const bool b )
+void _ScRangeListTabs::Append( const ScAddress& aSRD, SCTAB nTab )
{
ScAddress a = aSRD;
- if( b )
- {
- if (a.Tab() > MAXTAB)
- a.SetTab(MAXTAB);
+ if (a.Tab() > MAXTAB)
+ a.SetTab(MAXTAB);
- if (a.Col() > MAXCOL)
- a.SetCol(MAXCOL);
+ if (a.Col() > MAXCOL)
+ a.SetCol(MAXCOL);
- if (a.Row() > MAXROW)
- a.SetRow(MAXROW);
- }
- else
- {
- OSL_ENSURE( ValidTab(a.Tab()), "-_ScRangeListTabs::Append(): A lie has no crash!" );
- }
+ if (a.Row() > MAXROW)
+ a.SetRow(MAXROW);
if( nTab == SCTAB_MAX)
return;
@@ -73,50 +66,38 @@ void _ScRangeListTabs::Append( const ScAddress& aSRD, SCTAB nTab, const bool b )
itr->second->push_back(ScRange(a.Col(),a.Row(),a.Tab()));
}
-void _ScRangeListTabs::Append( const ScRange& aCRD, SCTAB nTab, bool b )
+void _ScRangeListTabs::Append( const ScRange& aCRD, SCTAB nTab )
{
ScRange a = aCRD;
- if( b )
- {
- // ignore 3D ranges
- if (a.aStart.Tab() != a.aEnd.Tab())
- return;
+ // ignore 3D ranges
+ if (a.aStart.Tab() != a.aEnd.Tab())
+ return;
- if (a.aStart.Tab() > MAXTAB)
- a.aStart.SetTab(MAXTAB);
- else if (a.aStart.Tab() < 0)
- a.aStart.SetTab(0);
-
- if (a.aStart.Col() > MAXCOL)
- a.aStart.SetCol(MAXCOL);
- else if (a.aStart.Col() < 0)
- a.aStart.SetCol(0);
-
- if (a.aStart.Row() > MAXROW)
- a.aStart.SetRow(MAXROW);
- else if (a.aStart.Row() < 0)
- a.aStart.SetRow(0);
-
- if (a.aEnd.Col() > MAXCOL)
- a.aEnd.SetCol(MAXCOL);
- else if (a.aEnd.Col() < 0)
- a.aEnd.SetCol(0);
-
- if (a.aEnd.Row() > MAXROW)
- a.aEnd.SetRow(MAXROW);
- else if (a.aEnd.Row() < 0)
- a.aEnd.SetRow(0);
- }
-#if 0 // no members 'Ref1' or 'Ref2' in 'ScRange'
- else
- {
- OSL_ENSURE( ValidTab(a.Ref1.nTab),
- "-_ScRangeListTabs::Append(): Luegen haben kurze Abstuerze!" );
- OSL_ENSURE( a.Ref1.nTab == a.Ref2.nTab,
- "+_ScRangeListTabs::Append(): 3D-Ranges werden in SC nicht unterstuetzt!" );
- }
-#endif
+ if (a.aStart.Tab() > MAXTAB)
+ a.aStart.SetTab(MAXTAB);
+ else if (a.aStart.Tab() < 0)
+ a.aStart.SetTab(0);
+
+ if (a.aStart.Col() > MAXCOL)
+ a.aStart.SetCol(MAXCOL);
+ else if (a.aStart.Col() < 0)
+ a.aStart.SetCol(0);
+
+ if (a.aStart.Row() > MAXROW)
+ a.aStart.SetRow(MAXROW);
+ else if (a.aStart.Row() < 0)
+ a.aStart.SetRow(0);
+
+ if (a.aEnd.Col() > MAXCOL)
+ a.aEnd.SetCol(MAXCOL);
+ else if (a.aEnd.Col() < 0)
+ a.aEnd.SetCol(0);
+
+ if (a.aEnd.Row() > MAXROW)
+ a.aEnd.SetRow(MAXROW);
+ else if (a.aEnd.Row() < 0)
+ a.aEnd.SetRow(0);
if( nTab == SCTAB_MAX)
return;
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 7ef64cc..11a4bf3 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -422,8 +422,8 @@ private:
void AppendMissingNameToken( const OUString& rName, sal_uInt8 nSpaces = 0 );
void AppendNameXToken( sal_uInt16 nExtSheet, sal_uInt16 nExtName, sal_uInt8 nSpaces = 0 );
void AppendMacroCallToken( const XclExpExtFuncData& rExtFuncData, sal_uInt8 nSpaces = 0 );
- void AppendAddInCallToken( const XclExpExtFuncData& rExtFuncData, sal_uInt8 nSpaces = 0 );
- void AppendEuroToolCallToken( const XclExpExtFuncData& rExtFuncData, sal_uInt8 nSpaces = 0 );
+ void AppendAddInCallToken( const XclExpExtFuncData& rExtFuncData );
+ void AppendEuroToolCallToken( const XclExpExtFuncData& rExtFuncData );
void AppendOperatorTokenId( sal_uInt8 nTokenId, const XclExpOperandListRef& rxOperands, sal_uInt8 nSpaces = 0 );
void AppendUnaryOperatorToken( sal_uInt8 nTokenId, sal_uInt8 nSpaces = 0 );
@@ -2358,7 +2358,7 @@ void XclExpFmlaCompImpl::AppendMacroCallToken( const XclExpExtFuncData& rExtFunc
AppendNameToken( nNameIdx, nSpaces );
}
-void XclExpFmlaCompImpl::AppendAddInCallToken( const XclExpExtFuncData& rExtFuncData, sal_uInt8 nSpaces )
+void XclExpFmlaCompImpl::AppendAddInCallToken( const XclExpExtFuncData& rExtFuncData )
{
OUString aXclFuncName;
if( mxData->mpLinkMgr && ScGlobal::GetAddInCollection()->GetExcelName( rExtFuncData.maFuncName, GetUILanguage(), aXclFuncName ) )
@@ -2366,20 +2366,20 @@ void XclExpFmlaCompImpl::AppendAddInCallToken( const XclExpExtFuncData& rExtFunc
sal_uInt16 nExtSheet, nExtName;
if( mxData->mpLinkMgr->InsertAddIn( nExtSheet, nExtName, aXclFuncName ) )
{
- AppendNameXToken( nExtSheet, nExtName, nSpaces );
+ AppendNameXToken( nExtSheet, nExtName );
return;
}
}
- AppendMacroCallToken( rExtFuncData, nSpaces );
+ AppendMacroCallToken( rExtFuncData );
}
-void XclExpFmlaCompImpl::AppendEuroToolCallToken( const XclExpExtFuncData& rExtFuncData, sal_uInt8 nSpaces )
+void XclExpFmlaCompImpl::AppendEuroToolCallToken( const XclExpExtFuncData& rExtFuncData )
{
sal_uInt16 nExtSheet(0), nExtName(0);
if( mxData->mpLinkMgr && mxData->mpLinkMgr->InsertEuroTool( nExtSheet, nExtName, rExtFuncData.maFuncName ) )
- AppendNameXToken( nExtSheet, nExtName, nSpaces );
+ AppendNameXToken( nExtSheet, nExtName );
else
- AppendMacroCallToken( rExtFuncData, nSpaces );
+ AppendMacroCallToken( rExtFuncData );
}
void XclExpFmlaCompImpl::AppendOperatorTokenId( sal_uInt8 nTokenId, const XclExpOperandListRef& rxOperands, sal_uInt8 nSpaces )
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 1961c7d..ab0c3b5 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -589,7 +589,7 @@ XclExpStringRef XclExpStringHelper::CreateCellString(
XclExpStringRef XclExpStringHelper::CreateString(
const XclExpRoot& rRoot, const SdrTextObj& rTextObj,
- XclStrFlags nFlags, sal_uInt16 nMaxLen )
+ XclStrFlags nFlags )
{
XclExpStringRef xString;
if( const OutlinerParaObject* pParaObj = rTextObj.GetOutlinerParaObject() )
@@ -599,7 +599,7 @@ XclExpStringRef XclExpStringHelper::CreateString(
rEE.SetUpdateMode( true );
// create the string
rEE.SetText( pParaObj->GetTextObject() );
- xString = lclCreateFormattedString( rRoot, rEE, nullptr, nFlags, nMaxLen );
+ xString = lclCreateFormattedString( rRoot, rEE, nullptr, nFlags, EXC_STR_MAXLEN );
rEE.SetUpdateMode( bOldUpdateMode );
// limit formats - TODO: BIFF dependent
if( !xString->IsEmpty() )
@@ -612,21 +612,21 @@ XclExpStringRef XclExpStringHelper::CreateString(
{
OSL_FAIL( "XclExpStringHelper::CreateString - textbox without para object" );
// create BIFF dependent empty Excel string
- xString = CreateString( rRoot, EMPTY_OUSTRING, nFlags, nMaxLen );
+ xString = CreateString( rRoot, EMPTY_OUSTRING, nFlags );
}
return xString;
}
XclExpStringRef XclExpStringHelper::CreateString(
const XclExpRoot& rRoot, const EditTextObject& rEditObj,
- XclStrFlags nFlags, sal_uInt16 nMaxLen )
+ XclStrFlags nFlags )
{
XclExpStringRef xString;
EditEngine& rEE = rRoot.GetDrawEditEngine();
bool bOldUpdateMode = rEE.GetUpdateMode();
rEE.SetUpdateMode( true );
rEE.SetText( rEditObj );
- xString = lclCreateFormattedString( rRoot, rEE, nullptr, nFlags, nMaxLen );
+ xString = lclCreateFormattedString( rRoot, rEE, nullptr, nFlags, EXC_STR_MAXLEN );
rEE.SetUpdateMode( bOldUpdateMode );
// limit formats - TODO: BIFF dependent
if( !xString->IsEmpty() )
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 474ba6c..7b7f23d 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -325,22 +325,17 @@ void XclExpStream::WriteUnicodeBuffer( const ScfUInt16Vec& rBuffer, sal_uInt8 nF
// Xcl has an obscure sense of whether starting a new record or not,
// and crashes if it encounters the string header at the very end of a record.
// Thus we add 1 to give some room, seems like they do it that way but with another count (10?)
-void XclExpStream::WriteByteString( const OString& rString, sal_uInt16 nMaxLen, bool b16BitCount )
+void XclExpStream::WriteByteString( const OString& rString, sal_uInt16 nMaxLen )
{
SetSliceSize( 0 );
sal_Size nLen = ::std::min< sal_Size >( rString.getLength(), nMaxLen );
- if( !b16BitCount )
- nLen = ::std::min< sal_Size >( nLen, 0xFF );
+ nLen = ::std::min< sal_Size >( nLen, 0xFF );
sal_uInt16 nLeft = PrepareWrite();
- sal_uInt16 nLenFieldSize = b16BitCount ? 2 : 1;
- if( mbInRec && (nLeft <= nLenFieldSize) )
+ if( mbInRec && (nLeft <= 1) )
StartContinue();
- if( b16BitCount )
- operator<<( static_cast< sal_uInt16 >( nLen ) );
- else
- operator<<( static_cast< sal_uInt8 >( nLen ) );
+ operator<<( static_cast< sal_uInt8 >( nLen ) );
Write( rString.getStr(), nLen );
}
diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx
index d30b2f7..1ac074e 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -113,9 +113,9 @@ void XclExpString::Assign( const OUString& rString, XclStrFlags nFlags, sal_uInt
Build( rString.getStr(), rString.getLength(), nFlags, nMaxLen );
}
-void XclExpString::Assign( sal_Unicode cChar, XclStrFlags nFlags, sal_uInt16 nMaxLen )
+void XclExpString::Assign( sal_Unicode cChar, XclStrFlags nFlags )
{
- Build( &cChar, 1, nFlags, nMaxLen );
+ Build( &cChar, 1, nFlags, EXC_STR_MAXLEN );
}
void XclExpString::AssignByte(
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 758c012..e9197e2 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1240,9 +1240,9 @@ sal_uInt16 XclExpFontBuffer::Insert(
}
sal_uInt16 XclExpFontBuffer::Insert(
- const SvxFont& rFont, XclExpColorType eColorType, bool bAppFont )
+ const SvxFont& rFont, XclExpColorType eColorType )
{
- return Insert( XclFontData( rFont ), eColorType, bAppFont );
+ return Insert( XclFontData( rFont ), eColorType );
}
sal_uInt16 XclExpFontBuffer::Insert( const SfxItemSet& rItemSet,
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 22265ca..0998647 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -4297,9 +4297,9 @@ void XclImpDffPropSet::Read( XclImpStream& rStrm )
maDffConv.ReadPropSet( *mxMemStrm, nullptr );
}
-sal_uInt32 XclImpDffPropSet::GetPropertyValue( sal_uInt16 nPropId, sal_uInt32 nDefault ) const
+sal_uInt32 XclImpDffPropSet::GetPropertyValue( sal_uInt16 nPropId ) const
{
- return maDffConv.GetPropertyValue( nPropId, nDefault );
+ return maDffConv.GetPropertyValue( nPropId, 0 );
}
void XclImpDffPropSet::FillToItemSet( SfxItemSet& rItemSet ) const
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index b663c78..9262d27 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -1400,7 +1400,7 @@ void XclImpXF::ApplyPatternToAttrList(
void XclImpXF::ApplyPattern(
SCCOL nScCol1, SCROW nScRow1, SCCOL nScCol2, SCROW nScRow2,
- SCTAB nScTab, sal_uLong nForceScNumFmt )
+ SCTAB nScTab )
{
// force creation of cell style and hard formatting, do it here to have mpStyleSheet
const ScPatternAttr& rPattern = CreatePattern();
@@ -1412,13 +1412,6 @@ void XclImpXF::ApplyPattern(
if( HasUsedFlags() )
rDoc.ApplyPatternAreaTab( nScCol1, nScRow1, nScCol2, nScRow2, nScTab, rPattern );
- // #108770# apply special number format
- if( nForceScNumFmt != NUMBERFORMAT_ENTRY_NOT_FOUND )
- {
- ScPatternAttr aPattern( GetDoc().GetPool() );
- GetNumFmtBuffer().FillScFmtToItemSet( aPattern.GetItemSet(), nForceScNumFmt );
- rDoc.ApplyPatternAreaTab( nScCol1, nScRow1, nScCol2, nScRow2, nScTab, aPattern );
- }
}
/*static*/ void XclImpXF::ApplyPatternForBiff2CellFormat( const XclImpRoot& rRoot,
diff --git a/sc/source/filter/excel/xladdress.cxx b/sc/source/filter/excel/xladdress.cxx
index 0e78a16..145a081 100644
--- a/sc/source/filter/excel/xladdress.cxx
+++ b/sc/source/filter/excel/xladdress.cxx
@@ -24,22 +24,16 @@
#include <osl/diagnose.h>
-void XclAddress::Read( XclImpStream& rStrm, bool bCol16Bit )
+void XclAddress::Read( XclImpStream& rStrm )
{
mnRow = rStrm.ReaduInt16();
- if( bCol16Bit )
- mnCol = rStrm.ReaduInt16();
- else
- mnCol = rStrm.ReaduInt8();
+ mnCol = rStrm.ReaduInt16();
}
-void XclAddress::Write( XclExpStream& rStrm, bool bCol16Bit ) const
+void XclAddress::Write( XclExpStream& rStrm ) const
{
rStrm << static_cast<sal_uInt16> (mnRow);
- if( bCol16Bit )
- rStrm << mnCol;
- else
- rStrm << static_cast< sal_uInt8 >( mnCol );
+ rStrm << mnCol;
}
bool XclRange::Contains( const XclAddress& rPos ) const
diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx
index cd317c4..2028575 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -339,12 +339,9 @@ void ScfPropSetHelper::ReadValue( bool& rbValue )
// write properties -----------------------------------------------------------
-void ScfPropSetHelper::InitializeWrite( bool bClearAllAnys )
+void ScfPropSetHelper::InitializeWrite()
{
mnNextIdx = 0;
- if( bClearAllAnys )
- for( sal_Int32 nIdx = 0, nLen = maValueSeq.getLength(); nIdx < nLen; ++nIdx )
- maValueSeq[ nIdx ].clear();
}
void ScfPropSetHelper::WriteValue( const Any& rAny )
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 47f81fb..073d659 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -1285,16 +1285,15 @@ bool ScHTMLExport::WriteFieldText( const EditTextObject* pData )
}
void ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm,
- const OUString& rTargetNm, bool bFileToFile )
+ const OUString& rTargetNm )
{
INetURLObject aFileUrl, aTargetUrl;
aFileUrl.SetSmartURL( rFileNm );
aTargetUrl.SetSmartURL( rTargetNm );
if( INetProtocol::File == aFileUrl.GetProtocol() &&
- ( (bFileToFile && INetProtocol::File == aTargetUrl.GetProtocol()) ||
- (!bFileToFile && INetProtocol::File != aTargetUrl.GetProtocol() &&
- INetProtocol::Ftp <= aTargetUrl.GetProtocol() &&
- INetProtocol::Javascript >= aTargetUrl.GetProtocol()) ) )
+ ( INetProtocol::File != aTargetUrl.GetProtocol() &&
+ INetProtocol::Ftp <= aTargetUrl.GetProtocol() &&
+ INetProtocol::Javascript >= aTargetUrl.GetProtocol()) )
{
if( pFileNameMap )
{
@@ -1318,30 +1317,18 @@ void ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm,
OUString aDest = aTargetUrl.GetPartBeforeLastName();
aDest += aFileUrl.GetName();
- if( bFileToFile )
+ SfxMedium aMedium( aDest, StreamMode::WRITE | StreamMode::SHARE_DENYNONE );
+
{
- INetURLObject aCpyURL( aDest );
- SvFileStream aCpy( aCpyURL.PathToFileName(), StreamMode::WRITE );
+ SvFileStream aCpy( aMedium.GetPhysicalName(), StreamMode::WRITE );
aCpy.WriteStream( aTmp );
-
- aCpy.Close();
- bRet = SVSTREAM_OK == aCpy.GetError();
}
- else
- {
- SfxMedium aMedium( aDest, StreamMode::WRITE | StreamMode::SHARE_DENYNONE );
- {
- SvFileStream aCpy( aMedium.GetPhysicalName(), StreamMode::WRITE );
- aCpy.WriteStream( aTmp );
- }
+ // Take over
+ aMedium.Close();
+ aMedium.Commit();
- // Take over
- aMedium.Close();
- aMedium.Commit();
-
- bRet = 0 == aMedium.GetError();
- }
+ bRet = 0 == aMedium.GetError();
if( bRet )
{
diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx
index 662d044..a2679da 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -94,7 +94,7 @@ struct BinAddress
inline explicit BinAddress( const ScAddress& rAddr ) : mnCol( rAddr.Col() ), mnRow( rAddr.Row() ) {}
void read( SequenceInputStream& rStrm );
- void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false );
+ void read( BiffInputStream& rStrm, bool bCol16Bit = true );
};
inline bool operator<( const BinAddress& rL, const BinAddress& rR )
@@ -130,7 +130,7 @@ struct BinRange
inline explicit BinRange( const css::table::CellRangeAddress& rRange ) : maFirst( rRange.StartColumn, rRange.StartRow ), maLast( rRange.EndColumn, rRange.EndRow ) {}
void read( SequenceInputStream& rStrm );
- void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false );
+ void read( BiffInputStream& rStrm, bool bCol16Bit = true );
};
inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRange& orRange )
@@ -225,7 +225,6 @@ public:
@param ornEndRow (out-parameter) returns the converted end row index.
@param rString The string containing the cell address.
@param nStart Start index of string part in rString to be parsed.
- @param nLength Length of string part in rString to be parsed.
@return true = Parsed string was valid, returned values can be used.
*/
@@ -233,8 +232,7 @@ public:
sal_Int32& ornStartColumn, sal_Int32& ornStartRow,
sal_Int32& ornEndColumn, sal_Int32& ornEndRow,
const OUString& rString,
- sal_Int32 nStart = 0,
- sal_Int32 nLength = SAL_MAX_INT32 );
+ sal_Int32 nStart = 0 );
/** Returns the biggest valid cell address in the own Calc document. */
inline const ScAddress&
diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx
index d2a0682..37f64e6 100644
--- a/sc/source/filter/inc/biffinputstream.hxx
+++ b/sc/source/filter/inc/biffinputstream.hxx
@@ -181,7 +181,7 @@ public:
Decryption is reenabled automatically, if a new record is started using
the function startNextRecord().
*/
- void enableDecoder( bool bEnable = true );
+ void enableDecoder();
// stream/record state and info -------------------------------------------
diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx
index 08f2065..c91417c 100644
--- a/sc/source/filter/inc/fapihelper.hxx
+++ b/sc/source/filter/inc/fapihelper.hxx
@@ -238,7 +238,7 @@ public:
// write properties -------------------------------------------------------
/** Must be called before reading or storing property values in the helper. */
- void InitializeWrite( bool bClearAllAnys = false );
+ void InitializeWrite();
/** Writes the next value to the value sequence. */
template< typename Type >
diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx
index de32e54..2faca17 100644
--- a/sc/source/filter/inc/formel.hxx
+++ b/sc/source/filter/inc/formel.hxx
@@ -70,8 +70,8 @@ public:
_ScRangeListTabs ();
~_ScRangeListTabs();
- void Append( const ScAddress& aSRD, SCTAB nTab, bool bLimit = true );
- void Append( const ScRange& aCRD, SCTAB nTab, bool bLimit = true );
+ void Append( const ScAddress& aSRD, SCTAB nTab );
+ void Append( const ScRange& aCRD, SCTAB nTab );
const ScRange* First ( SCTAB nTab = 0 );
const ScRange* Next ();
@@ -129,8 +129,7 @@ protected:
public:
void Reset( const ScAddress& rEingPos );
- virtual void Convert( const ScTokenArray*& rpErg, sal_Int32& nRest,
- const FORMULA_TYPE eFT = FT_CellFormula ) = 0;
+ virtual void Convert( const ScTokenArray*& rpErg, sal_Int32& nRest ) = 0;
protected:
using ConverterBase::Reset;
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index 5fc011e..8e8513d 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -144,7 +144,7 @@ class ScHTMLExport : public ScExportBase
bool WriteFieldText( const EditTextObject* pData );
// copy a local file to internet if needed
- void CopyLocalFileToINet( OUString& rFileNm, const OUString& rTargetNm, bool bFileToFile = false );
+ void CopyLocalFileToINet( OUString& rFileNm, const OUString& rTargetNm );
bool HasCId()
{
return !aCId.isEmpty();
diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx
index 9a162a5..31bb32b 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -288,7 +288,7 @@ public:
inline ScHTMLTableId GetTableId() const { return nTab; }
/** Sets or cleares the import always state. */
- inline void SetImportAlways( bool bSet = true ) { mbImportAlways = bSet; }
+ inline void SetImportAlways() { mbImportAlways = true; }
/** Sets start point of the entry selection to the start of the import info object. */
void AdjustStart( const ImportInfo& rInfo );
/** Sets end point of the entry selection to the end of the import info object. */
diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx
index 77c1001..c407358 100644
--- a/sc/source/filter/inc/lotform.hxx
+++ b/sc/source/filter/inc/lotform.hxx
@@ -89,8 +89,7 @@ private:
public:
LotusToSc(LotusContext &rContext, SvStream& aStr, svl::SharedStringPool& rSPool, rtl_TextEncoding eSrc, bool b);
- virtual void Convert( const ScTokenArray*& rpErg, sal_Int32& nRest,
- const FORMULA_TYPE eFT = FT_CellFormula ) override;
+ virtual void Convert( const ScTokenArray*& rpErg, sal_Int32& nRest ) override;
void Reset( const ScAddress& rEingPos );
inline void SetWK3();
diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx
index b26efe0..1065aed 100644
--- a/sc/source/filter/inc/qproform.hxx
+++ b/sc/source/filter/inc/qproform.hxx
@@ -61,8 +61,7 @@ public:
static const size_t nBufSize = 256;
QProToSc( SvStream &aStr, svl::SharedStringPool& rSPool, const ScAddress& rRefPos );
virtual ~QProToSc(){ };
- ConvErr Convert( const ScTokenArray*& pArray, sal_uInt16 nLen,
- const FORMULA_TYPE eFT = FT_CellFormula );
+ ConvErr Convert( const ScTokenArray*& pArray );
void DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtString );
void ReadSRD( ScSingleRefData& rR, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 rRel );
void IncToken( TokenId &aParam );
diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx
index 7312d26..3758714 100644
--- a/sc/source/filter/inc/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -252,13 +252,10 @@ public:
/** Converts the string and writes it into the passed XText.
@param rxText The XText interface of the target object.
- @param bReplaceOld True = replace old contents of the text object.
- @param pFirstPortionFont Optional font providing additional rich-text
- formatting for the first text portion, e.g. font escapement. */
+ @param bReplaceOld True = replace old contents of the text object. */
void convert(
const css::uno::Reference< css::text::XText >& rxText,
- bool bReplaceOld,
- const oox::xls::Font* pFirstPortionFont = nullptr ) const;
+ bool bReplaceOld ) const;
::EditTextObject* convert( ScEditEngineDefaulter& rEE, const oox::xls::Font* pFont ) const;
private:
diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx
index c5f80b6..108d2e5 100644
--- a/sc/source/filter/inc/sheetdatabuffer.hxx
+++ b/sc/source/filter/inc/sheetdatabuffer.hxx
@@ -154,9 +154,8 @@ public:
const ScAddress& rCellAddr,
sal_Int16 nStdNumFmt );
- /** Processes the cell formatting data of the passed cell.
- @param nNumFmtId If set, overrides number format of the cell XF. */
- void setCellFormat( const CellModel& rModel, sal_Int32 nNumFmtId = -1 );
+ /** Processes the cell formatting data of the passed cell. */
+ void setCellFormat( const CellModel& rModel );
/** Final processing after the sheet has been imported. */
void finalizeImport();
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index b140079..adec98b 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -822,27 +822,21 @@ class StylesBuffer : public WorkbookHelper
public:
explicit StylesBuffer( const WorkbookHelper& rHelper );
- /** Creates a new empty font object.
- @param opnFontId (out-param) The identifier of the new font object. */
- FontRef createFont( sal_Int32* opnFontId = nullptr );
+ /** Creates a new empty font object. */
+ FontRef createFont();
/** Creates a number format. */
NumberFormatRef createNumFmt( sal_Int32 nNumFmtId, const OUString& rFmtCode );
sal_Int32 nextFreeNumFmtId();
- /** Creates a new empty border object.
- @param opnBorderId (out-param) The identifier of the new border object. */
- BorderRef createBorder( sal_Int32* opnBorderId = nullptr );
- /** Creates a new empty fill object.
- @param opnFillId (out-param) The identifier of the new fill object. */
- FillRef createFill( sal_Int32* opnFillId = nullptr );
- /** Creates a new empty cell formatting object.
- @param opnXfId (out-param) The identifier of the new XF object. */
- XfRef createCellXf( sal_Int32* opnXfId = nullptr );
- /** Creates a new empty style formatting object.
- @param opnXfId (out-param) The identifier of the new XF object. */
- XfRef createStyleXf( sal_Int32* opnXfId = nullptr );
- /** Creates a new empty differential formatting object.
- @param opnDxfId (out-param) The identifier of the new DXF object. */
- DxfRef createDxf( sal_Int32* opnDxfId = nullptr );
+ /** Creates a new empty border object. */
+ BorderRef createBorder();
+ /** Creates a new empty fill object. */
+ FillRef createFill();
+ /** Creates a new empty cell formatting object. */
+ XfRef createCellXf();
+ /** Creates a new empty style formatting object. */
+ XfRef createStyleXf();
+ /** Creates a new empty differential formatting object. */
+ DxfRef createDxf();
/** Appends a new color to the color palette. */
void importPaletteColor( const AttributeList& rAttribs );
diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx
index cb74854..c07d18e 100644
--- a/sc/source/filter/inc/xehelper.hxx
+++ b/sc/source/filter/inc/xehelper.hxx
@@ -297,24 +297,20 @@ public:
current BIFF version contained in the passed XclExpRoot object.
@param rTextObj The text box object.
@param nFlags Modifiers for string export.
- @param nMaxLen The maximum number of characters to store in this string.
@return The new string object (shared pointer). */
static XclExpStringRef CreateString(
const XclExpRoot& rRoot,
const SdrTextObj& rTextObj,
- XclStrFlags nFlags = EXC_STR_DEFAULT,
- sal_uInt16 nMaxLen = EXC_STR_MAXLEN );
+ XclStrFlags nFlags = EXC_STR_DEFAULT );
/** Creates a new formatted string from a edit text string.
@param rEditObj The edittext object.
@param nFlags Modifiers for string export.
- @param nMaxLen The maximum number of characters to store in this string.
@return The new string object. */
static XclExpStringRef CreateString(
const XclExpRoot& rRoot,
const EditTextObject& rEditObj,
- XclStrFlags nFlags = EXC_STR_DEFAULT,
- sal_uInt16 nMaxLen = EXC_STR_MAXLEN );
+ XclStrFlags nFlags = EXC_STR_DEFAULT );
/** Returns the script type first text portion different to WEAK, or the system
default script type, if there is only weak script in the passed string. */
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index e392bc3..4e4b836 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -129,8 +129,7 @@ public:
/** Writes string length field and OString buffer. */
void WriteByteString(
const OString& rString,
- sal_uInt16 nMaxLen = 0x00FF,
- bool b16BitCount = false );
+ sal_uInt16 nMaxLen = 0x00FF );
/** Writes 8-bit character buffer. */
void WriteCharBuffer( const ScfUInt8Vec& rBuffer );
diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx
index 0109972..0b8c5ea 100644
--- a/sc/source/filter/inc/xestring.hxx
+++ b/sc/source/filter/inc/xestring.hxx
@@ -71,12 +71,10 @@ public:
sal_uInt16 nMaxLen = EXC_STR_MAXLEN );
/** Assigns a Unicode character, converts this object to a BIFF8 Unicode string.
- @param nFlags Modifiers for string export.
- @param nMaxLen The maximum number of characters to store in this string (for appending). */
+ @param nFlags Modifiers for string export. */
void Assign(
sal_Unicode cChar,
- XclStrFlags nFlags = EXC_STR_DEFAULT,
- sal_uInt16 nMaxLen = EXC_STR_MAXLEN );
+ XclStrFlags nFlags = EXC_STR_DEFAULT );
/** Assigns an unformatted string, converts this object to a BIFF2-BIFF7 byte string.
@param nFlags Modifiers for string export.
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index f2c4461..632577d 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -234,10 +234,9 @@ public:
sal_uInt16 Insert( const vcl::Font& rFont,
XclExpColorType eColorType, bool bAppFont = false );
/** Inserts the SvxFont into the buffer if not present, e.g. where escapements are used.
- @param bAppFont true = Sets the application font; false = Inserts a new font.
@return The resulting Excel font index. */
sal_uInt16 Insert( const SvxFont& rFont,
- XclExpColorType eColorType, bool bAppFont = false );
+ XclExpColorType eColorType );
/** Inserts the font contained in the passed item set into the buffer, if not present.
@param nScript The script type of the font properties to be used.
@param bAppFont true = Sets the application font; false = Inserts a new font.
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index 74e1466..7041bbb 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -1201,8 +1201,8 @@ public:
@descr The stream must point to the start of an DFF record containing properties. */
void Read( XclImpStream& rStrm );
- /** Returns the specified property or the default value, if not extant. */
- sal_uInt32 GetPropertyValue( sal_uInt16 nPropId, sal_uInt32 nDefault = 0 ) const;
+ /** Returns the specified property or zero, if not extant. */
+ sal_uInt32 GetPropertyValue( sal_uInt16 nPropId ) const;
/** Translates the properties and fills the item set. */
void FillToItemSet( SfxItemSet& rItemSet ) const;
diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx
index 8921843..55c4132 100644
--- a/sc/source/filter/inc/xistyle.hxx
+++ b/sc/source/filter/inc/xistyle.hxx
@@ -403,8 +403,7 @@ public:
void ApplyPattern(
SCCOL nScCol1, SCROW nScRow1,
SCCOL nScCol2, SCROW nScRow2,
- SCTAB nScTab,
- sal_uLong nForceScNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND );
+ SCTAB nScTab );
/** Converts formatting information from BIFF2 cell record data directly. */
static void ApplyPatternForBiff2CellFormat(
diff --git a/sc/source/filter/inc/xladdress.hxx b/sc/source/filter/inc/xladdress.hxx
index d282089..7021cbd 100644
--- a/sc/source/filter/inc/xladdress.hxx
+++ b/sc/source/filter/inc/xladdress.hxx
@@ -38,8 +38,8 @@ struct XclAddress
inline void Set( sal_uInt16 nCol, sal_uInt32 nRow ) { mnCol = nCol; mnRow = nRow; }
- void Read( XclImpStream& rStrm, bool bCol16Bit = true );
- void Write( XclExpStream& rStrm, bool bCol16Bit = true ) const;
+ void Read( XclImpStream& rStrm );
+ void Write( XclExpStream& rStrm ) const;
};
inline XclImpStream& operator>>( XclImpStream& rStrm, XclAddress& rXclPos )
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 1f55d05..1b80a49 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -369,8 +369,7 @@ LotusToSc::LotusToSc(LotusContext &rContext, SvStream &rStream, svl::SharedStrin
typedef FUNC_TYPE ( FuncType1 ) ( sal_uInt8 );
typedef DefTokenId ( FuncType2 ) ( sal_uInt8 );
-void LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest,
- const FORMULA_TYPE /*eFT*/ )
+void LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest )
{
sal_uInt8 nOc;
sal_uInt8 nAnz;
diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx
index 46e2585..bbc4a3d 100644
--- a/sc/source/filter/oox/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -87,9 +87,9 @@ void BinAddress::read( SequenceInputStream& rStrm )
mnCol = rStrm.readInt32();
}
-void BinAddress::read( BiffInputStream& rStrm, bool bCol16Bit, bool bRow32Bit )
+void BinAddress::read( BiffInputStream& rStrm, bool bCol16Bit )
{
- mnRow = bRow32Bit ? rStrm.readInt32() : rStrm.readuInt16();
+ mnRow = rStrm.readuInt16();
mnCol = bCol16Bit ? rStrm.readuInt16() : rStrm.readuInt8();
}
@@ -101,10 +101,10 @@ void BinRange::read( SequenceInputStream& rStrm )
maLast.mnCol = rStrm.readInt32();
}
-void BinRange::read( BiffInputStream& rStrm, bool bCol16Bit, bool bRow32Bit )
+void BinRange::read( BiffInputStream& rStrm, bool bCol16Bit )
{
- maFirst.mnRow = bRow32Bit ? rStrm.readInt32() : rStrm.readuInt16();
- maLast.mnRow = bRow32Bit ? rStrm.readInt32() : rStrm.readuInt16();
+ maFirst.mnRow = rStrm.readuInt16();
+ maLast.mnRow = rStrm.readuInt16();
maFirst.mnCol = bCol16Bit ? rStrm.readuInt16() : rStrm.readuInt8();
maLast.mnCol = bCol16Bit ? rStrm.readuInt16() : rStrm.readuInt8();
}
@@ -284,22 +284,22 @@ bool AddressConverter::parseOoxAddress2d( sal_Int32& ornColumn, sal_Int32& ornRo
bool AddressConverter::parseOoxRange2d(
sal_Int32& ornStartColumn, sal_Int32& ornStartRow,
sal_Int32& ornEndColumn, sal_Int32& ornEndRow,
- const OUString& rString, sal_Int32 nStart, sal_Int32 nLength )
+ const OUString& rString, sal_Int32 nStart )
{
ornStartColumn = ornStartRow = ornEndColumn = ornEndRow = 0;
- if( (nStart < 0) || (nStart >= rString.getLength()) || (nLength < 2) )
+ if( (nStart < 0) || (nStart >= rString.getLength()) )
return false;
- sal_Int32 nEnd = nStart + ::std::min( nLength, rString.getLength() - nStart );
+ sal_Int32 nEnd = nStart + ( rString.getLength() - nStart );
sal_Int32 nColonPos = rString.indexOf( ':', nStart );
if( (nStart < nColonPos) && (nColonPos + 1 < nEnd) )
{
return
parseOoxAddress2d( ornStartColumn, ornStartRow, rString, nStart, nColonPos - nStart ) &&
- parseOoxAddress2d( ornEndColumn, ornEndRow, rString, nColonPos + 1, nLength - nColonPos - 1 );
+ parseOoxAddress2d( ornEndColumn, ornEndRow, rString, nColonPos + 1, SAL_MAX_INT32 - nColonPos - 1 );
}
- if( parseOoxAddress2d( ornStartColumn, ornStartRow, rString, nStart, nLength ) )
+ if( parseOoxAddress2d( ornStartColumn, ornStartRow, rString, nStart ) )
{
ornEndColumn = ornStartColumn;
ornEndRow = ornStartRow;
diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx
index cd5a1cc..1619d2a 100644
--- a/sc/source/filter/oox/biffinputstream.cxx
+++ b/sc/source/filter/oox/biffinputstream.cxx
@@ -207,9 +207,9 @@ void BiffInputStream::setDecoder( const BiffDecoderRef& rxDecoder )
maRecBuffer.setDecoder( rxDecoder );
}
-void BiffInputStream::enableDecoder( bool bEnable )
+void BiffInputStream::enableDecoder()
{
- maRecBuffer.enableDecoder( bEnable );
+ maRecBuffer.enableDecoder( true );
}
// stream/record state and info -----------------------------------------------
diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx
index b415876..c88d76e 100644
--- a/sc/source/filter/oox/richstring.cxx
+++ b/sc/source/filter/oox/richstring.cxx
@@ -380,7 +380,7 @@ bool RichString::extractPlainString( OUString& orString, const oox::xls::Font* p
return false;
}
-void RichString::convert( const Reference< XText >& rxText, bool bReplaceOld, const oox::xls::Font* pFirstPortionFont ) const
+void RichString::convert( const Reference< XText >& rxText, bool bReplaceOld ) const
{
if (maTextPortions.size() == 1)
{
@@ -388,14 +388,13 @@ void RichString::convert( const Reference< XText >& rxText, bool bReplaceOld, co
// It's much faster this way.
RichStringPortion& rPtn = *maTextPortions.front();
rxText->setString(rPtn.getText());
- rPtn.writeFontProperties(rxText, pFirstPortionFont);
+ rPtn.writeFontProperties(rxText, nullptr);
return;
}
for( PortionVector::const_iterator aIt = maTextPortions.begin(), aEnd = maTextPortions.end(); aIt != aEnd; ++aIt )
{
- (*aIt)->convert( rxText, pFirstPortionFont, bReplaceOld );
- pFirstPortionFont = nullptr; // use passed font for first portion only
+ (*aIt)->convert( rxText, nullptr, bReplaceOld );
bReplaceOld = false; // do not replace first portion text with following portions
}
}
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx
index 68bc3d2..06768e3 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -727,12 +727,12 @@ void SheetDataBuffer::finalizeTableOperation( const CellRangeAddress& rRange, co
}
}
-void SheetDataBuffer::setCellFormat( const CellModel& rModel, sal_Int32 nNumFmtId )
+void SheetDataBuffer::setCellFormat( const CellModel& rModel )
{
- if( (rModel.mnXfId >= 0) || (nNumFmtId >= 0) )
+ if( rModel.mnXfId >= 0 )
{
- ::std::vector< CellRangeAddress >::reverse_iterator aIt = maXfIdRangeLists[ XfIdNumFmtKey( rModel.mnXfId, nNumFmtId ) ].rbegin();
- ::std::vector< CellRangeAddress >::reverse_iterator aItEnd = maXfIdRangeLists[ XfIdNumFmtKey( rModel.mnXfId, nNumFmtId ) ].rend();
+ ::std::vector< CellRangeAddress >::reverse_iterator aIt = maXfIdRangeLists[ XfIdNumFmtKey( rModel.mnXfId, -1 ) ].rbegin();
+ ::std::vector< CellRangeAddress >::reverse_iterator aItEnd = maXfIdRangeLists[ XfIdNumFmtKey( rModel.mnXfId, -1 ) ].rend();
/* The xlsx sheet data contains row wise information.
* It is sufficient to check if the row range size is one
*/
@@ -746,13 +746,13 @@ void SheetDataBuffer::setCellFormat( const CellModel& rModel, sal_Int32 nNumFmtI
}
else
{
- maXfIdRangeLists[ XfIdNumFmtKey (rModel.mnXfId, nNumFmtId ) ].push_back(
+ maXfIdRangeLists[ XfIdNumFmtKey (rModel.mnXfId, -1 ) ].push_back(
CellRangeAddress( rModel.maCellAddr.Tab(), rModel.maCellAddr.Col(), rModel.maCellAddr.Row(),
rModel.maCellAddr.Col(), rModel.maCellAddr.Row() ) );
}
- aIt = maXfIdRangeLists[ XfIdNumFmtKey( rModel.mnXfId, nNumFmtId ) ].rbegin();
- aItEnd = maXfIdRangeLists[ XfIdNumFmtKey( rModel.mnXfId, nNumFmtId ) ].rend();
+ aIt = maXfIdRangeLists[ XfIdNumFmtKey( rModel.mnXfId, -1 ) ].rbegin();
+ aItEnd = maXfIdRangeLists[ XfIdNumFmtKey( rModel.mnXfId, -1 ) ].rend();
::std::vector< CellRangeAddress >::reverse_iterator aItM = aIt+1;
while( aItM != aItEnd )
{
@@ -764,7 +764,7 @@ void SheetDataBuffer::setCellFormat( const CellModel& rModel, sal_Int32 nNumFmtI
aIt->EndColumn == aItM->EndColumn)
{
aItM->EndRow = aIt->EndRow;
- maXfIdRangeLists[ XfIdNumFmtKey( rModel.mnXfId, nNumFmtId ) ].pop_back();
+ maXfIdRangeLists[ XfIdNumFmtKey( rModel.mnXfId, -1 ) ].pop_back();
break;
}
else if( aIt->StartRow > aItM->EndRow + 1 )
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index d776f06..5756f2f 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2856,9 +2856,8 @@ StylesBuffer::StylesBuffer( const WorkbookHelper& rHelper ) :
{
}
-FontRef StylesBuffer::createFont( sal_Int32* opnFontId )
+FontRef StylesBuffer::createFont()
{
- if( opnFontId ) *opnFontId = static_cast< sal_Int32 >( maFonts.size() );
FontRef xFont( new Font( *this, false ) );
maFonts.push_back( xFont );
return xFont;
@@ -2874,41 +2873,36 @@ sal_Int32 StylesBuffer::nextFreeNumFmtId()
return maNumFmts.nextFreeId();
}
-BorderRef StylesBuffer::createBorder( sal_Int32* opnBorderId )
+BorderRef StylesBuffer::createBorder()
{
- if( opnBorderId ) *opnBorderId = static_cast< sal_Int32 >( maBorders.size() );
BorderRef xBorder( new Border( *this, false ) );
maBorders.push_back( xBorder );
return xBorder;
}
-FillRef StylesBuffer::createFill( sal_Int32* opnFillId )
+FillRef StylesBuffer::createFill()
{
- if( opnFillId ) *opnFillId = static_cast< sal_Int32 >( maFills.size() );
FillRef xFill( new Fill( *this, false ) );
maFills.push_back( xFill );
return xFill;
}
-XfRef StylesBuffer::createCellXf( sal_Int32* opnXfId )
+XfRef StylesBuffer::createCellXf()
{
- if( opnXfId ) *opnXfId = static_cast< sal_Int32 >( maCellXfs.size() );
XfRef xXf( new Xf( *this ) );
maCellXfs.push_back( xXf );
return xXf;
}
-XfRef StylesBuffer::createStyleXf( sal_Int32* opnXfId )
+XfRef StylesBuffer::createStyleXf()
{
- if( opnXfId ) *opnXfId = static_cast< sal_Int32 >( maStyleXfs.size() );
XfRef xXf( new Xf( *this ) );
maStyleXfs.push_back( xXf );
return xXf;
}
-DxfRef StylesBuffer::createDxf( sal_Int32* opnDxfId )
+DxfRef StylesBuffer::createDxf()
{
- if( opnDxfId ) *opnDxfId = static_cast< sal_Int32 >( maDxfs.size() );
DxfRef xDxf( new Dxf( *this ) );
maDxfs.push_back( xDxf );
return xDxf;
diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx
index 7601972..2cf7807 100644
--- a/sc/source/filter/qpro/qpro.cxx
+++ b/sc/source/filter/qpro/qpro.cxx
@@ -106,7 +106,7 @@ FltError ScQProReader::readSheet( SCTAB nTab, ScDocument* pDoc, ScQProStyle *pSt
const ScTokenArray *pArray;
QProToSc aConv(*mpStream, pDoc->GetSharedStringPool(), aAddr);
- if (ConvOK != aConv.Convert( pArray, nLen ))
+ if (ConvOK != aConv.Convert( pArray ))
eRet = eERR_FORMAT;
else
{
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index d3e2b6e..e91f55f 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -172,7 +172,7 @@ do { \
nRef-=amt; \
} while(false)
-ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, const FORMULA_TYPE /*eFT*/ )
+ConvErr QProToSc::Convert( const ScTokenArray*& pArray )
{
sal_uInt8 nFmla[ nBufSize ], i, nArg;
sal_uInt8 nArgArray[ nBufSize ] = {0};
diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx
index 1e5eaf1..7b3625d 100644
--- a/sc/source/filter/xml/XMLConverter.cxx
+++ b/sc/source/filter/xml/XMLConverter.cxx
@@ -100,8 +100,7 @@ ScSubTotalFunc ScXMLConverter::GetSubTotalFuncFromString( const OUString& sFunct
void ScXMLConverter::GetStringFromFunction(
OUString& rString,
- const sheet::GeneralFunction eFunction,
- bool bAppendStr )
+ const sheet::GeneralFunction eFunction )
{
OUString sFuncStr;
switch( eFunction )
@@ -124,13 +123,12 @@ void ScXMLConverter::GetStringFromFunction(
// added to avoid warnings
}
}
- ScRangeStringConverter::AssignString( rString, sFuncStr, bAppendStr );
+ ScRangeStringConverter::AssignString( rString, sFuncStr, false );
}
void ScXMLConverter::GetStringFromFunction(
OUString& rString,
- const ScSubTotalFunc eFunction,
- bool bAppendStr )
+ const ScSubTotalFunc eFunction )
{
OUString sFuncStr;
switch( eFunction )
@@ -151,7 +149,7 @@ void ScXMLConverter::GetStringFromFunction(
case SUBTOTAL_FUNC_VAR: sFuncStr = GetXMLToken( XML_VAR ); break;
case SUBTOTAL_FUNC_VARP: sFuncStr = GetXMLToken( XML_VARP ); break;
}
- ScRangeStringConverter::AssignString( rString, sFuncStr, bAppendStr );
+ ScRangeStringConverter::AssignString( rString, sFuncStr, false );
}
sheet::DataPilotFieldOrientation ScXMLConverter::GetOrientationFromString(
@@ -170,8 +168,7 @@ sheet::DataPilotFieldOrientation ScXMLConverter::GetOrientationFromString(
void ScXMLConverter::GetStringFromOrientation(
OUString& rString,
- const sheet::DataPilotFieldOrientation eOrientation,
- bool bAppendStr )
+ const sheet::DataPilotFieldOrientation eOrientation )
{
OUString sOrientStr;
switch( eOrientation )
@@ -196,7 +193,7 @@ void ScXMLConverter::GetStringFromOrientation(
// added to avoid warnings
}
}
- ScRangeStringConverter::AssignString( rString, sOrientStr, bAppendStr );
+ ScRangeStringConverter::AssignString( rString, sOrientStr, false );
}
ScDetectiveObjType ScXMLConverter::GetDetObjTypeFromString( const OUString& rString )
@@ -229,8 +226,7 @@ bool ScXMLConverter::GetDetOpTypeFromString( ScDetOpType& rDetOpType, const OUSt
void ScXMLConverter::GetStringFromDetObjType(
OUString& rString,
- const ScDetectiveObjType eObjType,
- bool bAppendStr )
+ const ScDetectiveObjType eObjType )
{
OUString sTypeStr;
switch( eObjType )
@@ -249,13 +245,12 @@ void ScXMLConverter::GetStringFromDetObjType(
// added to avoid warnings
}
}
- ScRangeStringConverter::AssignString( rString, sTypeStr, bAppendStr );
+ ScRangeStringConverter::AssignString( rString, sTypeStr, false );
}
void ScXMLConverter::GetStringFromDetOpType(
OUString& rString,
- const ScDetOpType eOpType,
- bool bAppendStr )
+ const ScDetOpType eOpType )
{
OUString sTypeStr;
switch( eOpType )
@@ -276,7 +271,7 @@ void ScXMLConverter::GetStringFromDetOpType(
sTypeStr = GetXMLToken( XML_REMOVE_PRECEDENTS );
break;
}
- ScRangeStringConverter::AssignString( rString, sTypeStr, bAppendStr );
+ ScRangeStringConverter::AssignString( rString, sTypeStr, false );
}
void ScXMLConverter::ConvertCellRangeAddress(OUString& sFormula)
diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx
index d249a7d..51a2f52 100644
--- a/sc/source/filter/xml/XMLConverter.hxx
+++ b/sc/source/filter/xml/XMLConverter.hxx
@@ -54,12 +54,10 @@ public:
// EXPORT: GeneralFunction / ScSubTotalFunc
static void GetStringFromFunction(
OUString& rString,
- const css::sheet::GeneralFunction eFunction,
- bool bAppendStr = false );
+ const css::sheet::GeneralFunction eFunction );
static void GetStringFromFunction(
OUString& rString,
- const ScSubTotalFunc eFunction,
- bool bAppendStr = false );
+ const ScSubTotalFunc eFunction );
// IMPORT: DataPilotFieldOrientation
static css::sheet::DataPilotFieldOrientation
@@ -69,8 +67,7 @@ public:
// EXPORT: DataPilotFieldOrientation
static void GetStringFromOrientation(
OUString& rString,
- const css::sheet::DataPilotFieldOrientation eOrientation,
- bool bAppendStr = false );
+ const css::sheet::DataPilotFieldOrientation eOrientation );
// IMPORT: Detective
static ScDetectiveObjType
@@ -83,12 +80,10 @@ public:
// EXPORT: Detective
static void GetStringFromDetObjType(
OUString& rString,
- const ScDetectiveObjType eObjType,
- bool bAppendStr = false );
+ const ScDetectiveObjType eObjType );
static void GetStringFromDetOpType(
OUString& rString,
- const ScDetOpType eOpType,
- bool bAppendStr = false );
+ const ScDetOpType eOpType );
// IMPORT: Formulas
static void ConvertCellRangeAddress(
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index dff739d..e256492 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -3339,9 +3339,9 @@ void ScXMLImport::SetRangeOverflowType(sal_uInt32 nType)
pDoc->SetRangeOverflowType( nType );
}
-void ScXMLImport::ProgressBarIncrement(bool bEditCell, sal_Int32 nInc)
+void ScXMLImport::ProgressBarIncrement(bool bEditCell)
{
- nProgressCount += nInc;
+ nProgressCount++;
if (bEditCell || nProgressCount > 100)
{
GetProgressBarHelper()->Increment(nProgressCount);
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 52cfb9d..04ff141 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -1149,7 +1149,7 @@ public:
const sal_Int16 nCellType,
const OUString& rCurrency);
- void ProgressBarIncrement(bool bEditCell, sal_Int32 nInc = 1);
+ void ProgressBarIncrement(bool bEditCell);
void SetNewCondFormatData() { mbHasNewCondFormatData = true; }
bool HasNewCondFormatData() { return mbHasNewCondFormatData; }
diff --git a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
index 3594aa7..982249c 100644
--- a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
+++ b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
@@ -66,11 +66,10 @@ void FormulaTemplate::applyRange(const OUString& aVariable, const ScRange& aRang
mTemplate = mTemplate.replaceAll(aVariable, aString);
}
-void FormulaTemplate::applyRangeList(const OUString& aVariable, const ScRangeList& aRangeList, bool b3D)
+void FormulaTemplate::applyRangeList(const OUString& aVariable, const ScRangeList& aRangeList)
{
- sal_uInt16 nFlag = b3D ? SCR_ABS_3D : SCR_ABS;
OUString aString;
- aRangeList.Format(aString, nFlag, mpDoc, mpDoc->GetAddressConvention());
+ aRangeList.Format(aString, SCR_ABS_3D, mpDoc, mpDoc->GetAddressConvention());
mTemplate = mTemplate.replaceAll(aVariable, aString);
}
diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx
index 2fb1030..2c09f20 100644
--- a/sc/source/ui/dbgui/csvcontrol.cxx
+++ b/sc/source/ui/dbgui/csvcontrol.cxx
@@ -155,11 +155,11 @@ void ScCsvControl::DisableRepaint()
++mrData.mnNoRepaint;
}
-void ScCsvControl::EnableRepaint( bool bInvalidate )
+void ScCsvControl::EnableRepaint()
{
OSL_ENSURE( IsNoRepaint(), "ScCsvControl::EnableRepaint - invalid call" );
--mrData.mnNoRepaint;
- Repaint( bInvalidate );
+ Repaint();
}
// command handling -----------------------------------------------------------
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index 2d78db6..e05b81f 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -116,7 +116,7 @@ bool ScDBDocFunc::DoImportUno( const ScAddress& rPos,
}
bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
- const svx::ODataAccessDescriptor* pDescriptor, bool bRecord, bool bAddrInsert )
+ const svx::ODataAccessDescriptor* pDescriptor, bool bRecord )
{
ScDocument& rDoc = rDocShell.GetDocument();
ScChangeTrack *pChangeTrack = nullptr;
@@ -125,16 +125,12 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
if (bRecord && !rDoc.IsUndoEnabled())
bRecord = false;
- ScDBData* pDBData = nullptr;
- if ( !bAddrInsert )
+ ScDBData* pDBData = rDoc.GetDBAtArea( nTab, rParam.nCol1, rParam.nRow1,
+ rParam.nCol2, rParam.nRow2 );
+ if (!pDBData)
{
- pDBData = rDoc.GetDBAtArea( nTab, rParam.nCol1, rParam.nRow1,
- rParam.nCol2, rParam.nRow2 );
- if (!pDBData)
- {
- OSL_FAIL( "DoImport: no DBData" );
- return false;
- }
+ OSL_FAIL( "DoImport: no DBData" );
+ return false;
}
vcl::Window* pWaitWin = ScDocShell::GetActiveDialogParent();
@@ -281,17 +277,15 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
pCurrArr[i] = xMeta->isCurrency( i+1 );
}
- if ( !bAddrInsert ) // read column names
+ // read column names
+ nCol = rParam.nCol1;
+ for (long i=0; i<nColCount; i++)
{
- nCol = rParam.nCol1;
- for (long i=0; i<nColCount; i++)
- {
- pImportDoc->SetString( nCol, nRow, nTab,
- xMeta->getColumnLabel( i+1 ) );
- ++nCol;
- }
- ++nRow;
+ pImportDoc->SetString( nCol, nRow, nTab,
+ xMeta->getColumnLabel( i+1 ) );
+ ++nCol;
}
+ ++nRow;
bool bEnd = false;
if ( !bDoSelection )
@@ -389,8 +383,8 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
// test for cell protection
- bool bKeepFormat = !bAddrInsert && pDBData->IsKeepFmt();
- bool bMoveCells = !bAddrInsert && pDBData->IsDoSize();
+ bool bKeepFormat = pDBData->IsKeepFmt();
+ bool bMoveCells = pDBData->IsDoSize();
SCCOL nFormulaCols = 0; // columns to be filled with formulas
if (bMoveCells && nEndCol == rParam.nCol2)
{
@@ -486,8 +480,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
pUndoDoc->InitUndo( &rDoc, nTab, nTab );
- if ( !bAddrInsert )
- pUndoDBData = new ScDBData( *pDBData );
+ pUndoDBData = new ScDBData( *pDBData );
}
ScMarkData aNewMark;
@@ -578,15 +571,13 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
aNewMark, InsertDeleteFlags::CONTENTS );
}
- if( !bAddrInsert ) // update database range
- {
- pDBData->SetImportParam( rParam );
- pDBData->SetHeader( true );
- pDBData->SetByRow( true );
- pDBData->SetArea( nTab, rParam.nCol1,rParam.nRow1, nEndCol,nEndRow );
- pDBData->SetImportSelection( bRealSelection );
- rDoc.CompileDBFormula();
- }
+ // update database range
+ pDBData->SetImportParam( rParam );
+ pDBData->SetHeader( true );
+ pDBData->SetByRow( true );
+ pDBData->SetArea( nTab, rParam.nCol1,rParam.nRow1, nEndCol,nEndRow );
+ pDBData->SetImportSelection( bRealSelection );
+ rDoc.CompileDBFormula();
if (bRecord)
{
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 5d03e98..e8b6cd8 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2768,13 +2768,13 @@ void ScDocShell::SetModified( bool bModified )
}
}
-void ScDocShell::SetDocumentModified( bool bIsModified /* = true */ )
+void ScDocShell::SetDocumentModified()
{
// BroadcastUno must also happen right away with pPaintLockData
// FIXME: Also for SetDrawModified, if Drawing is connected
// FIXME: Then own Hint?
- if ( pPaintLockData && bIsModified )
+ if ( pPaintLockData )
{
// #i115009# broadcast BCA_BRDCST_ALWAYS, so a component can read recalculated results
// of RecalcModeAlways formulas (like OFFSET) after modifying cells
@@ -2786,41 +2786,38 @@ void ScDocShell::SetDocumentModified( bool bIsModified /* = true */ )
return;
}
- SetDrawModified( bIsModified );
+ SetDrawModified();
- if ( bIsModified )
+ if ( aDocument.IsAutoCalcShellDisabled() )
+ SetDocumentModifiedPending( true );
+ else
{
- if ( aDocument.IsAutoCalcShellDisabled() )
- SetDocumentModifiedPending( true );
- else
+ SetDocumentModifiedPending( false );
+ aDocument.InvalidateStyleSheetUsage();
+ aDocument.InvalidateTableArea();
+ aDocument.InvalidateLastTableOpParams();
+ aDocument.Broadcast(ScHint(SC_HINT_DATACHANGED, BCA_BRDCST_ALWAYS));
+ if ( aDocument.IsForcedFormulaPending() && aDocument.GetAutoCalc() )
+ aDocument.CalcFormulaTree( true );
+ aDocument.RefreshDirtyTableColumnNames();
+ PostDataChanged();
+
+ // Detective AutoUpdate:
+ // Update if formulas were modified (DetectiveDirty) or the list contains
+ // "Trace Error" entries (Trace Error can look completely different
+ // after changes to non-formula cells).
+
+ ScDetOpList* pList = aDocument.GetDetOpList();
+ if ( pList && ( aDocument.IsDetectiveDirty() || pList->HasAddError() ) &&
+ pList->Count() && !IsInUndo() && SC_MOD()->GetAppOptions().GetDetectiveAuto() )
{
- SetDocumentModifiedPending( false );
- aDocument.InvalidateStyleSheetUsage();
- aDocument.InvalidateTableArea();
- aDocument.InvalidateLastTableOpParams();
- aDocument.Broadcast(ScHint(SC_HINT_DATACHANGED, BCA_BRDCST_ALWAYS));
- if ( aDocument.IsForcedFormulaPending() && aDocument.GetAutoCalc() )
- aDocument.CalcFormulaTree( true );
- aDocument.RefreshDirtyTableColumnNames();
- PostDataChanged();
-
- // Detective AutoUpdate:
- // Update if formulas were modified (DetectiveDirty) or the list contains
- // "Trace Error" entries (Trace Error can look completely different
- // after changes to non-formula cells).
-
- ScDetOpList* pList = aDocument.GetDetOpList();
- if ( pList && ( aDocument.IsDetectiveDirty() || pList->HasAddError() ) &&
- pList->Count() && !IsInUndo() && SC_MOD()->GetAppOptions().GetDetectiveAuto() )
- {
- GetDocFunc().DetectiveRefresh(true); // sal_True = caused by automatic update
- }
- aDocument.SetDetectiveDirty(false); // always reset, also if not refreshed
+ GetDocFunc().DetectiveRefresh(true); // sal_True = caused by automatic update
}
-
- // notify UNO objects after BCA_BRDCST_ALWAYS etc.
- aDocument.BroadcastUno( SfxSimpleHint( SFX_HINT_DATACHANGED ) );
+ aDocument.SetDetectiveDirty(false); // always reset, also if not refreshed
}
+
+ // notify UNO objects after BCA_BRDCST_ALWAYS etc.
+ aDocument.BroadcastUno( SfxSimpleHint( SFX_HINT_DATACHANGED ) );
}
/**
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 9719365..156c503 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -374,7 +374,7 @@ void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, vcl::Window* pWin )
}
}
-void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, sal_uInt16 nTabPage )
+void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq )
{
ScDrawView* pView = pViewData->GetScDrawView();
bool bHasMarked = pView->AreObjectsMarked();
@@ -396,8 +396,6 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, sal_uInt16 nTabPage )
pObj,
bHasMarked));
OSL_ENSURE(pDlg, "Dialog creation failed!");
- if ( nTabPage != 0xffff )
- pDlg->SetCurPageId( nTabPage );
if ( pDlg->Execute() == RET_OK )
{
@@ -411,7 +409,7 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, sal_uInt16 nTabPage )
}
}
-void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, sal_uInt16 nTabPage )
+void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq )
{
ScDrawView* pView = pViewData->GetScDrawView();
bool bHasMarked = pView->AreObjectsMarked();
@@ -425,9 +423,6 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, sal_uInt16 nTabPage )
pViewData->GetDialogParent(), &aNewAttr,
pViewData->GetDocument()->GetDrawLayer(), true));
- if ( nTabPage != 0xffff )
- pDlg->SetCurPageId( nTabPage );
-
if ( pDlg->Execute() == RET_OK )
{
if( bHasMarked )
@@ -440,7 +435,7 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, sal_uInt16 nTabPage )
}
}
-void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, sal_uInt16 /* nTabPage */ )
+void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq )
{
ScDrawView* pView = pViewData->GetScDrawView();
bool bHasMarked = pView->AreObjectsMarked();
diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx
index f59e889..6be50c4 100644
--- a/sc/source/ui/drawfunc/futext3.cxx
+++ b/sc/source/ui/drawfunc/futext3.cxx
@@ -46,9 +46,8 @@
// Editieren von Notiz-Legendenobjekten muss immer ueber StopEditMode beendet werden,
// damit die Aenderungen ins Dokument uebernommen werden!
// (Fontwork-Execute in drawsh und drtxtob passiert nicht fuer Legendenobjekte)
-// bTextDirection=sal_True means that this function is called from SID_TEXTDIRECTION_XXX(drtxtob.cxx).
-void FuText::StopEditMode(bool /*bTextDirection*/)
+void FuText::StopEditMode()
{
SdrObject* pObject = pView->GetTextEditObject();
if( !pObject ) return;
diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx
index d908eec..e1a1de7 100644
--- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx
+++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx
@@ -46,7 +46,7 @@ public:
void autoReplaceUses3D(bool bUse3D = true) { mbUse3D = bUse3D; }
void applyRange(const OUString& aVariable, const ScRange& aRange, bool b3D = true);
- void applyRangeList(const OUString& aVariable, const ScRangeList& aRangeList, bool b3D = true);
+ void applyRangeList(const OUString& aVariable, const ScRangeList& aRangeList);
void applyAddress(const OUString& aVariable, const ScAddress& aAddress, bool b3D = true);
void applyString(const OUString& aVariable, const OUString& aValue);
void applyNumber(const OUString& aVariable, sal_Int32 aValue);
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 637a5d6..d84d000 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -91,7 +91,7 @@ public:
inline void SetWindow(vcl::Window* _pWindow) { m_pWindow = _pWindow; }
void DoClose( sal_uInt16 nId );
static void SetDispatcherLock( bool bLock );
- static void EnableSpreadsheets( bool bFlag = true, bool bChildren = true );
+ static void EnableSpreadsheets( bool bFlag = true );
static void ViewShellChanged();
static void enableInput(bool _bInput);
diff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxx
index 45c6a13..49d5853 100644
--- a/sc/source/ui/inc/cbutton.hxx
+++ b/sc/source/ui/inc/cbutton.hxx
@@ -38,9 +38,8 @@ public:
const Size& rSize,
bool bState,
bool bBtnIn = false );
- void Draw( bool bState,
- bool bBtnIn = false )
- { Draw( aBtnPos, aBtnSize, bState, bBtnIn ); }
+ void Draw( bool bState )
+ { Draw( aBtnPos, aBtnSize, bState ); }
void SetOptSizePixel();
diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx
index eb7a7fb..f645a61 100644
--- a/sc/source/ui/inc/csvcontrol.hxx
+++ b/sc/source/ui/inc/csvcontrol.hxx
@@ -273,9 +273,8 @@ public:
void Repaint( bool bInvalidate = false );
/** Increases no-repaint counter (controls do not repaint until the last EnableRepaint()). */
void DisableRepaint();
- /** Decreases no-repaint counter and repaints if counter reaches 0.
- @param bInvalidate true = invalidates graphics of this control (not all). */
- void EnableRepaint( bool bInvalidate = false );
+ /** Decreases no-repaint counter and repaints if counter reaches 0. */
+ void EnableRepaint();
/** Returns true, if controls will not repaint. */
inline bool IsNoRepaint() const { return mrData.mnNoRepaint > 0; }
diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx
index fc58a57..f8e87b4 100644
--- a/sc/source/ui/inc/dbdocfun.hxx
+++ b/sc/source/ui/inc/dbdocfun.hxx
@@ -62,8 +62,7 @@ public:
bool DoImport( SCTAB nTab, const ScImportParam& rParam,
const svx::ODataAccessDescriptor* pDescriptor, // used for selection an existing ResultSet
- bool bRecord,
- bool bAddrInsert = false );
+ bool bRecord );
bool DoImportUno( const ScAddress& rPos,
const css::uno::Sequence<css::beans::PropertyValue>& aArgs );
diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx
index d8b2be5..6df004f 100644
--- a/sc/source/ui/inc/dbfunc.hxx
+++ b/sc/source/ui/inc/dbfunc.hxx
@@ -47,8 +47,7 @@ public:
// only UISort repeat the partial results if necessary
- void UISort( const ScSortParam& rSortParam,
- bool bRecord = true );
+ void UISort( const ScSortParam& rSortParam );
void Sort( const ScSortParam& rSortParam,
bool bRecord = true, bool bPaint = true );
@@ -62,7 +61,7 @@ public:
void RepeatDB( bool bRecord = true );
- bool ImportData( const ScImportParam& rParam, bool bRecord = true );
+ bool ImportData( const ScImportParam& rParam );
void GotoDBArea( const OUString& rDBName );
@@ -70,11 +69,11 @@ public:
ScDBData* GetDBData( bool bMarkArea = true, ScGetDBMode eMode = SC_DB_MAKE, ScGetDBSelection eSel = SC_DBSEL_KEEP);
ScDBData* GetAnonymousDBData();
- void Consolidate( const ScConsolidateParam& rParam, bool bRecord = true );
+ void Consolidate( const ScConsolidateParam& rParam );
bool MakePivotTable(
const ScDPSaveData& rData, const ScRange& rDest, bool bNewTable,
- const ScDPObject& rSource, bool bApi = false );
+ const ScDPObject& rSource );
void DeletePivotTable();
void RecalcPivotTable();
@@ -100,7 +99,7 @@ public:
void RemoveAllOutlines( bool bRecord = true );
void TestRemoveOutline( bool& rCol, bool& rRow );
- void AutoOutline( bool bRecord = true );
+ void AutoOutline();
void SelectLevel( bool bColumns, sal_uInt16 nLevel,
bool bRecord = true, bool bPaint = true );
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index c1fbcd7..3545654 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -331,7 +331,7 @@ public:
SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab );
void UpdatePaintExt( sal_uInt16& rExtFlags, const ScRange& rRange );
- void SetDocumentModified( bool bIsModified = true );
+ void SetDocumentModified();
void SetDrawModified( bool bIsModified = true );
void LockPaint();
diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx
index f13781e..e6beb61 100644
--- a/sc/source/ui/inc/drawsh.hxx
+++ b/sc/source/ui/inc/drawsh.hxx
@@ -78,9 +78,9 @@ public:
void StateFormatPaintbrush(SfxItemSet& rSet);
void ExecuteMacroAssign( SdrObject* pObj, vcl::Window* pWin );
- void ExecuteLineDlg( SfxRequest& rReq, sal_uInt16 nTabPage = 0xffff );
- void ExecuteAreaDlg( SfxRequest& rReq, sal_uInt16 nTabPage = 0xffff );
- void ExecuteTextAttrDlg( SfxRequest& rReq, sal_uInt16 nTabPage = 0xffff );
+ void ExecuteLineDlg( SfxRequest& rReq );
+ void ExecuteAreaDlg( SfxRequest& rReq );
+ void ExecuteTextAttrDlg( SfxRequest& rReq );
ScDrawView* GetDrawView();
diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
index 9548292..99280f3 100644
--- a/sc/source/ui/inc/drawview.hxx
+++ b/sc/source/ui/inc/drawview.hxx
@@ -114,7 +114,7 @@ public:
bool HasMarkedControl() const;
bool HasMarkedInternal() const;
- void InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, SdrInsertFlags nOptions=SdrInsertFlags::NONE);
+ void InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV);
/** Returns the selected object, if it is the caption object of a cell note.
@param ppCaptData (out-param) If not null, returns the pointer to the caption object data. */
diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx
index bb91182..559eb4c 100644
--- a/sc/source/ui/inc/futext.hxx
+++ b/sc/source/ui/inc/futext.hxx
@@ -50,7 +50,7 @@ public:
void SetInEditMode( SdrObject* pObj = nullptr, const Point* pMousePixel = nullptr,
bool bCursorToEnd = false, const KeyEvent* pInitialKey = nullptr );
- void StopEditMode(bool bTextDirection = false);
+ void StopEditMode();
// Create default drawing objects via keyboard
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) override;
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 601a90b..73434b4 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -293,7 +293,7 @@ public:
long GetScrW() const { return nScrW; }
long GetScrH() const { return nScrH; }
- void SetSnapPixel( bool bSet = true );
+ void SetSnapPixel();
void DrawGrid(vcl::RenderContext& rRenderContext, bool bGrid, bool bPage);
void DrawStrings( bool bPixelToLogic = false );
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index 142decf..d106b37 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -166,7 +166,7 @@ class ScSimpleRefDlgWrapper: public SfxChildWindow
SFX_DECL_CHILDWINDOW_WITHID(Class);
- static void SetDefaultPosSize(Point aPos, Size aSize, bool bSet = true);
+ static void SetDefaultPosSize(Point aPos, Size aSize);
void SetRefString(const OUString& rStr);
void SetCloseHdl( const Link<const OUString*,void>& rLink );
void SetUnoLinks( const Link<const OUString&,void>& rDone, const Link<const OUString&,void>& rAbort,
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 5e7d9c7..cb6c65b 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -308,8 +308,7 @@ public:
static void UpdateInputLine();
- void InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eType,
- bool bPaint = true );
+ void InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eType );
void DoneRefMode( bool bContinue = false );
void UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ );
void StopRefMode();
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index a2fb0a7..61f3775 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -157,8 +157,7 @@ public:
bool InsertName( const OUString& rName, const OUString& rSymbol,
const OUString& rType );
- void ApplyAttributes( const SfxItemSet* pDialogSet, const SfxItemSet* pOldSet,
- bool bRecord = true );
+ void ApplyAttributes( const SfxItemSet* pDialogSet, const SfxItemSet* pOldSet );
void ApplyAttr( const SfxPoolItem& rAttrItem );
void ApplySelectionPattern( const ScPatternAttr& rAttr,
bool bRecord = true,
@@ -171,8 +170,7 @@ public:
const SfxStyleSheet*
GetStyleSheetFromMarked();
- void SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet,
- bool bRecord = true );
+ void SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet );
void RemoveStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet );
void UpdateStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet );
@@ -189,21 +187,21 @@ public:
void Protect( SCTAB nTab, const OUString& rPassword );
bool Unprotect( SCTAB nTab, const OUString& rPassword );
- void DeleteCells( DelCellCmd eCmd, bool bRecord = true );
+ void DeleteCells( DelCellCmd eCmd );
bool InsertCells( InsCellCmd eCmd, bool bRecord = true, bool bPartOfPaste = false );
void DeleteMulti( bool bRows, bool bRecord = true );
- void DeleteContents( InsertDeleteFlags nFlags, bool bRecord = true );
+ void DeleteContents( InsertDeleteFlags nFlags );
void SetWidthOrHeight(
bool bWidth, const std::vector<sc::ColRowSpan>& rRanges, ScSizeMode eMode,
sal_uInt16 nSizeTwips, bool bRecord = true, bool bPaint = true, ScMarkData* pMarkData = nullptr );
void SetMarkedWidthOrHeight( bool bWidth, ScSizeMode eMode, sal_uInt16 nSizeTwips,
- bool bRecord = true, bool bPaint = true );
+ bool bRecord = true );
bool AdjustBlockHeight( bool bPaint = true, ScMarkData* pMarkData = nullptr );
- bool AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint = true );
+ bool AdjustRowHeight( SCROW nStartRow, SCROW nEndRow );
void ModifyCellSize( ScDirection eDir, bool bOptimal );
@@ -225,20 +223,20 @@ public:
bool TestRemoveMerge();
bool MergeCells( bool bApi, bool& rDoContents, bool bRecord = true, bool bCenter = false );
- bool RemoveMerge( bool bRecord = true );
+ bool RemoveMerge();
- void FillSimple( FillDir eDir, bool bRecord = true );
+ void FillSimple( FillDir eDir );
void FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
- double fStart, double fStep, double fMax, bool bRecord = true );
+ double fStart, double fStep, double fMax );
void FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow,
- SCCOL nEndCol, SCROW nEndRow, sal_uLong nCount, bool bRecord = true );
+ SCCOL nEndCol, SCROW nEndRow, sal_uLong nCount );
void FillCrossDblClick();
void ConvertFormulaToValue();
void TransliterateText( sal_Int32 nType );
ScAutoFormatData* CreateAutoFormatData();
- void AutoFormat( sal_uInt16 nFormatNo, bool bRecord = true );
+ void AutoFormat( sal_uInt16 nFormatNo );
bool SearchAndReplace( const SvxSearchItem* pSearchItem,
bool bAddUndo, bool bIsApi );
@@ -286,10 +284,10 @@ public:
void SetNoteText( const ScAddress& rPos, const OUString& rNoteText );
void ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, const OUString* pAuthor, const OUString* pDate );
- void DoRefConversion( bool bRecord = true );
+ void DoRefConversion();
- void DoHangulHanjaConversion( bool bRecord = true );
- void DoThesaurus( bool bRecord = true );
+ void DoHangulHanjaConversion();
+ void DoThesaurus();
/** Generic implementation of sheet conversion functions. */
void DoSheetConversion( const ScConversionParam& rParam, bool bRecord = true );
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index f843f00..1814f5e 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -679,7 +679,7 @@ void ScFormulaReferenceHelper::ViewShellChanged()
EnableSpreadsheets();
}
-void ScFormulaReferenceHelper::EnableSpreadsheets(bool bFlag, bool bChildren)
+void ScFormulaReferenceHelper::EnableSpreadsheets(bool bFlag)
{
ScDocShell* pDocShell = static_cast<ScDocShell*>(SfxObjectShell::GetFirst(checkSfxObjectShell<ScDocShell>));
while( pDocShell )
@@ -701,8 +701,7 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(bool bFlag, bool bChildren)
if(pParent)
{
pParent->EnableInput(bFlag,false);
- if(bChildren)
- pViewSh->EnableRefInput(bFlag);
+ pViewSh->EnableRefInput(bFlag);
}
}
}
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index e07e0b2..bacb10d 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -50,7 +50,7 @@ using std::shared_ptr;
namespace HelperNotifyChanges
{
void NotifyIfChangesListeners(ScDocShell& rDocShell, const ScAddress &rPos,
- const ScUndoEnterData::ValuesType &rOldValues, const OUString &rType = OUString("cell-change"))
+ const ScUndoEnterData::ValuesType &rOldValues)
{
if (ScModelObj* pModelObj = getMustPropagateChangesModel(rDocShell))
{
@@ -61,7 +61,7 @@ namespace HelperNotifyChanges
aChangeRanges.Append( ScRange(rPos.Col(), rPos.Row(), rOldValues[i].mnTab));
}
- Notify(*pModelObj, aChangeRanges, rType);
+ Notify(*pModelObj, aChangeRanges, "cell-change");
}
}
}
diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx
index 07aff09..7fe9a92 100644
--- a/sc/source/ui/vba/vbaname.cxx
+++ b/sc/source/ui/vba/vbaname.cxx
@@ -90,7 +90,7 @@ ScVbaName::setVisible( sal_Bool /*bVisible*/ ) throw (css::uno::RuntimeException
{
}
-OUString ScVbaName::getContent( const formula::FormulaGrammar::Grammar eGrammar, bool bPrependEquals )
+OUString ScVbaName::getContent( const formula::FormulaGrammar::Grammar eGrammar )
{
ScNamedRangeObj* pNamedRange = dynamic_cast< ScNamedRangeObj* >( mxNamedRange.get() );
OUString aContent;
@@ -100,22 +100,16 @@ OUString ScVbaName::getContent( const formula::FormulaGrammar::Grammar eGrammar,
if (pData)
pData->GetSymbol( aContent, eGrammar );
}
- if ( bPrependEquals )
- {
- if (aContent.indexOf('=') != 0)
- aContent = "=" + aContent;
- }
+ if (aContent.indexOf('=') != 0)
+ aContent = "=" + aContent;
return aContent;
}
-void ScVbaName::setContent( const OUString& rContent, const formula::FormulaGrammar::Grammar eGrammar, bool bRemoveEquals )
+void ScVbaName::setContent( const OUString& rContent, const formula::FormulaGrammar::Grammar eGrammar )
{
OUString sContent( rContent );
- if ( bRemoveEquals )
- {
- if (sContent.startsWith("="))
- sContent = sContent.copy(1);
- }
+ if (sContent.startsWith("="))
+ sContent = sContent.copy(1);
ScNamedRangeObj* pNamedRange = dynamic_cast< ScNamedRangeObj* >( mxNamedRange.get() );
// We should be able to do the below by just setting calling SetCode on pNamedRange
diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx
index 072b91e..b79f104 100644
--- a/sc/source/ui/vba/vbaname.hxx
+++ b/sc/source/ui/vba/vbaname.hxx
@@ -34,8 +34,8 @@ class ScVbaName : public NameImpl_BASE
css::uno::Reference< css::frame::XModel > mxModel;
css::uno::Reference< css::sheet::XNamedRange > mxNamedRange;
css::uno::Reference< css::sheet::XNamedRanges > mxNames;
- OUString getContent( const formula::FormulaGrammar::Grammar eGrammar, bool prependEquals = true );
- void setContent( const OUString& sContent, const formula::FormulaGrammar::Grammar eGrammar, bool removeEquals = true );
+ OUString getContent( const formula::FormulaGrammar::Grammar eGrammar );
+ void setContent( const OUString& sContent, const formula::FormulaGrammar::Grammar eGrammar );
public:
ScVbaName( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XNamedRange >& xName , const css::uno::Reference< css::sheet::XNamedRanges >& xNames , const css::uno::Reference< css::frame::XModel >& xModel );
virtual ~ScVbaName();
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 1216134..ae1c3be 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1126,14 +1126,14 @@ public:
static uno::Reference< excel::XRange > createRangeFromRange( const uno::Reference< XHelperInterface >& xParent, const uno::Reference<uno::XComponentContext >& xContext,
const uno::Reference< table::XCellRange >& xRange, const uno::Reference< sheet::XCellRangeAddressable >& xCellRangeAddressable,
- sal_Int32 nStartColOffset = 0, sal_Int32 nStartRowOffset = 0, sal_Int32 nEndColOffset = 0, sal_Int32 nEndRowOffset = 0 )
+ sal_Int32 nStartColOffset = 0, sal_Int32 nStartRowOffset = 0, sal_Int32 nEndColOffset = 0 )
{
return uno::Reference< excel::XRange >( new ScVbaRange( xParent, xContext,
xRange->getCellRangeByPosition(
xCellRangeAddressable->getRangeAddress().StartColumn + nStartColOffset,
xCellRangeAddressable->getRangeAddress().StartRow + nStartRowOffset,
xCellRangeAddressable->getRangeAddress().EndColumn + nEndColOffset,
- xCellRangeAddressable->getRangeAddress().EndRow + nEndRowOffset ) ) );
+ xCellRangeAddressable->getRangeAddress().EndRow ) ) );
}
};
@@ -1361,7 +1361,7 @@ ScVbaRange::getRangeObjectForName(
return getRangeForName( xContext, sRangeName, pDocSh, refAddr, eConv );
}
-table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1) throw ( uno::RuntimeException )
+table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, ScDocShell* pDocSh ) throw ( uno::RuntimeException )
{
uno::Reference< table::XCellRange > xRangeParam;
switch ( aParam.getValueTypeClass() )
@@ -1372,7 +1372,7 @@ table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam,
aParam >>= rString;
ScRangeList aCellRanges;
ScRange refRange;
- if ( getScRangeListForAddress ( rString, pDocSh, refRange, aCellRanges, aConv ) )
+ if ( getScRangeListForAddress ( rString, pDocSh, refRange, aCellRanges ) )
{
if ( aCellRanges.size() == 1 )
{
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index c1de01e..faf6cab 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -195,7 +195,7 @@ ScDBData* ScDBFunc::GetAnonymousDBData()
// Sort
-void ScDBFunc::UISort( const ScSortParam& rSortParam, bool bRecord )
+void ScDBFunc::UISort( const ScSortParam& rSortParam )
{
ScDocShell* pDocSh = GetViewData().GetDocShell();
ScDocument& rDoc = pDocSh->GetDocument();
@@ -214,11 +214,11 @@ void ScDBFunc::UISort( const ScSortParam& rSortParam, bool bRecord )
{
// repeat subtotals, with new sortorder
- DoSubTotals( aSubTotalParam, bRecord, &rSortParam );
+ DoSubTotals( aSubTotalParam, true/*bRecord*/, &rSortParam );
}
else
{
- Sort( rSortParam, bRecord ); // just sort
+ Sort( rSortParam ); // just sort
}
}
@@ -439,7 +439,7 @@ void ScDBFunc::HideAutoFilter()
// Re-Import
-bool ScDBFunc::ImportData( const ScImportParam& rParam, bool bRecord )
+bool ScDBFunc::ImportData( const ScImportParam& rParam )
{
ScDocument* pDoc = GetViewData().GetDocument();
ScEditableTester aTester( pDoc, GetViewData().GetTabNo(), rParam.nCol1,rParam.nRow1,
@@ -451,7 +451,7 @@ bool ScDBFunc::ImportData( const ScImportParam& rParam, bool bRecord )
}
ScDBDocFunc aDBDocFunc( *GetViewData().GetDocShell() );
- return aDBDocFunc.DoImport( GetViewData().GetTabNo(), rParam, nullptr, bRecord );
+ return aDBDocFunc.DoImport( GetViewData().GetTabNo(), rParam, nullptr, true/*bRecord*/ );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index f2172a4..886b8cb 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -189,7 +189,7 @@ void ScDBFunc::RemoveAllOutlines( bool bRecord )
// auto outlines
-void ScDBFunc::AutoOutline( bool bRecord )
+void ScDBFunc::AutoOutline( )
{
SCTAB nTab = GetViewData().GetTabNo();
ScRange aRange( 0,0,nTab, MAXCOL,MAXROW,nTab ); // the complete sheet, if nothing is marked
@@ -202,7 +202,7 @@ void ScDBFunc::AutoOutline( bool bRecord )
ScDocShell* pDocSh = GetViewData().GetDocShell();
ScOutlineDocFunc aFunc(*pDocSh);
- aFunc.AutoOutline( aRange, bRecord );
+ aFunc.AutoOutline( aRange, true );
}
// select outline level
@@ -528,10 +528,10 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord,
// consolidate
-void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, bool bRecord )
+void ScDBFunc::Consolidate( const ScConsolidateParam& rParam )
{
ScDocShell* pDocShell = GetViewData().GetDocShell();
- pDocShell->DoConsolidate( rParam, bRecord );
+ pDocShell->DoConsolidate( rParam );
SetTabNo( rParam.nTab, true );
}
@@ -545,12 +545,12 @@ static OUString lcl_MakePivotTabName( const OUString& rPrefix, SCTAB nNumber )
bool ScDBFunc::MakePivotTable(
const ScDPSaveData& rData, const ScRange& rDest, bool bNewTable,
- const ScDPObject& rSource, bool bApi )
+ const ScDPObject& rSource )
{
// error message if no fields are set
// this must be removed when drag&drop of fields from a toolbox is available
- if ( rData.IsEmpty() && !bApi )
+ if ( rData.IsEmpty() )
{
ErrorMessage(STR_PIVOT_NODATA);
return false;
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 78d7925..34daf66 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -778,8 +778,9 @@ bool ScDrawView::GetObjectIsMarked( SdrObject* pObject )
return bisMarked;
}
-void ScDrawView::InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, SdrInsertFlags nOptions)
+void ScDrawView::InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV)
{
+ SdrInsertFlags nOptions=SdrInsertFlags::NONE;
// Do not change marks when the ole object is active
// (for Drop from ole object would otherwise be deactivated in the middle of ExecuteDrag!)
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 523349f..45e0a034 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -273,9 +273,9 @@ void ScOutputData::SetShowSpellErrors( bool bSet )
bShowSpellErrors = bSet;
}
-void ScOutputData::SetSnapPixel( bool bSet )
+void ScOutputData::SetSnapPixel()
{
- bSnapPixel = bSet;
+ bSnapPixel = true;
}
void ScOutputData::SetEditCell( SCCOL nCol, SCROW nRow )
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index 565d989..c6f6e39 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -169,16 +169,13 @@ ScSimpleRefDlgWrapper::ScSimpleRefDlgWrapper( vcl::Window* pParentP,
}
}
-void ScSimpleRefDlgWrapper::SetDefaultPosSize(Point aPos, Size aSize, bool bSet)
+void ScSimpleRefDlgWrapper::SetDefaultPosSize(Point aPos, Size aSize)
{
- bScSimpleRefFlag=bSet;
- if(bScSimpleRefFlag)
- {
- nScSimpleRefX=aPos.X();
- nScSimpleRefY=aPos.Y();
- nScSimpleRefHeight=aSize.Height();
- nScSimpleRefWidth=aSize.Width();
- }
+ bScSimpleRefFlag=true;
+ nScSimpleRefX=aPos.X();
+ nScSimpleRefY=aPos.Y();
+ nScSimpleRefHeight=aSize.Height();
+ nScSimpleRefWidth=aSize.Width();
}
void ScSimpleRefDlgWrapper::SetAutoReOpen(bool bFlag)
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 71da361..e016af8 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -281,7 +281,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ )
}
}
-void ScTabView::InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eType, bool bPaint )
+void ScTabView::InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eType )
{
ScDocument* pDoc = aViewData.GetDocument();
ScMarkData& rMark = aViewData.GetMarkData();
@@ -291,7 +291,7 @@ void ScTabView::InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eT
aViewData.SetRefStart( nCurX, nCurY, nCurZ );
aViewData.SetRefEnd( nCurX, nCurY, nCurZ );
- if (nCurZ == aViewData.GetTabNo() && bPaint)
+ if (nCurZ == aViewData.GetTabNo())
{
SCCOL nStartX = nCurX;
SCROW nStartY = nCurY;
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index b264886..55e6e81 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -158,7 +158,7 @@ bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData )
return bAnyChanged;
}
-bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint )
+bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow )
{
ScDocShell* pDocSh = GetViewData().GetDocShell();
ScDocument& rDoc = pDocSh->GetDocument();
@@ -188,7 +188,7 @@ bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint )
bChanged = false;
}
- if ( bPaint && bChanged )
+ if ( bChanged )
pDocSh->PostPaint( 0, nStartRow, nTab, MAXCOL, MAXROW, nTab,
PAINT_GRID | PAINT_LEFT );
@@ -1144,7 +1144,7 @@ static bool lcl_extendMergeRange(ScCellMergeOption& rOption, const ScRange& rRan
return bExtended;
}
-bool ScViewFunc::RemoveMerge( bool bRecord )
+bool ScViewFunc::RemoveMerge()
{
ScRange aRange;
ScEditableTester aTester( this );
@@ -1182,7 +1182,7 @@ bool ScViewFunc::RemoveMerge( bool bRecord )
}
while (bExtended);
- bool bOk = pDocSh->GetDocFunc().UnmergeCells(aOption, bRecord );
+ bool bOk = pDocSh->GetDocFunc().UnmergeCells(aOption, true/*bRecord*/ );
aExtended = aOption.getFirstSingleRange();
MarkRange( aExtended );
@@ -1192,14 +1192,14 @@ bool ScViewFunc::RemoveMerge( bool bRecord )
return true; //! bOk ??
}
-void ScViewFunc::FillSimple( FillDir eDir, bool bRecord )
+void ScViewFunc::FillSimple( FillDir eDir )
{
ScRange aRange;
if (GetViewData().GetSimpleArea(aRange) == SC_MARK_SIMPLE)
{
ScDocShell* pDocSh = GetViewData().GetDocShell();
const ScMarkData& rMark = GetViewData().GetMarkData();
- bool bSuccess = pDocSh->GetDocFunc().FillSimple( aRange, &rMark, eDir, bRecord, false );
+ bool bSuccess = pDocSh->GetDocFunc().FillSimple( aRange, &rMark, eDir, true/*bRecord*/, false );
if (bSuccess)
{
pDocSh->UpdateOle(&GetViewData());
@@ -1215,7 +1215,7 @@ void ScViewFunc::FillSimple( FillDir eDir, bool bRecord )
}
void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
- double fStart, double fStep, double fMax, bool bRecord )
+ double fStart, double fStep, double fMax )
{
ScRange aRange;
if (GetViewData().GetSimpleArea(aRange) == SC_MARK_SIMPLE)
@@ -1224,7 +1224,7 @@ void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
const ScMarkData& rMark = GetViewData().GetMarkData();
bool bSuccess = pDocSh->GetDocFunc().
FillSeries( aRange, &rMark, eDir, eCmd, eDateCmd,
- fStart, fStep, fMax, bRecord, false );
+ fStart, fStep, fMax, true/*bRecord*/, false );
if (bSuccess)
{
pDocSh->UpdateOle(&GetViewData());
@@ -1238,7 +1238,7 @@ void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
}
void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow,
- SCCOL nEndCol, SCROW nEndRow, sal_uLong nCount, bool bRecord )
+ SCCOL nEndCol, SCROW nEndRow, sal_uLong nCount )
{
SCTAB nTab = GetViewData().GetTabNo();
ScRange aRange( nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab );
@@ -1246,7 +1246,7 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow,
ScDocShell* pDocSh = GetViewData().GetDocShell();
const ScMarkData& rMark = GetViewData().GetMarkData();
bool bSuccess = pDocSh->GetDocFunc().
- FillAuto( aRange, &rMark, eDir, nCount, bRecord, false );
+ FillAuto( aRange, &rMark, eDir, nCount, true/*bRecord*/, false );
if (bSuccess)
{
MarkRange( aRange, false ); // aRange was modified in FillAuto
@@ -1610,7 +1610,7 @@ ScAutoFormatData* ScViewFunc::CreateAutoFormatData()
return pData;
}
-void ScViewFunc::AutoFormat( sal_uInt16 nFormatNo, bool bRecord )
+void ScViewFunc::AutoFormat( sal_uInt16 nFormatNo )
{
ScRange aRange;
if (GetViewData().GetSimpleArea(aRange) == SC_MARK_SIMPLE)
@@ -1618,7 +1618,7 @@ void ScViewFunc::AutoFormat( sal_uInt16 nFormatNo, bool bRecord )
ScDocShell* pDocSh = GetViewData().GetDocShell();
ScMarkData& rMark = GetViewData().GetMarkData();
- bool bSuccess = pDocSh->GetDocFunc().AutoFormat( aRange, &rMark, nFormatNo, bRecord, false );
+ bool bSuccess = pDocSh->GetDocFunc().AutoFormat( aRange, &rMark, nFormatNo, true/*bRecord*/, false );
if (bSuccess)
pDocSh->UpdateOle(&GetViewData());
}
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index c2f08be..79192ad 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -172,12 +172,13 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow,
ShowAllCursors();
}
}
-void ScViewFunc::DoRefConversion( bool bRecord )
+void ScViewFunc::DoRefConversion()
{
ScDocument* pDoc = GetViewData().GetDocument();
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list