include/linguistic/lngprophelp.hxx | 10 --
l10ntools/inc/xmlparse.hxx | 5 -
l10ntools/source/xmlparse.cxx | 10 --
linguistic/source/lngprophelp.cxx | 47 +++++------
reportdesign/source/filter/xml/xmlStyleImport.cxx | 2
reportdesign/source/filter/xml/xmlStyleImport.hxx | 1
reportdesign/source/filter/xml/xmlfilter.cxx | 1
reportdesign/source/filter/xml/xmlfilter.hxx | 1
sax/source/expatwrap/sax_expat.cxx | 6 -
sax/source/fastparser/fastparser.cxx | 24 -----
sc/inc/externalrefmgr.hxx | 3
sc/inc/mtvelements.hxx | 1
sc/inc/pagepar.hxx | 2
sc/source/core/data/column3.cxx | 1
sc/source/core/data/pagepar.cxx | 2
sc/source/filter/xml/xmldpimp.hxx | 4
sc/source/filter/xml/xmlfilti.cxx | 4
sc/source/filter/xml/xmltabi.cxx | 1
sc/source/filter/xml/xmltabi.hxx | 1
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 4
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 1
sc/source/ui/docshell/externalrefmgr.cxx | 6 -
sc/source/ui/inc/AccessibleSpreadsheet.hxx | 1
sc/source/ui/inc/preview.hxx | 1
sc/source/ui/miscdlgs/dataproviderdlg.cxx | 7 -
sc/source/ui/vba/vbaformatcondition.cxx | 1
sc/source/ui/vba/vbaformatcondition.hxx | 1
sc/source/ui/view/preview.cxx | 1
sc/source/ui/view/printfun.cxx | 2
scripting/source/vbaevents/eventhelper.cxx | 10 --
30 files changed, 36 insertions(+), 125 deletions(-)
New commits:
commit c9611c5e6465948de029e9c2fbd17e75ee07d31f
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Feb 22 15:31:15 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Feb 23 07:30:12 2019 +0100
loplugin:unusedfields in l10ntools..sax
Change-Id: I6e4ff4853c3995072b020af54549dc81303a4fde
Reviewed-on: https://gerrit.libreoffice.org/68225
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/linguistic/lngprophelp.hxx
b/include/linguistic/lngprophelp.hxx
index f8613deb454e..f86d810e159c 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -27,6 +27,7 @@
#include <com/sun/star/linguistic2/XLinguProperties.hpp>
#include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp>
#include <linguistic/lngdllapi.h>
+#include <rtl/ref.hxx>
namespace com { namespace sun { namespace star { namespace beans {
class XPropertySet;
@@ -148,8 +149,7 @@ public:
class LNG_DLLPUBLIC PropertyHelper_Thesaurus
{
- PropertyHelper_Thes* pInst;
- css::uno::Reference< css::beans::XPropertyChangeListener > xPropHelper;
+ rtl::Reference< PropertyHelper_Thes > mxPropHelper;
// disallow use of copy-constructor and assignment-operator
PropertyHelper_Thesaurus( const PropertyHelper_Thes & ) = delete;
@@ -209,8 +209,7 @@ public:
class LNG_DLLPUBLIC PropertyHelper_Spelling
{
- PropertyHelper_Spell* pInst;
- css::uno::Reference< css::beans::XPropertyChangeListener > xPropHelper;
+ rtl::Reference< PropertyHelper_Spell > mxPropHelper;
// disallow use of copy-constructor and assignment-operator
PropertyHelper_Spelling( const PropertyHelper_Spell & ) = delete;
@@ -279,8 +278,7 @@ public:
class LNG_DLLPUBLIC PropertyHelper_Hyphenation
{
- PropertyHelper_Hyphen* pInst;
- css::uno::Reference< css::beans::XPropertyChangeListener > xPropHelper;
+ rtl::Reference< PropertyHelper_Hyphen > mxPropHelper;
// disallow use of copy-constructor and assignment-operator
PropertyHelper_Hyphenation( const PropertyHelper_Hyphen & ) = delete;
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 67b40ac2205c..a9d2893d68b3 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -206,8 +206,6 @@ class XMLElement : public XMLParentNode
private:
OString m_sElementName;
std::unique_ptr<XMLAttributeList> m_pAttributes;
- OString m_sId;
- OString m_sLanguageId;
protected:
void Print(XMLNode *pCur, OStringBuffer& rBuffer, bool bRootelement) const;
@@ -237,9 +235,6 @@ public:
/// Return a Unicode String representation of this object
OString ToOString();
-
- void SetId ( OString const & sTheId ) { m_sId = sTheId; }
- void SetLanguageId ( OString const & sLangId ) { m_sLanguageId =
sLangId; }
};
/** Holds character data
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 369d8e6e1562..b6df209ed896 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -472,8 +472,6 @@ void XMLFile::SearchL10NElements( XMLChildNode *pCur )
sLanguage=(*pElement->GetAttributeList())[ j
]->GetValue();
}
}
- pElement->SetLanguageId( sLanguage );
- pElement->SetId( sTmpStrVal );
}
if ( bInsert && ( m_aNodes_localize.find( sName ) !=
m_aNodes_localize.end() ) )
@@ -555,16 +553,12 @@ XMLElement::XMLElement(
)
: XMLParentNode( pParent )
, m_sElementName( rName )
- , m_sId(OString())
- , m_sLanguageId(OString())
{
}
XMLElement::XMLElement(const XMLElement& rObj)
: XMLParentNode( rObj )
, m_sElementName( rObj.m_sElementName )
- , m_sId( rObj.m_sId )
- , m_sLanguageId( rObj.m_sLanguageId )
{
if ( rObj.m_pAttributes )
{
@@ -580,8 +574,6 @@ XMLElement& XMLElement::operator=(const XMLElement& rObj)
{
XMLParentNode::operator=(rObj);
m_sElementName = rObj.m_sElementName;
- m_sId = rObj.m_sId;
- m_sLanguageId = rObj.m_sLanguageId;
if ( m_pAttributes )
{
@@ -608,7 +600,6 @@ void XMLElement::AddAttribute( const OString &rAttribute,
const OString &rValue
void XMLElement::ChangeLanguageTag( const OString &rValue )
{
- SetLanguageId(rValue);
if ( m_pAttributes )
{
bool bWasSet = false;
@@ -635,7 +626,6 @@ void XMLElement::ChangeLanguageTag( const OString &rValue )
{
XMLElement* pElem = static_cast< XMLElement* >(pNode);
pElem->ChangeLanguageTag( rValue );
- pElem->SetLanguageId(rValue);
pElem = nullptr;
pNode = nullptr;
}
diff --git a/linguistic/source/lngprophelp.cxx
b/linguistic/source/lngprophelp.cxx
index 7c061be2a621..d1368b1e3a62 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -654,8 +654,7 @@ PropertyHelper_Thesaurus::PropertyHelper_Thesaurus(
const css::uno::Reference< css::uno::XInterface > &rxSource,
css::uno::Reference< css::linguistic2::XLinguProperties > const
&rxPropSet )
{
- pInst = new PropertyHelper_Thes( rxSource, rxPropSet );
- xPropHelper = pInst;
+ mxPropHelper = new PropertyHelper_Thes( rxSource, rxPropSet );
}
PropertyHelper_Thesaurus::~PropertyHelper_Thesaurus()
@@ -664,25 +663,24 @@ PropertyHelper_Thesaurus::~PropertyHelper_Thesaurus()
void PropertyHelper_Thesaurus::AddAsPropListener()
{
- pInst->AddAsPropListener();
+ mxPropHelper->AddAsPropListener();
}
void PropertyHelper_Thesaurus::RemoveAsPropListener()
{
- pInst->RemoveAsPropListener();
+ mxPropHelper->RemoveAsPropListener();
}
void PropertyHelper_Thesaurus::SetTmpPropVals( const
css::beans::PropertyValues &rPropVals )
{
- pInst->SetTmpPropVals( rPropVals );
+ mxPropHelper->SetTmpPropVals( rPropVals );
}
PropertyHelper_Hyphenation::PropertyHelper_Hyphenation(
const css::uno::Reference< css::uno::XInterface > &rxSource,
css::uno::Reference< css::linguistic2::XLinguProperties > const
&rxPropSet)
{
- pInst = new PropertyHelper_Hyphen( rxSource, rxPropSet );
- xPropHelper = pInst;
+ mxPropHelper = new PropertyHelper_Hyphen( rxSource, rxPropSet );
}
PropertyHelper_Hyphenation::~PropertyHelper_Hyphenation()
@@ -691,52 +689,51 @@ PropertyHelper_Hyphenation::~PropertyHelper_Hyphenation()
void PropertyHelper_Hyphenation::AddAsPropListener()
{
- pInst->AddAsPropListener();
+ mxPropHelper->AddAsPropListener();
}
void PropertyHelper_Hyphenation::RemoveAsPropListener()
{
- pInst->RemoveAsPropListener();
+ mxPropHelper->RemoveAsPropListener();
}
void PropertyHelper_Hyphenation::SetTmpPropVals( const
css::beans::PropertyValues &rPropVals )
{
- pInst->SetTmpPropVals( rPropVals );
+ mxPropHelper->SetTmpPropVals( rPropVals );
}
sal_Int16 PropertyHelper_Hyphenation::GetMinLeading() const
{
- return pInst->GetMinLeading();
+ return mxPropHelper->GetMinLeading();
}
sal_Int16 PropertyHelper_Hyphenation::GetMinTrailing() const
{
- return pInst->GetMinTrailing();
+ return mxPropHelper->GetMinTrailing();
}
sal_Int16 PropertyHelper_Hyphenation::GetMinWordLength() const
{
- return pInst->GetMinWordLength();
+ return mxPropHelper->GetMinWordLength();
}
bool PropertyHelper_Hyphenation::addLinguServiceEventListener(
const css::uno::Reference<
css::linguistic2::XLinguServiceEventListener >& rxListener )
{
- return pInst->addLinguServiceEventListener( rxListener );
+ return mxPropHelper->addLinguServiceEventListener( rxListener );
}
bool PropertyHelper_Hyphenation::removeLinguServiceEventListener(
const css::uno::Reference<
css::linguistic2::XLinguServiceEventListener >& rxListener )
{
- return pInst->removeLinguServiceEventListener( rxListener );
+ return mxPropHelper->removeLinguServiceEventListener( rxListener );
}
PropertyHelper_Spelling::PropertyHelper_Spelling(
const css::uno::Reference< css::uno::XInterface > &rxSource,
css::uno::Reference< css::linguistic2::XLinguProperties > const
&rxPropSet )
{
- pInst = new PropertyHelper_Spell( rxSource, rxPropSet );
- xPropHelper = pInst;
+ mxPropHelper = new PropertyHelper_Spell( rxSource, rxPropSet );
}
PropertyHelper_Spelling::~PropertyHelper_Spelling()
@@ -745,46 +742,46 @@ PropertyHelper_Spelling::~PropertyHelper_Spelling()
void PropertyHelper_Spelling::AddAsPropListener()
{
- pInst->AddAsPropListener();
+ mxPropHelper->AddAsPropListener();
}
void PropertyHelper_Spelling::RemoveAsPropListener()
{
- pInst->RemoveAsPropListener();
+ mxPropHelper->RemoveAsPropListener();
}
void PropertyHelper_Spelling::SetTmpPropVals( const css::beans::PropertyValues
&rPropVals )
{
- pInst->SetTmpPropVals( rPropVals );
+ mxPropHelper->SetTmpPropVals( rPropVals );
}
bool PropertyHelper_Spelling::IsSpellUpperCase() const
{
- return pInst->IsSpellUpperCase();
+ return mxPropHelper->IsSpellUpperCase();
}
bool PropertyHelper_Spelling::IsSpellWithDigits() const
{
- return pInst->IsSpellWithDigits();
+ return mxPropHelper->IsSpellWithDigits();
}
bool PropertyHelper_Spelling::IsSpellCapitalization() const
{
- return pInst->IsSpellCapitalization();
+ return mxPropHelper->IsSpellCapitalization();
}
bool PropertyHelper_Spelling::addLinguServiceEventListener(
const css::uno::Reference<
css::linguistic2::XLinguServiceEventListener >& rxListener
)
{
- return pInst->addLinguServiceEventListener( rxListener );
+ return mxPropHelper->addLinguServiceEventListener( rxListener );
}
bool PropertyHelper_Spelling::removeLinguServiceEventListener(
const css::uno::Reference<
css::linguistic2::XLinguServiceEventListener >& rxListener
)
{
- return pInst->removeLinguServiceEventListener( rxListener );
+ return mxPropHelper->removeLinguServiceEventListener( rxListener );
}
} // namespace linguistic
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx
b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 5d0f9b1383a7..704641996661 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -136,7 +136,7 @@ void OControlStyleContext::SetAttribute( sal_uInt16
nPrefixKey,
if( IsXMLToken(rLocalName, XML_DATA_STYLE_NAME ) )
m_sDataStyleName = rValue;
else if ( IsXMLToken(rLocalName, XML_MASTER_PAGE_NAME ) )
- sPageStyle = rValue;
+ ;
else
XMLPropStyleContext::SetAttribute( nPrefixKey, rLocalName, rValue );
}
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx
b/reportdesign/source/filter/xml/xmlStyleImport.hxx
index 8ae7335f0006..5a59b8dab229 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.hxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx
@@ -39,7 +39,6 @@ namespace rptxml
class OControlStyleContext : public XMLPropStyleContext
{
OUString m_sDataStyleName;
- OUString sPageStyle;
SvXMLStylesContext* pStyles;
// std::vector<ScXMLMapContent> aMaps;
sal_Int32 m_nNumberFormat;
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx
b/reportdesign/source/filter/xml/xmlfilter.cxx
index 2ff95dd1b3f8..1f54bf8f66c8 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -350,7 +350,6 @@ ORptFilter::ORptFilter( const uno::Reference<
XComponentContext >& _rxContext, S
m_xCellStylesPropertySetMapper = OXMLHelper::GetCellStylePropertyMap(true,
false);
m_xColumnStylesPropertySetMapper = new
XMLPropertySetMapper(OXMLHelper::GetColumnStyleProps(), m_xPropHdlFactory,
false);
m_xRowStylesPropertySetMapper = new
XMLPropertySetMapper(OXMLHelper::GetRowStyleProps(), m_xPropHdlFactory, false);
- m_xTableStylesPropertySetMapper = new XMLTextPropertySetMapper(
TextPropMap::TABLE_DEFAULTS, false );
}
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx
b/reportdesign/source/filter/xml/xmlfilter.hxx
index 079ef969cc7f..266198f46bfb 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -85,7 +85,6 @@ private:
rtl::Reference < XMLPropertySetMapper >
m_xCellStylesPropertySetMapper;
rtl::Reference < XMLPropertySetMapper >
m_xColumnStylesPropertySetMapper;
rtl::Reference < XMLPropertySetMapper >
m_xRowStylesPropertySetMapper;
- rtl::Reference < XMLPropertySetMapper >
m_xTableStylesPropertySetMapper;
Reference<XReportDefinition> m_xReportDefinition;
std::shared_ptr<rptui::OReportModel> m_pReportModel;
diff --git a/sax/source/expatwrap/sax_expat.cxx
b/sax/source/expatwrap/sax_expat.cxx
index 57437b093442..e98da4dd2a83 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -176,8 +176,6 @@ public: // module scope
bool bExceptionWasThrown;
bool bRTExceptionWasThrown;
- Locale locale;
-
public:
SaxExpatParser_Impl()
: m_bEnableDoS(false)
@@ -512,9 +510,9 @@ void SaxExpatParser::setEntityResolver(const
css::uno::Reference < XEntityResolv
}
-void SaxExpatParser::setLocale( const Locale & locale )
+void SaxExpatParser::setLocale( const Locale & )
{
- m_pImpl->locale = locale;
+ // not implemented
}
// XServiceInfo
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index a8c0c8fc357c..1e8b578e325f 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -124,9 +124,7 @@ struct ParserData
css::uno::Reference< css::xml::sax::XFastTokenHandler > mxTokenHandler;
FastTokenHandlerBase* mpTokenHandler;
css::uno::Reference< css::xml::sax::XErrorHandler > mxErrorHandler;
- css::uno::Reference< css::xml::sax::XEntityResolver >
mxEntityResolver;
css::uno::Reference< css::xml::sax::XFastNamespaceHandler
>mxNamespaceHandler;
- css::lang::Locale maLocale;
ParserData();
};
@@ -228,11 +226,7 @@ public:
/// @throws css::uno::RuntimeException
void setErrorHandler( const css::uno::Reference<
css::xml::sax::XErrorHandler >& Handler );
/// @throws css::uno::RuntimeException
- void setEntityResolver( const css::uno::Reference<
css::xml::sax::XEntityResolver >& Resolver );
- /// @throws css::uno::RuntimeException
void setNamespaceHandler( const css::uno::Reference<
css::xml::sax::XFastNamespaceHandler >& Handler);
- /// @throws css::uno::RuntimeException
- void setLocale( const css::lang::Locale& rLocale );
// called by the C callbacks of the expat parser
void callbackStartElement( const xmlChar *localName , const xmlChar*
prefix, const xmlChar* URI,
@@ -917,16 +911,6 @@ void FastSaxParserImpl::setErrorHandler(const Reference<
XErrorHandler > & Handl
maData.mxErrorHandler = Handler;
}
-void FastSaxParserImpl::setEntityResolver(const Reference < XEntityResolver >
& Resolver)
-{
- maData.mxEntityResolver = Resolver;
-}
-
-void FastSaxParserImpl::setLocale( const lang::Locale & Locale )
-{
- maData.maLocale = Locale;
-}
-
void FastSaxParserImpl::setNamespaceHandler( const Reference<
XFastNamespaceHandler >& Handler )
{
maData.mxNamespaceHandler = Handler;
@@ -1400,14 +1384,14 @@ void FastSaxParser::setErrorHandler( const
uno::Reference< xml::sax::XErrorHandl
mpImpl->setErrorHandler(Handler);
}
-void FastSaxParser::setEntityResolver( const uno::Reference<
xml::sax::XEntityResolver >& Resolver )
+void FastSaxParser::setEntityResolver( const uno::Reference<
xml::sax::XEntityResolver >& )
{
- mpImpl->setEntityResolver(Resolver);
+ // not implemented
}
-void FastSaxParser::setLocale( const lang::Locale& rLocale )
+void FastSaxParser::setLocale( const lang::Locale& )
{
- mpImpl->setLocale(rLocale);
+ // not implemented
}
void FastSaxParser::setNamespaceHandler( const uno::Reference<
css::xml::sax::XFastNamespaceHandler >& Handler)
commit d3d8618608ec0f329a40e029de951374871a8de0
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Feb 22 15:24:59 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Feb 23 07:30:03 2019 +0100
loplugin:unusedfields in sc
Change-Id: I5e9842970821d0ae61e06e3ad35c9f571b43632c
Reviewed-on: https://gerrit.libreoffice.org/68224
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 0dee986d81c0..00a5ca7429ad 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -54,7 +54,7 @@ class ColumnSpanSet;
class ScExternalRefLink : public ::sfx2::SvBaseLink
{
public:
- ScExternalRefLink(ScDocument* pDoc, sal_uInt16 nFileId, const OUString&
rFilter);
+ ScExternalRefLink(ScDocument* pDoc, sal_uInt16 nFileId);
virtual ~ScExternalRefLink() override;
virtual void Closed() override;
@@ -69,7 +69,6 @@ private:
ScExternalRefLink(const ScExternalRefLink&) = delete;
sal_uInt16 const mnFileId;
- OUString maFilterName;
ScDocument* const mpDoc;
bool mbDoRefresh;
};
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 04c34775cedb..407f0392c4cd 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -130,7 +130,6 @@ struct ColumnBlockPosition
struct ColumnBlockConstPosition
{
CellNoteStoreType::const_iterator miCellNotePos;
- BroadcasterStoreType::const_iterator miBroadcasterPos;
CellTextAttrStoreType::const_iterator miCellTextAttrPos;
CellStoreType::const_iterator miCellPos;
diff --git a/sc/inc/pagepar.hxx b/sc/inc/pagepar.hxx
index 50a51cde8b63..2a86e32936f2 100644
--- a/sc/inc/pagepar.hxx
+++ b/sc/inc/pagepar.hxx
@@ -59,8 +59,6 @@ struct ScPageAreaParam
bool bRepeatRow;
bool bRepeatCol;
ScRange aPrintArea;
- ScRange aRepeatRow;
- ScRange aRepeatCol;
ScPageAreaParam();
~ScPageAreaParam();
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index a5a6a4a0993a..329971d2b3bf 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -788,7 +788,6 @@ void ScColumn::InitBlockPosition( sc::ColumnBlockPosition&
rBlockPos )
void ScColumn::InitBlockPosition( sc::ColumnBlockConstPosition& rBlockPos )
const
{
- rBlockPos.miBroadcasterPos = maBroadcasters.begin();
rBlockPos.miCellNotePos = maCellNotes.begin();
rBlockPos.miCellTextAttrPos = maCellTextAttrs.begin();
rBlockPos.miCellPos = maCells.begin();
diff --git a/sc/source/core/data/pagepar.cxx b/sc/source/core/data/pagepar.cxx
index 9853e4ac52a5..35a270e39391 100644
--- a/sc/source/core/data/pagepar.cxx
+++ b/sc/source/core/data/pagepar.cxx
@@ -58,8 +58,6 @@ void ScPageAreaParam::Reset()
bPrintArea = bRepeatRow = bRepeatCol = false;
aPrintArea = ScRange();
- aRepeatRow = ScRange();
- aRepeatCol = ScRange();
}
diff --git a/sc/source/filter/xml/xmldpimp.hxx
b/sc/source/filter/xml/xmldpimp.hxx
index c75abd762f41..31bd37690efb 100644
--- a/sc/source/filter/xml/xmldpimp.hxx
+++ b/sc/source/filter/xml/xmldpimp.hxx
@@ -87,8 +87,6 @@ class ScXMLDataPilotTableContext : public ScXMLImportContext
OUString sSourceRangeName;
ScRange aSourceCellRangeAddress;
ScRange aTargetRangeAddress;
- ScRange aFilterSourceRange;
- ScAddress aFilterOutputPosition;
ScQueryParam aSourceQueryParam;
ScMySourceType nSourceType;
sal_uInt32 mnRowFieldCount;
@@ -132,8 +130,6 @@ public:
void SetSourceRangeName(const OUString& sValue) { sSourceRangeName =
sValue; bSourceCellRange = true; }
void SetSourceCellRangeAddress(const ScRange& aValue) {
aSourceCellRangeAddress = aValue; bSourceCellRange = true; }
void SetSourceQueryParam(const ScQueryParam& aValue) { aSourceQueryParam =
aValue; }
- void SetFilterOutputPosition(const ScAddress& aValue) {
aFilterOutputPosition = aValue; }
- void SetFilterSourceRange(const ScRange& aValue) { aFilterSourceRange =
aValue; }
void AddDimension(ScDPSaveDimension* pDim);
void AddGroupDim(const ScDPSaveNumGroupDimension& aNumGroupDim);
void AddGroupDim(const ScDPSaveGroupDimension& aGroupDim);
diff --git a/sc/source/filter/xml/xmlfilti.cxx
b/sc/source/filter/xml/xmlfilti.cxx
index ea051785c59d..d97bf44957ee 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -575,12 +575,8 @@ void SAL_CALL ScXMLDPFilterContext::endFastElement(
sal_Int32 /*nElement*/ )
aFilterFields.eSearchType = eSearchType;
aFilterFields.bCaseSens = bIsCaseSensitive;
aFilterFields.bDuplicate = !bSkipDuplicates;
- if (bCopyOutputData)
- pDataPilotTable->SetFilterOutputPosition(aOutputPosition);
pDataPilotTable->SetSourceQueryParam(aFilterFields);
- if (bConditionSourceRange)
- pDataPilotTable->SetFilterSourceRange(aConditionSourceRangeAddress);
}
void ScXMLDPFilterContext::AddFilterField (const ScQueryEntry& aFilterField)
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index 936170a1624a..ce006dc9e399 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -187,7 +187,6 @@ ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport,
{
// This is an external ref cache table.
pExternalRefInfo.reset(new ScXMLExternalTabData);
- pExternalRefInfo->maFileUrl = aExtUrl;
ScDocument* pDoc = GetScImport().GetDocument();
if (pDoc)
{
diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx
index 5ada4b365f50..2b194d172d16 100644
--- a/sc/source/filter/xml/xmltabi.hxx
+++ b/sc/source/filter/xml/xmltabi.hxx
@@ -30,7 +30,6 @@ namespace sax_fastparser { class FastAttributeList; }
struct ScXMLExternalTabData
{
- OUString maFileUrl;
ScExternalRefCache::TableTypeRef mpCacheTable;
sal_Int32 mnRow;
sal_Int32 mnCol;
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 878bb48aed10..81b8cf79460e 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -584,8 +584,6 @@ struct ScShapeRange
ScShapeChildVec maBackShapes;
ScShapeChildVec maForeShapes; // inclusive internal shapes
ScShapeChildVec maControls;
- tools::Rectangle maPixelRect;
- MapMode maMapMode;
ScIAccessibleViewForwarder maViewForwarder;
};
@@ -1010,8 +1008,6 @@ void ScShapeChildren::FillShapes(const tools::Rectangle&
aPixelPaintRect, const
tools::Rectangle aRect2(Point(0,0),
mpAccDoc->GetBoundingBoxOnScreen().GetSize());
aClippedPixelPaintRect = aPixelPaintRect.GetIntersection(aRect2);
}
- maShapeRanges[nRangeId].maPixelRect = aClippedPixelPaintRect;
- maShapeRanges[nRangeId].maMapMode = aMapMode;
ScIAccessibleViewForwarder aViewForwarder(mpViewShell, mpAccDoc,
aMapMode);
maShapeRanges[nRangeId].maViewForwarder = aViewForwarder;
const size_t nCount(pPage->GetObjCount());
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index 0cd1d7ac24d5..4370cbb66db2 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -284,7 +284,6 @@ void
ScAccessibleSpreadsheet::ConstructScAccessibleSpreadsheet(
mnTab = nTab;
mbDelIns = false;
mbIsFocusSend = false;
- maVisCells = GetVisCells(GetVisArea(mpViewShell, meSplitPos));
if (mpViewShell)
{
mpViewShell->AddAccessibilityObject(*this);
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx
b/sc/source/ui/docshell/externalrefmgr.cxx
index 7f36443d802d..e7fc510ef308 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1411,10 +1411,9 @@ ScExternalRefCache::DocItem*
ScExternalRefCache::getDocItem(sal_uInt16 nFileId)
return &itrDoc->second;
}
-ScExternalRefLink::ScExternalRefLink(ScDocument* pDoc, sal_uInt16 nFileId,
const OUString& rFilter) :
+ScExternalRefLink::ScExternalRefLink(ScDocument* pDoc, sal_uInt16 nFileId) :
::sfx2::SvBaseLink(::SfxLinkUpdateMode::ONCALL,
SotClipboardFormatId::SIMPLE_FILE),
mnFileId(nFileId),
- maFilterName(rFilter),
mpDoc(pDoc),
mbDoRefresh(true)
{
@@ -1458,7 +1457,6 @@ void ScExternalRefLink::Closed()
ScDocShell* pDocShell = ScDocShell::GetViewData()->GetDocShell();
ScDocShellModificator aMod(*pDocShell);
pMgr->switchSrcFile(mnFileId, aFile, aFilter);
- maFilterName = aFilter;
aMod.SetDocumentModified();
}
@@ -2591,7 +2589,7 @@ void ScExternalRefManager::maybeLinkExternalFile(
sal_uInt16 nFileId, bool bDefe
SAL_WARN( "sc.ui", "ScExternalRefManager::maybeLinkExternalFile:
pLinkMgr==NULL");
return;
}
- ScExternalRefLink* pLink = new ScExternalRefLink(mpDoc, nFileId, aFilter);
+ ScExternalRefLink* pLink = new ScExternalRefLink(mpDoc, nFileId);
OSL_ENSURE(pFileName, "ScExternalRefManager::maybeLinkExternalFile: file
name pointer is NULL");
pLinkMgr->InsertFileLink(*pLink, OBJECT_CLIENT_FILE, *pFileName,
(aFilter.isEmpty() && bDeferFilterDetection ? nullptr : &aFilter));
diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
index b425e92faff1..543526bc596f 100644
--- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
+++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
@@ -216,7 +216,6 @@ private:
std::unique_ptr<ScRangeList> mpMarkedRanges;
ScAccessibleDocument* mpAccDoc;
rtl::Reference<ScAccessibleCell> mpAccCell;
- tools::Rectangle maVisCells;
ScSplitPos meSplitPos;
ScAddress maActiveCell;
SCTAB mnTab;
diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx
index ac4e8f5ed6e8..f3595722398c 100644
--- a/sc/source/ui/inc/preview.hxx
+++ b/sc/source/ui/inc/preview.hxx
@@ -49,7 +49,6 @@ private:
long nDisplayStart; // same as above, relative to the
start of counting
DateTime aDateTime;
long nTotalPages;
- Size aPageSize; // for GetOptimalZoom
ScPrintState aState;
std::unique_ptr<ScPreviewLocationData> pLocationData; // stores table
layout for accessibility API
std::unique_ptr<FmFormView> pDrawView;
diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
index d55babb13174..38c9d6b4cabd 100644
--- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
+++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
@@ -37,10 +37,6 @@ class ScDataProviderBaseControl : public VclContainer,
VclPtr<Edit> maEditID;
VclPtr<PushButton> mpApplyBtn;
- OUString maOldProvider;
- OUString maURL;
- OUString maID;
-
Link<Window*, void> const maImportCallback;
DECL_LINK(ProviderSelectHdl, ListBox&, void);
@@ -163,19 +159,16 @@ void ScDataProviderBaseControl::updateApplyBtn(bool
bValidConfig)
IMPL_LINK_NOARG(ScDataProviderBaseControl, ProviderSelectHdl, ListBox&, void)
{
isValid();
- maOldProvider = maProviderList->GetSelectedEntry();
}
IMPL_LINK_NOARG(ScDataProviderBaseControl, IDEditHdl, Edit&, void)
{
isValid();
- maID = maEditID->GetText();
}
IMPL_LINK_NOARG(ScDataProviderBaseControl, URLEditHdl, Edit&, void)
{
isValid();
- maURL = maEditURL->GetText();
}
IMPL_LINK_NOARG(ScDataProviderBaseControl, ApplyBtnHdl, Button*, void)
diff --git a/sc/source/ui/vba/vbaformatcondition.cxx
b/sc/source/ui/vba/vbaformatcondition.cxx
index ed885a16fa01..51390e200369 100644
--- a/sc/source/ui/vba/vbaformatcondition.cxx
+++ b/sc/source/ui/vba/vbaformatcondition.cxx
@@ -47,7 +47,6 @@ ScVbaFormatCondition::ScVbaFormatCondition( const
uno::Reference< XHelperInterfa
{
mxSheetConditionalEntries = lcl_getScVbaFormatConditionsPtr(
moFormatConditions )->getSheetConditionalEntries();
- mxSheetConditionalEntry = _xSheetConditionalEntry;
msStyleName = mxStyle->getName();
}
diff --git a/sc/source/ui/vba/vbaformatcondition.hxx
b/sc/source/ui/vba/vbaformatcondition.hxx
index 892f6eb6e74e..dbf503bae84c 100644
--- a/sc/source/ui/vba/vbaformatcondition.hxx
+++ b/sc/source/ui/vba/vbaformatcondition.hxx
@@ -31,7 +31,6 @@ typedef ScVbaCondition< ov::excel::XFormatCondition >
ScVbaFormatCondition_BASE
class ScVbaFormatCondition final : public ScVbaFormatCondition_BASE
{
OUString msStyleName;
- css::uno::Reference< css::sheet::XSheetConditionalEntry >
mxSheetConditionalEntry;
css::uno::Reference< css::sheet::XSheetConditionalEntries >
mxSheetConditionalEntries;
css::uno::Reference< ov::excel::XFormatConditions> moFormatConditions;
css::uno::Reference< ov::excel::XStyle > mxStyle;
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 26b1f4fa6825..fe01ce5ad169 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -278,7 +278,6 @@ void ScPreview::CalcPages()
nTabStart = nThisStart;
aPrintFunc.GetPrintState( aState );
- aPageSize = aPrintFunc.GetPageSize();
}
}
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index e144046b7fd7..96248b21bd31 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -1032,7 +1032,6 @@ void ScPrintFunc::InitParam( const ScPrintOptions*
pOptions )
if ( pRepeatCol )
{
aAreaParam.bRepeatCol = true;
- aAreaParam.aRepeatCol = *pRepeatCol;
nRepeatStartCol = pRepeatCol->aStart.Col();
nRepeatEndCol = pRepeatCol->aEnd .Col();
}
@@ -1045,7 +1044,6 @@ void ScPrintFunc::InitParam( const ScPrintOptions*
pOptions )
if ( pRepeatRow )
{
aAreaParam.bRepeatRow = true;
- aAreaParam.aRepeatRow = *pRepeatRow;
nRepeatStartRow = pRepeatRow->aStart.Row();
nRepeatEndRow = pRepeatRow->aEnd .Row();
}
diff --git a/scripting/source/vbaevents/eventhelper.cxx
b/scripting/source/vbaevents/eventhelper.cxx
index 405ad6b4747b..b44b9c87acb6 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -612,7 +612,6 @@ private:
Reference< frame::XModel > m_xModel;
bool m_bDocClosed;
SfxObjectShell* mpShell;
- OUString msProject;
};
EventListener::EventListener() :
@@ -620,7 +619,6 @@ OPropertyContainer(GetBroadcastHelper()),
m_bDocClosed(false), mpShell( nullptr
{
registerProperty( EVENTLSTNR_PROPERTY_MODEL, EVENTLSTNR_PROPERTY_ID_MODEL,
beans::PropertyAttribute::TRANSIENT, &m_xModel,
cppu::UnoType<decltype(m_xModel)>::get() );
- msProject = "Standard";
}
void
@@ -638,14 +636,6 @@ EventListener::setShellFromModel()
}
pShell = SfxObjectShell::GetNext( *pShell );
}
- // set ProjectName from model
- try
- {
- uno::Reference< beans::XPropertySet > xProps( m_xModel,
UNO_QUERY_THROW );
- uno::Reference< script::vba::XVBACompatibility > xVBAMode(
xProps->getPropertyValue("BasicLibraries"), uno::UNO_QUERY_THROW );
- msProject = xVBAMode->getProjectName();
- }
- catch ( uno::Exception& ) {}
}
//XEventListener
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
