[Libreoffice-commits] core.git: avmedia/source chart2/source codemaker/source comphelper/source compilerplugins/clang cppcanvas/source dbaccess/source desktop/source framework/source i18npool/inc i18npool/source idlc/inc idlc/source idl/inc idl/source lotuswordpro/source sdext/source starmath/inc starmath/source svtools/source sw/source ucb/source xmlsecurity/inc xmlsecurity/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Jan 19 12:26:56 UTC 2018
avmedia/source/vlc/inc/wrapper/Player.hxx | 5 -
avmedia/source/vlc/wrapper/Player.cxx | 18 ------
chart2/source/model/template/ChartType.hxx | 3 -
codemaker/source/cppumaker/cpputype.cxx | 8 +--
comphelper/source/misc/backupfilehelper.cxx | 4 -
compilerplugins/clang/unusedmethods.py | 3 -
cppcanvas/source/inc/implrenderer.hxx | 2
cppcanvas/source/mtfrenderer/implrenderer.cxx | 4 -
dbaccess/source/ui/browser/brwctrlr.cxx | 3 -
dbaccess/source/ui/browser/unodatbr.cxx | 7 --
dbaccess/source/ui/inc/QueryViewSwitch.hxx | 2
dbaccess/source/ui/inc/brwctrlr.hxx | 2
dbaccess/source/ui/inc/unodatbr.hxx | 2
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 9 +--
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 26 +++-------
desktop/source/deployment/gui/dp_gui_dialog2.hxx | 6 +-
framework/source/uiconfiguration/CommandImageResolver.cxx | 3 -
framework/source/uiconfiguration/CommandImageResolver.hxx | 2
i18npool/inc/cclass_unicode.hxx | 2
i18npool/source/characterclassification/cclass_unicode_parser.cxx | 3 -
idl/inc/bastype.hxx | 2
idl/inc/lex.hxx | 4 -
idl/inc/parser.hxx | 2
idl/source/objects/bastype.cxx | 5 -
idl/source/prj/parser.cxx | 7 +-
idlc/inc/astattribute.hxx | 2
idlc/inc/astoperation.hxx | 2
idlc/source/astdump.cxx | 4 -
idlc/source/astoperation.cxx | 4 -
lotuswordpro/source/filter/lwptblformula.cxx | 3 -
lotuswordpro/source/filter/lwptblformula.hxx | 2
sdext/source/minimizer/impoptimizer.cxx | 3 -
sdext/source/minimizer/impoptimizer.hxx | 2
sdext/source/presenter/PresenterWindowManager.cxx | 4 -
sdext/source/presenter/PresenterWindowManager.hxx | 2
starmath/inc/document.hxx | 2
starmath/source/document.cxx | 4 -
starmath/source/mathmlattr.hxx | 5 -
svtools/source/contnr/imivctl.hxx | 2
sw/source/core/text/inftxt.hxx | 3 -
sw/source/filter/ww8/docxattributeoutput.cxx | 10 ---
sw/source/filter/ww8/docxattributeoutput.hxx | 2
ucb/source/ucp/ftp/ftpcontentprovider.cxx | 6 --
ucb/source/ucp/ftp/ftpcontentprovider.hxx | 2
xmlsecurity/inc/xmlsignaturehelper.hxx | 4 -
xmlsecurity/source/helper/xmlsignaturehelper.cxx | 8 ---
46 files changed, 65 insertions(+), 145 deletions(-)
New commits:
commit be8c414567f49242164b1fdfb12764b16be355c1
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Jan 19 09:13:03 2018 +0200
loplugin:unusedmethods also check for functions returning bool
we were previously excluding them
Change-Id: I48a68799b0de60b4995fae541eb363e043d4dd11
Reviewed-on: https://gerrit.libreoffice.org/48167
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/avmedia/source/vlc/inc/wrapper/Player.hxx b/avmedia/source/vlc/inc/wrapper/Player.hxx
index 740390080d63..84b064493d61 100644
--- a/avmedia/source/vlc/inc/wrapper/Player.hxx
+++ b/avmedia/source/vlc/inc/wrapper/Player.hxx
@@ -51,16 +51,13 @@ namespace wrapper
void setWindow( intptr_t id );
- bool takeSnapshot(const rtl::OUString& file);
+ void takeSnapshot(const rtl::OUString& file);
bool hasVout() const;
void setScale( float factor );
void setVideoSize( unsigned width, unsigned height );
- unsigned getWidth() const;
- unsigned getHeight() const;
-
operator libvlc_media_player_t*()
{
return mPlayer;
diff --git a/avmedia/source/vlc/wrapper/Player.cxx b/avmedia/source/vlc/wrapper/Player.cxx
index 44eed54fca8e..7eb33440e24d 100644
--- a/avmedia/source/vlc/wrapper/Player.cxx
+++ b/avmedia/source/vlc/wrapper/Player.cxx
@@ -180,20 +180,6 @@ namespace wrapper
libvlc_video_set_scale( mPlayer, factor );
}
- unsigned Player::getWidth() const
- {
- unsigned width, height;
- libvlc_video_get_size( mPlayer, 0, &width, &height );
- return width;
- }
-
- unsigned Player::getHeight() const
- {
- unsigned width, height;
- libvlc_video_get_size( mPlayer, 0, &width, &height );
- return height;
- }
-
void Player::setMouseHandling(bool flag)
{
libvlc_video_set_mouse_input( mPlayer, flag );
@@ -243,11 +229,11 @@ namespace wrapper
#endif
}
- bool Player::takeSnapshot( const rtl::OUString& file )
+ void Player::takeSnapshot( const rtl::OUString& file )
{
rtl::OString dest;
file.convertToString( &dest, RTL_TEXTENCODING_UTF8, 0 );
- return libvlc_video_take_snapshot( mPlayer, 0, dest.getStr(), 480, 360 ) == 0;
+ libvlc_video_take_snapshot( mPlayer, 0, dest.getStr(), 480, 360 );
}
bool Player::hasVout() const
diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx
index 60f39a7df87c..57b12f67a5fd 100644
--- a/chart2/source/model/template/ChartType.hxx
+++ b/chart2/source/model/template/ChartType.hxx
@@ -62,9 +62,6 @@ public:
protected:
explicit ChartType( const ChartType & rOther );
- const css::uno::Reference< css::uno::XComponentContext >&
- GetComponentContext() const { return m_xContext;}
-
// ____ XChartType ____
// still abstract ! implement !
virtual OUString SAL_CALL getChartType() override = 0;
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 22711d444126..15e1f116d638 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -162,7 +162,7 @@ public:
void dump(CppuOptions const & options);
- bool dumpFile(
+ void dumpFile(
OUString const & uri, OUString const & name, bool hpp,
CppuOptions const & options);
@@ -410,7 +410,7 @@ void CppuType::dump(CppuOptions const & options)
options.isValid("-O") ? b2u(options.getOption("-O")) : "", options);
}
-bool CppuType::dumpFile(
+void CppuType::dumpFile(
OUString const & uri, OUString const & name, bool hpp,
CppuOptions const & options)
{
@@ -422,7 +422,7 @@ bool CppuType::dumpFile(
}
bool exists = fileExists(u2b(fileUri));
if (exists && options.isValid("-G")) {
- return false;
+ return;
}
FileStream out;
out.createTempFile(getTempDir(u2b(fileUri)));
@@ -449,7 +449,7 @@ bool CppuType::dumpFile(
throw;
}
out.close();
- return makeValidTypeFile(
+ makeValidTypeFile(
u2b(fileUri), u2b(tmpUri), exists && options.isValid("-Gc"));
}
diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx
index d9452964d11e..64a8cea73929 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -1433,7 +1433,7 @@ namespace
}
}
- bool flush()
+ void flush()
{
bool bRetval(true);
@@ -1543,8 +1543,6 @@ namespace
// delete temp file (in all cases - it may be moved already)
osl::File::remove(aTempURL);
}
-
- return bRetval;
}
bool tryPush(FileSharedPtr const & rFileCandidate, bool bCompress)
diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py
index 811eca65cae4..58521e6b45b3 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -209,9 +209,6 @@ for d in definitionSet:
# ignore methods with no return type, and constructors
if d[0] == "void" or d[0] == "":
continue
- # ignore bool returns, provides important documentation in the code
- if d[0] == "_Bool":
- continue
# ignore UNO constructor method entrypoints
if "_get_implementation" in d[1] or "_getFactory" in d[1]:
continue
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 05c4c9c2ae2e..6fec26e3d18a 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -221,7 +221,7 @@ namespace cppcanvas
css::rendering::XCanvasFont > createFont( double& o_rFontRotation,
const vcl::Font& rFont,
const ActionFactoryParameters& rParms );
- bool createActions( GDIMetaFile& rMtf,
+ void createActions( GDIMetaFile& rMtf,
const ActionFactoryParameters& rParms,
bool bSubsettableActions );
bool createFillAndStroke( const ::basegfx::B2DPolyPolygon& rPolyPoly,
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index cb8949684542..491fc81bf89c 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1183,7 +1183,7 @@ namespace cppcanvas
}
}
- bool ImplRenderer::createActions( GDIMetaFile& rMtf,
+ void ImplRenderer::createActions( GDIMetaFile& rMtf,
const ActionFactoryParameters& rFactoryParms,
bool bSubsettableActions )
{
@@ -2594,8 +2594,6 @@ namespace cppcanvas
// correction for the unconditional increment here).
++io_rCurrActionIndex;
}
-
- return true;
}
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index d917d79333c2..372bd7b8b2ef 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2607,9 +2607,8 @@ void SbaXDataBrowserController::addColumnListeners(const Reference< css::awt::XC
}
}
-bool SbaXDataBrowserController::InitializeGridModel(const Reference< css::form::XFormComponent > & /*xGrid*/)
+void SbaXDataBrowserController::InitializeGridModel(const Reference< css::form::XFormComponent > & /*xGrid*/)
{
- return true;
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index a66d68ff612b..2f14c616b6a5 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -576,7 +576,7 @@ void SbaTableQueryBrowser::initializePreviewMode()
}
}
-bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XFormComponent > & xGrid)
+void SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XFormComponent > & xGrid)
{
try
{
@@ -599,7 +599,7 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm
DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(m_pCurrentlyDisplayed->GetUserData());
OSL_ENSURE( pData->xObjectProperties.is(), "SbaTableQueryBrowser::InitializeGridModel: No table available!" );
if ( !pData->xObjectProperties.is() )
- return false;
+ return;
OUString* pStringIter = aProperties.getArray();
Any* pValueIter = aValues.getArray();
@@ -803,10 +803,7 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm
catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
- return false;
}
-
- return true;
}
Reference<XPropertySet> getColumnHelper(SvTreeListEntry const * _pCurrentlyDisplayed, const Reference<XPropertySet>& _rxSource)
diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx b/dbaccess/source/ui/inc/QueryViewSwitch.hxx
index 2be9eefe1991..23d207c2f227 100644
--- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx
+++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx
@@ -72,7 +72,7 @@ namespace dbaui
void setSlotEnabled(sal_Int32 _nSlotId, bool _bEnable);
void setNoneVisbleRow(sal_Int32 _nRows);
void SaveUIConfig();
- bool reset();
+ void reset();
void GrabFocus();
// returns the add table dialog from the design view
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index e52f803d833c..fa38eb03e802 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -236,7 +236,7 @@ namespace dbaui
// do any initialization (data source etc.) here. the form should be fully functional after that.
// return sal_False if you didn't succeed (don't throw exceptions, they won't be caught)
- virtual bool InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid);
+ virtual void InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid);
css::uno::Reference< css::form::XFormComponent > CreateGridModel();
// our default implementation simply instantiates a stardiv.one.form.component.Grid service
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 8f149a104722..60f55d121218 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -205,7 +205,7 @@ namespace dbaui
private:
// SbaXDataBrowserController overridables
virtual bool InitializeForm( const css::uno::Reference< css::beans::XPropertySet >& i_formProperties ) override;
- virtual bool InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid) override;
+ virtual void InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid) override;
virtual bool preReloadForm() override;
virtual void postReloadForm() override;
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index ecef58f3bc9a..227720fc5c12 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -277,16 +277,13 @@ Reference< XComponentContext > const & OQueryViewSwitch::getORB() const
return m_pDesignView->getORB();
}
-bool OQueryViewSwitch::reset()
+void OQueryViewSwitch::reset()
{
m_pDesignView->reset();
if ( !m_pDesignView->initByParseIterator( nullptr ) )
- return false;
+ return;
- if ( switchView( nullptr ) )
- return false;
-
- return true;
+ switchView( nullptr );
}
void OQueryViewSwitch::setNoneVisbleRow(sal_Int32 _nRows)
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index d1c16ea2007a..f477e4245d31 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -602,53 +602,49 @@ bool ExtMgrDialog::removeExtensionWarn( const OUString &rExtensionName ) const
return ( RET_OK == aInfo->Execute() );
}
-bool ExtMgrDialog::enablePackage( const uno::Reference< deployment::XPackage > &xPackage,
+void ExtMgrDialog::enablePackage( const uno::Reference< deployment::XPackage > &xPackage,
bool bEnable )
{
if ( !xPackage.is() )
- return false;
+ return;
if ( bEnable )
{
if ( ! continueOnSharedExtension( xPackage, this, RID_STR_WARNING_ENABLE_SHARED_EXTENSION, m_bEnableWarning ) )
- return false;
+ return;
}
else
{
if ( ! continueOnSharedExtension( xPackage, this, RID_STR_WARNING_DISABLE_SHARED_EXTENSION, m_bDisableWarning ) )
- return false;
+ return;
}
m_pManager->getCmdQueue()->enableExtension( xPackage, bEnable );
-
- return true;
}
-bool ExtMgrDialog::removePackage( const uno::Reference< deployment::XPackage > &xPackage )
+void ExtMgrDialog::removePackage( const uno::Reference< deployment::XPackage > &xPackage )
{
if ( !xPackage.is() )
- return false;
+ return;
if ( !IsSharedPkgMgr( xPackage ) || m_bDeleteWarning )
{
if ( ! removeExtensionWarn( xPackage->getDisplayName() ) )
- return false;
+ return;
}
if ( ! continueOnSharedExtension( xPackage, this, RID_STR_WARNING_REMOVE_SHARED_EXTENSION, m_bDeleteWarning ) )
- return false;
+ return;
m_pManager->getCmdQueue()->removeExtension( xPackage );
-
- return true;
}
-bool ExtMgrDialog::updatePackage( const uno::Reference< deployment::XPackage > &xPackage )
+void ExtMgrDialog::updatePackage( const uno::Reference< deployment::XPackage > &xPackage )
{
if ( !xPackage.is() )
- return false;
+ return;
// get the extension with highest version
uno::Sequence<uno::Reference<deployment::XPackage> > seqExtensions =
@@ -661,8 +657,6 @@ bool ExtMgrDialog::updatePackage( const uno::Reference< deployment::XPackage > &
vEntries.push_back(extension);
m_pManager->getCmdQueue()->checkForUpdates( vEntries );
-
- return true;
}
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 2daae7c20e52..29cf6b47722e 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -164,10 +164,10 @@ public:
void setGetExtensionsURL( const OUString &rURL );
virtual void addPackageToList( const css::uno::Reference< css::deployment::XPackage > &,
bool bLicenseMissing = false ) override;
- bool enablePackage(const css::uno::Reference< css::deployment::XPackage > &xPackage,
+ void enablePackage(const css::uno::Reference< css::deployment::XPackage > &xPackage,
bool bEnable );
- bool removePackage(const css::uno::Reference< css::deployment::XPackage > &xPackage );
- bool updatePackage(const css::uno::Reference< css::deployment::XPackage > &xPackage );
+ void removePackage(const css::uno::Reference< css::deployment::XPackage > &xPackage );
+ void updatePackage(const css::uno::Reference< css::deployment::XPackage > &xPackage );
bool acceptLicense(const css::uno::Reference< css::deployment::XPackage > &xPackage );
TheExtensionManager* getExtensionManager() const { return m_pManager; }
diff --git a/framework/source/uiconfiguration/CommandImageResolver.cxx b/framework/source/uiconfiguration/CommandImageResolver.cxx
index 12d902d4bfd5..7e0d504083ad 100644
--- a/framework/source/uiconfiguration/CommandImageResolver.cxx
+++ b/framework/source/uiconfiguration/CommandImageResolver.cxx
@@ -70,7 +70,7 @@ CommandImageResolver::~CommandImageResolver()
{
}
-bool CommandImageResolver::registerCommands(Sequence<OUString>& aCommandSequence)
+void CommandImageResolver::registerCommands(Sequence<OUString>& aCommandSequence)
{
sal_Int32 nSequenceSize = aCommandSequence.getLength();
@@ -109,7 +109,6 @@ bool CommandImageResolver::registerCommands(Sequence<OUString>& aCommandSequence
m_aImageNameVector[i] = aImageName;
m_aCommandToImageNameMap[aCommandName] = aImageName;
}
- return true;
}
bool CommandImageResolver::hasImage(const OUString& rCommandURL)
diff --git a/framework/source/uiconfiguration/CommandImageResolver.hxx b/framework/source/uiconfiguration/CommandImageResolver.hxx
index 8b5dbe3a82b5..094229b3ab9e 100644
--- a/framework/source/uiconfiguration/CommandImageResolver.hxx
+++ b/framework/source/uiconfiguration/CommandImageResolver.hxx
@@ -43,7 +43,7 @@ public:
CommandImageResolver();
~CommandImageResolver();
- bool registerCommands(css::uno::Sequence<OUString>& aCommandSequence);
+ void registerCommands(css::uno::Sequence<OUString>& aCommandSequence);
Image getImageFromCommandURL(ImageType nImageType, const OUString& rCommandURL);
std::vector<OUString>& getCommandNames()
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index e48e048c5176..bea025a231e9 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -173,7 +173,7 @@ private:
sal_Int32 nTokenType = 0xffffffff );
/// Setup International class, new'ed only if different from existing.
- bool setupInternational( const css::lang::Locale& rLocale );
+ void setupInternational( const css::lang::Locale& rLocale );
/// Implementation of getCharacterType() for one single character
static sal_Int32 getCharType( const OUString& Text, sal_Int32 *nPos, sal_Int32 increment);
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 7c6aa2eb3819..eca2cf18e10c 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -368,7 +368,7 @@ sal_Int32 cclass_Unicode::getParseTokensType(sal_uInt32 const c, bool const isFi
}
}
-bool cclass_Unicode::setupInternational( const Locale& rLocale )
+void cclass_Unicode::setupInternational( const Locale& rLocale )
{
bool bChanged = (aParserLocale.Language != rLocale.Language
|| aParserLocale.Country != rLocale.Country
@@ -383,7 +383,6 @@ bool cclass_Unicode::setupInternational( const Locale& rLocale )
{
mxLocaleData.set( LocaleData2::create(m_xContext) );
}
- return bChanged;
}
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index de659276472a..1c0d93765e2e 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -56,7 +56,7 @@ public:
void setString(const OString& rStr) { m_aStr = rStr; }
const OString& getString() const { return m_aStr; }
- bool ReadSvIdl( SvStringHashEntry const * pName, SvTokenStream & rInStm );
+ void ReadSvIdl( SvStringHashEntry const * pName, SvTokenStream & rInStm );
bool IsSet() const
{
return !m_aStr.isEmpty() || nValue != 0;
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 1da4c2f97ea8..58728260772c 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -187,16 +187,14 @@ public:
return false;
}
- bool ReadIfDelimiter()
+ void ReadIfDelimiter()
{
if( GetToken().IsChar()
&& (';' == GetToken().GetChar()
|| ',' == GetToken().GetChar()) )
{
GetToken_Next();
- return true;
}
- return false;
}
sal_uInt32 Tell() const { return pCurToken-aTokList.begin(); }
diff --git a/idl/inc/parser.hxx b/idl/inc/parser.hxx
index cdd1e30a10f7..ae9db7105bd9 100644
--- a/idl/inc/parser.hxx
+++ b/idl/inc/parser.hxx
@@ -57,7 +57,7 @@ public:
SvMetaType* ReadKnownType();
void Read(char cChar);
bool ReadIfBoolAttribute( SvBOOL&, SvStringHashEntry const * pName);
- bool ReadIfIdAttribute( SvIdentifier& rIdentifier, SvStringHashEntry const * pName );
+ void ReadIfIdAttribute( SvIdentifier& rIdentifier, SvStringHashEntry const * pName );
bool ReadIf(char cChar);
void ReadDelimiter();
bool ReadIfDelimiter();
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 5a34b1c381ea..0dddd98d5323 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -49,7 +49,7 @@ bool SvBOOL::ReadSvIdl( SvStringHashEntry const * pName, SvTokenStream & rInStm
return false;
}
-bool SvIdentifier::ReadSvIdl( SvStringHashEntry const * pName, SvTokenStream & rInStm )
+void SvIdentifier::ReadSvIdl( SvStringHashEntry const * pName, SvTokenStream & rInStm )
{
sal_uInt32 nTokPos = rInStm.Tell();
SvToken& rTok = rInStm.GetToken_Next();
@@ -70,10 +70,9 @@ bool SvIdentifier::ReadSvIdl( SvStringHashEntry const * pName, SvTokenStream & r
bOk = rInStm.ReadIf( ')' );
}
if( bOk )
- return true;
+ return;
}
rInStm.Seek( nTokPos );
- return false;
}
void SvIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
diff --git a/idl/source/prj/parser.cxx b/idl/source/prj/parser.cxx
index 5701f4f93cd0..c6fa85431f0e 100644
--- a/idl/source/prj/parser.cxx
+++ b/idl/source/prj/parser.cxx
@@ -499,7 +499,7 @@ bool SvIdlParser::ReadIfBoolAttribute( SvBOOL& rBool, SvStringHashEntry const *
return false;
}
-bool SvIdlParser::ReadIfIdAttribute( SvIdentifier& rIdentifier, SvStringHashEntry const * pName )
+void SvIdlParser::ReadIfIdAttribute( SvIdentifier& rIdentifier, SvStringHashEntry const * pName )
{
sal_uInt32 nTokPos = rInStm.Tell();
SvToken& rTok = rInStm.GetToken_Next();
@@ -514,10 +514,9 @@ bool SvIdlParser::ReadIfIdAttribute( SvIdentifier& rIdentifier, SvStringHashEntr
rIdentifier.setString(rTok.GetString());
rInStm.GetToken_Next();
}
- return true;
}
- rInStm.Seek( nTokPos );
- return false;
+ else
+ rInStm.Seek( nTokPos );
}
void SvIdlParser::ReadDelimiter()
diff --git a/idlc/inc/astattribute.hxx b/idlc/inc/astattribute.hxx
index 034a3a40d847..7ce370a7fa94 100644
--- a/idlc/inc/astattribute.hxx
+++ b/idlc/inc/astattribute.hxx
@@ -85,7 +85,7 @@ public:
bool isRemoveable() const
{ return ((m_flags & AF_REMOVABLE) == AF_REMOVABLE); }
- bool dumpBlob(
+ void dumpBlob(
typereg::Writer & rBlob, sal_uInt16 index, sal_uInt16 * methodIndex) const;
private:
diff --git a/idlc/inc/astoperation.hxx b/idlc/inc/astoperation.hxx
index ced2fb32213a..a6aa2cffde1a 100644
--- a/idlc/inc/astoperation.hxx
+++ b/idlc/inc/astoperation.hxx
@@ -42,7 +42,7 @@ public:
void setExceptions(DeclList const * pExceptions);
- bool dumpBlob(typereg::Writer & rBlob, sal_uInt16 index);
+ void dumpBlob(typereg::Writer & rBlob, sal_uInt16 index);
private:
AstType const * m_pReturnType;
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx
index 7b869b7564dc..fbdd7232d893 100644
--- a/idlc/source/astdump.cxx
+++ b/idlc/source/astdump.cxx
@@ -321,7 +321,7 @@ bool AstService::dump(RegistryKey& rKey)
return true;
}
-bool AstAttribute::dumpBlob(
+void AstAttribute::dumpBlob(
typereg::Writer & rBlob, sal_uInt16 index, sal_uInt16 * methodIndex) const
{
RTFieldAccess accessMode = RTFieldAccess::INVALID;
@@ -377,8 +377,6 @@ bool AstAttribute::dumpBlob(
dumpExceptions(
rBlob, m_setDocumentation, m_setExceptions, RTMethodMode::ATTRIBUTE_SET,
methodIndex);
-
- return true;
}
void AstAttribute::dumpExceptions(
diff --git a/idlc/source/astoperation.cxx b/idlc/source/astoperation.cxx
index 2ff452690077..122b4a57992f 100644
--- a/idlc/source/astoperation.cxx
+++ b/idlc/source/astoperation.cxx
@@ -38,7 +38,7 @@ bool AstOperation::isVariadic() const {
&& static_cast< AstParameter const * >(*(--i))->isRest();
}
-bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index)
+void AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index)
{
sal_uInt16 nParam = getNodeCount(NT_parameter);
sal_uInt16 nExcep = static_cast<sal_uInt16>(m_exceptions.size());
@@ -113,8 +113,6 @@ bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index)
++iter;
}
}
-
- return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx
index 7c9f0567a76c..8d0fcff0592e 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -114,7 +114,7 @@ void LwpFormulaInfo::ReadText()
m_aStack.push_back(new LwpFormulaText(aText));
}
-bool LwpFormulaInfo::ReadCellID()
+void LwpFormulaInfo::ReadCellID()
{
LwpRowSpecifier RowSpecifier;
LwpColumnSpecifier ColumnSpecifier;
@@ -124,7 +124,6 @@ bool LwpFormulaInfo::ReadCellID()
m_aStack.push_back( new LwpFormulaCellAddr(ColumnSpecifier.ColumnID(cColumn),
RowSpecifier.RowID(m_nFormulaRow)) );
- return true;
}
void LwpFormulaInfo::ReadCellRange()
diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx
index 800ad4020f20..d3135abb29f7 100644
--- a/lotuswordpro/source/filter/lwptblformula.hxx
+++ b/lotuswordpro/source/filter/lwptblformula.hxx
@@ -199,7 +199,7 @@ public:
void Convert(XFCell * pCell, LwpTableLayout* pCellsMap=nullptr) override;
private:
void Read() override;
- bool ReadCellID();
+ void ReadCellID();
void ReadText();
void ReadCellRange();
void ReadExpression();
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index ccbd4cc1f056..2507a657abbb 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -509,7 +509,7 @@ void ImpOptimizer::DispatchStatus()
}
-bool ImpOptimizer::Optimize()
+void ImpOptimizer::Optimize()
{
if ( !maCustomShowName.isEmpty() )
@@ -559,7 +559,6 @@ bool ImpOptimizer::Optimize()
}
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 100 ) ) );
DispatchStatus();
- return true;
}
static void DispatchURL( const Reference< XComponentContext >& xContext, const OUString& sURL, const Reference< XFrame >& xFrame )
diff --git a/sdext/source/minimizer/impoptimizer.hxx b/sdext/source/minimizer/impoptimizer.hxx
index 60f15fb500ae..169c3fdfb834 100644
--- a/sdext/source/minimizer/impoptimizer.hxx
+++ b/sdext/source/minimizer/impoptimizer.hxx
@@ -56,7 +56,7 @@ private:
css::uno::Reference< css::frame::XFrame > mxInformationDialog;
- bool Optimize();
+ void Optimize();
public:
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 99b71da4dd26..5c206493768a 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -318,7 +318,7 @@ void SAL_CALL PresenterWindowManager::disposing (const lang::EventObject& rEvent
}
-bool PresenterWindowManager::PaintChildren (const awt::PaintEvent& rEvent) const
+void PresenterWindowManager::PaintChildren (const awt::PaintEvent& rEvent) const
{
// Call windowPaint on all children that lie in or touch the
// update rectangle.
@@ -368,8 +368,6 @@ bool PresenterWindowManager::PaintChildren (const awt::PaintEvent& rEvent) const
OSL_FAIL("paint children failed!");
}
}
-
- return false;
}
void PresenterWindowManager::SetLayoutMode (const LayoutMode eMode)
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
index 64d850386f35..bb765094869f 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -173,7 +173,7 @@ private:
LayoutListenerContainer maLayoutListeners;
bool mbIsMouseClickPending;
- bool PaintChildren (const css::awt::PaintEvent& rEvent) const;
+ void PaintChildren (const css::awt::PaintEvent& rEvent) const;
void UpdateWindowSize (const css::uno::Reference<css::awt::XWindow>& rxBorderWindow);
void PaintBackground (const css::awt::Rectangle& rUpdateBox);
void ProvideBackgroundBitmap();
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 04cb436b9d0e..2d6e63da5f2f 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -212,7 +212,7 @@ public:
*/
bool HasCursor();
- bool writeFormulaOoxml(const ::sax_fastparser::FSHelperPtr& pSerializer,
+ void writeFormulaOoxml(const ::sax_fastparser::FSHelperPtr& pSerializer,
oox::core::OoxmlVersion version,
oox::drawingml::DocumentType documentType);
void writeFormulaRtf(OStringBuffer& rBuffer, rtl_TextEncoding nEncoding);
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 399ff0dece69..2d5a29e2f6ba 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -858,7 +858,7 @@ bool SmDocShell::ConvertTo( SfxMedium &rMedium )
return bRet;
}
-bool SmDocShell::writeFormulaOoxml(
+void SmDocShell::writeFormulaOoxml(
::sax_fastparser::FSHelperPtr const& pSerializer,
oox::core::OoxmlVersion const version,
oox::drawingml::DocumentType const documentType)
@@ -868,7 +868,7 @@ bool SmDocShell::writeFormulaOoxml(
if( mpTree )
ArrangeFormula();
SmOoxmlExport aEquation(mpTree, version, documentType);
- return aEquation.ConvertFromStarMath( pSerializer );
+ aEquation.ConvertFromStarMath( pSerializer );
}
void SmDocShell::writeFormulaRtf(OStringBuffer& rBuffer, rtl_TextEncoding nEncoding)
diff --git a/starmath/source/mathmlattr.hxx b/starmath/source/mathmlattr.hxx
index a794e2f482a6..232e080e65dc 100644
--- a/starmath/source/mathmlattr.hxx
+++ b/starmath/source/mathmlattr.hxx
@@ -18,11 +18,6 @@
// <https://www.w3.org/TR/MathML/chapter2.html#id.2.1.5.1>
// MathML 2: 2.4.4.2 Attributes with units
// <https://www.w3.org/TR/MathML2/chapter2.html#fund.attval>
-
-sal_Int32 ParseMathMLUnsignedNumber(const OUString &rStr, Fraction *pUN);
-
-sal_Int32 ParseMathMLNumber(const OUString &rStr, Fraction *pN);
-
// MathML 3: 2.1.5.2 Length Valued Attributes
// <https://www.w3.org/TR/MathML/chapter2.html#fund.units>
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 2920288c91bc..e142449e99ec 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -309,7 +309,7 @@ public:
SvxIconChoiceCtrl_Impl( SvtIconChoiceCtrl* pView, WinBits nWinStyle );
~SvxIconChoiceCtrl_Impl();
- bool SetChoiceWithCursor() { bool bOld = bChooseWithCursor; bChooseWithCursor = true; return bOld; }
+ void SetChoiceWithCursor() { bChooseWithCursor = true; }
void Clear( bool bInCtor );
void SetStyle( WinBits nWinStyle );
WinBits GetStyle() const { return nWinBits; }
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index bf8b7d666605..c8ed80689ec7 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -428,9 +428,6 @@ public:
void DrawCheckBox(const SwFieldFormCheckboxPortion &rPor, bool bChecked) const;
- void NotifyURL( const SwLinePortion &rPor ) const
- { if( URLNotify() ) NotifyURL_( rPor ); }
-
/**
* Calculate the rectangular area where the portion takes place.
* @param[in] rPor portion for which the method specify the painting area
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 11def7b3b857..03ee052f4053 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -9208,14 +9208,4 @@ void DocxAttributeOutput::AddToAttrList( rtl::Reference<sax_fastparser::FastAttr
va_end( args );
}
-void DocxAttributeOutput::SetStartedParaSdt(bool bStartedParaSdt)
-{
- m_bStartedParaSdt = bStartedParaSdt;
-}
-
-bool DocxAttributeOutput::IsStartedParaSdt()
-{
- return m_bStartedParaSdt;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 237204592766..958627d4062a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -1010,8 +1010,6 @@ public:
void SetAlternateContentChoiceOpen( bool bAltContentChoiceOpen ) { m_bAlternateContentChoiceOpen = bAltContentChoiceOpen; }
bool IsAlternateContentChoiceOpen( ) { return m_bAlternateContentChoiceOpen; }
void GetSdtEndBefore(const SdrObject* pSdrObj);
- void SetStartedParaSdt(bool bStartedParaSdt);
- bool IsStartedParaSdt();
bool IsFirstParagraph() { return m_bIsFirstParagraph; }
/// Stores the table export state to the passed context and resets own state.
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 359259ac94ad..c74b0ae7cf10 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -212,7 +212,7 @@ CURL* FTPContentProvider::handle()
}
-bool FTPContentProvider::forHost( const OUString& host,
+void FTPContentProvider::forHost( const OUString& host,
const OUString& port,
const OUString& username,
OUString& password,
@@ -226,10 +226,8 @@ bool FTPContentProvider::forHost( const OUString& host,
{
password = i.password;
account = i.account;
- return true;
+ return;
}
-
- return false;
}
bool FTPContentProvider::setHost( const OUString& host,
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
index 8aa6e7dfcaea..f7ac598c69fc 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
@@ -80,7 +80,7 @@ namespace ftp
/** host is in the form host:port.
*/
- bool forHost(const OUString& host,
+ void forHost(const OUString& host,
const OUString& port,
const OUString& username,
OUString& password,
diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsignaturehelper.hxx
index 6f9784f4a690..880293f68669 100644
--- a/xmlsecurity/inc/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsignaturehelper.hxx
@@ -130,7 +130,7 @@ public:
void SetDescription(sal_Int32 nSecurityId, const OUString& rDescription);
void AddForSigning( sal_Int32 securityId, const OUString& uri, bool bBinary, bool bXAdESCompliantIfODF );
- bool CreateAndWriteSignature( const css::uno::Reference< css::xml::sax::XDocumentHandler >& xDocumentHandler, bool bXAdESCompliantIfODF );
+ void CreateAndWriteSignature( const css::uno::Reference< css::xml::sax::XDocumentHandler >& xDocumentHandler, bool bXAdESCompliantIfODF );
bool ReadAndVerifySignature( const css::uno::Reference< css::io::XInputStream >& xInputStream );
// MT: ??? I think only for adding/removing, not for new signatures...
@@ -152,7 +152,7 @@ public:
/// Given that xStorage is an OOXML _xmlsignatures storage, create origin.sigs and its relations.
void ExportSignatureRelations(const css::uno::Reference<css::embed::XStorage>& xStorage, int nSignatureCount);
/// Given that xSignatureStorage is an OOXML _xmlsignatures storage, create and write a new signature.
- bool CreateAndWriteOOXMLSignature(const css::uno::Reference<css::embed::XStorage>& xRootStorage, const css::uno::Reference<css::embed::XStorage>& xSignatureStorage, int nSignatureIndex);
+ void CreateAndWriteOOXMLSignature(const css::uno::Reference<css::embed::XStorage>& xRootStorage, const css::uno::Reference<css::embed::XStorage>& xSignatureStorage, int nSignatureIndex);
/// Similar to CreateAndWriteOOXMLSignature(), but used to write the signature to the persistent storage, not the temporary one.
void ExportOOXMLSignature(const css::uno::Reference<css::embed::XStorage>& xRootStorage, const css::uno::Reference<css::embed::XStorage>& xSignatureStorage, const SignatureInformation& rInformation, int nSignatureIndex);
/// Given that xStorage is an OOXML root storage, advertise signatures in its [Content_Types].xml stream.
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 0f7630171285..dcc30de40f61 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -221,7 +221,7 @@ void XMLSignatureHelper::ExportOOXMLSignature(const uno::Reference<embed::XStora
}
}
-bool XMLSignatureHelper::CreateAndWriteSignature( const uno::Reference< xml::sax::XDocumentHandler >& xDocumentHandler, bool bXAdESCompliantIfODF )
+void XMLSignatureHelper::CreateAndWriteSignature( const uno::Reference< xml::sax::XDocumentHandler >& xDocumentHandler, bool bXAdESCompliantIfODF )
{
mbError = false;
@@ -229,8 +229,6 @@ bool XMLSignatureHelper::CreateAndWriteSignature( const uno::Reference< xml::sax
{
mbError = true;
}
-
- return !mbError;
}
bool XMLSignatureHelper::ReadAndVerifySignature( const css::uno::Reference< css::io::XInputStream >& xInputStream )
@@ -538,7 +536,7 @@ void XMLSignatureHelper::ExportSignatureContentTypes(const css::uno::Reference<c
uno::Reference<embed::XTransactedObject> xTransact(xStorage, uno::UNO_QUERY);
xTransact->commit();
}
-bool XMLSignatureHelper::CreateAndWriteOOXMLSignature(const uno::Reference<embed::XStorage>& xRootStorage, const uno::Reference<embed::XStorage>& xSignatureStorage, int nSignatureIndex)
+void XMLSignatureHelper::CreateAndWriteOOXMLSignature(const uno::Reference<embed::XStorage>& xRootStorage, const uno::Reference<embed::XStorage>& xSignatureStorage, int nSignatureIndex)
{
uno::Reference<io::XOutputStream> xOutputStream(xSignatureStorage->openStreamElement("sig" + OUString::number(nSignatureIndex) + ".xml", embed::ElementModes::READWRITE), uno::UNO_QUERY);
uno::Reference<xml::sax::XWriter> xSaxWriter = xml::sax::Writer::create(mxCtx);
@@ -551,8 +549,6 @@ bool XMLSignatureHelper::CreateAndWriteOOXMLSignature(const uno::Reference<embed
mbError = true;
xSaxWriter->endDocument();
-
- return !mbError;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list