mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:returnconstant in forms..fpicker

Browse Source 
Change-Id: I3f0bead636632682488cbe677fd7fee60350f04d
Reviewed-on: https://gerrit.libreoffice.org/58876
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-08-11 13:52:39 +02:00
parent 22828c32d1
commit ff4d6a7e5b
9 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forms/source/component/DatabaseForm.cxx
View File

@@ -958,7 +958,7 @@ void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const OUString& rN
}
bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const OUString& rName,
void ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const OUString& rName,
const OUString& rFileName )
{
OUString aFileName(rFileName);
@@ -1014,8 +1014,6 @@ bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const OUString& rN
// Body
pChild->SetDocumentLB( new SvLockBytes(pStream.release(), true) );
rParent.AttachChild( std::move(pChild) );
return true;
}

2
forms/source/component/DatabaseForm.hxx
View File

@@ -512,7 +512,7 @@ private:
void FillSuccessfulList(HtmlSuccessfulObjList& rList, const css::uno::Reference< css::awt::XControl>& rxSubmitButton, const css::awt::MouseEvent& MouseEvt);
static void InsertTextPart(INetMIMEMessage& rParent, const OUString& rName, const OUString& rData);
static bool InsertFilePart(INetMIMEMessage& rParent, const OUString& rName, const OUString& rFileName);
static void InsertFilePart(INetMIMEMessage& rParent, const OUString& rName, const OUString& rFileName);
static void Encode(OUString& rString);
css::uno::Reference< css::sdbc::XConnection > getConnection();

10
forms/source/component/ImageControl.cxx
View File

@@ -429,13 +429,13 @@ bool OImageControlModel::impl_updateStreamForURL_lck( const OUString& _rURL, Val
}
bool OImageControlModel::impl_handleNewImageURL_lck( ValueChangeInstigator _eInstigator )
void OImageControlModel::impl_handleNewImageURL_lck( ValueChangeInstigator _eInstigator )
{
switch ( lcl_getImageStoreType( getFieldType() ) )
{
case ImageStoreBinary:
if ( impl_updateStreamForURL_lck( m_sImageURL, _eInstigator ) )
return true;
return;
break;
case ImageStoreLink:
@@ -447,7 +447,7 @@ bool OImageControlModel::impl_handleNewImageURL_lck( ValueChangeInstigator _eIns
if ( m_xColumnUpdate.is() )
{
m_xColumnUpdate->updateString( sCommitURL );
return true;
return;
}
}
break;
@@ -463,8 +463,6 @@ bool OImageControlModel::impl_handleNewImageURL_lck( ValueChangeInstigator _eIns
m_xColumnUpdate->updateNull();
else
setControlValue( Any(), _eInstigator );
return true;
}
@@ -480,7 +478,7 @@ bool OImageControlModel::commitControlValueToDbColumn( bool _bPostReset )
else
{
::osl::MutexGuard aGuard(m_aMutex);
return impl_handleNewImageURL_lck( eDbColumnBinding );
impl_handleNewImageURL_lck( eDbColumnBinding );
}
return true;

2
forms/source/component/ImageControl.hxx
View File

@@ -122,7 +122,7 @@ private:
@precond
our own mutex is locked
*/
bool impl_handleNewImageURL_lck( ValueChangeInstigator _eInstigator );
void impl_handleNewImageURL_lck( ValueChangeInstigator _eInstigator );
/** updates the binary stream, created from loading the file which the given URL points to, into our
bound field, or the control itself if there is no bound field

6
formula/source/core/api/FormulaCompiler.cxx
View File

@@ -1233,12 +1233,6 @@ void FormulaCompiler::AppendErrorConstant( OUStringBuffer& rBuffer, FormulaError
}
sal_Int32 FormulaCompiler::OpCodeMap::getOpCodeUnknown()
{
static const sal_Int32 kOpCodeUnknown = -1;
return kOpCodeUnknown;
}
bool FormulaCompiler::GetToken()
{
static const short nRecursionMax = 42;

5
formula/source/ui/dlg/formula.cxx
View File

@@ -82,7 +82,7 @@ public:
void RefInputStartAfter();
void RefInputDoneAfter( bool bForced );
bool CalcValue( const OUString& rStrExp, OUString& rStrResult, bool bForceMatrixFormula = false );
bool CalcStruct( const OUString& rStrExp, bool bForceRecalcStruct = false );
void CalcStruct( const OUString& rStrExp, bool bForceRecalcStruct = false );
void UpdateValues( bool bForceRecalcStruct = false );
void DeleteArgs();
sal_Int32 GetFunctionPos(sal_Int32 nPos);
@@ -608,7 +608,7 @@ void FormulaDlg_Impl::UpdateValues( bool bForceRecalcStruct )
CalcStruct( m_pMEdit->GetText(), bForceRecalcStruct);
}
bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp, bool bForceRecalcStruct )
void FormulaDlg_Impl::CalcStruct( const OUString& rStrExp, bool bForceRecalcStruct )
{
sal_Int32 nLength = rStrExp.getLength();
@@ -635,7 +635,6 @@ bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp, bool bForceRecalcStru
if (rStrExp[nLength-1] == '(')
UpdateTokenArray(rStrExp);
}
return true;
}

6
fpicker/source/office/RemoteFilesDialog.cxx
View File

@@ -561,7 +561,7 @@ void RemoteFilesDialog::AddFilter( const OUString& rFilter, const OUString& rTyp
}
FileViewResult RemoteFilesDialog::OpenURL( OUString const & sURL )
void RemoteFilesDialog::OpenURL( OUString const & sURL )
{
if( m_pFileView )
{
@@ -604,14 +604,12 @@ FileViewResult RemoteFilesDialog::OpenURL( OUString const & sURL )
ErrorHandler::HandleError( ERRCODE_IO_NOTEXISTS );
EnableControls();
return eFailure;
return;
}
SetPointer( PointerStyle::Arrow );
EnableChildPointerOverwrite( false );
}
return eFailure;
}
void RemoteFilesDialog::AddFileExtension()

2
fpicker/source/office/RemoteFilesDialog.hxx
View File

@@ -166,7 +166,7 @@ private:
/* If failure returns < 0 */
int GetSelectedServicePos();
FileViewResult OpenURL( OUString const & sURL );
void OpenURL( OUString const & sURL );
void AddFileExtension();

2
include/formula/FormulaCompiler.hxx
View File

@@ -182,7 +182,7 @@ public:
/** The value used in createSequenceOfAvailableMappings() and thus in
XFormulaOpCodeMapper::getMappings() for an unknown symbol. */
static sal_Int32 getOpCodeUnknown();
static sal_Int32 getOpCodeUnknown() { return -1; }
private: