summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-08-11 13:52:39 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-08-13 08:34:21 +0200
commitff4d6a7e5b166bb98bbe8d0f59cc4db36e7002aa (patch)
tree47215924da6d8605d1790ca90b57b141b4cf3776 /forms
parent22828c32d1ae379782631a351aac34d0b1df95f4 (diff)
loplugin:returnconstant in forms..fpicker
Change-Id: I3f0bead636632682488cbe677fd7fee60350f04d Reviewed-on: https://gerrit.libreoffice.org/58876 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/DatabaseForm.cxx4
-rw-r--r--forms/source/component/DatabaseForm.hxx2
-rw-r--r--forms/source/component/ImageControl.cxx10
-rw-r--r--forms/source/component/ImageControl.hxx2
4 files changed, 7 insertions, 11 deletions
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 0808b029edf7..8c7f9a227774 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -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;
}
diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx
index 920a1b8ead21..19483b27db5e 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -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();
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 0db96134a902..b5b85d77b1fa 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -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;
diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx
index f72d69cda836..df6914825e47 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -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