summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2012-01-19 19:14:49 +0100
committerThomas Arnhold <thomas@arnhold.org>2012-01-19 19:15:08 +0100
commitd93536e52943c910936504e531956f04d9c0503f (patch)
treec3f8265e2544c8fac4f35abd59ded537e1aaa704 /formula
parent3e7151db8d6ffe1688f2b3c68dbc0741fe953cdc (diff)
remove unused methods
Diffstat (limited to 'formula')
-rw-r--r--formula/inc/formula/formdata.hxx1
-rw-r--r--formula/inc/formula/formula.hxx1
-rw-r--r--formula/inc/formula/token.hxx2
-rw-r--r--formula/inc/formula/tokenarray.hxx2
-rw-r--r--formula/source/core/api/token.cxx29
-rw-r--r--formula/source/core/resource/core_resource.cxx7
-rw-r--r--formula/source/ui/dlg/formula.cxx151
-rw-r--r--formula/source/ui/dlg/funcutl.cxx21
-rw-r--r--formula/source/ui/dlg/structpg.cxx10
-rw-r--r--formula/source/ui/dlg/structpg.hxx3
10 files changed, 0 insertions, 227 deletions
diff --git a/formula/inc/formula/formdata.hxx b/formula/inc/formula/formdata.hxx
index b8540a7ecfc1..b4099ed75429 100644
--- a/formula/inc/formula/formdata.hxx
+++ b/formula/inc/formula/formdata.hxx
@@ -43,7 +43,6 @@ public:
virtual ~FormEditData();
virtual void SaveValues();
- void RestoreValues();
sal_Bool HasParent() const { return pParent != NULL; }
inline sal_uInt16 GetMode() const { return nMode; }
diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx
index e846ae89e0a6..25f2ad863cf6 100644
--- a/formula/inc/formula/formula.hxx
+++ b/formula/inc/formula/formula.hxx
@@ -116,7 +116,6 @@ protected:
::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL );
void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL );
void RefInputDoneAfter( sal_Bool bForced = sal_False );
- rtl::OString FindFocusWin(Window *pWin);
void SetFocusWin(Window *pWin,const rtl::OString& nUniqueId);
void HighlightFunctionParas(const String& aFormula);
diff --git a/formula/inc/formula/token.hxx b/formula/inc/formula/token.hxx
index 738caa1a63dd..af3d57397226 100644
--- a/formula/inc/formula/token.hxx
+++ b/formula/inc/formula/token.hxx
@@ -114,7 +114,6 @@ public:
inline void Delete() { delete this; }
inline StackVar GetType() const { return eType; }
bool IsFunction() const; // pure functions, no operators
- bool IsMatrixFunction() const; // if a function _always_ returns a Matrix
bool IsExternalRef() const;
sal_uInt8 GetParamCount() const;
inline void IncRef() const { nRefCnt++; }
@@ -392,7 +391,6 @@ public:
virtual ~FormulaSubroutineToken();
virtual FormulaToken* Clone() const { return new FormulaSubroutineToken(*this); }
virtual bool operator==( const FormulaToken& rToken ) const;
- const FormulaTokenArray* GetTokenArray() const;
private:
const FormulaTokenArray* mpArray;
diff --git a/formula/inc/formula/tokenarray.hxx b/formula/inc/formula/tokenarray.hxx
index 3947ed5987dd..8b217a26453f 100644
--- a/formula/inc/formula/tokenarray.hxx
+++ b/formula/inc/formula/tokenarray.hxx
@@ -111,7 +111,6 @@ public:
FormulaToken* FirstNoSpaces() { nIndex = 0; return NextNoSpaces(); }
FormulaToken* NextNoSpaces();
FormulaToken* GetNextName();
- FormulaToken* GetNextDBArea();
FormulaToken* GetNextReference();
FormulaToken* GetNextReferenceRPN();
FormulaToken* GetNextReferenceOrName();
@@ -207,7 +206,6 @@ public:
FormulaToken* AddString( const sal_Unicode* pStr );
FormulaToken* AddString( const String& rStr );
FormulaToken* AddDouble( double fVal );
- FormulaToken* AddName( sal_uInt16 n );
FormulaToken* AddExternal( const sal_Unicode* pStr );
/** Xcl import may play dirty tricks with OpCode!=ocExternal.
Others don't use! */
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 8dab7d7474d0..ca0186e3f688 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -125,12 +125,6 @@ sal_uInt8 FormulaToken::GetParamCount() const
// if so then it should be in cByte
}
-
-bool FormulaToken::IsMatrixFunction() const
-{
- return formula::FormulaCompiler::IsMatrixFunction(GetOpCode());
-}
-
bool FormulaToken::IsExternalRef() const
{
bool bRet = false;
@@ -443,20 +437,6 @@ FormulaToken* FormulaTokenArray::GetNextName()
return NULL;
}
-FormulaToken* FormulaTokenArray::GetNextDBArea()
-{
- if( pCode )
- {
- while ( nIndex < nLen )
- {
- FormulaToken* t = pCode[ nIndex++ ];
- if( t->GetOpCode() == ocDBArea )
- return t;
- } // while ( nIndex < nLen )+
- }
- return NULL;
-}
-
FormulaToken* FormulaTokenArray::GetNextOpCodeRPN( OpCode eOp )
{
while( nIndex < nRPN )
@@ -782,11 +762,6 @@ FormulaToken* FormulaTokenArray::AddDouble( double fVal )
return Add( new FormulaDoubleToken( fVal ) );
}
-FormulaToken* FormulaTokenArray::AddName( sal_uInt16 n )
-{
- return Add( new FormulaIndexToken( ocName, n ) );
-}
-
FormulaToken* FormulaTokenArray::AddExternal( const sal_Unicode* pStr )
{
return AddExternal( String( pStr ) );
@@ -1409,10 +1384,6 @@ FormulaSubroutineToken::~FormulaSubroutineToken()
{
delete mpArray;
}
-const FormulaTokenArray* FormulaSubroutineToken::GetTokenArray() const
-{
- return mpArray;
-}
bool FormulaSubroutineToken::operator==( const FormulaToken& r ) const
{
// Arrays don't equal..
diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx
index a8c068dac807..139d52aa98b8 100644
--- a/formula/source/core/resource/core_resource.cxx
+++ b/formula/source/core/resource/core_resource.cxx
@@ -68,13 +68,6 @@ namespace formula
return sReturn;
}
- //------------------------------------------------------------------
- ::rtl::OUString ResourceManager::loadString( sal_uInt16 _nResId, const sal_Char* _pPlaceholderAscii, const ::rtl::OUString& _rReplace )
- {
- String sString( loadString( _nResId ) );
- sString.SearchAndReplaceAscii( _pPlaceholderAscii, _rReplace );
- return sString;
- }
//-------------------------------------------------------------------------
void ResourceManager::registerClient()
{
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index a64242e2b2ad..685b42feeded 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -26,8 +26,6 @@
*
************************************************************************/
-
-//----------------------------------------------------------------------------
#include <sfx2/dispatch.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/viewfrm.hxx>
@@ -113,18 +111,14 @@ namespace formula
void FillDialog(sal_Bool nFlag=sal_True);
void EditNextFunc( sal_Bool bForward, xub_StrLen nFStart=NOT_FOUND );
void EditThisFunc(xub_StrLen nFStart);
- void EditFuncParas(xub_StrLen nEditPos);
-
void UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 nInput );
void Update();
void Update(const String& _sExp);
-
void SaveArg( sal_uInt16 nEd );
void UpdateSelection();
void DoEnter( sal_Bool bOk );
- void UpdateFunctionDesc();
void ResizeArgArr( const IFunctionDescription* pNewFunc );
void FillListboxes();
void FillControls(sal_Bool &rbNext, sal_Bool &rbPrev);
@@ -142,7 +136,6 @@ namespace formula
void PreNotify( NotifyEvent& rNEvt );
RefEdit* GetCurrRefEdit();
- rtl::OString FindFocusWin(Window *pWin);
const FormulaHelper& GetFormulaHelper() const;
uno::Reference< sheet::XFormulaOpCodeMapper > GetFormulaOpCodeMapper() const;
@@ -813,9 +806,6 @@ void FormulaDlg_Impl::FillListboxes()
}
FuncSelHdl(NULL);
- // ResizeArgArr is now already in UpdateFunctionDesc
-
-
m_pHelper->setDispatcherLock( sal_True );// Activate Modal-Mode
aNewTitle = aTitle1;
@@ -1050,48 +1040,6 @@ void FormulaDlg_Impl::ResizeArgArr( const IFunctionDescription* pNewFunc )
}
// -----------------------------------------------------------------------------
-void FormulaDlg_Impl::UpdateFunctionDesc()
-{
- FormEditData* pData = m_pHelper->getFormEditData();
- if (!pData)
- return;
- sal_uInt16 nCat = pFuncPage->GetCategory();
- if ( nCat == LISTBOX_ENTRY_NOTFOUND )
- nCat = 0;
- pData->SetCatSel( nCat );
- sal_uInt16 nFunc = pFuncPage->GetFunction();
- if ( nFunc == LISTBOX_ENTRY_NOTFOUND )
- nFunc = 0;
- pData->SetFuncSel( nFunc );
-
- if ( (pFuncPage->GetFunctionEntryCount() > 0)
- && (pFuncPage->GetFunction() != LISTBOX_ENTRY_NOTFOUND) )
- {
- const IFunctionDescription* pDesc = pFuncPage->GetFuncDesc(pFuncPage->GetFunction() );
- if (pDesc)
- {
- pDesc->initArgumentInfo(); // full argument info is needed
-
- String aSig = pDesc->getSignature();
-
- aFtFuncName.SetText( aSig );
- aFtFuncDesc.SetText( pDesc->getDescription() );
- ResizeArgArr( pDesc );
-
- if ( !m_aArguments.empty() ) // still arguments there?
- aSig = pDesc->getFormula( m_aArguments ); // for input line
- }
- }
- else
- {
- aFtFuncName.SetText( String() );
- aFtFuncDesc.SetText( String() );
-
- m_pHelper->setCurrentFormula( String() );
- }
-}
-// -----------------------------------------------------------------------------
-
// Handler for Listboxes
IMPL_LINK( FormulaDlg_Impl, DblClkHdl, FuncPage*, EMPTYARG )
@@ -1230,51 +1178,6 @@ void FormulaDlg_Impl::EditNextFunc( sal_Bool bForward, xub_StrLen nFStart )
}
}
-void FormulaDlg_Impl::EditFuncParas(xub_StrLen nEditPos)
-{
- if(pFuncDesc!=NULL)
- {
- FormEditData* pData = m_pHelper->getFormEditData();
- if (!pData) return;
-
- String aFormula = m_pHelper->getCurrentFormula();
- aFormula +=')';
- xub_StrLen nFStart = pData->GetFStart();
-
- DeleteArgs();
-
- nArgs = pFuncDesc->getSuppressedArgumentCount();
-
- sal_Int32 nArgPos=m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 );
- m_aFormulaHelper.GetArgStrings(m_aArguments,aFormula, nFStart, nArgs );
-
- sal_uInt16 nActiv=pParaWin->GetSliderPos();
- sal_Bool bFlag=sal_False;
- ::std::vector< ::rtl::OUString >::iterator aIter = m_aArguments.begin();
- ::std::vector< ::rtl::OUString >::iterator aEnd = m_aArguments.end();
- for(sal_uInt16 i=0;aIter != aEnd;i++,++aIter)
- {
- sal_Int32 nLength=(*aIter).getLength();
- pParaWin->SetArgument(i,(*aIter));
- if(nArgPos<=nEditPos && nEditPos<nArgPos+nLength)
- {
- nActiv=i;
- bFlag=sal_True;
- }
- nArgPos+=nLength+1;
- }
-
- if(bFlag)
- {
- pParaWin->SetSliderPos(nActiv);
- }
-
- pParaWin->UpdateParas();
- UpdateValues();
- }
-
-}
-
void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd )
{
if (nEd<nArgs)
@@ -1736,38 +1639,6 @@ sal_Bool FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection)
}
return pTheRefEdit == NULL;
}
-rtl::OString FormulaDlg_Impl::FindFocusWin(Window *pWin)
-{
- rtl::OString aUniqueId;
- if(pWin->HasFocus())
- {
- aUniqueId=pWin->GetUniqueId();
- if(aUniqueId.isEmpty())
- {
- Window* pParent=pWin->GetParent();
- while(pParent!=NULL)
- {
- aUniqueId=pParent->GetUniqueId();
-
- if(!aUniqueId.isEmpty()) break;
-
- pParent=pParent->GetParent();
- }
- }
- }
- else
- {
- sal_uInt16 nCount=pWin->GetChildCount();
-
- for(sal_uInt16 i=0;i<nCount;i++)
- {
- Window* pChild=pWin->GetChild(i);
- aUniqueId=FindFocusWin(pChild);
- if(!aUniqueId.isEmpty()) break;
- }
- }
- return aUniqueId;
-}
void FormulaDlg_Impl::SetEdSelection()
{
@@ -1955,11 +1826,6 @@ void FormulaDlg::RefInputDoneAfter( sal_Bool bForced )
m_pImpl->RefInputDoneAfter( bForced );
}
-rtl::OString FormulaDlg::FindFocusWin(Window *pWin)
-{
- return m_pImpl->FindFocusWin( pWin );
-}
-
void FormulaDlg::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId)
{
if(pWin->GetUniqueId()==nUniqueId)
@@ -1985,11 +1851,6 @@ long FormulaDlg::PreNotify( NotifyEvent& rNEvt )
return SfxModelessDialog::PreNotify(rNEvt);
}
-void FormulaDlg::HighlightFunctionParas(const String& aFormula)
-{
- m_pImpl->m_pHelper->showReference(aFormula);
-}
-
void FormulaDlg::disableOk()
{
m_pImpl->aBtnEnd.Disable();
@@ -2062,18 +1923,6 @@ void FormEditData::Reset()
aUndoStr.Erase();
}
// -----------------------------------------------------------------------------
-void FormEditData::RestoreValues()
-{
- FormEditData* pTemp = pParent;
- DBG_ASSERT(pTemp,"RestoreValues ohne Parent");
- if (pTemp)
- {
- *this = *pTemp;
- pTemp->pParent = NULL; // otherwise it would be cleared too!
- delete pTemp;
- }
-}
-// -----------------------------------------------------------------------------
const FormEditData& FormEditData::operator=( const FormEditData& r )
{
pParent = r.pParent;
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 1a8192ccc953..d13a4b6dd62a 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -307,7 +307,6 @@ String ArgInput::GetArgName()
return aPrivArgName;
}
-
/*************************************************************************
#* Member: SetArgName Date:13.01.97
#*------------------------------------------------------------------------
@@ -365,26 +364,6 @@ Selection ArgInput::GetArgSelection ()
}
/*************************************************************************
-#* Member: SetArgSelection Date:13.01.97
-#*------------------------------------------------------------------------
-#*
-#* Class: ArgInput
-#*
-#* Function: Replaces the Selection in the EditBox.
-#*
-#* Input: String
-#*
-#* Output: ---
-#*
-#************************************************************************/
-void ArgInput::ReplaceSelOfArg(const String& rStr )
-{
- if(pEdArg !=NULL) pEdArg ->ReplaceSelected(rStr );
-}
-
-
-
-/*************************************************************************
#* Member: SetArgVal Date:13.01.97
#*------------------------------------------------------------------------
#*
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index ffdba3587d2a..21b1bb88e46d 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -203,16 +203,6 @@ IMPL_LINK( StructPage, SelectHdl, SvTreeListBox*, pTlb )
return 0;
}
-IFormulaToken* StructPage::GetSelectedToken()
-{
- return pSelectedToken;
-}
-
-String StructPage::GetSelectedEntryText()
-{
- return aTlbStruct.GetEntryText(aTlbStruct.GetCurEntry());
-}
-
} // formula
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index 3cceca618205..8ae7715f9f76 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -108,9 +108,6 @@ public:
virtual String GetEntryText(SvLBoxEntry* pEntry) const;
virtual SvLBoxEntry* GetParent(SvLBoxEntry* pEntry) const;
- String GetSelectedEntryText();
- IFormulaToken* GetSelectedToken();
-
void SetSelectionHdl( const Link& rLink ) { aSelLink = rLink; }
const Link& GetSelectionHdl() const { return aSelLink; }
};