Kaydet (Commit) b275246c authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedfields in formula..registry

Change-Id: I031654d8bb4f1788d364ef4f8d3bf7a05fadb148
Reviewed-on: https://gerrit.libreoffice.org/54454Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst f046fed2
...@@ -199,8 +199,6 @@ public: ...@@ -199,8 +199,6 @@ public:
bool m_bIsShutDown; bool m_bIsShutDown;
bool m_bMakingTree; // in method of constructing tree bool m_bMakingTree; // in method of constructing tree
vcl::Font m_aFntBold;
vcl::Font m_aFntLight;
bool m_bEditFlag; bool m_bEditFlag;
const IFunctionDescription* m_pFuncDesc; const IFunctionDescription* m_pFuncDesc;
sal_Int32 m_nArgs; sal_Int32 m_nArgs;
...@@ -331,18 +329,18 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent ...@@ -331,18 +329,18 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
m_pMEdit->SetModifyHdl( LINK( this, FormulaDlg_Impl, FormulaHdl ) ); m_pMEdit->SetModifyHdl( LINK( this, FormulaDlg_Impl, FormulaHdl ) );
m_pMEFormula->SetSelChangedHdl( LINK( this, FormulaDlg_Impl, FormulaCursorHdl ) ); m_pMEFormula->SetSelChangedHdl( LINK( this, FormulaDlg_Impl, FormulaCursorHdl ) );
m_aFntLight = m_pFtFormula->GetFont(); vcl::Font aFntLight = m_pFtFormula->GetFont();
m_aFntLight.SetTransparent( true ); aFntLight.SetTransparent( true );
m_aFntBold = m_aFntLight; vcl::Font aFntBold = aFntLight;
m_aFntBold.SetWeight( WEIGHT_BOLD ); 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 // function description for choosing a function is no longer in a different color
m_pFtHeadLine->SetFont(m_aFntBold); m_pFtHeadLine->SetFont(aFntBold);
m_pFtFuncName->SetFont(m_aFntLight); m_pFtFuncName->SetFont(aFntLight);
m_pFtFuncDesc->SetFont(m_aFntLight); m_pFtFuncDesc->SetFont(aFntLight);
} }
FormulaDlg_Impl::~FormulaDlg_Impl() FormulaDlg_Impl::~FormulaDlg_Impl()
......
...@@ -195,7 +195,7 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, PickerFlags nBits ) ...@@ -195,7 +195,7 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, PickerFlags nBits )
m_eMode = ( nBits & PickerFlags::SaveAs ) ? REMOTEDLG_MODE_SAVE : REMOTEDLG_MODE_OPEN; m_eMode = ( nBits & PickerFlags::SaveAs ) ? REMOTEDLG_MODE_SAVE : REMOTEDLG_MODE_OPEN;
m_eType = ( nBits & PickerFlags::PathDialog ) ? REMOTEDLG_TYPE_PATHDLG : REMOTEDLG_TYPE_FILEDLG; 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_bIsUpdated = false;
m_bIsConnected = false; m_bIsConnected = false;
m_bServiceChanged = false; m_bServiceChanged = false;
...@@ -245,7 +245,7 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, PickerFlags nBits ) ...@@ -245,7 +245,7 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, PickerFlags nBits )
m_pFileView = VclPtr< SvtFileView >::Create( m_pContainer, WB_BORDER | WB_TABSTOP, m_pFileView = VclPtr< SvtFileView >::Create( m_pContainer, WB_BORDER | WB_TABSTOP,
REMOTEDLG_TYPE_PATHDLG == m_eType, REMOTEDLG_TYPE_PATHDLG == m_eType,
m_bMultiselection, false ); bMultiselection, false );
m_pFileView->Show(); m_pFileView->Show();
m_pFileView->EnableAutoResize(); m_pFileView->EnableAutoResize();
......
...@@ -122,7 +122,6 @@ private: ...@@ -122,7 +122,6 @@ private:
SvtRemoteDlgMode m_eMode; SvtRemoteDlgMode m_eMode;
SvtRemoteDlgType m_eType; SvtRemoteDlgType m_eType;
bool m_bMultiselection;
bool m_bIsUpdated; bool m_bIsUpdated;
bool m_bIsConnected; bool m_bIsConnected;
bool m_bServiceChanged; bool m_bServiceChanged;
......
...@@ -63,12 +63,6 @@ class JobResult final ...@@ -63,12 +63,6 @@ class JobResult final
private: 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 an user of us must know, which (possible) parts of
a "pure result" was really set by an executed job. a "pure result" was really set by an executed job.
...@@ -85,13 +79,6 @@ class JobResult final ...@@ -85,13 +79,6 @@ class JobResult final
*/ */
std::vector< css::beans::NamedValue > m_lArguments; 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" represent the part "DispatchResult"
It's a fulfilled event type, which was given It's a fulfilled event type, which was given
......
...@@ -86,15 +86,6 @@ class JobURL ...@@ -86,15 +86,6 @@ class JobURL
/** holds the service part of a job URL */ /** holds the service part of a job URL */
OUString m_sService; 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 // native interface
public: public:
......
...@@ -55,7 +55,6 @@ private: ...@@ -55,7 +55,6 @@ private:
/** identify the application module, where this accelerator /** identify the application module, where this accelerator
configuration cache should work on. */ configuration cache should work on. */
OUString m_sModule; OUString m_sModule;
OUString m_sLocale;
public: public:
...@@ -106,7 +105,7 @@ ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration( ...@@ -106,7 +105,7 @@ ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration(
{ {
::comphelper::SequenceAsHashMap lArgs(lArguments); ::comphelper::SequenceAsHashMap lArgs(lArguments);
m_sModule = lArgs.getUnpackedValueOrDefault("ModuleIdentifier", OUString()); 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()) if (m_sModule.isEmpty())
......
...@@ -35,7 +35,6 @@ namespace framework{ ...@@ -35,7 +35,6 @@ namespace framework{
but it marks this new instance as non valid! but it marks this new instance as non valid!
*/ */
JobResult::JobResult() JobResult::JobResult()
: m_bDeactivate(false)
{ {
// reset the flag mask! // reset the flag mask!
// It will reset the accessible state of this object. // It will reset the accessible state of this object.
...@@ -87,12 +86,7 @@ JobResult::JobResult() ...@@ -87,12 +86,7 @@ JobResult::JobResult()
the job result the job result
*/ */
JobResult::JobResult( /*IN*/ const css::uno::Any& aResult ) 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! // reset the flag mask!
// It will reset the accessible state of this object. // It will reset the accessible state of this object.
// That can be useful if something will fail here ... // That can be useful if something will fail here ...
...@@ -106,8 +100,14 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult ) ...@@ -106,8 +100,14 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult )
::comphelper::SequenceAsHashMap::const_iterator pIt = aProtocol.find(JobConst::ANSWER_DEACTIVATE_JOB()); ::comphelper::SequenceAsHashMap::const_iterator pIt = aProtocol.find(JobConst::ANSWER_DEACTIVATE_JOB());
if (pIt != aProtocol.end()) 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; m_eParts |= E_DEACTIVATE;
} }
...@@ -134,10 +134,8 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult ) ...@@ -134,10 +134,8 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult )
*/ */
JobResult::JobResult( const JobResult& rCopy ) JobResult::JobResult( const JobResult& rCopy )
{ {
m_aPureResult = rCopy.m_aPureResult;
m_eParts = rCopy.m_eParts; m_eParts = rCopy.m_eParts;
m_lArguments = rCopy.m_lArguments; m_lArguments = rCopy.m_lArguments;
m_bDeactivate = rCopy.m_bDeactivate;
m_aDispatchResult = rCopy.m_aDispatchResult; m_aDispatchResult = rCopy.m_aDispatchResult;
} }
...@@ -160,10 +158,8 @@ JobResult::~JobResult() ...@@ -160,10 +158,8 @@ JobResult::~JobResult()
JobResult& JobResult::operator=( const JobResult& rCopy ) JobResult& JobResult::operator=( const JobResult& rCopy )
{ {
SolarMutexGuard g; SolarMutexGuard g;
m_aPureResult = rCopy.m_aPureResult;
m_eParts = rCopy.m_eParts; m_eParts = rCopy.m_eParts;
m_lArguments = rCopy.m_lArguments; m_lArguments = rCopy.m_lArguments;
m_bDeactivate = rCopy.m_bDeactivate;
m_aDispatchResult = rCopy.m_aDispatchResult; m_aDispatchResult = rCopy.m_aDispatchResult;
return *this; return *this;
} }
......
...@@ -65,7 +65,6 @@ JobURL::JobURL( /*IN*/ const OUString& sURL ) ...@@ -65,7 +65,6 @@ JobURL::JobURL( /*IN*/ const OUString& sURL )
{ {
// set the part value // set the part value
m_sEvent = sPartValue; m_sEvent = sPartValue;
m_sEventArgs = sPartArguments;
m_eRequest |= E_EVENT; m_eRequest |= E_EVENT;
} }
else else
...@@ -77,7 +76,6 @@ JobURL::JobURL( /*IN*/ const OUString& sURL ) ...@@ -77,7 +76,6 @@ JobURL::JobURL( /*IN*/ const OUString& sURL )
{ {
// set the part value // set the part value
m_sAlias = sPartValue; m_sAlias = sPartValue;
m_sAliasArgs = sPartArguments;
m_eRequest |= E_ALIAS; m_eRequest |= E_ALIAS;
} }
else else
...@@ -89,7 +87,6 @@ JobURL::JobURL( /*IN*/ const OUString& sURL ) ...@@ -89,7 +87,6 @@ JobURL::JobURL( /*IN*/ const OUString& sURL )
{ {
// set the part value // set the part value
m_sService = sPartValue; m_sService = sPartValue;
m_sServiceArgs = sPartArguments;
m_eRequest |= E_SERVICE; m_eRequest |= E_SERVICE;
} }
} }
......
...@@ -210,7 +210,6 @@ private: ...@@ -210,7 +210,6 @@ private:
OUString m_aPropUIName; OUString m_aPropUIName;
OUString m_aPropResourceURL; OUString m_aPropResourceURL;
OUString m_aModuleIdentifier; OUString m_aModuleIdentifier;
OUString m_aModuleShortName;
css::uno::Reference< css::embed::XTransactedObject > m_xUserRootCommit; css::uno::Reference< css::embed::XTransactedObject > m_xUserRootCommit;
css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::uno::XComponentContext > m_xContext;
osl::Mutex m_mutex; osl::Mutex m_mutex;
...@@ -846,13 +845,14 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager( ...@@ -846,13 +845,14 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager(
SolarMutexGuard g; 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 else
{ {
::comphelper::SequenceAsHashMap lArgs(aArguments); ::comphelper::SequenceAsHashMap lArgs(aArguments);
m_aModuleShortName = lArgs.getUnpackedValueOrDefault("ModuleShortName", OUString()); aModuleShortName = lArgs.getUnpackedValueOrDefault("ModuleShortName", OUString());
m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault("ModuleIdentifier", OUString()); m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault("ModuleIdentifier", OUString());
} }
...@@ -873,7 +873,7 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager( ...@@ -873,7 +873,7 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager(
m_pStorageHandler[i].reset( new PresetHandler( m_xContext ) ); m_pStorageHandler[i].reset( new PresetHandler( m_xContext ) );
m_pStorageHandler[i]->connectToResource( PresetHandler::E_MODULES, m_pStorageHandler[i]->connectToResource( PresetHandler::E_MODULES,
aResourceType, // this path won't be used later... see next lines! 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! css::uno::Reference< css::embed::XStorage >()); // no document root used here!
} }
} }
......
...@@ -47,7 +47,6 @@ inline bool isSeparator(const char c){ ...@@ -47,7 +47,6 @@ inline bool isSeparator(const char c){
Guess::Guess() Guess::Guess()
: language_str(DEFAULT_LANGUAGE) : language_str(DEFAULT_LANGUAGE)
, country_str(DEFAULT_COUNTRY) , country_str(DEFAULT_COUNTRY)
, encoding_str(DEFAULT_ENCODING)
{ {
} }
...@@ -59,7 +58,6 @@ Guess::Guess() ...@@ -59,7 +58,6 @@ Guess::Guess()
Guess::Guess(const char * guess_str) Guess::Guess(const char * guess_str)
: language_str(DEFAULT_LANGUAGE) : language_str(DEFAULT_LANGUAGE)
, country_str(DEFAULT_COUNTRY) , country_str(DEFAULT_COUNTRY)
, encoding_str(DEFAULT_ENCODING)
{ {
string lang; string lang;
string country; string country;
...@@ -103,10 +101,6 @@ Guess::Guess(const char * guess_str) ...@@ -103,10 +101,6 @@ Guess::Guess(const char * guess_str)
language_str=lang; language_str=lang;
} }
country_str=country; country_str=country;
if(enc!=""){//if not we use the default value
encoding_str=enc;
}
} }
} }
......
...@@ -51,7 +51,6 @@ class Guess final { ...@@ -51,7 +51,6 @@ class Guess final {
private: private:
string language_str; string language_str;
string country_str; string country_str;
string encoding_str;
}; };
#endif #endif
......
...@@ -552,7 +552,6 @@ class FieldList : public BlopObject ...@@ -552,7 +552,6 @@ class FieldList : public BlopObject
public: public:
sal_uInt16 m_numOfEntries; sal_uInt16 m_numOfEntries;
sal_uInt16 m_numOfFieldEntries;
size_t m_FIELD_ENTRY_SIZE; size_t m_FIELD_ENTRY_SIZE;
ConstantPool* m_pCP; ConstantPool* m_pCP;
...@@ -563,11 +562,10 @@ public: ...@@ -563,11 +562,10 @@ public:
{ {
if ( m_numOfEntries > 0 ) if ( m_numOfEntries > 0 )
{ {
m_numOfFieldEntries = readUINT16(0); sal_uInt16 numOfFieldEntries = readUINT16(0);
m_FIELD_ENTRY_SIZE = m_numOfFieldEntries * sizeof(sal_uInt16); m_FIELD_ENTRY_SIZE = numOfFieldEntries * sizeof(sal_uInt16);
} else } else
{ {
m_numOfFieldEntries = 0;
m_FIELD_ENTRY_SIZE = 0; m_FIELD_ENTRY_SIZE = 0;
} }
} }
...@@ -738,7 +736,6 @@ class ReferenceList : public BlopObject ...@@ -738,7 +736,6 @@ class ReferenceList : public BlopObject
public: public:
sal_uInt16 m_numOfEntries; sal_uInt16 m_numOfEntries;
sal_uInt16 m_numOfReferenceEntries;
size_t m_REFERENCE_ENTRY_SIZE; size_t m_REFERENCE_ENTRY_SIZE;
ConstantPool* m_pCP; ConstantPool* m_pCP;
...@@ -749,11 +746,10 @@ public: ...@@ -749,11 +746,10 @@ public:
{ {
if ( m_numOfEntries > 0 ) if ( m_numOfEntries > 0 )
{ {
m_numOfReferenceEntries = readUINT16(0); sal_uInt16 numOfReferenceEntries = readUINT16(0);
m_REFERENCE_ENTRY_SIZE = m_numOfReferenceEntries * sizeof(sal_uInt16); m_REFERENCE_ENTRY_SIZE = numOfReferenceEntries * sizeof(sal_uInt16);
} else } else
{ {
m_numOfReferenceEntries = 0;
m_REFERENCE_ENTRY_SIZE = 0; m_REFERENCE_ENTRY_SIZE = 0;
} }
} }
...@@ -840,7 +836,6 @@ class MethodList : public BlopObject ...@@ -840,7 +836,6 @@ class MethodList : public BlopObject
public: public:
sal_uInt16 m_numOfEntries; sal_uInt16 m_numOfEntries;
sal_uInt16 m_numOfParamEntries;
size_t m_PARAM_ENTRY_SIZE; size_t m_PARAM_ENTRY_SIZE;
std::unique_ptr<sal_uInt32[]> m_pIndex; std::unique_ptr<sal_uInt32[]> m_pIndex;
ConstantPool* m_pCP; ConstantPool* m_pCP;
...@@ -853,11 +848,10 @@ public: ...@@ -853,11 +848,10 @@ public:
if ( m_numOfEntries > 0 ) if ( m_numOfEntries > 0 )
{ {
readUINT16(0) /* numOfMethodEntries */; readUINT16(0) /* numOfMethodEntries */;
m_numOfParamEntries = readUINT16(sizeof(sal_uInt16)); sal_uInt16 numOfParamEntries = readUINT16(sizeof(sal_uInt16));
m_PARAM_ENTRY_SIZE = m_numOfParamEntries * sizeof(sal_uInt16); m_PARAM_ENTRY_SIZE = numOfParamEntries * sizeof(sal_uInt16);
} else } else
{ {
m_numOfParamEntries = 0;
m_PARAM_ENTRY_SIZE = 0; m_PARAM_ENTRY_SIZE = 0;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment