diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /formula | |
parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'formula')
-rw-r--r-- | formula/source/core/api/FormulaOpCodeMapperObj.cxx | 8 | ||||
-rw-r--r-- | formula/source/core/api/token.cxx | 10 | ||||
-rw-r--r-- | formula/source/core/resource/core_resource.cxx | 6 | ||||
-rw-r--r-- | formula/source/ui/dlg/FormulaHelper.cxx | 10 | ||||
-rw-r--r-- | formula/source/ui/dlg/formula.cxx | 74 | ||||
-rw-r--r-- | formula/source/ui/dlg/funcpage.cxx | 6 | ||||
-rw-r--r-- | formula/source/ui/dlg/structpg.cxx | 2 | ||||
-rw-r--r-- | formula/source/ui/resource/ModuleHelper.cxx | 14 |
8 files changed, 65 insertions, 65 deletions
diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx index 39f522bd872c..f7972622956a 100644 --- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx +++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx @@ -80,17 +80,17 @@ SAL_CALL FormulaOpCodeMapperObj::getAvailableMappings( throw lang::IllegalArgumentException(); return xMap->createSequenceOfAvailableMappings( *m_pCompiler,nGroups); } -//-------------------------------------------------------------------------- + OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName_Static() { return OUString( "simple.formula.FormulaOpCodeMapperObj" ); } -// -------------------------------------------------------------------------------- + uno::Sequence< OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); @@ -110,7 +110,7 @@ uno::Reference< uno::XInterface > SAL_CALL FormulaOpCodeMapperObj::create( } SAL_WNODEPRECATED_DECLARATIONS_POP -// ----------------------------------------------------------------------------- + // ============================================================================= } // formula diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index c66153f6460e..9d40ef9a35b1 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -255,7 +255,7 @@ bool FormulaToken::TextEqual( const FormulaToken& rToken ) const } // ========================================================================== // real implementations of virtual functions -// -------------------------------------------------------------------------- + sal_uInt8 FormulaByteToken::GetByte() const { return nByte; } @@ -1337,10 +1337,10 @@ bool FormulaTokenIterator::IsEndOfPath() const return GetNonEndOfPathToken( pCur->nPC + 1) == NULL; } -// ----------------------------------------------------------------------------- + // ========================================================================== // real implementations of virtual functions -// -------------------------------------------------------------------------- + double FormulaDoubleToken::GetDouble() const { return fDouble; } double & FormulaDoubleToken::GetDoubleAsReference() { return fDouble; } @@ -1451,8 +1451,8 @@ bool FormulaUnknownToken::operator==( const FormulaToken& r ) const return FormulaToken::operator==( r ); } -// ----------------------------------------------------------------------------- + } // formula -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx index 97debb2901f5..36435b18fde6 100644 --- a/formula/source/core/resource/core_resource.cxx +++ b/formula/source/core/resource/core_resource.cxx @@ -42,7 +42,7 @@ namespace formula sal_Int32 ResourceManager::s_nClients = 0; ResMgr* ResourceManager::m_pImpl = NULL; - //------------------------------------------------------------------ + void ResourceManager::ensureImplExists() { if (m_pImpl) @@ -51,14 +51,14 @@ namespace formula m_pImpl = ResMgr::CreateResMgr("for", Application::GetSettings().GetUILanguageTag()); } - //------------------------------------------------------------------------- + void ResourceManager::registerClient() { ::osl::MutexGuard aGuard(theResourceManagerMutex::get()); ++s_nClients; } - //------------------------------------------------------------------------- + void ResourceManager::revokeClient() { ::osl::MutexGuard aGuard(theResourceManagerMutex::get()); diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index 19b0abf96226..6db3c75039a8 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -120,7 +120,7 @@ bool FormulaHelper::GetNextFunc( const OUString& rFormula, return bFound; } -//------------------------------------------------------------------------ + void FormulaHelper::FillArgStrings( const OUString& rFormula, sal_Int32 nFuncPos, @@ -160,7 +160,7 @@ void FormulaHelper::FillArgStrings( const OUString& rFormula, _rArgs.push_back(OUString()); } -//------------------------------------------------------------------------ + void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs, const OUString& rFormula, @@ -173,7 +173,7 @@ void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs, } } -//------------------------------------------------------------------------ + inline sal_Bool IsFormulaText( const CharClass* _pCharClass,const OUString& rStr, sal_Int32 nPos ) { @@ -280,7 +280,7 @@ sal_Int32 FormulaHelper::GetFunctionStart( const OUString& rFormula, return nFStart; } -//------------------------------------------------------------------------ + sal_Int32 FormulaHelper::GetFunctionEnd( const OUString& rStr, sal_Int32 nStart ) const { @@ -338,7 +338,7 @@ sal_Int32 FormulaHelper::GetFunctionEnd( const OUString& rStr, sal_Int32 nStart return nStart; } -//------------------------------------------------------------------ + sal_Int32 FormulaHelper::GetArgStart( const OUString& rStr, sal_Int32 nStart, sal_uInt16 nArg ) const { diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 1fb3bb14918b..085242f42b6e 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -383,7 +383,7 @@ void FormulaDlg_Impl::StoreFormEditData(FormEditData* pData) } } -// ----------------------------------------------------------------------------- + void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt ) { sal_uInt16 nSwitch=rNEvt.GetType(); @@ -460,7 +460,7 @@ namespace } }; } -// ----------------------------------------------------------------------------- + sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos) { if ( !m_aTokenList.hasElements() ) @@ -570,7 +570,7 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos) return nFuncPos; } -// ----------------------------------------------------------------------------- + sal_Bool FormulaDlg_Impl::CalcValue( const OUString& rStrExp, OUString& rStrResult ) { sal_Bool bResult = sal_True; @@ -646,7 +646,7 @@ sal_Bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp) return bResult; } -// ----------------------------------------------------------------------------- + void FormulaDlg_Impl::MakeTree(IStructHelper* _pTree,SvTreeListEntry* pParent,FormulaToken* _pToken,long Count) { if( _pToken != NULL && Count > 0 ) @@ -780,7 +780,7 @@ void FormulaDlg_Impl::FillDialog(sal_Bool nFlag) } } -// ----------------------------------------------------------------------------- + void FormulaDlg_Impl::FillListboxes() { // Switch between the "Pages" @@ -811,7 +811,7 @@ void FormulaDlg_Impl::FillListboxes() m_pParent->SetHelpId( aOldHelp ); m_pParent->SetUniqueId( aOldUnique ); } -// ----------------------------------------------------------------------------- + void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev) { // Switch between the "Pages" @@ -910,7 +910,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev) pData->SetFStart(nTempStart); rbPrev = m_aFormulaHelper.GetNextFunc( aFormula, true, nTempStart ); } -// ----------------------------------------------------------------------------- + void FormulaDlg_Impl::ClearAllParas() { @@ -978,7 +978,7 @@ void FormulaDlg_Impl::DoEnter(bool bOk) // Close dialog m_pHelper->doClose(bOk); } -// ----------------------------------------------------------------------------- + IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn ) { @@ -1014,14 +1014,14 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn ) return 0; } -// ----------------------------------------------------------------------------- + // -------------------------------------------------------------------------- // Functions for 1. Page // -------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + // Handler for Listboxes @@ -1056,7 +1056,7 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, DblClkHdl) return 0; } -// ----------------------------------------------------------------------------- + // -------------------------------------------------------------------------- // Functions for right Page @@ -1086,7 +1086,7 @@ void FormulaDlg_Impl::SetData(sal_Int32 nFStart, sal_Int32 nNextFStart, sal_Int3 FillDialog(); } -// ----------------------------------------------------------------------------- + void FormulaDlg_Impl::EditThisFunc(sal_Int32 nFStart) { FormEditData* pData = m_pHelper->getFormEditData(); @@ -1581,9 +1581,9 @@ void FormulaDlg_Impl::UpdateParaWin(const Selection& _rSelection, const OUString theSel.Max() = theSel.Min() + _sRefStr.getLength(); aEdRef.SetSelection( theSel ); - //------------------------------------- + // Manual Update of the results' fields: - //------------------------------------- + sal_uInt16 nPrivActiv = pParaWin->GetActiveLine(); pParaWin->SetArgument(nPrivActiv,aEdRef.GetText()); pParaWin->UpdateParas(); @@ -1630,7 +1630,7 @@ void FormulaDlg_Impl::SetEdSelection() pEd->SetSelection(theSel); } // if( pEd ) } -// ----------------------------------------------------------------------------- + const FormulaHelper& FormulaDlg_Impl::GetFormulaHelper() const { return m_aFormulaHelper; @@ -1654,24 +1654,24 @@ FormulaModalDialog::FormulaModalDialog( Window* pParent FormulaModalDialog::~FormulaModalDialog() { } -// ----------------------------------------------------------------------------- + void FormulaModalDialog::Update(const OUString& _sExp) { m_pImpl->Update(_sExp); } -// ----------------------------------------------------------------------------- + void FormulaModalDialog::SetMeText(const OUString& _sText) { m_pImpl->SetMeText(_sText); } -// ----------------------------------------------------------------------------- + bool FormulaModalDialog::CheckMatrix(OUString& aFormula) { return m_pImpl->CheckMatrix(aFormula); } -// ----------------------------------------------------------------------------- + void FormulaModalDialog::Update() { m_pImpl->Update(); @@ -1743,39 +1743,39 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, FormulaDlg::~FormulaDlg() { } -// ----------------------------------------------------------------------------- + void FormulaDlg::Update(const OUString& _sExp) { m_pImpl->Update(_sExp); } -// ----------------------------------------------------------------------------- + void FormulaDlg::SetMeText(const OUString& _sText) { m_pImpl->SetMeText(_sText); } -// ----------------------------------------------------------------------------- + FormulaDlgMode FormulaDlg::SetMeText(const OUString& _sText, sal_Int32 PrivStart, sal_Int32 PrivEnd, bool bMatrix, bool _bSelect, bool _bUpdate) { return m_pImpl->SetMeText(_sText,PrivStart, PrivEnd,bMatrix,_bSelect,_bUpdate); } -// ----------------------------------------------------------------------------- + void FormulaDlg::CheckMatrix() { m_pImpl->aBtnMatrix.Check(); } -// ----------------------------------------------------------------------------- + bool FormulaDlg::CheckMatrix(OUString& aFormula) { return m_pImpl->CheckMatrix(aFormula); } -// ----------------------------------------------------------------------------- + OUString FormulaDlg::GetMeText() const { return m_pImpl->pMEdit->GetText(); } -// ----------------------------------------------------------------------------- + void FormulaDlg::Update() { m_pImpl->Update(); @@ -1836,13 +1836,13 @@ void FormulaDlg::StoreFormEditData(FormEditData* pData) m_pImpl->StoreFormEditData(pData); } -// ----------------------------------------------------------------------------- + const IFunctionDescription* FormulaDlg::getCurrentFunctionDescription() const { OSL_VERIFY(!m_pImpl->pFuncDesc || m_pImpl->pFuncDesc->getSuppressedArgumentCount() == m_pImpl->nArgs); return m_pImpl->pFuncDesc; } -// ----------------------------------------------------------------------------- + void FormulaDlg::UpdateParaWin(const Selection& _rSelection,const OUString& _sRefStr) { m_pImpl->UpdateParaWin(_rSelection,_sRefStr); @@ -1851,17 +1851,17 @@ bool FormulaDlg::UpdateParaWin(Selection& _rSelection) { return m_pImpl->UpdateParaWin(_rSelection); } -// ----------------------------------------------------------------------------- + RefEdit* FormulaDlg::GetActiveEdit() { return m_pImpl->pParaWin->GetActiveEdit(); } -// ----------------------------------------------------------------------------- + const FormulaHelper& FormulaDlg::GetFormulaHelper() const { return m_pImpl->GetFormulaHelper(); } -// ----------------------------------------------------------------------------- + void FormulaDlg::SetEdSelection() { m_pImpl->SetEdSelection(); @@ -1879,7 +1879,7 @@ IMPL_LINK_NOARG(FormulaDlg, UpdateFocusHdl) return 0; } -// ----------------------------------------------------------------------------- + void FormEditData::SaveValues() { FormEditData* pTemp = new FormEditData(*this); @@ -1887,7 +1887,7 @@ void FormEditData::SaveValues() Reset(); pParent = pTemp; } -// ----------------------------------------------------------------------------- + void FormEditData::Reset() { pParent = NULL; @@ -1903,7 +1903,7 @@ void FormEditData::Reset() aSelection.Max()=0; aUndoStr = ""; } -// ----------------------------------------------------------------------------- + const FormEditData& FormEditData::operator=( const FormEditData& r ) { pParent = r.pParent; @@ -1919,7 +1919,7 @@ const FormEditData& FormEditData::operator=( const FormEditData& r ) aSelection = r.aSelection; return *this; } -// ----------------------------------------------------------------------------- + FormEditData::FormEditData() { Reset(); @@ -1935,8 +1935,8 @@ FormEditData::FormEditData( const FormEditData& r ) *this = r; } -// ----------------------------------------------------------------------------- + } // formula -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 6b4c49d97066..b73556ecf408 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -99,7 +99,7 @@ FuncPage::FuncPage(Window* pParent,const IFunctionManager* _pFunctionManager): aLbFunction.SetSelectHdl( LINK( this, FuncPage, SelHdl ) ); aLbFunction.SetDoubleClickHdl( LINK( this, FuncPage, DblClkHdl ) ); } -// ----------------------------------------------------------------------------- + void FuncPage::impl_addFunctions(const IFunctionCategory* _pCategory) { const sal_uInt32 nCount = _pCategory->getCount(); @@ -122,7 +122,7 @@ void FuncPage::UpdateFunctionList() aLbFunction.Clear(); aLbFunction.SetUpdateMode( false ); - //------------------------------------------------------ + if ( nSelPos > 0 ) { @@ -155,7 +155,7 @@ void FuncPage::UpdateFunctionList() } } - //------------------------------------------------------ + aLbFunction.SetUpdateMode( true ); aLbFunction.SelectEntryPos(0); diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index 81bb9f50244a..5928a4dc249c 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -29,7 +29,7 @@ #include "formula/IFunctionDescription.hxx" #include "ForResId.hrc" -//---------------------------------------------------------------------------- + namespace formula { StructListBox::StructListBox(Window* pParent, const ResId& rResId ): diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx index ec6f68b20622..6b360d0fa77a 100644 --- a/formula/source/ui/resource/ModuleHelper.cxx +++ b/formula/source/ui/resource/ModuleHelper.cxx @@ -55,7 +55,7 @@ public: }; DBG_NAME( rpt_OModuleImpl ) -//------------------------------------------------------------------------- + OModuleImpl::OModuleImpl() :m_pResources(NULL) { @@ -63,7 +63,7 @@ OModuleImpl::OModuleImpl() } -//------------------------------------------------------------------------- + OModuleImpl::~OModuleImpl() { if (m_pResources) @@ -72,7 +72,7 @@ OModuleImpl::~OModuleImpl() DBG_DTOR( rpt_OModuleImpl,NULL); } -//------------------------------------------------------------------------- + ResMgr* OModuleImpl::getResManager() { // note that this method is not threadsafe, which counts for the whole class ! @@ -95,21 +95,21 @@ namespace } sal_Int32 OModule::s_nClients = 0; OModuleImpl* OModule::s_pImpl = NULL; -//------------------------------------------------------------------------- + ResMgr* OModule::getResManager() { ENTER_MOD_METHOD(); return s_pImpl->getResManager(); } -//------------------------------------------------------------------------- + void OModule::registerClient() { ::osl::MutexGuard aGuard(theOModuleMutex::get()); ++s_nClients; } -//------------------------------------------------------------------------- + void OModule::revokeClient() { ::osl::MutexGuard aGuard(theOModuleMutex::get()); @@ -120,7 +120,7 @@ void OModule::revokeClient() } } -//------------------------------------------------------------------------- + void OModule::ensureImpl() { if (s_pImpl) |