summaryrefslogtreecommitdiff
path: root/formula/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'formula/source/ui')
-rw-r--r--formula/source/ui/dlg/FormulaHelper.cxx6
-rw-r--r--formula/source/ui/dlg/formula.cxx40
-rw-r--r--formula/source/ui/dlg/funcpage.cxx2
-rw-r--r--formula/source/ui/dlg/funcutl.cxx28
-rw-r--r--formula/source/ui/dlg/parawin.cxx8
-rw-r--r--formula/source/ui/dlg/structpg.cxx16
-rw-r--r--formula/source/ui/dlg/structpg.hxx6
-rw-r--r--formula/source/ui/resource/ModuleHelper.cxx6
8 files changed, 56 insertions, 56 deletions
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index bde6ca837f0f..1e296f710709 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -36,7 +36,7 @@ namespace formula
virtual ~OEmptyFunctionDescription(){}
virtual OUString getFunctionName() const override { return OUString(); }
- virtual const IFunctionCategory* getCategory() const override { return NULL; }
+ virtual const IFunctionCategory* getCategory() const override { return nullptr; }
virtual OUString getDescription() const override { return OUString(); }
virtual sal_Int32 getSuppressedArgumentCount() const override { return 0; }
virtual OUString getFormula(const ::std::vector< OUString >& ) const override { return OUString(); }
@@ -78,7 +78,7 @@ bool FormulaHelper::GetNextFunc( const OUString& rFormula,
sal_Int32 nOldStart = rFStart;
OUString aFname;
- rFStart = GetFunctionStart( rFormula, rFStart, bBack, ppFDesc ? &aFname : NULL );
+ rFStart = GetFunctionStart( rFormula, rFStart, bBack, ppFDesc ? &aFname : nullptr );
bool bFound = ( rFStart != FUNC_NOTFOUND );
if ( bFound )
@@ -88,7 +88,7 @@ bool FormulaHelper::GetNextFunc( const OUString& rFormula,
if ( ppFDesc )
{
- *ppFDesc = NULL;
+ *ppFDesc = nullptr;
const OUString sTemp( aFname );
const sal_uInt32 nCategoryCount = m_pFunctionManager->getCount();
for(sal_uInt32 j= 0; j < nCategoryCount && !*ppFDesc; ++j)
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 0af8a12d73aa..0d3fbbc95c4f 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -227,16 +227,16 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
,const IFunctionManager* _pFunctionMgr
,IControlReferenceHandler* _pDlg)
:
- m_pSpecialOpCodesEnd(NULL),
- m_pFunctionOpCodesEnd(NULL),
- m_pUnaryOpCodesEnd(NULL),
- m_pBinaryOpCodesEnd(NULL),
+ m_pSpecialOpCodesEnd(nullptr),
+ m_pFunctionOpCodesEnd(nullptr),
+ m_pUnaryOpCodesEnd(nullptr),
+ m_pBinaryOpCodesEnd(nullptr),
m_pHelper (_pHelper),
m_pParent (pParent),
m_pDlg (_pDlg),
- pTheRefEdit (NULL),
- pTheRefButton (NULL),
- pMEdit (NULL),
+ pTheRefEdit (nullptr),
+ pTheRefButton (nullptr),
+ pMEdit (nullptr),
bUserMatrixFlag (false),
aTitle1 ( ModuleRes( STR_TITLE1 ) ),
aTitle2 ( ModuleRes( STR_TITLE2 ) ),
@@ -245,7 +245,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
bIsShutDown (false),
bMakingTree (false),
nEdFocus (0),
- pFuncDesc (NULL),
+ pFuncDesc (nullptr),
nArgs (0)
{
pParent->get(m_pParaWinBox, "BOX");
@@ -394,13 +394,13 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt )
if(nSwitch==MouseNotifyEvent::GETFOCUS && !bIsShutDown)
{
vcl::Window* pWin=rNEvt.GetWindow();
- if(pWin!=NULL)
+ if(pWin!=nullptr)
{
aActivWinId = pWin->GetUniqueId();
if(aActivWinId.isEmpty())
{
vcl::Window* pParent=pWin->GetParent();
- while(pParent!=NULL)
+ while(pParent!=nullptr)
{
aActivWinId=pParent->GetUniqueId();
@@ -646,7 +646,7 @@ bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp)
void FormulaDlg_Impl::MakeTree(StructPage* _pTree,SvTreeListEntry* pParent,FormulaToken* _pToken,long Count)
{
- if( _pToken != NULL && Count > 0 )
+ if( _pToken != nullptr && Count > 0 )
{
long nParas = _pToken->GetParamCount();
OpCode eOp = _pToken->GetOpCode();
@@ -762,9 +762,9 @@ void FormulaDlg_Impl::fillTree(StructPage* _pTree)
GetFormulaOpCodeMapper();
FormulaToken* pToken = m_pTokenArray->LastRPN();
- if( pToken != NULL)
+ if( pToken != nullptr)
{
- MakeTree(_pTree,NULL,pToken,1);
+ MakeTree(_pTree,nullptr,pToken,1);
bMakingTree = false;
}
}
@@ -958,7 +958,7 @@ void FormulaDlg_Impl::FillControls(bool &rbNext, bool &rbPrev)
void FormulaDlg_Impl::ClearAllParas()
{
DeleteArgs();
- pFuncDesc = NULL;
+ pFuncDesc = nullptr;
pParaWin->ClearAll();
m_pWndResult->SetText(OUString());
m_pFtFuncName->SetText(OUString());
@@ -1452,10 +1452,10 @@ void FormulaDlg_Impl::UpdateSelection()
m_pEdRef->SetUniqueId( pTheRefEdit->GetUniqueId() );
}
- m_pRefBtn->Show( pButton != NULL );
+ m_pRefBtn->Show( pButton != nullptr );
::std::pair<RefButton*,RefEdit*> aPair;
- aPair.first = pButton ? m_pRefBtn.get() : NULL;
+ aPair.first = pButton ? m_pRefBtn.get() : nullptr;
aPair.second = m_pEdRef;
return aPair;
}
@@ -1495,7 +1495,7 @@ void FormulaDlg_Impl::RefInputDoneAfter( bool bForced )
sal_uInt16 nPrivActiv = pParaWin->GetActiveLine();
pParaWin->SetArgument( nPrivActiv, m_pEdRef->GetText() );
ModifyHdl( *pParaWin );
- pTheRefEdit = NULL;
+ pTheRefEdit = nullptr;
}
m_pParent->SetText( aTitle1 );
}
@@ -1622,7 +1622,7 @@ void FormulaDlg_Impl::UpdateParaWin(const Selection& _rSelection, const OUString
pParaWin->UpdateParas();
Edit* pEd = GetCurrRefEdit();
- if( pEd != NULL )
+ if( pEd != nullptr )
pEd->SetSelection( theSel );
pParaWin->SetRefMode(false);
@@ -1633,7 +1633,7 @@ bool FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection)
OUString aStrEd;
Edit* pEd = GetCurrRefEdit();
- if(pEd!=NULL && pTheRefEdit==nullptr)
+ if(pEd!=nullptr && pTheRefEdit==nullptr)
{
_rSelection=pEd->GetSelection();
_rSelection.Justify();
@@ -1921,7 +1921,7 @@ void FormEditData::SaveValues()
void FormEditData::Reset()
{
- pParent = NULL;
+ pParent = nullptr;
nMode = 0;
nFStart = 0;
nCatSel = 1; //! oder 0 (zuletzt benutzte)
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 58d6461d171c..42a2b351a81d 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -124,7 +124,7 @@ void FuncPage::UpdateFunctionList()
if ( nSelPos > 0 )
{
- if ( pCategory == NULL )
+ if ( pCategory == nullptr )
{
const sal_uInt32 nCount = m_pFunctionManager->getCount();
for(sal_uInt32 i = 0 ; i < nCount; ++i)
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 15275820983c..2d49d982b0f5 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -35,10 +35,10 @@ namespace formula
// class ArgEdit
ArgEdit::ArgEdit( vcl::Window* pParent, WinBits nBits )
- : RefEdit( pParent, NULL, nBits ),
- pEdPrev ( NULL ),
- pEdNext ( NULL ),
- pSlider ( NULL ),
+ : RefEdit( pParent, nullptr, nBits ),
+ pEdPrev ( nullptr ),
+ pEdNext ( nullptr ),
+ pSlider ( nullptr ),
nArgs ( 0 )
{
}
@@ -80,7 +80,7 @@ void ArgEdit::KeyInput( const KeyEvent& rKEvt )
{
if ( nArgs > 1 )
{
- ArgEdit* pEd = NULL;
+ ArgEdit* pEd = nullptr;
long nThumb = pSlider->GetThumbPos();
bool bDoScroll = false;
bool bChangeFocus = false;
@@ -146,10 +146,10 @@ void ArgEdit::KeyInput( const KeyEvent& rKEvt )
// class ArgInput
ArgInput::ArgInput()
{
- pFtArg=NULL;
- pBtnFx=NULL;
- pEdArg=NULL;
- pRefBtn=NULL;
+ pFtArg=nullptr;
+ pBtnFx=nullptr;
+ pEdArg=nullptr;
+ pRefBtn=nullptr;
}
void ArgInput::InitArgInput( FixedText* pftArg, PushButton* pbtnFx,
@@ -383,7 +383,7 @@ bool EditBox::PreNotify( NotifyEvent& rNEvt )
else
{
bResult=Control::PreNotify(rNEvt);
- Application::PostUserEvent( LINK( this, EditBox, ChangedHdl ), NULL, true );
+ Application::PostUserEvent( LINK( this, EditBox, ChangedHdl ), nullptr, true );
}
}
@@ -394,7 +394,7 @@ bool EditBox::PreNotify( NotifyEvent& rNEvt )
if(nSwitch==MouseNotifyEvent::MOUSEBUTTONDOWN || nSwitch==MouseNotifyEvent::MOUSEBUTTONUP)
{
bMouseFlag=true;
- Application::PostUserEvent( LINK( this, EditBox, ChangedHdl ), NULL, true );
+ Application::PostUserEvent( LINK( this, EditBox, ChangedHdl ), nullptr, true );
}
}
return bResult;
@@ -429,7 +429,7 @@ void EditBox::UpdateOldSel()
RefEdit::RefEdit( vcl::Window* _pParent, vcl::Window* pShrinkModeLabel, WinBits nStyle )
: Edit( _pParent, nStyle )
- , pAnyRefDlg( NULL )
+ , pAnyRefDlg( nullptr )
, pLabelWidget(pShrinkModeLabel)
{
aIdle.SetIdleHdl( LINK( this, RefEdit, UpdateHdl ) );
@@ -563,8 +563,8 @@ RefButton::RefButton( vcl::Window* _pParent, WinBits nStyle ) :
aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ),
aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ).toString() ),
aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ).toString() ),
- pAnyRefDlg( NULL ),
- pRefEdit( NULL )
+ pAnyRefDlg( nullptr ),
+ pRefEdit( nullptr )
{
SetStartImage();
}
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 0bec0bb1a045..e32d257fdd8c 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -37,7 +37,7 @@ namespace formula
ParaWin::ParaWin(vcl::Window* pParent,IControlReferenceHandler* _pDlg):
TabPage (pParent, "ParameterPage", "formula/ui/parameter.ui"),
- pFuncDesc ( NULL ),
+ pFuncDesc ( nullptr ),
pMyParent (_pDlg),
m_sOptional ( ModuleRes( STR_OPTIONAL ) ),
m_sRequired ( ModuleRes( STR_REQUIRED ) ),
@@ -287,7 +287,7 @@ RefEdit* ParaWin::GetActiveEdit()
}
else
{
- return NULL;
+ return nullptr;
}
}
@@ -340,7 +340,7 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc)
SetArgumentText( OUString() );
SetEditDesc( OUString() );
nArgs = 0;
- if ( pFuncDesc!=NULL)
+ if ( pFuncDesc!=nullptr)
{
if ( !pFuncDesc->getDescription().isEmpty() )
{
@@ -444,7 +444,7 @@ void ParaWin::InitArgInput( sal_uInt16 nPos, FixedText& rFtArg, PushButton& rBtn
void ParaWin::ClearAll()
{
- SetFunctionDesc(NULL);
+ SetFunctionDesc(nullptr);
SetArgumentOffset(0);
}
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index fcbf0e6b3834..11d562722321 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -84,7 +84,7 @@ StructPage::StructPage(vcl::Window* pParent):
TabPage(pParent, "StructPage", "formula/ui/structpage.ui"),
maImgEnd ( ModuleRes( BMP_STR_END ) ),
maImgError ( ModuleRes( BMP_STR_ERROR ) ),
- pSelectedToken ( NULL )
+ pSelectedToken ( nullptr )
{
get(m_pTlbStruct, "struct");
Size aSize(LogicToPixel(Size(86, 162), MAP_APPFONT));
@@ -123,7 +123,7 @@ SvTreeListEntry* StructPage::InsertEntry( const OUString& rText, SvTreeListEntry
{
m_pTlbStruct->SetActiveFlag( false );
- SvTreeListEntry* pEntry = NULL;
+ SvTreeListEntry* pEntry = nullptr;
switch( nFlag )
{
case STRUCT_FOLDER:
@@ -145,17 +145,17 @@ SvTreeListEntry* StructPage::InsertEntry( const OUString& rText, SvTreeListEntry
OUString StructPage::GetEntryText(SvTreeListEntry* pEntry) const
{
OUString aString;
- if(pEntry!=NULL)
+ if(pEntry!=nullptr)
aString = m_pTlbStruct->GetEntryText(pEntry);
return aString;
}
IFormulaToken* StructPage::GetFunctionEntry(SvTreeListEntry* pEntry)
{
- if(pEntry!=NULL)
+ if(pEntry!=nullptr)
{
IFormulaToken * pToken=static_cast<IFormulaToken *>(pEntry->GetUserData());
- if(pToken!=NULL)
+ if(pToken!=nullptr)
{
if ( !(pToken->isFunction() || pToken->getArgumentCount() > 1 ) )
{
@@ -167,7 +167,7 @@ IFormulaToken* StructPage::GetFunctionEntry(SvTreeListEntry* pEntry)
}
}
}
- return NULL;
+ return nullptr;
}
IMPL_LINK_TYPED( StructPage, SelectHdl, SvTreeListBox*, pTlb, void )
@@ -177,10 +177,10 @@ IMPL_LINK_TYPED( StructPage, SelectHdl, SvTreeListBox*, pTlb, void )
if(pTlb==m_pTlbStruct)
{
SvTreeListEntry* pCurEntry=m_pTlbStruct->GetCurEntry();
- if(pCurEntry!=NULL)
+ if(pCurEntry!=nullptr)
{
pSelectedToken=static_cast<IFormulaToken *>(pCurEntry->GetUserData());
- if(pSelectedToken!=NULL)
+ if(pSelectedToken!=nullptr)
{
if ( !(pSelectedToken->isFunction() || pSelectedToken->getArgumentCount() > 1) )
{
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index f150e8a38304..cb8642cbe78e 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -54,9 +54,9 @@ public:
SvTreeListEntry* InsertStaticEntry(
const OUString& rText,
const Image& rEntryImg,
- SvTreeListEntry* pParent = NULL,
+ SvTreeListEntry* pParent = nullptr,
sal_uLong nPos = TREELIST_APPEND,
- IFormulaToken* pToken = NULL );
+ IFormulaToken* pToken = nullptr );
void SetActiveFlag(bool bFlag=true);
bool GetActiveFlag() { return bActiveFlag;}
@@ -94,7 +94,7 @@ public:
void ClearStruct();
SvTreeListEntry* InsertEntry(const OUString& rText, SvTreeListEntry* pParent,
- sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=NULL);
+ sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=nullptr);
OUString GetEntryText(SvTreeListEntry* pEntry) const;
diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx
index 8044b84ad15c..de87fa8af07a 100644
--- a/formula/source/ui/resource/ModuleHelper.cxx
+++ b/formula/source/ui/resource/ModuleHelper.cxx
@@ -55,7 +55,7 @@ public:
};
OModuleImpl::OModuleImpl()
- :m_pResources(NULL)
+ :m_pResources(nullptr)
{
}
@@ -87,7 +87,7 @@ namespace
struct theOModuleMutex : public rtl::Static< osl::Mutex, theOModuleMutex > {};
}
sal_Int32 OModule::s_nClients = 0;
-OModuleImpl* OModule::s_pImpl = NULL;
+OModuleImpl* OModule::s_pImpl = nullptr;
ResMgr* OModule::getResManager()
{
@@ -109,7 +109,7 @@ void OModule::revokeClient()
if (!--s_nClients && s_pImpl)
{
delete s_pImpl;
- s_pImpl = NULL;
+ s_pImpl = nullptr;
}
}
generated by cgit (git 2.34.1) at 2024-07-30 18:16:37 +0000