summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-02-22 15:54:49 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-02-23 11:54:54 +0100
commitcd383000f84b8b75ffe15d1cd1bb8d5a14a71685 (patch)
tree01387d2f0750baae62139a6ee572c73d122f8714
parenta25ee52f6861796853cb3ebf12e49834222bcba0 (diff)
loplugin:unusedfields in forms..fpicker
Change-Id: Ifd3afbf276100e3cef802bbcc0792b43a9cd84f8 Reviewed-on: https://gerrit.libreoffice.org/68228 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--forms/source/component/ComboBox.cxx1
-rw-r--r--forms/source/component/ComboBox.hxx3
-rw-r--r--forms/source/xforms/submission.cxx1
-rw-r--r--forms/source/xforms/submission/submission.hxx5
-rw-r--r--formula/source/ui/dlg/formula.cxx6
-rw-r--r--fpicker/source/office/OfficeFolderPicker.cxx3
-rw-r--r--fpicker/source/office/OfficeFolderPicker.hxx3
7 files changed, 1 insertions, 21 deletions
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index ce94ba6d846d..06f5f4234c0d 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -163,7 +163,6 @@ void OComboBoxModel::disposing()
OBoundControlModel::disposing();
OEntryListHelper::disposing();
OErrorBroadcaster::disposing();
- m_xFormatter = nullptr;
}
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index 06b77f762d5f..dd5db15a010e 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -54,9 +54,6 @@ class OComboBoxModel final
css::uno::Any m_aLastKnownValue;
css::uno::Sequence<OUString> m_aDesignModeStringItems;
- // upon loading, in some cases we reset fill our string item list ourself. We don't want
- // to lose the user's items then, so we remember them here.
- css::uno::Reference< css::util::XNumberFormatter> m_xFormatter;
css::form::ListSourceType m_eListSourceType; // ListSource's type
bool m_bEmptyIsNull; // Empty string is interpreted as NULL
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index 08e04b8b2a33..54cc757db748 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -255,7 +255,6 @@ bool Submission::doSubmit( const Reference< XInteractionHandler >& xHandler )
return false;
}
- xSubmission->setEncoding(getEncoding());
CSubmission::SubmissionResult aResult = xSubmission->submit( xHandler );
if (aResult == CSubmission::SUCCESS)
diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx
index 7d726392c736..77d59b1f740e 100644
--- a/forms/source/xforms/submission/submission.hxx
+++ b/forms/source/xforms/submission/submission.hxx
@@ -110,7 +110,6 @@ protected:
css::uno::Reference< css::xml::dom::XDocumentFragment > m_aFragment;
css::uno::Reference< css::io::XInputStream > m_aResultStream;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- OUString m_aEncoding;
::std::unique_ptr< CSerialization > createSerialization(const css::uno::Reference< css::task::XInteractionHandler >& aHandler
,css::uno::Reference<css::ucb::XCommandEnvironment>& _rOutEnv);
@@ -129,10 +128,6 @@ public:
virtual ~CSubmission() {}
- void setEncoding(const OUString& aEncoding)
- {
- m_aEncoding = aEncoding;
- }
virtual SubmissionResult submit(const css::uno::Reference< css::task::XInteractionHandler >& ) = 0;
SubmissionResult replace(const OUString&, const css::uno::Reference< css::xml::dom::XDocument >&, const css::uno::Reference< css::frame::XFrame>&);
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index d1052c3a4142..19d41ee211d7 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -144,8 +144,6 @@ public:
mutable uno::Sequence< sheet::FormulaToken > m_aSeparatorsOpCodes;
mutable uno::Sequence< sheet::FormulaOpCodeMapEntry > m_aFunctionOpCodes;
mutable const sheet::FormulaOpCodeMapEntry* m_pFunctionOpCodesEnd;
- mutable uno::Sequence< sheet::FormulaOpCodeMapEntry > m_aUnaryOpCodes;
- mutable uno::Sequence< sheet::FormulaOpCodeMapEntry > m_aBinaryOpCodes;
::std::map<const FormulaToken*, sheet::FormulaToken> m_aTokenMap;
IFormulaEditorHelper* m_pHelper;
VclPtr<Dialog> m_pParent;
@@ -403,10 +401,6 @@ void FormulaDlg_Impl::InitFormulaOpCodeMapper()
m_aFunctionOpCodes = m_xOpCodeMapper->getAvailableMappings( sheet::FormulaLanguage::ODFF, sheet::FormulaMapGroup::FUNCTIONS);
m_pFunctionOpCodesEnd = m_aFunctionOpCodes.getConstArray() + m_aFunctionOpCodes.getLength();
- m_aUnaryOpCodes = m_xOpCodeMapper->getAvailableMappings( sheet::FormulaLanguage::ODFF, sheet::FormulaMapGroup::UNARY_OPERATORS);
-
- m_aBinaryOpCodes = m_xOpCodeMapper->getAvailableMappings( sheet::FormulaLanguage::ODFF, sheet::FormulaMapGroup::BINARY_OPERATORS);
-
uno::Sequence< OUString > aArgs(3);
aArgs[TOKEN_OPEN] = "(";
aArgs[TOKEN_CLOSE] = ")";
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index b95f0f972980..2c049ed605f0 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -141,9 +141,8 @@ OUString SAL_CALL SvtFolderPicker::getDirectory()
return OUString();
}
-void SAL_CALL SvtFolderPicker::setDescription( const OUString& aDescription )
+void SAL_CALL SvtFolderPicker::setDescription( const OUString& )
{
- m_aDescription = aDescription;
}
void SvtFolderPicker::cancel()
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index 7a44881c05f8..790dff6e9048 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -40,8 +40,6 @@ typedef
class SvtFolderPicker: public SvtFolderPicker_Base
{
private:
- OUString m_aDescription;
-
css::uno::Reference< css::ui::dialogs::XDialogClosedListener >
m_xListener;
@@ -55,7 +53,6 @@ public:
// XFolderPicker2 functions
-
virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override;
virtual OUString SAL_CALL getDisplayDirectory() override;
virtual OUString SAL_CALL getDirectory() override;