[Libreoffice-commits] core.git: formula/source fpicker/source framework/inc framework/source lingucomponent/source registry/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu May 17 09:59:52 UTC 2018
formula/source/ui/dlg/formula.cxx | 18 ++++-----
fpicker/source/office/RemoteFilesDialog.cxx | 4 +-
fpicker/source/office/RemoteFilesDialog.hxx | 1
framework/inc/jobs/jobresult.hxx | 13 ------
framework/inc/jobs/joburl.hxx | 9 ----
framework/source/accelerators/moduleacceleratorconfiguration.cxx | 3 -
framework/source/jobs/jobresult.cxx | 20 ++++------
framework/source/jobs/joburl.cxx | 3 -
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 8 ++--
lingucomponent/source/languageguessing/guess.cxx | 6 ---
lingucomponent/source/languageguessing/guess.hxx | 1
registry/source/reflread.cxx | 18 +++------
12 files changed, 29 insertions(+), 75 deletions(-)
New commits:
commit b275246c30ce3796cd22f72cd82c58b5cf4c86f0
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed May 16 14:22:45 2018 +0200
loplugin:unusedfields in formula..registry
Change-Id: I031654d8bb4f1788d364ef4f8d3bf7a05fadb148
Reviewed-on: https://gerrit.libreoffice.org/54454
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index c4d702e32d70..a099c9d62823 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -199,8 +199,6 @@ public:
bool m_bIsShutDown;
bool m_bMakingTree; // in method of constructing tree
- vcl::Font m_aFntBold;
- vcl::Font m_aFntLight;
bool m_bEditFlag;
const IFunctionDescription* m_pFuncDesc;
sal_Int32 m_nArgs;
@@ -331,18 +329,18 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
m_pMEdit->SetModifyHdl( LINK( this, FormulaDlg_Impl, FormulaHdl ) );
m_pMEFormula->SetSelChangedHdl( LINK( this, FormulaDlg_Impl, FormulaCursorHdl ) );
- m_aFntLight = m_pFtFormula->GetFont();
- m_aFntLight.SetTransparent( true );
- m_aFntBold = m_aFntLight;
- m_aFntBold.SetWeight( WEIGHT_BOLD );
+ vcl::Font aFntLight = m_pFtFormula->GetFont();
+ aFntLight.SetTransparent( true );
+ vcl::Font aFntBold = aFntLight;
+ aFntBold.SetWeight( WEIGHT_BOLD );
- m_pParaWin->SetArgumentFonts( m_aFntBold, m_aFntLight);
+ m_pParaWin->SetArgumentFonts( aFntBold, aFntLight);
// function description for choosing a function is no longer in a different color
- m_pFtHeadLine->SetFont(m_aFntBold);
- m_pFtFuncName->SetFont(m_aFntLight);
- m_pFtFuncDesc->SetFont(m_aFntLight);
+ m_pFtHeadLine->SetFont(aFntBold);
+ m_pFtFuncName->SetFont(aFntLight);
+ m_pFtFuncDesc->SetFont(aFntLight);
}
FormulaDlg_Impl::~FormulaDlg_Impl()
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index bf629dfe8f2a..7825064c3d25 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -195,7 +195,7 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, PickerFlags nBits )
m_eMode = ( nBits & PickerFlags::SaveAs ) ? REMOTEDLG_MODE_SAVE : REMOTEDLG_MODE_OPEN;
m_eType = ( nBits & PickerFlags::PathDialog ) ? REMOTEDLG_TYPE_PATHDLG : REMOTEDLG_TYPE_FILEDLG;
- m_bMultiselection = bool( nBits & PickerFlags::MultiSelection );
+ bool bMultiselection = bool( nBits & PickerFlags::MultiSelection );
m_bIsUpdated = false;
m_bIsConnected = false;
m_bServiceChanged = false;
@@ -245,7 +245,7 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, PickerFlags nBits )
m_pFileView = VclPtr< SvtFileView >::Create( m_pContainer, WB_BORDER | WB_TABSTOP,
REMOTEDLG_TYPE_PATHDLG == m_eType,
- m_bMultiselection, false );
+ bMultiselection, false );
m_pFileView->Show();
m_pFileView->EnableAutoResize();
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx
index b2ffa7099f15..c53f660e46f6 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -122,7 +122,6 @@ private:
SvtRemoteDlgMode m_eMode;
SvtRemoteDlgType m_eType;
- bool m_bMultiselection;
bool m_bIsUpdated;
bool m_bIsConnected;
bool m_bServiceChanged;
diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx
index 0d399c461ae5..a083bee27808 100644
--- a/framework/inc/jobs/jobresult.hxx
+++ b/framework/inc/jobs/jobresult.hxx
@@ -63,12 +63,6 @@ class JobResult final
private:
- /** hold the original pure result, which was given back by an
- executed job
- We analyze it and use it to set all our other members.
- */
- css::uno::Any m_aPureResult;
-
/**
an user of us must know, which (possible) parts of
a "pure result" was really set by an executed job.
@@ -86,13 +80,6 @@ class JobResult final
std::vector< css::beans::NamedValue > m_lArguments;
/**
- an executed job can force his deactivation
- But we provide this information here only.
- Doing so is part of any user of us.
- */
- bool m_bDeactivate;
-
- /**
represent the part "DispatchResult"
It's a fulfilled event type, which was given
back by the executed job. Any user of us can send
diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx
index 261026d501d8..2e3e2cb0c0c9 100644
--- a/framework/inc/jobs/joburl.hxx
+++ b/framework/inc/jobs/joburl.hxx
@@ -86,15 +86,6 @@ class JobURL
/** holds the service part of a job URL */
OUString m_sService;
- /** holds the event arguments */
- OUString m_sEventArgs;
-
- /** holds the alias arguments */
- OUString m_sAliasArgs;
-
- /** holds the service arguments */
- OUString m_sServiceArgs;
-
// native interface
public:
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 699de38760b4..65534a31a1e2 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -55,7 +55,6 @@ private:
/** identify the application module, where this accelerator
configuration cache should work on. */
OUString m_sModule;
- OUString m_sLocale;
public:
@@ -106,7 +105,7 @@ ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration(
{
::comphelper::SequenceAsHashMap lArgs(lArguments);
m_sModule = lArgs.getUnpackedValueOrDefault("ModuleIdentifier", OUString());
- m_sLocale = lArgs.getUnpackedValueOrDefault("Locale", OUString("x-default"));
+ // OUString sLocale = lArgs.getUnpackedValueOrDefault("Locale", OUString("x-default"));
}
if (m_sModule.isEmpty())
diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx
index c9f5a0218af2..2c7e4d4a08ea 100644
--- a/framework/source/jobs/jobresult.cxx
+++ b/framework/source/jobs/jobresult.cxx
@@ -35,7 +35,6 @@ namespace framework{
but it marks this new instance as non valid!
*/
JobResult::JobResult()
- : m_bDeactivate(false)
{
// reset the flag mask!
// It will reset the accessible state of this object.
@@ -87,12 +86,7 @@ JobResult::JobResult()
the job result
*/
JobResult::JobResult( /*IN*/ const css::uno::Any& aResult )
- : m_bDeactivate(false)
{
- // safe the pure result
- // May someone need it later ...
- m_aPureResult = aResult;
-
// reset the flag mask!
// It will reset the accessible state of this object.
// That can be useful if something will fail here ...
@@ -106,8 +100,14 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult )
::comphelper::SequenceAsHashMap::const_iterator pIt = aProtocol.find(JobConst::ANSWER_DEACTIVATE_JOB());
if (pIt != aProtocol.end())
{
- pIt->second >>= m_bDeactivate;
- if (m_bDeactivate)
+ /**
+ an executed job can force his deactivation
+ But we provide this information here only.
+ Doing so is part of any user of us.
+ */
+ bool bDeactivate;
+ pIt->second >>= bDeactivate;
+ if (bDeactivate)
m_eParts |= E_DEACTIVATE;
}
@@ -134,10 +134,8 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult )
*/
JobResult::JobResult( const JobResult& rCopy )
{
- m_aPureResult = rCopy.m_aPureResult;
m_eParts = rCopy.m_eParts;
m_lArguments = rCopy.m_lArguments;
- m_bDeactivate = rCopy.m_bDeactivate;
m_aDispatchResult = rCopy.m_aDispatchResult;
}
@@ -160,10 +158,8 @@ JobResult::~JobResult()
JobResult& JobResult::operator=( const JobResult& rCopy )
{
SolarMutexGuard g;
- m_aPureResult = rCopy.m_aPureResult;
m_eParts = rCopy.m_eParts;
m_lArguments = rCopy.m_lArguments;
- m_bDeactivate = rCopy.m_bDeactivate;
m_aDispatchResult = rCopy.m_aDispatchResult;
return *this;
}
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index 64b4745ede9a..307f6c9cdc93 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -65,7 +65,6 @@ JobURL::JobURL( /*IN*/ const OUString& sURL )
{
// set the part value
m_sEvent = sPartValue;
- m_sEventArgs = sPartArguments;
m_eRequest |= E_EVENT;
}
else
@@ -77,7 +76,6 @@ JobURL::JobURL( /*IN*/ const OUString& sURL )
{
// set the part value
m_sAlias = sPartValue;
- m_sAliasArgs = sPartArguments;
m_eRequest |= E_ALIAS;
}
else
@@ -89,7 +87,6 @@ JobURL::JobURL( /*IN*/ const OUString& sURL )
{
// set the part value
m_sService = sPartValue;
- m_sServiceArgs = sPartArguments;
m_eRequest |= E_SERVICE;
}
}
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 92dfa66c1a00..26e462495e16 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -210,7 +210,6 @@ private:
OUString m_aPropUIName;
OUString m_aPropResourceURL;
OUString m_aModuleIdentifier;
- OUString m_aModuleShortName;
css::uno::Reference< css::embed::XTransactedObject > m_xUserRootCommit;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
osl::Mutex m_mutex;
@@ -846,13 +845,14 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager(
SolarMutexGuard g;
- if( aArguments.getLength() == 2 && (aArguments[0] >>= m_aModuleShortName) && (aArguments[1] >>= m_aModuleIdentifier))
+ OUString aModuleShortName;
+ if( aArguments.getLength() == 2 && (aArguments[0] >>= aModuleShortName) && (aArguments[1] >>= m_aModuleIdentifier))
{
}
else
{
::comphelper::SequenceAsHashMap lArgs(aArguments);
- m_aModuleShortName = lArgs.getUnpackedValueOrDefault("ModuleShortName", OUString());
+ aModuleShortName = lArgs.getUnpackedValueOrDefault("ModuleShortName", OUString());
m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault("ModuleIdentifier", OUString());
}
@@ -873,7 +873,7 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager(
m_pStorageHandler[i].reset( new PresetHandler( m_xContext ) );
m_pStorageHandler[i]->connectToResource( PresetHandler::E_MODULES,
aResourceType, // this path won't be used later... see next lines!
- m_aModuleShortName,
+ aModuleShortName,
css::uno::Reference< css::embed::XStorage >()); // no document root used here!
}
}
diff --git a/lingucomponent/source/languageguessing/guess.cxx b/lingucomponent/source/languageguessing/guess.cxx
index cd6b0427f717..7c578672d19e 100644
--- a/lingucomponent/source/languageguessing/guess.cxx
+++ b/lingucomponent/source/languageguessing/guess.cxx
@@ -47,7 +47,6 @@ inline bool isSeparator(const char c){
Guess::Guess()
: language_str(DEFAULT_LANGUAGE)
, country_str(DEFAULT_COUNTRY)
- , encoding_str(DEFAULT_ENCODING)
{
}
@@ -59,7 +58,6 @@ Guess::Guess()
Guess::Guess(const char * guess_str)
: language_str(DEFAULT_LANGUAGE)
, country_str(DEFAULT_COUNTRY)
- , encoding_str(DEFAULT_ENCODING)
{
string lang;
string country;
@@ -103,10 +101,6 @@ Guess::Guess(const char * guess_str)
language_str=lang;
}
country_str=country;
-
- if(enc!=""){//if not we use the default value
- encoding_str=enc;
- }
}
}
diff --git a/lingucomponent/source/languageguessing/guess.hxx b/lingucomponent/source/languageguessing/guess.hxx
index 5227c8f12be8..9277f94c559d 100644
--- a/lingucomponent/source/languageguessing/guess.hxx
+++ b/lingucomponent/source/languageguessing/guess.hxx
@@ -51,7 +51,6 @@ class Guess final {
private:
string language_str;
string country_str;
- string encoding_str;
};
#endif
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index 7ed943afae36..fc5a7325a704 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -552,7 +552,6 @@ class FieldList : public BlopObject
public:
sal_uInt16 m_numOfEntries;
- sal_uInt16 m_numOfFieldEntries;
size_t m_FIELD_ENTRY_SIZE;
ConstantPool* m_pCP;
@@ -563,11 +562,10 @@ public:
{
if ( m_numOfEntries > 0 )
{
- m_numOfFieldEntries = readUINT16(0);
- m_FIELD_ENTRY_SIZE = m_numOfFieldEntries * sizeof(sal_uInt16);
+ sal_uInt16 numOfFieldEntries = readUINT16(0);
+ m_FIELD_ENTRY_SIZE = numOfFieldEntries * sizeof(sal_uInt16);
} else
{
- m_numOfFieldEntries = 0;
m_FIELD_ENTRY_SIZE = 0;
}
}
@@ -738,7 +736,6 @@ class ReferenceList : public BlopObject
public:
sal_uInt16 m_numOfEntries;
- sal_uInt16 m_numOfReferenceEntries;
size_t m_REFERENCE_ENTRY_SIZE;
ConstantPool* m_pCP;
@@ -749,11 +746,10 @@ public:
{
if ( m_numOfEntries > 0 )
{
- m_numOfReferenceEntries = readUINT16(0);
- m_REFERENCE_ENTRY_SIZE = m_numOfReferenceEntries * sizeof(sal_uInt16);
+ sal_uInt16 numOfReferenceEntries = readUINT16(0);
+ m_REFERENCE_ENTRY_SIZE = numOfReferenceEntries * sizeof(sal_uInt16);
} else
{
- m_numOfReferenceEntries = 0;
m_REFERENCE_ENTRY_SIZE = 0;
}
}
@@ -840,7 +836,6 @@ class MethodList : public BlopObject
public:
sal_uInt16 m_numOfEntries;
- sal_uInt16 m_numOfParamEntries;
size_t m_PARAM_ENTRY_SIZE;
std::unique_ptr<sal_uInt32[]> m_pIndex;
ConstantPool* m_pCP;
@@ -853,11 +848,10 @@ public:
if ( m_numOfEntries > 0 )
{
readUINT16(0) /* numOfMethodEntries */;
- m_numOfParamEntries = readUINT16(sizeof(sal_uInt16));
- m_PARAM_ENTRY_SIZE = m_numOfParamEntries * sizeof(sal_uInt16);
+ sal_uInt16 numOfParamEntries = readUINT16(sizeof(sal_uInt16));
+ m_PARAM_ENTRY_SIZE = numOfParamEntries * sizeof(sal_uInt16);
} else
{
- m_numOfParamEntries = 0;
m_PARAM_ENTRY_SIZE = 0;
}
}
More information about the Libreoffice-commits
mailing list