summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-07-29 10:40:50 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-08-01 06:05:58 +0000
commit069d71b72566a0b8f234304d3bd4511ee86b6c60 (patch)
treea345f45ff5e987b81fa89a16103a9420a137a238 /starmath
parent4475c191de479e7a5ddb20d14bc3aa32b0ab84d3 (diff)
loplugin:countusersofdefaultparams in shell..starmath
Change-Id: I553d1b031b8d261a1caa8b77a8d687af21a6f8d6 Reviewed-on: https://gerrit.libreoffice.org/27672 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'starmath')
-rw-r--r--starmath/inc/edit.hxx2
-rw-r--r--starmath/inc/node.hxx2
-rw-r--r--starmath/inc/view.hxx2
-rw-r--r--starmath/source/edit.cxx4
-rw-r--r--starmath/source/mathtype.cxx4
-rw-r--r--starmath/source/mathtype.hxx6
-rw-r--r--starmath/source/node.cxx2
-rw-r--r--starmath/source/ooxmlexport.hxx2
-rw-r--r--starmath/source/rtfexport.hxx2
-rw-r--r--starmath/source/visitors.cxx2
-rw-r--r--starmath/source/wordexportbase.cxx2
-rw-r--r--starmath/source/wordexportbase.hxx2
12 files changed, 16 insertions, 16 deletions
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 85d429323b91..084fae6b927b 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -80,7 +80,7 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper
void SetScrollBarRanges();
void InitScrollBars();
void InvalidateSlots();
- void UpdateStatus(bool bSetDocModified = false);
+ void UpdateStatus(bool bSetDocModified);
public:
explicit SmEditWindow(SmCmdBoxWindow& rMyCmdBoxWin);
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index a62f1ccefa72..3511d71f395a 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -200,7 +200,7 @@ public:
/** True if this node is selected */
bool IsSelected() const {return mbIsSelected;}
- void SetSelected(bool Selected = true) {mbIsSelected = Selected;}
+ void SetSelected(bool Selected) {mbIsSelected = Selected;}
/** Get the parent node of this node */
SmStructureNode* GetParent(){ return mpParentNode; }
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index ccc903754bb5..287ddc48d440 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -320,7 +320,7 @@ public:
* so that when text is inserted from catalog or elsewhere we know whether to
* insert for the visual editor, or the text editor.
*/
- void SetInsertIntoEditWindow(bool bEditWindowHadFocusLast = true){
+ void SetInsertIntoEditWindow(bool bEditWindowHadFocusLast){
bInsertIntoEditWindow = bEditWindowHadFocusLast;
}
bool IsInlineEditEnabled() const;
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 69ae86594e43..780966900cd5 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -253,7 +253,7 @@ void SmEditWindow::DataChanged( const DataChangedEvent& )
IMPL_LINK_NOARG_TYPED( SmEditWindow, ModifyTimerHdl, Idle *, void )
{
- UpdateStatus();
+ UpdateStatus(false);
aModifyIdle.Stop();
}
@@ -707,7 +707,7 @@ void SmEditWindow::GetFocus()
//Let SmViewShell know we got focus
if(GetView() && IsInlineEditEnabled())
- GetView()->SetInsertIntoEditWindow();
+ GetView()->SetInsertIntoEditWindow(true);
}
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 82a5bc832b19..f39843e825d6 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -574,7 +574,7 @@ bool MathType::Parse(SotStorage *pStor)
if (nVersion > 3) // allow only supported versions of MathType to be parsed
return false;
- bool bRet = HandleRecords();
+ bool bRet = HandleRecords(0);
//little crude hack to close occasionally open expressions
//a sophisticated system to determine what expressions are
//opened is required, but this is as much work as rewriting
@@ -1932,7 +1932,7 @@ bool MathType::ConvertFromStarMath( SfxMedium& rMedium )
sal_uInt32 nSize = pS->Tell();
nPendingAttributes=0;
- HandleNodes(pTree);
+ HandleNodes(pTree, 0);
pS->WriteUChar( END );
nSize = pS->Tell()-nSize;
diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx
index a47b43e4f453..1bf66020cc0a 100644
--- a/starmath/source/mathtype.hxx
+++ b/starmath/source/mathtype.hxx
@@ -122,7 +122,7 @@ private:
void Init();
- bool HandleRecords(int nLevel =0, sal_uInt8 nSelector =0xFF,
+ bool HandleRecords(int nLevel, sal_uInt8 nSelector =0xFF,
sal_uInt8 nVariation =0xFF, int nRows =0, int nCols =0);
bool HandleSize(sal_Int16 nLSize, sal_Int16 nDSize, int &rSetSize);
void HandleAlign(sal_uInt8 nHAlign, sal_uInt8 nVAlign, int &rSetAlign);
@@ -142,7 +142,7 @@ private:
static int xfEMBELL(sal_uInt8 nTest) {return nTest&0x20;}
static int xfNULL(sal_uInt8 nTest) {return nTest&0x10;}
- void HandleNodes(SmNode *pNode,int nLevel=0);
+ void HandleNodes(SmNode *pNode,int nLevel);
int StartTemplate(sal_uInt16 nSelector,sal_uInt16 nVariation=0);
void EndTemplate(int nOldPendingAttributes);
void HandleSmMatrix(SmMatrixNode *pMatrix,int nLevel);
@@ -195,7 +195,7 @@ private:
};
public:
static bool LookupChar(sal_Unicode nChar,OUString &rRet,
- sal_uInt8 nVersion=3,sal_uInt8 nTypeFace=0);
+ sal_uInt8 nVersion,sal_uInt8 nTypeFace=0);
};
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 18143d5b9187..34c3480962bc 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2509,7 +2509,7 @@ void SmMathSymbolNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat)
void SmMathSymbolNode::CreateTextFromNode(OUString &rText)
{
OUString sStr;
- MathType::LookupChar(GetToken().cMathChar, sStr);
+ MathType::LookupChar(GetToken().cMathChar, sStr, 3);
rText += sStr;
}
diff --git a/starmath/source/ooxmlexport.hxx b/starmath/source/ooxmlexport.hxx
index 5899a49796cf..41cb6516efac 100644
--- a/starmath/source/ooxmlexport.hxx
+++ b/starmath/source/ooxmlexport.hxx
@@ -28,7 +28,7 @@ public:
private:
virtual void HandleVerticalStack( const SmNode* pNode, int nLevel ) override;
virtual void HandleText( const SmNode* pNode, int nLevel ) override;
- virtual void HandleFractions( const SmNode* pNode, int nLevel, const char* type = nullptr ) override;
+ virtual void HandleFractions( const SmNode* pNode, int nLevel, const char* type ) override;
virtual void HandleRoot( const SmRootNode* pNode, int nLevel ) override;
virtual void HandleAttribute( const SmAttributNode* pNode, int nLevel ) override;
virtual void HandleOperator( const SmOperNode* pNode, int nLevel ) override;
diff --git a/starmath/source/rtfexport.hxx b/starmath/source/rtfexport.hxx
index 7071b9f74fa7..380fda80149b 100644
--- a/starmath/source/rtfexport.hxx
+++ b/starmath/source/rtfexport.hxx
@@ -25,7 +25,7 @@ public:
private:
virtual void HandleVerticalStack(const SmNode* pNode, int nLevel) override;
virtual void HandleText(const SmNode* pNode, int nLevel) override;
- virtual void HandleFractions(const SmNode* pNode, int nLevel, const char* type = nullptr) override;
+ virtual void HandleFractions(const SmNode* pNode, int nLevel, const char* type) override;
virtual void HandleRoot(const SmRootNode* pNode, int nLevel) override;
virtual void HandleAttribute(const SmAttributNode* pNode, int nLevel) override;
virtual void HandleOperator(const SmOperNode* pNode, int nLevel) override;
diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx
index c80ce63bebd5..7efec06a4937 100644
--- a/starmath/source/visitors.cxx
+++ b/starmath/source/visitors.cxx
@@ -688,7 +688,7 @@ void SmSetSelectionVisitor::Visit( SmTextNode* pNode ) {
i2 = maEndPos.Index;
long start, end;
- pNode->SetSelected();
+ pNode->SetSelected(true);
if( i1 != -1 && i2 != -1 ) {
start = i1 < i2 ? i1 : i2; //MIN
end = i1 > i2 ? i1 : i2; //MAX
diff --git a/starmath/source/wordexportbase.cxx b/starmath/source/wordexportbase.cxx
index 215a6c73769c..ea38df853755 100644
--- a/starmath/source/wordexportbase.cxx
+++ b/starmath/source/wordexportbase.cxx
@@ -46,7 +46,7 @@ void SmWordExportBase::HandleNode(const SmNode* pNode, int nLevel)
HandleBinaryOperation(static_cast< const SmBinHorNode* >(pNode), nLevel);
break;
case NBINVER:
- HandleFractions(pNode,nLevel);
+ HandleFractions(pNode,nLevel,nullptr);
break;
case NROOT:
HandleRoot(static_cast< const SmRootNode* >(pNode), nLevel);
diff --git a/starmath/source/wordexportbase.hxx b/starmath/source/wordexportbase.hxx
index b8aac113334a..f40c261e9413 100644
--- a/starmath/source/wordexportbase.hxx
+++ b/starmath/source/wordexportbase.hxx
@@ -27,7 +27,7 @@ protected:
virtual void HandleVerticalStack( const SmNode* pNode, int nLevel ) = 0;
virtual void HandleText( const SmNode* pNode, int nLevel ) = 0;
void HandleMath( const SmNode* pNode, int nLevel );
- virtual void HandleFractions( const SmNode* pNode, int nLevel, const char* type = nullptr ) = 0;
+ virtual void HandleFractions( const SmNode* pNode, int nLevel, const char* type ) = 0;
void HandleUnaryOperation( const SmUnHorNode* pNode, int nLevel );
void HandleBinaryOperation( const SmBinHorNode* pNode, int nLevel );
virtual void HandleRoot( const SmRootNode* pNode, int nLevel ) = 0;