summaryrefslogtreecommitdiff
path: root/starmath/inc
diff options
context:
space:
mode:
Diffstat (limited to 'starmath/inc')
-rw-r--r--starmath/inc/ElementsDockingWindow.hxx2
-rw-r--r--starmath/inc/caret.hxx16
-rw-r--r--starmath/inc/cursor.hxx16
-rw-r--r--starmath/inc/document.hxx2
-rw-r--r--starmath/inc/node.hxx14
-rw-r--r--starmath/inc/unomodel.hxx2
-rw-r--r--starmath/inc/visitors.hxx2
7 files changed, 27 insertions, 27 deletions
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index 41ec150cadd6..e57e50c73eae 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -108,7 +108,7 @@ class SmElementsControl : public Control
//if pContext is not NULL, then draw, otherwise
//just layout
- void LayoutOrPaintContents(vcl::RenderContext *pContext = NULL);
+ void LayoutOrPaintContents(vcl::RenderContext *pContext = nullptr);
public:
SmElementsControl(vcl::Window *pParent);
diff --git a/starmath/inc/caret.hxx b/starmath/inc/caret.hxx
index d7f7b9efa3bb..bb1fc840d385 100644
--- a/starmath/inc/caret.hxx
+++ b/starmath/inc/caret.hxx
@@ -17,7 +17,7 @@
/** Representation of caret position with an equation */
struct SmCaretPos{
- SmCaretPos(SmNode* selectedNode = NULL, int iIndex = 0) {
+ SmCaretPos(SmNode* selectedNode = nullptr, int iIndex = 0) {
pSelectedNode = selectedNode;
Index = iIndex;
}
@@ -35,7 +35,7 @@ struct SmCaretPos{
//TODO: Consider forgetting about the todo above... As it's really unpleasant.
int Index;
/** True, if this is a valid caret position */
- bool IsValid() const { return pSelectedNode != NULL; }
+ bool IsValid() const { return pSelectedNode != nullptr; }
bool operator!=(SmCaretPos pos) const {
return pos.pSelectedNode != pSelectedNode || Index != pos.Index;
}
@@ -100,8 +100,8 @@ private:
/** An entry in SmCaretPosGraph */
struct SmCaretPosGraphEntry{
SmCaretPosGraphEntry(SmCaretPos pos = SmCaretPos(),
- SmCaretPosGraphEntry* left = NULL,
- SmCaretPosGraphEntry* right = NULL){
+ SmCaretPosGraphEntry* left = nullptr,
+ SmCaretPosGraphEntry* right = nullptr){
CaretPos = pos;
Left = left;
Right = right;
@@ -128,7 +128,7 @@ public:
SmCaretPosGraphIterator(SmCaretPosGraph* graph){
pGraph = graph;
nOffset = 0;
- pEntry = NULL;
+ pEntry = nullptr;
}
/** Get the next entry, NULL if none */
SmCaretPosGraphEntry* Next();
@@ -156,7 +156,7 @@ private:
class SmCaretPosGraph{
public:
SmCaretPosGraph(){
- pNext = NULL;
+ pNext = nullptr;
nOffset = 0;
}
~SmCaretPosGraph();
@@ -168,8 +168,8 @@ public:
* @remarks If left and/or right are set NULL, they will point back to the entry.
*/
SmCaretPosGraphEntry* Add(SmCaretPos pos,
- SmCaretPosGraphEntry* left = NULL,
- SmCaretPosGraphEntry* right = NULL){
+ SmCaretPosGraphEntry* left = nullptr,
+ SmCaretPosGraphEntry* right = nullptr){
SAL_WARN_IF( pos.Index < 0, "starmath", "Index shouldn't be -1!" );
return Add(SmCaretPosGraphEntry(pos, left, right));
}
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index 298882839b11..9de6b5309d57 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -215,7 +215,7 @@ public:
/** Draw the caret */
void Draw(OutputDevice& pDev, Point Offset, bool isCaretVisible);
- bool IsAtTailOfBracket(SmBracketType eBracketType, SmBraceNode** ppBraceNode = NULL) const;
+ bool IsAtTailOfBracket(SmBracketType eBracketType, SmBraceNode** ppBraceNode = nullptr) const;
void MoveAfterBracket(SmBraceNode* pBraceNode, bool bMoveAnchor = true);
private:
@@ -269,9 +269,9 @@ private:
if(rpNode && rpNode->GetParent()){ //Don't remove this, correctness relies on it
int index = rpNode->GetParent()->IndexOfSubNode(rpNode);
if(index != -1)
- rpNode->GetParent()->SetSubNode(index, NULL);
+ rpNode->GetParent()->SetSubNode(index, nullptr);
}
- rpNode = NULL;
+ rpNode = nullptr;
//Create line from node
if(pNode && IsLineCompositionNode(pNode))
return LineToList(static_cast<SmStructureNode*>(pNode), pList);
@@ -308,7 +308,7 @@ private:
* Call this method with NULL to reset the clipboard
* @remarks: This method takes ownership of pList.
*/
- void SetClipboard(SmNodeList* pList = NULL);
+ void SetClipboard(SmNodeList* pList = nullptr);
/** Clone list of nodes (creates a deep clone) */
static SmNodeList* CloneList(SmNodeList* pList);
@@ -350,7 +350,7 @@ private:
* @returns An iterator pointing to the element following the selection taken.
*/
static SmNodeList::iterator TakeSelectedNodesFromList(SmNodeList *pLineList,
- SmNodeList *pSelectedNodes = NULL);
+ SmNodeList *pSelectedNodes = nullptr);
/** Create an instance of SmMathSymbolNode usable for brackets */
static SmNode *CreateBracket(SmBracketType eBracketType, bool bIsLeft);
@@ -384,7 +384,7 @@ private:
SmStructureNode* pParent,
int nParentIndex,
SmCaretPos PosAfterEdit,
- SmNode* pStartLine = NULL);
+ SmNode* pStartLine = nullptr);
/** Request the formula is repainted */
void RequestRepaint();
};
@@ -411,7 +411,7 @@ class SmNodeListParser{
public:
/** Create an instance of SmNodeListParser */
SmNodeListParser(){
- pList = NULL;
+ pList = nullptr;
}
/** Parse a list of nodes to an expression
*
@@ -436,7 +436,7 @@ private:
SmNode* Terminal(){
if(pList->size() > 0)
return pList->front();
- return NULL;
+ return nullptr;
}
/** Move to next terminal */
SmNode* Next(){
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index a76538efda06..b26b3e9a45c6 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -220,7 +220,7 @@ public:
/** True, if cursor have previously been requested and thus
* has some sort of position.
*/
- bool HasCursor() { return pCursor != NULL; }
+ bool HasCursor() { return pCursor != nullptr; }
};
#endif
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index c7f71ba99554..f07687ac05f5 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -250,21 +250,21 @@ public:
pNode = node;
nSize = pNode->GetNumSubNodes();
nIndex = 0;
- pChildNode = NULL;
+ pChildNode = nullptr;
bIsReverse = bReverse;
}
/** Get the subnode or NULL if none */
SmNode* Next(){
while(!bIsReverse && nIndex < nSize){
- if(NULL != (pChildNode = pNode->GetSubNode(nIndex++)))
+ if(nullptr != (pChildNode = pNode->GetSubNode(nIndex++)))
return pChildNode;
}
while(bIsReverse && nSize > 0){
- if(NULL != (pChildNode = pNode->GetSubNode((nSize--)-1)))
+ if(nullptr != (pChildNode = pNode->GetSubNode((nSize--)-1)))
return pChildNode;
}
- pChildNode = NULL;
- return NULL;
+ pChildNode = nullptr;
+ return nullptr;
}
/** Get the current child node, NULL if none */
SmNode* Current(){
@@ -314,7 +314,7 @@ public:
using SmNode::GetSubNode;
virtual SmNode * GetSubNode(sal_uInt16 nIndex) override;
- void SetSubNodes(SmNode *pFirst, SmNode *pSecond, SmNode *pThird = NULL);
+ void SetSubNodes(SmNode *pFirst, SmNode *pSecond, SmNode *pThird = nullptr);
void SetSubNodes(const SmNodeArray &rNodeArray);
SmStructureNode & operator = ( const SmStructureNode &rNode );
@@ -330,7 +330,7 @@ public:
aSubNodes.resize(nIndex + 1);
//Set new slots to NULL
for (size_t i = size; i < nIndex+1; i++)
- aSubNodes[i] = NULL;
+ aSubNodes[i] = nullptr;
}
aSubNodes[nIndex] = pNode;
ClaimPaternity();
diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx
index 2227e20639a8..6b6ac0779f69 100644
--- a/starmath/inc/unomodel.hxx
+++ b/starmath/inc/unomodel.hxx
@@ -62,7 +62,7 @@ protected:
virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue )
throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override;
public:
- SmModel( SfxObjectShell *pObjSh = 0 );
+ SmModel( SfxObjectShell *pObjSh = nullptr );
virtual ~SmModel() throw ();
//XInterface
diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx
index 2a7bc4b6121c..9fb287374bde 100644
--- a/starmath/inc/visitors.hxx
+++ b/starmath/inc/visitors.hxx
@@ -340,7 +340,7 @@ private:
class SmCloningVisitor : public SmVisitor
{
public:
- SmCloningVisitor( ){ pResult = NULL; }
+ SmCloningVisitor( ){ pResult = nullptr; }
virtual ~SmCloningVisitor() {}
void Visit( SmTableNode* pNode ) override;
void Visit( SmBraceNode* pNode ) override;
generated by cgit (git 2.34.1) at 2025-03-01 18:27:58 +0000