diff options
64 files changed, 6 insertions, 131 deletions
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 5a9921dddf56..b83e04408b82 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -592,7 +592,6 @@ void SAL_CALL ChartModel::removeEventListener( const uno::Reference< lang::XEven return; //behave passive if already disposed or closed m_aLifeTimeManager.m_aListenerContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(), xListener ); - return; } // util::XCloseBroadcaster (base of XCloseable) @@ -607,7 +606,6 @@ void SAL_CALL ChartModel::removeCloseListener( const uno::Reference< util::XClos return; //behave passive if already disposed or closed m_aLifeTimeManager.m_aListenerContainer.removeInterface( cppu::UnoType<util::XCloseListener>::get(), xListener ); - return; } // util::XCloseable diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index f6039056aea4..7e42baa89628 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -507,7 +507,6 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram } } - return; } // ____ XServiceName ____ @@ -676,8 +675,7 @@ void ChartTypeTemplate::adaptScales( void ChartTypeTemplate::adaptDiagram( const Reference< XDiagram > & /* xDiagram */ ) { - return; -} + } void ChartTypeTemplate::createAxes( const Sequence< Reference< XCoordinateSystem > > & rCoordSys ) diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index 8f2deb44b353..6e6e2fcaa601 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -1081,7 +1081,6 @@ void OpenGL3DRenderer::RenderPolygon3DObject() } } glDepthMask(GL_TRUE); - return; } void OpenGL3DRenderer::Set3DSenceInfo(sal_uInt32 nColor, bool twoSidesLighting) diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index ad9098defc69..af385be7aa5d 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -438,7 +438,6 @@ namespace cppcanvas } // EOF - return; } bool ImplRenderer::isActionContained( GDIMetaFile& rMtf, diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index ef3775226053..a6e5d5f68004 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -983,7 +983,6 @@ void AbstractScriptSelectorDialog_Impl::SetRunLabel() { if (pDlg) pDlg->SetRunLabel(); - return; } VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( vcl::Window* pParent, diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 9c859b39e10c..bc1e6517b3a1 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1096,8 +1096,6 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() sHelpId = pFirstChild->GetHelpId(); } pBox->SetHelpId(sHelpId); - - return; } OfaPageResource::OfaPageResource() : diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 626ff623e74a..e542a07c0a1d 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -2542,8 +2542,6 @@ void OApplicationController::OnFirstControllerConnected() { DBG_UNHANDLED_EXCEPTION(); } - - return; } void SAL_CALL OApplicationController::attachFrame( const Reference< XFrame > & i_rxFrame ) diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index e368ca681baf..ba8387e7f436 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -420,8 +420,6 @@ namespace dbaui onTypeSelected( sURLPrefix ); // tell the listener we were modified callModifiedHdl(); - // outta here - return; } IMPL_LINK( OGeneralPage, OnDatasourceTypeSelected, ListBox&, _rBox, void ) diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 6af740f15a1a..df5346195a7f 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1022,8 +1022,6 @@ void Desktop::HandleBootstrapErrors( aDiagnosticMessage.makeStringAndClear() ); FatalError(aMessage); } - - return; } diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 6296b54b5d3b..170b786ba4d9 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -932,8 +932,6 @@ void OutlinerView::ToggleBulletsNumbering( // switch off bullets/numbering for selected paragraphs SwitchOffBulletsNumbering( true ); } - - return; } @@ -1099,8 +1097,6 @@ void OutlinerView::ApplyBulletsNumbering( pOwner->pEditEngine->SetUpdateMode( bUpdate ); pOwner->UndoActionEnd(); - - return; } diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx index 5f768df6a7a6..83056c2a022e 100644 --- a/embeddedobj/source/general/dummyobject.cxx +++ b/embeddedobj/source/general/dummyobject.cxx @@ -437,7 +437,6 @@ void SAL_CALL ODummyEmbeddedObject::storeOwn() static_cast< ::cppu::OWeakObject* >(this) ); // the object can not be activated or changed - return; } diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx index 0ea4da053d50..72bea300c678 100644 --- a/embeddedobj/source/msole/ownview.cxx +++ b/embeddedobj/source/msole/ownview.cxx @@ -60,7 +60,6 @@ public: void SAL_CALL DummyHandler_Impl::handle( const uno::Reference< task::XInteractionRequest >& ) { - return; } diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 9d1f485f2448..b61f6c8d6c23 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6536,7 +6536,7 @@ bool SvxMSDffManager::ProcessClientData(SvStream& rStData, sal_uInt32 nDatLen, void SvxMSDffManager::ProcessClientAnchor2( SvStream& /* rSt */, DffRecordHeader& /* rHd */ , void* /* pData */, DffObjData& /* rObj */ ) { - return; // will be overridden by SJ in Draw + // will be overridden by SJ in Draw } bool SvxMSDffManager::GetOLEStorageName( sal_uInt32, OUString&, tools::SvRef<SotStorage>&, uno::Reference < embed::XStorage >& ) const diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index fbc20999a81f..966e5f773bc9 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -611,7 +611,6 @@ void SdrEscherImport::ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd, Scale( b ); rObj.aChildAnchor = tools::Rectangle( l, t, r, b ); rObj.bChildAnchor = true; - return; }; void SdrEscherImport::RecolorGraphic( SvStream& rSt, sal_uInt32 nRecLen, Graphic& rGraphic ) diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index 3544673a88d2..13f802a86705 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -2044,8 +2044,6 @@ struct OfficeStylesWritingVisitor } SAL_INFO("filter.svg", "SvgDashArray2Odf " << *dash_distance << " " << *dots1 << " " << *dots1_length << " " << *dots2 << " " << *dots2_length ); - - return; } static void push() {} diff --git a/hwpfilter/source/hwpeq.cxx b/hwpfilter/source/hwpeq.cxx index 5a0ca83774c5..519a4457dc03 100644 --- a/hwpfilter/source/hwpeq.cxx +++ b/hwpfilter/source/hwpeq.cxx @@ -450,7 +450,6 @@ void make_keyword( char *keyword, const char *token) ptr++; } } - return; } // token reading function diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx index c95657d1b27f..ccc3214cc8a5 100644 --- a/io/source/stm/opipe.cxx +++ b/io/source/stm/opipe.cxx @@ -227,7 +227,6 @@ void OPipeImpl::closeInput() m_conditionBytesAvail.set(); setSuccessor( Reference< XConnectable > () ); - return; } @@ -278,7 +277,6 @@ void OPipeImpl::writeBytes(const Sequence< sal_Int8 >& aData) void OPipeImpl::flush() { // nothing to do for a pipe - return; } void OPipeImpl::closeOutput() @@ -288,7 +286,6 @@ void OPipeImpl::closeOutput() m_bOutputStreamClosed = true; m_conditionBytesAvail.set(); setPredecessor( Reference < XConnectable > () ); - return; } diff --git a/lotuswordpro/source/filter/explode.cxx b/lotuswordpro/source/filter/explode.cxx index edaad856836c..2e95dd03d34b 100644 --- a/lotuswordpro/source/filter/explode.cxx +++ b/lotuswordpro/source/filter/explode.cxx @@ -343,7 +343,6 @@ void Decompression::ToString(sal_uInt32 nBits, sal_Char *pChar, sal_uInt32 nLen) pChar[nLen - i] = nBit ? '1':'0'; } pChar[nLen] = '\0'; - return; } /** diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx index 3024e53ce1a0..dbec3ce35eb1 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.cxx +++ b/lotuswordpro/source/filter/lwpcelllayout.cxx @@ -289,8 +289,6 @@ void LwpCellLayout::ApplyFmtStyle(XFCellStyle *pCellStyle) pCellStyle->SetDataStyle(m_NumfmtName); } } - - return; } /** * @short get style name according to cell position, only table default cells use this function @@ -855,7 +853,6 @@ LwpHiddenCellLayout::~LwpHiddenCellLayout() */ void LwpHiddenCellLayout::SetCellMap() { - return; } /** * @short Read hidden cell layout diff --git a/lotuswordpro/source/filter/utbenvs.cxx b/lotuswordpro/source/filter/utbenvs.cxx index 64c19679484c..aac43171f8cd 100644 --- a/lotuswordpro/source/filter/utbenvs.cxx +++ b/lotuswordpro/source/filter/utbenvs.cxx @@ -111,8 +111,6 @@ sal_uInt64 LtcUtBenValueStream::SeekPos(sal_uInt64 const nPos) { //pLtcBenContainer pContainer = cpValue->GetContainer(); //pContainer->GetStream()->SetStreamSize(nSize); - - return; } /** * Flush data function, not supported now @@ -124,7 +122,6 @@ void LtcUtBenValueStream::FlushData() pLtcBenContainer pContainer = cpValue->GetContainer(); pContainer->GetStream()->Flush();*/ assert(false); - return; } /** * Construction diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx index 4c1d9d842d2e..768763bf91d4 100644 --- a/oox/source/export/ColorPropertySet.cxx +++ b/oox/source/export/ColorPropertySet.cxx @@ -132,25 +132,21 @@ uno::Any SAL_CALL ColorPropertySet::getPropertyValue( const OUString& aPropertyN void SAL_CALL ColorPropertySet::addPropertyChangeListener( const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* xListener */ ) { OSL_FAIL( "Not Implemented" ); - return; } void SAL_CALL ColorPropertySet::removePropertyChangeListener( const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* aListener */ ) { OSL_FAIL( "Not Implemented" ); - return; } void SAL_CALL ColorPropertySet::addVetoableChangeListener( const OUString& /* PropertyName */, const Reference< XVetoableChangeListener >& /* aListener */ ) { OSL_FAIL( "Not Implemented" ); - return; } void SAL_CALL ColorPropertySet::removeVetoableChangeListener( const OUString& /* PropertyName */, const Reference< XVetoableChangeListener >& /* aListener */ ) { OSL_FAIL( "Not Implemented" ); - return; } // ____ XPropertyState ____ diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index f12d63c999b7..90f457d351db 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2784,8 +2784,6 @@ void DrawingML::WriteFill( const Reference< XPropertySet >& xPropSet ) default: ; } - - return; } void DrawingML::WriteStyleProperties( sal_Int32 nTokenId, const Sequence< PropertyValue >& aProperties ) diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx index 892c2dd1bcf0..2ca0a603a5da 100644 --- a/opencl/source/openclwrapper.cxx +++ b/opencl/source/openclwrapper.cxx @@ -348,8 +348,6 @@ void releaseOpenCLEnv( GPUEnv *gpuInfo ) } bIsInited = false; gpuInfo->mnIsUserCreated = 0; - - return; } namespace { diff --git a/pyuno/source/module/pyuno_callable.cxx b/pyuno/source/module/pyuno_callable.cxx index b52e8d6b517a..9320c8e84a8e 100644 --- a/pyuno/source/module/pyuno_callable.cxx +++ b/pyuno/source/module/pyuno_callable.cxx @@ -50,8 +50,6 @@ void PyUNO_callable_del (PyObject* self) me = reinterpret_cast<PyUNO_callable*>(self); delete me->members; PyObject_Del (self); - - return; } PyObject* PyUNO_callable_call( diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx index 446108b3c042..1f0138f1266d 100644 --- a/sal/osl/all/log.cxx +++ b/sal/osl/all/log.cxx @@ -181,7 +181,6 @@ void maybeOutputTimestamp(std::ostringstream &s) { ; // nothing } } - return; } #endif diff --git a/sal/osl/unx/conditn.cxx b/sal/osl/unx/conditn.cxx index 56eadde87a17..64a1ea3ae0e7 100644 --- a/sal/osl/unx/conditn.cxx +++ b/sal/osl/unx/conditn.cxx @@ -93,8 +93,6 @@ void SAL_CALL osl_destroyCondition(oslCondition Condition) free(Condition); } - - return; } sal_Bool SAL_CALL osl_setCondition(oslCondition Condition) diff --git a/sal/osl/unx/mutex.cxx b/sal/osl/unx/mutex.cxx index 1e262dd63be8..570b452a4cfa 100644 --- a/sal/osl/unx/mutex.cxx +++ b/sal/osl/unx/mutex.cxx @@ -84,8 +84,6 @@ void SAL_CALL osl_destroyMutex(oslMutexImpl *pMutex) free(pMutex); } - - return; } sal_Bool SAL_CALL osl_acquireMutex(oslMutexImpl *pMutex) diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx index c5e5dd77d819..200bb5d2f578 100644 --- a/sal/osl/unx/profile.cxx +++ b/sal/osl/unx/profile.cxx @@ -1323,8 +1323,6 @@ static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo) pProfile->m_NoLines--; } - - return; } static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection, @@ -1335,8 +1333,6 @@ static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection, pSection->m_Entries[NoEntry].m_Line = Line; pSection->m_Entries[NoEntry].m_Offset = Entry - pProfile->m_Lines[Line]; pSection->m_Entries[NoEntry].m_Len = Len; - - return; } static bool addEntry(osl_TProfileImpl* pProfile, @@ -1398,7 +1394,6 @@ static void removeEntry(osl_TProfileSection *pSection, sal_uInt32 NoEntry) pSection->m_NoEntries--; } - return; } static bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len) @@ -1474,8 +1469,6 @@ static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSect pProfile->m_NoSections--; } - - return; } static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, @@ -1763,8 +1756,6 @@ static void osl_ProfileGenerateExtension(const sal_Char* pszFileName, const sal_ cursor += BufferMaxLen - 1; } *cursor = 0; - - return; } static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable) diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx index 6b24b0ab0143..973c1d68699e 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -971,8 +971,6 @@ void SAL_CALL osl_getHostnameOfHostAddr ( pHostname = osl_psz_getHostnameOfHostAddr(Addr); rtl_uString_newFromAscii (ustrHostname, pHostname); - - return; } const sal_Char* SAL_CALL osl_psz_getHostnameOfHostAddr (const oslHostAddr pAddr) @@ -2276,8 +2274,6 @@ void SAL_CALL osl_getLastSocketErrorDescription(oslSocket Socket, rtl_uString ** osl_psz_getLastSocketErrorDescription(Socket,pszError,sizeof(pszError)); rtl_uString_newFromAscii(ustrError,pszError); - - return; } void SAL_CALL osl_psz_getLastSocketErrorDescription(oslSocket pSocket, sal_Char* pBuffer, sal_uInt32 BufferSize) @@ -2292,7 +2288,6 @@ void SAL_CALL osl_psz_getLastSocketErrorDescription(oslSocket pSocket, sal_Char* } strncpy(pBuffer, strerror(pSocket->m_nLastError), BufferSize-1); - return; } oslSocketError SAL_CALL osl_getLastSocketError(oslSocket pSocket) diff --git a/sal/rtl/strbuf.cxx b/sal/rtl/strbuf.cxx index 374f329f5a55..194e9b159af5 100644 --- a/sal/rtl/strbuf.cxx +++ b/sal/rtl/strbuf.cxx @@ -40,7 +40,6 @@ void SAL_CALL rtl_stringbuffer_newFromStr_WithLength( rtl_String ** newStr, rtl_string_new_WithLength( newStr, count + 16 ); (*newStr)->length = count; memcpy( (*newStr)->buffer, value, count ); - return; } /************************************************************************* diff --git a/sal/rtl/ustrbuf.cxx b/sal/rtl/ustrbuf.cxx index b73318b6e5f4..cef31a5da2ea 100644 --- a/sal/rtl/ustrbuf.cxx +++ b/sal/rtl/ustrbuf.cxx @@ -45,7 +45,6 @@ void SAL_CALL rtl_uStringbuffer_newFromStr_WithLength( rtl_uString ** newStr, (*newStr)->length = count; memcpy( (*newStr)->buffer, value, count * sizeof(sal_Unicode)); RTL_LOG_STRING_NEW( *newStr ); - return; } rtl_uString * SAL_CALL rtl_uStringBuffer_refReturn( rtl_uString * pThis ) diff --git a/salhelper/source/timer.cxx b/salhelper/source/timer.cxx index c79f1fc03588..a43078dade97 100644 --- a/salhelper/source/timer.cxx +++ b/salhelper/source/timer.cxx @@ -413,9 +413,6 @@ void TimerManager::checkForTimeout() { m_Lock.release(); } - - - return; } void TimerManager::run() diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 7942ad881bc0..249489b01e64 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -1895,7 +1895,6 @@ void ScColumn::SetEditText( sc::ColumnBlockPosition& rBlockPos, SCROW nRow, cons EditEngine& rEngine = pDocument->GetEditEngine(); rEngine.SetText(rEditText); SetEditText(rBlockPos, nRow, rEngine.CreateTextObject()); - return; } void ScColumn::SetEditText( SCROW nRow, const EditTextObject& rEditText, const SfxItemPool* pEditPool ) @@ -1912,7 +1911,6 @@ void ScColumn::SetEditText( SCROW nRow, const EditTextObject& rEditText, const S EditEngine& rEngine = pDocument->GetEditEngine(); rEngine.SetText(rEditText); SetEditText(nRow, rEngine.CreateTextObject()); - return; } void ScColumn::SetFormula( SCROW nRow, const ScTokenArray& rArray, formula::FormulaGrammar::Grammar eGram ) diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index 30fb96af0cf5..a7420be0bf78 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -1427,7 +1427,6 @@ void ScDPSaveData::RemoveDuplicateNameCount(const OUString& rName) } --it->second; - return; } ScDPSaveDimension* ScDPSaveData::AppendNewDimension(const OUString& rName, bool bDataLayout) diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx index 6e614098e4a7..0db0bd226373 100644 --- a/sc/source/core/tool/interpr6.cxx +++ b/sc/source/core/tool/interpr6.cxx @@ -365,7 +365,7 @@ public: mpCol->InitBlockPosition(maPos); } - virtual void execute(SCROW, SCROW, bool) override { return; }; + virtual void execute(SCROW, SCROW, bool) override {} virtual void executeSum(SCROW nRow1, SCROW nRow2, bool bVal, double& fMem ) override { diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx index e2e1e9430a18..cadcc34df828 100644 --- a/sc/source/core/tool/interpr8.cxx +++ b/sc/source/core/tool/interpr8.cxx @@ -650,8 +650,6 @@ void ScETSForecastCalculation::CalcAlphaBetaGamma() } } calcAccuracyIndicators(); - - return; } void ScETSForecastCalculation::CalcBetaGamma() @@ -1381,8 +1379,6 @@ void ScInterpreter::ScForecast_Ets( ScETSType eETSType ) } break; } - - return; } void ScInterpreter::ScConcat_MS() diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index a1471475d540..d9b407fddc9f 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -1225,7 +1225,6 @@ ScVbaApplication::Volatile( const uno::Any& aVolatile ) } // this is bound to break when loading the document - return; } sal_Bool SAL_CALL diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 3e9e6d9827f3..53e2fe30dab6 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1306,8 +1306,6 @@ void SfxDispatcher::Update_Impl( bool bForce ) const SfxPoolItem *pItem; SfxViewShell::Current()->GetDispatcher()->QueryState(SID_NOTEBOOKBAR, pItem); } - - return; } void SfxDispatcher::Update_Impl_( bool bUIActive, bool bIsMDIApp, bool bIsIPOwner, SfxWorkWindow *pTaskWin ) diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 106f87b22982..29510c59fbf1 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -641,7 +641,6 @@ IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl, Button*, void) } else EndDialog(); - return; } diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx index a93f726ef463..9dd1fe3f6d2c 100644 --- a/starmath/source/utility.cxx +++ b/starmath/source/utility.cxx @@ -169,8 +169,6 @@ void SmFontPickListBox::Insert(const vcl::Font &rFont) while (GetEntryCount() > nMaxItems) RemoveEntry(GetEntryCount() - 1); - - return; } diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 734af6294825..6b06d6beed62 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -1992,7 +1992,6 @@ void SvNumberformat::ImpGetOutputInputLine(double fNumber, OUString& OutString) { OutString += "%"; } - return; } short SvNumberformat::ImpCheckCondition(double& fNumber, diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 092f4cdaa021..c3f23259f262 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -2078,8 +2078,6 @@ void SvImpLBox::MouseButtonUp( const MouseEvent& rMEvt) aEditClickPos = rMEvt.GetPosPixel(); aEditIdle.Start(); } - - return; } void SvImpLBox::MouseMove( const MouseEvent& rMEvt) @@ -2087,7 +2085,6 @@ void SvImpLBox::MouseMove( const MouseEvent& rMEvt) SvTreeListEntry* pEntry = GetClickedEntry( rMEvt.GetPosPixel() ); if ( !MouseMoveCheckCtrl( rMEvt, pEntry ) && ( aSelEng.GetSelectionMode() != SelectionMode::NONE ) ) aSelEng.SelMouseMove( rMEvt ); - return; } bool SvImpLBox::KeyInput( const KeyEvent& rKEvt) diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 2a91e98fb1e2..7fb25ece7334 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -787,8 +787,6 @@ void SvtMatchContext_Impl::doExecute() else break; } - - return; } void SvtURLBox::TryAutoComplete() diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index f612e2e6304c..30a4177d0bf4 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -165,7 +165,6 @@ static void lcl_ShapeSegmentFromBinary( EnhancedCustomShapeSegment& rSegInfo, sa rSegInfo.Count = nSDat; break; } - return; } static MSO_SPT ImpGetCustomShapeType( const SdrObjCustomShape& rCustoShape ) @@ -825,7 +824,6 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, css::beans: rPropValues[ n++ ].Value <<= aRangeYMaximum; } } - return; } sdr::properties::BaseProperties* SdrObjCustomShape::CreateObjectSpecificProperties() diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx index 04944c370d0d..43d9f428cb37 100644 --- a/sw/source/core/access/accportions.cxx +++ b/sw/source/core/access/accportions.cxx @@ -127,7 +127,6 @@ void SwAccessiblePortionData::Text(sal_Int32 nLength, sal_uInt16 nType, sal_Int3 void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16 nAttrFieldType ) { m_aAttrFieldType.push_back(nAttrFieldType); - return; } void SwAccessiblePortionData::Special( diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx index 74bfe7371592..491ce495e59c 100644 --- a/sw/source/core/docnode/finalthreadmanager.cxx +++ b/sw/source/core/docnode/finalthreadmanager.cxx @@ -390,8 +390,6 @@ void SAL_CALL FinalThreadManager::queryTermination( const css::lang::EventObject } mpPauseThreadStarting = new SwPauseThreadStarting(); - - return; } void SAL_CALL FinalThreadManager::cancelTermination( const css::lang::EventObject& ) @@ -402,8 +400,7 @@ void SAL_CALL FinalThreadManager::cancelTermination( const css::lang::EventObjec mpPauseThreadStarting = nullptr; } - return; -} + } void SAL_CALL FinalThreadManager::notifyTermination( const css::lang::EventObject& ) { diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 8aafdb2df7f1..8a777c49b9ba 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -516,7 +516,7 @@ OUString SwSetExpFieldType::GetName() const void SwSetExpFieldType::Modify( const SfxPoolItem*, const SfxPoolItem* ) { - return; // do not expand further + // do not expand further } void SwSetExpFieldType::SetSeqFormat(sal_uLong nFormat) diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx index 1477ea9d0ef2..4762a1950faa 100644 --- a/sw/source/core/text/txtftn.cxx +++ b/sw/source/core/text/txtftn.cxx @@ -783,7 +783,6 @@ void SwTextFrame::ConnectFootnote( SwTextFootnote *pFootnote, const SwTwips nDea (void)nRstHeight; #endif mbInFootnoteConnect = false; - return; } /** diff --git a/sw/source/core/unocore/unocrsr.cxx b/sw/source/core/unocore/unocrsr.cxx index 080a0081bedf..da347c2801b9 100644 --- a/sw/source/core/unocore/unocrsr.cxx +++ b/sw/source/core/unocore/unocrsr.cxx @@ -66,7 +66,7 @@ SwUnoCursor::DoSetBidiLevelLeftRight( bool &, bool, bool ) void SwUnoCursor::DoSetBidiLevelUpDown() { - return; // not for uno cursor + // not for uno cursor } bool SwUnoCursor::IsSelOvr( SwCursorSelOverFlags eFlags ) diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx index b3a6c497c7e6..86b46af7d51b 100644 --- a/sw/source/core/unocore/unotextmarkup.cxx +++ b/sw/source/core/unocore/unotextmarkup.cxx @@ -473,8 +473,6 @@ void SAL_CALL SwXTextMarkup::commitMultiTextMarkup( if( bRepaint ) finishGrammarCheck(*m_pImpl->m_pTextNode); - - return; } void SwXTextMarkup::Impl::Modify( const SfxPoolItem* /*pOld*/, const SfxPoolItem* /*pNew*/ ) diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx index e0d11151b90d..079f764ea2b2 100644 --- a/sw/source/core/view/viewpg.cxx +++ b/sw/source/core/view/viewpg.cxx @@ -65,8 +65,6 @@ void SwViewShell::AdjustOptionsForPagePreview(SwPrintData const& rPrintOptions) } PrepareForPrint( rPrintOptions ); - - return; } /// print brochure diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index b8b5eac1853e..640cff74020f 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -2775,7 +2775,6 @@ void WW8PLCFx::GetSprms( WW8PLCFxDesc* p ) p->pMemPos = nullptr; p->nSprmsLen = 0; p->bRealLineEnd = false; - return; } long WW8PLCFx::GetNoSprms( WW8_CP& rStart, WW8_CP& rEnd, sal_Int32& rLen ) diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx index 0d540f0bf39c..353267044110 100644 --- a/toolkit/source/awt/stylesettings.cxx +++ b/toolkit/source/awt/stylesettings.cxx @@ -72,7 +72,6 @@ namespace toolkit EventObject aEvent( *pOwningWindow ); aStyleChangeListeners.notifyEach( &XStyleChangeListener::styleSettingsChanged, aEvent ); - return; } diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 4cad6911abe2..3234e975ab10 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -422,7 +422,6 @@ void SAL_CALL XResultSet_impl::refreshRow() { // get the row from the filesystem - return; } diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 4c3f7899edfd..cd0d4b9e272f 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -430,7 +430,6 @@ FileProvider::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) { - return; } @@ -439,7 +438,6 @@ FileProvider::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) { - return; } void SAL_CALL @@ -447,7 +445,6 @@ FileProvider::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) { - return; } @@ -456,7 +453,6 @@ FileProvider::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) { - return; } diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx index 2b45f65a77d2..0c44afd07f17 100644 --- a/unoxml/source/rdf/CURI.cxx +++ b/unoxml/source/rdf/CURI.cxx @@ -704,7 +704,6 @@ void SAL_CALL CURI::initFromConstant(const sal_Int16 i_Constant) } m_Namespace = OUString::createFromAscii(ns).intern(); m_LocalName = OUString::createFromAscii(ln).intern(); - return; } // css::lang::XInitialization: diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 3747e7df27d0..8d84bab5cec0 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -236,7 +236,6 @@ VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar) } } } - return; } sal_Bool SAL_CALL VbaApplicationBase::getInteractive() diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 713494c640b3..c1570b56855e 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -1415,8 +1415,6 @@ static void GetKern(TrueTypeFont *ttf) badtable: ttf->kerntype = KT_NONE; ttf->kerntables = nullptr; - - return; } /*- Public functions */ @@ -1734,7 +1732,6 @@ void CloseTTFont(TrueTypeFont *ttf) free(ttf->kerntables); free(ttf); - return; } int GetTTGlyphPoints(TrueTypeFont *ttf, sal_uInt32 glyphID, ControlPoint **pointArray) diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index d62ca0ad75bf..0d6570d4dc74 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -397,8 +397,6 @@ GetPreeditSpotLocation(XIC ic, XPointer client_data) preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &point, nullptr); XSetICValues(ic, XNPreeditAttributes, preedit_attr, nullptr); XFree(preedit_attr); - - return; } // iv. preedit caret callback @@ -463,13 +461,11 @@ IsControlCode(sal_Unicode nChar) void StatusStartCallback (XIC, XPointer, XPointer) { - return; } void StatusDoneCallback (XIC, XPointer, XPointer) { - return; } void @@ -513,7 +509,6 @@ StatusDrawCallback (XIC, XPointer, XIMStatusDrawCallbackStruct *call_data) call_data->type == XIMBitmapType ? "XIMBitmapType" : OString::number(call_data->type).getStr() ); } #endif - return; } // vii. destroy callbacks: internally disable all IC/IM calls diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 6b6b1442778a..18eea3f44722 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -680,8 +680,6 @@ void PrintFontManager::addFontconfigDir( const OString& rDirName ) if( !bCfgOk ) fprintf( stderr, "FcConfigParseAndLoad( \"%s\") => %d\n", aConfFileName.getStr(), bCfgOk ); } - - return; } static void addtopattern(FcPattern *pPattern, diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index 84b3cfd56a89..b1df96613a53 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -549,7 +549,6 @@ void PrintFontManager::analyzeSfntFamilyName( void* pTTFont, ::std::list< OUStri if( *it != aFamily ) rNames.push_back( *it ); } - return; } bool PrintFontManager::analyzeSfntFile( PrintFont* pFont ) const diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index 1feccabbd013..4674ae771182 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -537,7 +537,6 @@ void PspSalInfoPrinter::ReleaseGraphics( SalGraphics* pGraphics ) delete pGraphics; m_pGraphics = nullptr; } - return; } bool PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup ) diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index f3c47a661d49..1744dc6e06bc 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -2372,7 +2372,6 @@ void X11SalFrame::SetInputContext( SalInputContext* pContext ) } else mpInputContext->Map( this ); - return; } void X11SalFrame::EndExtTextInput( EndExtTextInputFlags ) diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx index 573a29605207..abaabc83b04d 100644 --- a/xmloff/source/chart/ColorPropertySet.cxx +++ b/xmloff/source/chart/ColorPropertySet.cxx @@ -112,25 +112,21 @@ uno::Any SAL_CALL ColorPropertySet::getPropertyValue( const OUString& /* Propert void SAL_CALL ColorPropertySet::addPropertyChangeListener( const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* xListener */ ) { OSL_FAIL( "Not Implemented" ); - return; } void SAL_CALL ColorPropertySet::removePropertyChangeListener( const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* aListener */ ) { OSL_FAIL( "Not Implemented" ); - return; } void SAL_CALL ColorPropertySet::addVetoableChangeListener( const OUString& /* PropertyName */, const Reference< XVetoableChangeListener >& /* aListener */ ) { OSL_FAIL( "Not Implemented" ); - return; } void SAL_CALL ColorPropertySet::removeVetoableChangeListener( const OUString& /* PropertyName */, const Reference< XVetoableChangeListener >& /* aListener */ ) { OSL_FAIL( "Not Implemented" ); - return; } // ____ XPropertyState ____ |