[Libreoffice-commits] core.git: sc/inc sc/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon May 21 06:59:19 UTC 2018
sc/inc/formulaiter.hxx | 1
sc/inc/funcdesc.hxx | 1
sc/source/core/data/formulaiter.cxx | 3 -
sc/source/core/data/funcdesc.cxx | 3 -
sc/source/core/data/table3.cxx | 4 -
sc/source/core/tool/scmatrix.cxx | 3 -
sc/source/filter/dif/difimp.cxx | 3 -
sc/source/filter/excel/exctools.cxx | 2
sc/source/filter/excel/xeescher.cxx | 1
sc/source/filter/excel/xeextlst.cxx | 5 --
sc/source/filter/inc/XclExpChangeTrack.hxx | 4 -
sc/source/filter/inc/dif.hxx | 1
sc/source/filter/inc/excscen.hxx | 1
sc/source/filter/inc/xeescher.hxx | 1
sc/source/filter/inc/xeextlst.hxx | 1
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 10 ++--
sc/source/filter/xml/XMLDDELinksContext.cxx | 5 --
sc/source/filter/xml/XMLDDELinksContext.hxx | 2
sc/source/filter/xml/XMLTableHeaderFooterContext.cxx | 11 ++---
sc/source/filter/xml/XMLTableHeaderFooterContext.hxx | 5 --
sc/source/filter/xml/XMLTrackedChangesContext.cxx | 39 +++++--------------
sc/source/filter/xml/xmlcondformat.cxx | 14 +++---
sc/source/filter/xml/xmlcondformat.hxx | 4 -
sc/source/filter/xml/xmlnexpi.cxx | 14 ++----
sc/source/filter/xml/xmlnexpi.hxx | 6 --
sc/source/ui/app/inputwin.cxx | 12 +----
sc/source/ui/cctrl/dpcontrol.cxx | 7 ---
sc/source/ui/condformat/condformatmgr.cxx | 3 -
sc/source/ui/dbgui/scuiasciiopt.cxx | 3 -
sc/source/ui/inc/condformatmgr.hxx | 2
sc/source/ui/inc/conflictsdlg.hxx | 3 -
sc/source/ui/inc/datafdlg.hxx | 1
sc/source/ui/inc/dpcontrol.hxx | 3 -
sc/source/ui/inc/inputwin.hxx | 4 -
sc/source/ui/inc/navipi.hxx | 1
sc/source/ui/inc/prevwsh.hxx | 1
sc/source/ui/inc/scuiasciiopt.hxx | 1
sc/source/ui/inc/selectionstate.hxx | 1
sc/source/ui/inc/sharedocdlg.hxx | 1
sc/source/ui/miscdlgs/conflictsdlg.cxx | 9 +---
sc/source/ui/miscdlgs/datafdlg.cxx | 2
sc/source/ui/miscdlgs/sharedocdlg.cxx | 5 --
sc/source/ui/navipi/navipi.cxx | 2
sc/source/ui/vba/vbacharacters.cxx | 12 +++++
sc/source/ui/vba/vbacharacters.hxx | 2
sc/source/ui/view/gridwin2.cxx | 2
sc/source/ui/view/gridwin4.cxx | 2
sc/source/ui/view/prevwsh.cxx | 1
sc/source/ui/view/selectionstate.cxx | 1
49 files changed, 74 insertions(+), 151 deletions(-)
New commits:
commit f7a011c45b0b88cb3c3ea9206cb851375266523d
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed May 16 14:03:34 2018 +0200
loplugin:unusedfields in sc
Change-Id: I04aee9574b97d6120fe20be97b2c0fb8187fb260
Reviewed-on: https://gerrit.libreoffice.org/54453
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sc/inc/formulaiter.hxx b/sc/inc/formulaiter.hxx
index bbc0811cc286..6e471d7574b1 100644
--- a/sc/inc/formulaiter.hxx
+++ b/sc/inc/formulaiter.hxx
@@ -33,7 +33,6 @@ class ScFormulaCell;
class ScDetectiveRefIter
{
private:
- ScTokenArray* pCode;
formula::FormulaTokenArrayPlainIterator maIter;
ScAddress aPos;
public:
diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx
index 31ad6b0d10e8..8ff400e3afbf 100644
--- a/sc/inc/funcdesc.hxx
+++ b/sc/inc/funcdesc.hxx
@@ -249,7 +249,6 @@ public:
private:
::std::vector<const ScFuncDesc*> aFunctionList; /**< List of functions */
::std::vector<const ScFuncDesc*>::iterator aFunctionListIter; /**< position in function list */
- sal_Int32 nMaxFuncNameLen; /**< Length of longest function name */
};
/**
diff --git a/sc/source/core/data/formulaiter.cxx b/sc/source/core/data/formulaiter.cxx
index f786042f93ff..ac5369285b49 100644
--- a/sc/source/core/data/formulaiter.cxx
+++ b/sc/source/core/data/formulaiter.cxx
@@ -26,8 +26,7 @@
using namespace formula;
ScDetectiveRefIter::ScDetectiveRefIter( ScFormulaCell* pCell ) :
- pCode(pCell->GetCode()),
- maIter(*pCode),
+ maIter(*pCell->GetCode()),
aPos(pCell->aPos)
{
}
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index d4373e1170e9..5143be8de956 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -414,8 +414,9 @@ bool ScFuncDesc::compareByName(const ScFuncDesc* a, const ScFuncDesc* b)
// class ScFunctionList:
ScFunctionList::ScFunctionList()
- : nMaxFuncNameLen(0)
{
+ sal_Int32 nMaxFuncNameLen = 0; // Length of longest function name
+
// See ScFuncDescCore definition for format details.
// This list must be sorted in order of the opcode, dbgutil builds enable _GLIBCXX_DEBUG
// which will concept check that the list is sorted on first use to ensure this holds
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 19f8af3ff5d1..07c4030382c2 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -259,7 +259,6 @@ private:
std::unique_ptr<RowsType> mpRows; /// row-wise data table for sort by row operation.
std::vector<std::unique_ptr<ScSortInfo[]>> mvppInfo;
- SCSIZE nCount;
SCCOLROW nStart;
SCCOLROW mnLastIndex; /// index of last non-empty cell position.
@@ -273,11 +272,12 @@ public:
ScSortInfoArray( sal_uInt16 nSorts, SCCOLROW nInd1, SCCOLROW nInd2 ) :
mvppInfo(nSorts),
- nCount( nInd2 - nInd1 + 1 ), nStart( nInd1 ),
+ nStart( nInd1 ),
mnLastIndex(nInd2),
mbKeepQuery(false),
mbUpdateRefs(false)
{
+ SCSIZE nCount( nInd2 - nInd1 + 1 );
if (nSorts)
{
for ( sal_uInt16 nSort = 0; nSort < nSorts; nSort++ )
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 705a1bc0b992..7f8c8767e917 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1909,11 +1909,10 @@ struct ArrayMul
template<typename Op>
class MergeDoubleArrayFunc
{
- std::vector<double>& mrArray;
std::vector<double>::iterator miPos;
double mfNaN;
public:
- MergeDoubleArrayFunc(std::vector<double>& rArray) : mrArray(rArray), miPos(mrArray.begin())
+ MergeDoubleArrayFunc(std::vector<double>& rArray) : miPos(rArray.begin())
{
mfNaN = CreateDoubleError( FormulaError::ElementNaN);
}
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 349f8e4864d7..a17ef86c728b 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -225,12 +225,11 @@ ErrCode ScFormatFilterPluginImpl::ScImportDif(SvStream& rIn, ScDocument* pDoc, c
return ERRCODE_NONE;
}
-DifParser::DifParser( SvStream& rNewIn, const ScDocument& rDoc, rtl_TextEncoding e )
+DifParser::DifParser( SvStream& rNewIn, const ScDocument& rDoc, rtl_TextEncoding eCharSet )
: fVal(0.0)
, nVector(0)
, nVal(0)
, nNumFormat(0)
- , eCharSet(e)
, pNumFormatter(rDoc.GetFormatTable())
, rIn(rNewIn)
{
diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx
index 8531779412ae..97c5f97c24df 100644
--- a/sc/source/filter/excel/exctools.cxx
+++ b/sc/source/filter/excel/exctools.cxx
@@ -196,7 +196,7 @@ ExcScenario::ExcScenario( XclImpStream& rIn, const RootData& rR )
rIn.Ignore( 1 );
}
- aUserName = rIn.ReadUniString();
+ rIn.ReadUniString(); // username
if( nComment )
aComment = rIn.ReadUniString();
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 4bd9db8ef79d..df36ba79d252 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1183,7 +1183,6 @@ XclExpNote::XclExpNote(const XclExpRoot& rRoot, const ScAddress& rScPos,
}
// append additional text
aNoteText = ScGlobal::addToken( aNoteText, rAddText, '\n', 2 );
- maOrigNoteText = aNoteText;
// initialize record dependent on BIFF type
switch( rRoot.GetBiff() )
diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx
index 0fa28198e2e2..9af26168c850 100644
--- a/sc/source/filter/excel/xeextlst.cxx
+++ b/sc/source/filter/excel/xeextlst.cxx
@@ -366,12 +366,11 @@ void XclExpExtConditionalFormatting::SaveXml( XclExpXmlStream& rStrm )
}
XclExpExtCalcPr::XclExpExtCalcPr( const XclExpRoot& rRoot, formula::FormulaGrammar::AddressConvention eConv ):
- XclExpExt( rRoot ),
- meConv( eConv )
+ XclExpExt( rRoot )
{
maURI = OString("{7626C862-2A13-11E5-B345-FEFF819CDC9F}");
- switch (meConv)
+ switch (eConv)
{
case formula::FormulaGrammar::CONV_OOO:
maSyntax = OString("CalcA1");
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx
index d32fb53615ec..00eda16e0ffe 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -596,10 +596,6 @@ class XclExpChangeTrack : protected XclExpRoot
ScDocumentUniquePtr xTempDoc; // empty document
- XclExpChTrHeader* pHeader; // header record for last GUID
- sal_uInt8 aGUID[ 16 ]; // GUID for action info records
- bool bValidGUID;
-
ScChangeTrack* CreateTempChangeTrack();
void PushActionRecord( const ScChangeAction& rAction );
diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx
index cf0634d96c53..ac1ebc8cb024 100644
--- a/sc/source/filter/inc/dif.hxx
+++ b/sc/source/filter/inc/dif.hxx
@@ -66,7 +66,6 @@ public:
sal_uInt32 nVector;
sal_uInt32 nVal;
sal_uInt32 nNumFormat;
- rtl_TextEncoding eCharSet;
private:
SvNumberFormatter* pNumFormatter;
SvStream& rIn;
diff --git a/sc/source/filter/inc/excscen.hxx b/sc/source/filter/inc/excscen.hxx
index c0445af19a2f..dce758a30ca4 100644
--- a/sc/source/filter/inc/excscen.hxx
+++ b/sc/source/filter/inc/excscen.hxx
@@ -53,7 +53,6 @@ public:
private:
OUString aName;
OUString aComment;
- OUString aUserName;
sal_uInt8 nProtected;
const sal_uInt16 nTab;
std::vector<ExcScenarioCell> aEntries;
diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx
index 8bfbaa72b989..46cc7519fbcc 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -344,7 +344,6 @@ private:
private:
XclExpString maAuthor; /// Name of the author.
- OUString maOrigNoteText; /// Original main text of the note.
OString maNoteText; /// Main text of the note (<=BIFF7).
XclExpStringRef mpNoteContents; /// Text and formatting data (OOXML)
ScAddress maScPos; /// Calc cell address of the note.
diff --git a/sc/source/filter/inc/xeextlst.hxx b/sc/source/filter/inc/xeextlst.hxx
index bde914c87d07..859237321be8 100644
--- a/sc/source/filter/inc/xeextlst.hxx
+++ b/sc/source/filter/inc/xeextlst.hxx
@@ -174,7 +174,6 @@ public:
virtual XclExpExtType GetType() override { return XclExpExtDataFooType; }
private:
- formula::FormulaGrammar::AddressConvention meConv;
OString maSyntax;
};
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 13da7b636f54..3231609d921b 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1409,9 +1409,7 @@ void EndXmlElement::SaveXml( XclExpXmlStream& rStrm )
XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) :
XclExpRoot( rRoot ),
aActionStack(),
- pTabIdBuffer( nullptr ),
- pHeader( nullptr ),
- bValidGUID( false )
+ pTabIdBuffer( nullptr )
{
OSL_ENSURE( GetOldRoot().pTabId, "XclExpChangeTrack::XclExpChangeTrack - root data incomplete" );
if( !GetOldRoot().pTabId )
@@ -1449,7 +1447,7 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) :
// build record list
if (GetOutput() == EXC_OUTPUT_BINARY)
{
- pHeader = new XclExpChTrHeader;
+ XclExpChTrHeader* pHeader = new XclExpChTrHeader; // header record for last GUID
maRecList.push_back( std::unique_ptr<ExcRecord>(pHeader) );
maRecList.push_back( std::unique_ptr<ExcRecord>( new XclExpChTr0x0195 ) );
maRecList.push_back( std::unique_ptr<ExcRecord>( new XclExpChTr0x0194( *pTempChangeTrack ) ) );
@@ -1458,6 +1456,7 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) :
DateTime aLastDateTime( DateTime::EMPTY );
sal_uInt32 nIndex = 1;
sal_Int32 nLogNumber = 1;
+ sal_uInt8 aGUID[ 16 ]; // GUID for action info records
while( !aActionStack.empty() )
{
XclExpChTrAction* pAction = aActionStack.top();
@@ -1467,6 +1466,7 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) :
(pAction->GetUsername() != sLastUsername) ||
(pAction->GetDateTime() != aLastDateTime) )
{
+ bool bValidGUID;
lcl_GenerateGUID( aGUID, bValidGUID );
sLastUsername = pAction->GetUsername();
aLastDateTime = pAction->GetDateTime();
@@ -1494,6 +1494,7 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) :
sal_uInt32 nIndex = 1;
sal_Int32 nLogNumber = 1;
XclExpXmlChTrHeader* pCurHeader = nullptr;
+ sal_uInt8 aGUID[ 16 ]; // GUID for action info records
while (!aActionStack.empty())
{
@@ -1504,6 +1505,7 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) :
(pAction->GetUsername() != sLastUsername) ||
(pAction->GetDateTime() != aLastDateTime) )
{
+ bool bValidGUID;
lcl_GenerateGUID( aGUID, bValidGUID );
sLastUsername = pAction->GetUsername();
aLastDateTime = pAction->GetDateTime();
diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx
index 55631e777364..e1002df74501 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.cxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.cxx
@@ -263,9 +263,8 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDDETableContext::c
ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport,
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
- ScXMLDDELinkContext* pTempDDELink) :
- ScXMLImportContext( rImport ),
- pDDELink(pTempDDELink)
+ ScXMLDDELinkContext* pDDELink) :
+ ScXMLImportContext( rImport )
{
if ( rAttrList.is() )
{
diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx
index 85b543a9e04b..713c9ac66b94 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.hxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.hxx
@@ -109,8 +109,6 @@ public:
class ScXMLDDEColumnContext : public ScXMLImportContext
{
- ScXMLDDELinkContext* pDDELink;
-
public:
ScXMLDDEColumnContext( ScXMLImport& rImport,
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
index e52f442d1efb..e8b2f1ae886e 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
@@ -40,19 +40,18 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rImport,
const uno::Reference<
xml::sax::XAttributeList > & xAttrList,
const Reference < XPropertySet > & rPageStylePropSet,
- bool bFooter, bool bLft ) :
+ bool bFooter, bool bLeft ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
xPropSet( rPageStylePropSet ),
sOn( bFooter ? OUString(SC_UNO_PAGE_FTRON) : OUString(SC_UNO_PAGE_HDRON) ),
- sShareContent( bFooter ? OUString(SC_UNO_PAGE_FTRSHARED) : OUString(SC_UNO_PAGE_HDRSHARED) ),
- sContent( bFooter ? OUString(SC_UNO_PAGE_RIGHTFTRCON) : OUString(SC_UNO_PAGE_RIGHTHDRCON) ),
- sContentLeft( bFooter ? OUString(SC_UNO_PAGE_LEFTFTRCONT) : OUString(SC_UNO_PAGE_LEFTHDRCONT) ),
- bDisplay( true ),
- bLeft( bLft ),
bContainsLeft(false),
bContainsRight(false),
bContainsCenter(false)
{
+ OUString sContent( bFooter ? OUString(SC_UNO_PAGE_RIGHTFTRCON) : OUString(SC_UNO_PAGE_RIGHTHDRCON) );
+ OUString sContentLeft( bFooter ? OUString(SC_UNO_PAGE_LEFTFTRCONT) : OUString(SC_UNO_PAGE_LEFTHDRCONT) );
+ OUString sShareContent( bFooter ? OUString(SC_UNO_PAGE_FTRSHARED) : OUString(SC_UNO_PAGE_HDRSHARED) );
+ bool bDisplay( true );
sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0);
for( sal_Int16 i=0; i < nAttrCount; ++i )
{
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
index 685deee25eff..1b8a13f9fc9f 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
@@ -36,13 +36,8 @@ class XMLTableHeaderFooterContext: public SvXMLImportContext
css::uno::Reference< css::sheet::XHeaderFooterContent > xHeaderFooterContent;
const OUString sOn;
- const OUString sShareContent;
- const OUString sContent;
- const OUString sContentLeft;
OUString sCont;
- bool bDisplay;
- bool bLeft;
bool bContainsLeft;
bool bContainsRight;
bool bContainsCenter;
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index 9710415925c7..c309c73f8c35 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -64,8 +64,6 @@ public:
class ScXMLBigRangeContext : public ScXMLImportContext
{
- ScBigRange& rBigRange;
-
public:
ScXMLBigRangeContext( ScXMLImport& rImport,
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
@@ -102,8 +100,6 @@ public:
class ScXMLDependenceContext : public ScXMLImportContext
{
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
-
public:
ScXMLDependenceContext( ScXMLImport& rImport,
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
@@ -124,8 +120,6 @@ public:
class ScXMLChangeDeletionContext : public ScXMLImportContext
{
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
-
public:
ScXMLChangeDeletionContext( ScXMLImport& rImport,
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
@@ -180,7 +174,6 @@ class ScXMLChangeCellContext : public ScXMLImportContext
OUString sText;
OUString& rInputString;
rtl::Reference<ScEditEngineTextObj> mpEditTextObj;
- double& rDateTimeValue;
double fValue;
sal_uInt16& rType;
bool bEmpty;
@@ -268,8 +261,6 @@ public:
class ScXMLInsertionCutOffContext : public ScXMLImportContext
{
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
-
public:
ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -283,8 +274,6 @@ public:
class ScXMLMovementCutOffContext : public ScXMLImportContext
{
- ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
-
public:
ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -482,9 +471,8 @@ void SAL_CALL ScXMLChangeInfoContext::endFastElement( sal_Int32 /*nElement*/ )
ScXMLBigRangeContext::ScXMLBigRangeContext( ScXMLImport& rImport,
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
- ScBigRange& rTempBigRange ) :
- ScXMLImportContext( rImport ),
- rBigRange(rTempBigRange)
+ ScBigRange& rBigRange ) :
+ ScXMLImportContext( rImport )
{
bool bColumn(false);
bool bRow(false);
@@ -606,9 +594,8 @@ void SAL_CALL ScXMLCellContentDeletionContext::endFastElement( sal_Int32 /*nElem
ScXMLDependenceContext::ScXMLDependenceContext( ScXMLImport& rImport,
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
- ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- ScXMLImportContext( rImport ),
- pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper ) :
+ ScXMLImportContext( rImport )
{
sal_uInt32 nID(0);
if ( rAttrList.is() )
@@ -650,9 +637,8 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLDependingsContext:
ScXMLChangeDeletionContext::ScXMLChangeDeletionContext( ScXMLImport& rImport,
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
- ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- ScXMLImportContext( rImport ),
- pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper ) :
+ ScXMLImportContext( rImport )
{
sal_uInt32 nID(0);
if ( rAttrList.is() )
@@ -781,12 +767,11 @@ ScXMLChangeCellContext::ScXMLChangeCellContext( ScXMLImport& rImport,
ScCellValue& rOldCell, OUString& rAddress,
OUString& rFormula, OUString& rFormulaNmsp,
formula::FormulaGrammar::Grammar& rGrammar,
- OUString& rTempInputString, double& fDateTimeValue, sal_uInt16& nType,
+ OUString& rTempInputString, double& rDateTimeValue, sal_uInt16& nType,
ScMatrixMode& nMatrixFlag, sal_Int32& nMatrixCols, sal_Int32& nMatrixRows )
: ScXMLImportContext( rImport )
, mrOldCell(rOldCell)
, rInputString(rTempInputString)
- , rDateTimeValue(fDateTimeValue)
, fValue(0.0)
, rType(nType)
, bEmpty(true)
@@ -1170,9 +1155,8 @@ ScXMLInsertionCutOffContext::ScXMLInsertionCutOffContext( ScXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
- ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- ScXMLImportContext( rImport, nPrfx, rLName ),
- pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper ) :
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
sal_uInt32 nID(0);
sal_Int32 nPosition(0);
@@ -1215,9 +1199,8 @@ ScXMLMovementCutOffContext::ScXMLMovementCutOffContext( ScXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
- ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- ScXMLImportContext( rImport, nPrfx, rLName ),
- pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
+ ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper ) :
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
sal_uInt32 nID(0);
sal_Int32 nPosition(0);
diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx
index 6fdcdee9b5b8..54b3b3deea77 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -95,11 +95,12 @@ ScXMLConditionalFormatContext::ScXMLConditionalFormatContext( ScXMLImport& rImpo
}
}
- ScRangeStringConverter::GetRangeListFromString(maRange, sRange, GetScImport().GetDocument(),
+ ScRangeList aRangeList;
+ ScRangeStringConverter::GetRangeListFromString(aRangeList, sRange, GetScImport().GetDocument(),
formula::FormulaGrammar::CONV_ODF);
mxFormat.reset(new ScConditionalFormat(0, GetScImport().GetDocument()));
- mxFormat->SetRange(maRange);
+ mxFormat->SetRange(aRangeList);
}
css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL ScXMLConditionalFormatContext::createFastChildContext(
@@ -854,8 +855,7 @@ void setColorEntryType(const OUString& rType, ScColorScaleEntry* pEntry, const O
ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImport& rImport,
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
ScColorScaleFormat* pFormat):
- ScXMLImportContext( rImport ),
- mpFormatEntry( nullptr )
+ ScXMLImportContext( rImport )
{
double nVal = 0;
Color aColor;
@@ -890,9 +890,9 @@ ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImpor
if(!sVal.isEmpty())
sax::Converter::convertDouble(nVal, sVal);
- mpFormatEntry = new ScColorScaleEntry(nVal, aColor);
- setColorEntryType(sType, mpFormatEntry, sVal, GetScImport());
- pFormat->AddEntry(mpFormatEntry);
+ auto pFormatEntry = new ScColorScaleEntry(nVal, aColor);
+ setColorEntryType(sType, pFormatEntry, sVal, GetScImport());
+ pFormat->AddEntry(pFormatEntry);
}
ScXMLFormattingEntryContext::ScXMLFormattingEntryContext( ScXMLImport& rImport,
diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx
index ed979d273985..fc78b54b02e4 100644
--- a/sc/source/filter/xml/xmlcondformat.hxx
+++ b/sc/source/filter/xml/xmlcondformat.hxx
@@ -73,7 +73,6 @@ public:
private:
std::unique_ptr<ScConditionalFormat> mxFormat;
- ScRangeList maRange;
ScXMLConditionalFormatsContext& mrParent;
};
@@ -127,9 +126,6 @@ public:
ScXMLColorScaleFormatEntryContext( ScXMLImport& rImport,
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
ScColorScaleFormat* pFormat);
-
-private:
- ScColorScaleEntry* mpFormatEntry;
};
class ScXMLFormattingEntryContext : public ScXMLImportContext
diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx
index 2741b90b1573..b83cda294db6 100644
--- a/sc/source/filter/xml/xmlnexpi.cxx
+++ b/sc/source/filter/xml/xmlnexpi.cxx
@@ -89,10 +89,9 @@ ScXMLNamedRangeContext::ScXMLNamedRangeContext(
ScXMLImport& rImport,
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
ScXMLNamedExpressionsContext::Inserter* pInserter ) :
- ScXMLImportContext( rImport ),
- mpInserter(pInserter)
+ ScXMLImportContext( rImport )
{
- if (!mpInserter)
+ if (!pInserter)
return;
ScMyNamedExpression* pNamedExpression(new ScMyNamedExpression);
@@ -124,7 +123,7 @@ ScXMLNamedRangeContext::ScXMLNamedRangeContext(
}
}
pNamedExpression->bIsExpression = false;
- mpInserter->insert(pNamedExpression);
+ pInserter->insert(pNamedExpression);
}
ScXMLNamedRangeContext::~ScXMLNamedRangeContext()
@@ -135,10 +134,9 @@ ScXMLNamedExpressionContext::ScXMLNamedExpressionContext(
ScXMLImport& rImport,
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
ScXMLNamedExpressionsContext::Inserter* pInserter ) :
- ScXMLImportContext( rImport ),
- mpInserter(pInserter)
+ ScXMLImportContext( rImport )
{
- if (!mpInserter)
+ if (!pInserter)
return;
ScMyNamedExpression* pNamedExpression(new ScMyNamedExpression);
@@ -164,7 +162,7 @@ ScXMLNamedExpressionContext::ScXMLNamedExpressionContext(
}
}
pNamedExpression->bIsExpression = true;
- mpInserter->insert(pNamedExpression);
+ pInserter->insert(pNamedExpression);
}
ScXMLNamedExpressionContext::~ScXMLNamedExpressionContext()
diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx
index 64d9ea46fb30..8601ee9a4eb2 100644
--- a/sc/source/filter/xml/xmlnexpi.hxx
+++ b/sc/source/filter/xml/xmlnexpi.hxx
@@ -92,9 +92,6 @@ public:
ScXMLNamedExpressionsContext::Inserter* pInserter );
virtual ~ScXMLNamedRangeContext() override;
-
-private:
- ScXMLNamedExpressionsContext::Inserter* mpInserter;
};
class ScXMLNamedExpressionContext : public ScXMLImportContext
@@ -107,9 +104,6 @@ public:
ScXMLNamedExpressionsContext::Inserter* pInserter );
virtual ~ScXMLNamedExpressionContext() override;
-
-private:
- ScXMLNamedExpressionsContext::Inserter* mpInserter;
};
#endif
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 2771187c9ca2..5bba4dbe5e03 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -169,10 +169,6 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const SfxBindings* pBind ) :
pRuntimeWindow ( lcl_chooseRuntimeImpl( this, pBind ) ),
aTextWindow ( *pRuntimeWindow ),
pInputHdl ( nullptr ),
- aTextOk ( ScResId( SCSTR_QHELP_BTNOK ) ), // Not always new as a Resource
- aTextCancel ( ScResId( SCSTR_QHELP_BTNCANCEL ) ),
- aTextSum ( ScResId( SCSTR_QHELP_BTNSUM ) ),
- aTextEqual ( ScResId( SCSTR_QHELP_BTNEQUAL ) ),
mnMaxY (0),
bIsOkCancelMode ( false ),
bInResize ( false )
@@ -209,16 +205,16 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const SfxBindings* pBind ) :
SetItemText (SID_INPUT_FUNCTION, ScResId(SCSTR_QHELP_BTNCALC));
SetHelpId (SID_INPUT_FUNCTION, HID_INSWIN_CALC);
- SetItemText (SID_INPUT_SUM, aTextSum);
+ SetItemText (SID_INPUT_SUM, ScResId( SCSTR_QHELP_BTNSUM ) );
SetHelpId (SID_INPUT_SUM, HID_INSWIN_SUMME);
- SetItemText (SID_INPUT_EQUAL, aTextEqual);
+ SetItemText (SID_INPUT_EQUAL, ScResId( SCSTR_QHELP_BTNEQUAL ) );
SetHelpId (SID_INPUT_EQUAL, HID_INSWIN_FUNC);
- SetItemText ( SID_INPUT_CANCEL, aTextCancel );
+ SetItemText ( SID_INPUT_CANCEL, ScResId( SCSTR_QHELP_BTNCANCEL ) );
SetHelpId ( SID_INPUT_CANCEL, HID_INSWIN_CANCEL );
- SetItemText ( SID_INPUT_OK, aTextOk );
+ SetItemText ( SID_INPUT_OK, ScResId( SCSTR_QHELP_BTNOK ) );
SetHelpId ( SID_INPUT_OK, HID_INSWIN_OK );
EnableItem( SID_INPUT_CANCEL, false );
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index a714f116f9c5..be2bbd64b2d6 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -27,7 +27,7 @@
#include <docpool.hxx>
#include <patattr.hxx>
-ScDPFieldButton::ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle, const Fraction* pZoomX, const Fraction* pZoomY, ScDocument* pDoc) :
+ScDPFieldButton::ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle, const Fraction* pZoomY, ScDocument* pDoc) :
mpDoc(pDoc),
mpOutDev(pOutDev),
mpStyle(pStyle),
@@ -37,11 +37,6 @@ ScDPFieldButton::ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pSt
mbPopupPressed(false),
mbPopupLeft(false)
{
- if (pZoomX)
- maZoomX = *pZoomX;
- else
- maZoomX = Fraction(1, 1);
-
if (pZoomY)
maZoomY = *pZoomY;
else
diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
index db83d606220e..75c5e77ef8e0 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -104,14 +104,13 @@ void ScCondFormatManagerWindow::setColSizes()
ScCondFormatManagerDlg::ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList):
ModalDialog(pParent, "CondFormatManager", "modules/scalc/ui/condformatmanager.ui"),
mpFormatList( pFormatList ? new ScConditionalFormatList(*pFormatList) : nullptr),
- mpDoc(pDoc),
mbModified(false)
{
SvSimpleTableContainer *pContainer = get<SvSimpleTableContainer>("CONTAINER");
Size aSize(LogicToPixel(Size(290, 220), MapMode(MapUnit::MapAppFont)));
pContainer->set_width_request(aSize.Width());
pContainer->set_height_request(aSize.Height());
- m_pCtrlManager = VclPtr<ScCondFormatManagerWindow>::Create(*pContainer, mpDoc, mpFormatList);
+ m_pCtrlManager = VclPtr<ScCondFormatManagerWindow>::Create(*pContainer, pDoc, mpFormatList);
get(m_pBtnAdd, "add");
get(m_pBtnRemove, "remove");
get(m_pBtnEdit, "edit");
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 381bc7e9cacb..b885e9b9c7ec 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -285,7 +285,6 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa
mpRowPosArray( nullptr ),
mnRowPosCount(0),
- aCharSetUser( ScResId( SCSTR_CHARSET_USER ) ),
aColumnUser ( ScResId( SCSTR_COLUMN_USER ) ),
aTextSepList(SCSTR_TEXTSEP),
mcTextSep ( ScAsciiOptions::cDefaultTextSep ),
@@ -447,7 +446,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatNa
pLbCharSet->FillFromTextEncodingTable( true );
// Insert one "SYSTEM" entry for compatibility in AsciiOptions and system
// independent document linkage.
- pLbCharSet->InsertTextEncoding( RTL_TEXTENCODING_DONTKNOW, aCharSetUser );
+ pLbCharSet->InsertTextEncoding( RTL_TEXTENCODING_DONTKNOW, ScResId( SCSTR_CHARSET_USER ) );
if ( ePreselectUnicode == RTL_TEXTENCODING_DONTKNOW )
{
rtl_TextEncoding eSystemEncoding = osl_getThreadTextEncoding();
diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx
index b99a3be3a089..8fd579a87809 100644
--- a/sc/source/ui/inc/condformatmgr.hxx
+++ b/sc/source/ui/inc/condformatmgr.hxx
@@ -65,8 +65,6 @@ private:
ScConditionalFormatList* mpFormatList;
VclPtr<ScCondFormatManagerWindow> m_pCtrlManager;
- ScDocument* mpDoc;
-
DECL_LINK(RemoveBtnHdl, Button*, void);
DECL_LINK(EditBtnClickHdl, Button*, void);
DECL_LINK(AddBtnHdl, Button*, void);
diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx
index fd352bccb01c..e21fa544fbb3 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -125,8 +125,6 @@ private:
VclPtr<PushButton> m_pBtnKeepAllOthers;
OUString maStrTitleConflict;
- OUString maStrTitleAuthor;
- OUString maStrTitleDate;
OUString maStrUnknownUser;
ScViewData* mpViewData;
@@ -135,7 +133,6 @@ private:
ScDocument* mpSharedDoc;
ScChangeTrack* mpSharedTrack;
ScConflictsList& mrConflictsList;
- Size maDialogSize;
Idle maSelectionIdle;
bool mbInSelectHdl;
diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx
index c4ec9a090553..5a944e1d7420 100644
--- a/sc/source/ui/inc/datafdlg.hxx
+++ b/sc/source/ui/inc/datafdlg.hxx
@@ -47,7 +47,6 @@ private:
SCROW nStartRow;
SCROW nEndRow;
SCTAB nTab;
- bool bNoSelection;
std::vector<VclPtr<FixedText> > maFixedTexts;
std::vector<VclPtr<Edit> > maEdits;
diff --git a/sc/source/ui/inc/dpcontrol.hxx b/sc/source/ui/inc/dpcontrol.hxx
index bff1e5c6781c..ad4d65371923 100644
--- a/sc/source/ui/inc/dpcontrol.hxx
+++ b/sc/source/ui/inc/dpcontrol.hxx
@@ -38,7 +38,7 @@ class ScDocument;
class ScDPFieldButton
{
public:
- ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle, const Fraction* pZoomX = nullptr, const Fraction* pZoomY = nullptr,
+ ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle, const Fraction* pZoomY = nullptr,
ScDocument* pDoc = nullptr);
~ScDPFieldButton();
@@ -60,7 +60,6 @@ private:
Point maPos;
Size maSize;
OUString maText;
- Fraction maZoomX;
Fraction maZoomY;
ScDocument* mpDoc;
VclPtr<OutputDevice> mpOutDev;
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 2c645a509307..c562198de265 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -273,10 +273,6 @@ private:
VclPtr<ScTextWndBase> pRuntimeWindow;
ScTextWndBase& aTextWindow;
ScInputHandler* pInputHdl;
- OUString aTextOk;
- OUString aTextCancel;
- OUString aTextSum;
- OUString aTextEqual;
long mnMaxY;
bool bIsOkCancelMode;
bool bInResize;
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index 1ee61b41a355..98a8b48aaa89 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -187,7 +187,6 @@ private:
Size aExpandedSize;
Idle aContentIdle;
- OUString aTitleBase;
OUString aStrDragMode;
OUString aStrDisplay;
OUString aStrActive;
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index bfeb685faa99..85b5afdf1044 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -46,7 +46,6 @@ class SC_DLLPUBLIC ScPreviewShell: public SfxViewShell
VclPtr<ScrollBar> pVerScroll;
VclPtr<vcl::Window> pCorner;
- css::uno::Sequence< css::beans::PropertyValue > aSourceData; // ViewData
TriState nSourceDesignMode; // form design mode from TabView
SvxZoomType eZoom;
long nMaxVertPos;
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx
index 225c6b718ed6..5a6ea8a1a0c7 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -81,7 +81,6 @@ class ScImportAsciiDlg : public ModalDialog
VclPtr<ScCsvTableBox> mpTableBox;
- OUString aCharSetUser;
OUString aColumnUser;
OUString aTextSepList;
OUString maFieldSeparators; // selected field separators
diff --git a/sc/source/ui/inc/selectionstate.hxx b/sc/source/ui/inc/selectionstate.hxx
index 868bda24a23c..b45b4725f59e 100644
--- a/sc/source/ui/inc/selectionstate.hxx
+++ b/sc/source/ui/inc/selectionstate.hxx
@@ -50,7 +50,6 @@ public:
private:
ScSelectionType meType; /// Type of the selection.
ScAddress maCursor; /// Cell cursor position.
- ScRangeList maSheetSel; /// Sheet selection.
ESelection maEditSel; /// Selection in edit mode.
};
diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx
index 17ea38156bda..c54c99c11e60 100644
--- a/sc/source/ui/inc/sharedocdlg.hxx
+++ b/sc/source/ui/inc/sharedocdlg.hxx
@@ -41,7 +41,6 @@ private:
OUString m_aStrUnknownUser;
OUString m_aStrExclusiveAccess;
- ScViewData* mpViewData;
ScDocShell* mpDocShell;
DECL_LINK( ToggleHandle, CheckBox&, void );
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 9e5c2cba5abd..f6fbfbd3184f 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -371,8 +371,6 @@ ScConflictsDlg::ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScD
,m_pLbConflictsContainer ( get<SvSimpleTableContainer>("container") )
,m_pLbConflicts ( VclPtr<SvxRedlinTable>::Create(*m_pLbConflictsContainer) )
,maStrTitleConflict ( ScResId( STR_TITLE_CONFLICT ) )
- ,maStrTitleAuthor ( ScResId( STR_TITLE_AUTHOR ) )
- ,maStrTitleDate ( ScResId( STR_TITLE_DATE ) )
,maStrUnknownUser ( ScResId( STR_UNKNOWN_USER_CONFLICT ) )
,mpViewData ( pViewData )
,mpOwnDoc ( nullptr )
@@ -380,7 +378,6 @@ ScConflictsDlg::ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScD
,mpSharedDoc ( pSharedDoc )
,mpSharedTrack ( nullptr )
,mrConflictsList ( rConflictsList )
- ,maDialogSize ( GetSizePixel() )
,maSelectionIdle ( "ScConflictsDlg SelectionIdle" )
,mbInSelectHdl ( false )
,mbInDeselectHdl ( false )
@@ -399,7 +396,7 @@ ScConflictsDlg::ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScD
mpSharedTrack = ( mpSharedDoc ? mpSharedDoc->GetChangeTrack() : nullptr );
OSL_ENSURE( mpSharedTrack, "ScConflictsDlg CTOR: mpSharedTrack is null!" );
- SetMinOutputSizePixel( maDialogSize );
+ SetMinOutputSizePixel( GetSizePixel() );
long const nTabs[] = { 10, 216, 266 };
m_pLbConflicts->SetTabs( SAL_N_ELEMENTS(nTabs), nTabs );
@@ -407,9 +404,9 @@ ScConflictsDlg::ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScD
OUString aTab('\t');
OUString aHeader( maStrTitleConflict );
aHeader += aTab;
- aHeader += maStrTitleAuthor;
+ aHeader += ScResId( STR_TITLE_AUTHOR );
aHeader += aTab;
- aHeader += maStrTitleDate;
+ aHeader += ScResId( STR_TITLE_DATE );
m_pLbConflicts->InsertHeaderEntry( aHeader, HEADERBAR_APPEND, HeaderBarItemBits::LEFT | HeaderBarItemBits::LEFTIMAGE | HeaderBarItemBits::VCENTER );
m_pLbConflicts->SetStyle( m_pLbConflicts->GetStyle() | WB_HASLINES | WB_CLIPCHILDREN | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL );
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx
index f023a3d2dc57..4d73a2aef251 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -29,7 +29,6 @@ ScDataFormDlg::ScDataFormDlg(vcl::Window* pParent, ScTabViewShell* pTabViewShell
, nStartRow(0)
, nEndRow(0)
, nTab(0)
- , bNoSelection(false)
{
get(m_pBtnNew, "new");
get(m_pBtnDelete, "delete");
@@ -60,6 +59,7 @@ ScDataFormDlg::ScDataFormDlg(vcl::Window* pParent, ScTabViewShell* pTabViewShell
nEndRow = aEnd.Row();
nTab = rViewData.GetTabNo();
+ bool bNoSelection(false);
//if there is no selection
if ((nStartCol == nEndCol) && (nStartRow == nEndRow))
bNoSelection = true;
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 9038c96d4a33..6d9500255692 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -69,11 +69,10 @@ public:
ScShareDocumentDlg::ScShareDocumentDlg( vcl::Window* pParent, ScViewData* pViewData )
: ModalDialog(pParent, "ShareDocumentDialog", "modules/scalc/ui/sharedocumentdlg.ui")
- , mpViewData(pViewData)
, mpDocShell(nullptr)
{
- OSL_ENSURE( mpViewData, "ScShareDocumentDlg CTOR: mpViewData is null!" );
- mpDocShell = ( mpViewData ? mpViewData->GetDocShell() : nullptr );
+ OSL_ENSURE( pViewData, "ScShareDocumentDlg CTOR: mpViewData is null!" );
+ mpDocShell = ( pViewData ? pViewData->GetDocShell() : nullptr );
OSL_ENSURE( mpDocShell, "ScShareDocumentDlg CTOR: mpDocShell is null!" );
get(m_pCbShare, "share");
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index dc7a07ecc42d..ce8090ea4fc4 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -510,8 +510,6 @@ ScNavigatorDlg::ScNavigatorDlg(SfxBindings* pB, vcl::Window* pParent)
aStrNotActive = " (" + ScResId(SCSTR_NOTACTIVE) + ")"; // " (not active)"
aStrHidden = " (" + ScResId(SCSTR_HIDDEN) + ")"; // " (hidden)"
- aTitleBase = GetText();
-
ppBoundItems = new ScNavigatorControllerItem* [CTRL_ITEMS];
rBindings.ENTERREGISTRATIONS();
diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx
index 10ce85c79f12..137c32cda823 100644
--- a/sc/source/ui/vba/vbacharacters.cxx
+++ b/sc/source/ui/vba/vbacharacters.cxx
@@ -24,8 +24,18 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const ScVbaPalette& dPalette, const uno::Reference< text::XSimpleText>& xRange,const css::uno::Any& Start, const css::uno::Any& Length, bool Replace ) : ScVbaCharacters_BASE( xParent, xContext ), m_xSimpleText(xRange), m_aPalette( dPalette), nLength(-1), nStart(1), bReplace( Replace )
+ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xParent,
+ const uno::Reference< uno::XComponentContext >& xContext,
+ const ScVbaPalette& dPalette,
+ const uno::Reference< text::XSimpleText>& xRange,
+ const css::uno::Any& Start,
+ const css::uno::Any& Length,
+ bool Replace )
+ : ScVbaCharacters_BASE( xParent, xContext ),
+ m_xSimpleText(xRange), m_aPalette( dPalette), bReplace( Replace )
{
+ sal_Int16 nLength(-1);
+ sal_Int16 nStart(1);
Start >>= nStart;
if ( nStart < 1 )
nStart = 1; // silently correct user error ( as ms )
diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx
index 8dc1acd22f91..9a7bd69229f2 100644
--- a/sc/source/ui/vba/vbacharacters.hxx
+++ b/sc/source/ui/vba/vbacharacters.hxx
@@ -33,8 +33,6 @@ private:
css::uno::Reference< css::text::XTextRange > m_xTextRange;
css::uno::Reference< css::text::XSimpleText > m_xSimpleText;
ScVbaPalette m_aPalette;
- sal_Int16 nLength;
- sal_Int16 nStart;
// Add because of MSO has different behavior.
bool bReplace;
public:
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 6801dea6a400..9ca2b14bcab7 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -123,7 +123,7 @@ bool ScGridWindow::DoAutoFilterButton( SCCOL nCol, SCROW nRow, const MouseEvent&
Size aScrSize(nSizeX-1, nSizeY-1);
// Check if the mouse cursor is clicking on the popup arrow box.
- mpFilterButton.reset(new ScDPFieldButton(this, &GetSettings().GetStyleSettings(), &pViewData->GetZoomX(), &pViewData->GetZoomY(), pDoc));
+ mpFilterButton.reset(new ScDPFieldButton(this, &GetSettings().GetStyleSettings(), &pViewData->GetZoomY(), pDoc));
mpFilterButton->setBoundingBox(aScrPos, aScrSize, bLayoutRTL);
mpFilterButton->setPopupLeft(bLayoutRTL); // #i114944# AutoFilter button is left-aligned in RTL
Point aPopupPos;
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index be65eb24216b..62ccfd036e27 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1537,7 +1537,7 @@ void ScGridWindow::DrawButtons(SCCOL nX1, SCCOL nX2, const ScTableInfo& rTabInfo
aComboButton.SetOutputDevice( pContentDev );
ScDocument* pDoc = pViewData->GetDocument();
- ScDPFieldButton aCellBtn(pContentDev, &GetSettings().GetStyleSettings(), &pViewData->GetZoomX(), &pViewData->GetZoomY(), pDoc);
+ ScDPFieldButton aCellBtn(pContentDev, &GetSettings().GetStyleSettings(), &pViewData->GetZoomY(), pDoc);
SCCOL nCol;
SCROW nRow;
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 7d8f387ed0fe..82de4646a28f 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -164,7 +164,6 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
ScTabViewShell* pTabViewShell = static_cast<ScTabViewShell*>(pOldSh);
const ScViewData& rData = pTabViewShell->GetViewData();
- rData.WriteUserDataSequence( aSourceData );
pPreview->SetSelectedTabs(rData.GetMarkData());
InitStartTable( rData.GetTabNo() );
diff --git a/sc/source/ui/view/selectionstate.cxx b/sc/source/ui/view/selectionstate.cxx
index 11181970f5bf..91c6a278cb77 100644
--- a/sc/source/ui/view/selectionstate.cxx
+++ b/sc/source/ui/view/selectionstate.cxx
@@ -46,7 +46,6 @@ ScSelectionState::ScSelectionState( ScViewData& rViewData ) :
if( rMarkData.IsMultiMarked() )
{
meType = SC_SELECTTYPE_SHEET;
- rMarkData.FillRangeListWithMarks( &maSheetSel, false );
}
// else type is SC_SELECTTYPE_NONE - already initialized
}
More information about the Libreoffice-commits
mailing list