summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-06-18 12:14:29 +0200
committerNoel Grandin <noel@peralex.com>2014-06-24 11:34:21 +0200
commite2080e70fe8b085f18e868e46340454720fa94ca (patch)
tree4038d1d57b41b68a47d5ebbbe6ad390648ec6303 /starmath
parentf910280b8704ed9c289150a4ca3c8d60e15d0d97 (diff)
new compilerplugin returnbyref
Find places where we are returning a pointer to something, where we can be returning a reference. e.g. class A { struct X x; public X* getX() { return &x; } } which can be: public X& getX() { return x; } Change-Id: I796fd23fd36a18aedf6e36bc28f8fab4f518c6c7
Diffstat (limited to 'starmath')
-rw-r--r--starmath/inc/view.hxx4
-rw-r--r--starmath/source/edit.cxx2
-rw-r--r--starmath/source/view.cxx5
3 files changed, 5 insertions, 6 deletions
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 9c7980609250..fa2edee2bfee 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -185,7 +185,7 @@ public:
void AdjustPosition();
- SmEditWindow *GetEditWindow() { return (&aEdit); }
+ SmEditWindow& GetEditWindow() { return aEdit; }
SmViewShell *GetView();
};
@@ -207,7 +207,7 @@ protected:
public:
- SmEditWindow *GetEditWindow()
+ SmEditWindow& GetEditWindow()
{
return (((SmCmdBoxWindow *)pWindow)->GetEditWindow());
}
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 4376b7ad8fb6..eb3ac83c21d6 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -98,7 +98,7 @@ SmEditWindow::SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin ) :
SetMapMode(MAP_PIXEL);
// Even RTL languages don't use RTL for math
- rCmdBox.GetEditWindow()->EnableRTL( false );
+ rCmdBox.GetEditWindow().EnableRTL( false );
ApplyColorConfigValues( SM_MOD()->GetColorConfig() );
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 1de12e66c507..e60f22df460d 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1374,9 +1374,8 @@ SmEditWindow *SmViewShell::GetEditWindow()
if (pWrapper != NULL)
{
- SmEditWindow *pEditWin = pWrapper->GetEditWindow();
- SAL_WARN_IF( !pEditWin, "starmath", "SmEditWindow missing" );
- return pEditWin;
+ SmEditWindow& rEditWin = pWrapper->GetEditWindow();
+ return &rEditWin;
}
return NULL;