summaryrefslogtreecommitdiff
path: root/sw/source/uibase/docvw
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 /sw/source/uibase/docvw
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 'sw/source/uibase/docvw')
-rw-r--r--sw/source/uibase/docvw/AnnotationWin.cxx8
-rw-r--r--sw/source/uibase/docvw/SidebarWin.cxx4
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx6
-rw-r--r--sw/source/uibase/docvw/frmsidebarwincontainer.cxx2
4 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index 9ef1e482bae0..1a0692146548 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -127,7 +127,7 @@ void SwAnnotationWin::UpdateData()
{
SwTxtFld *const pTxtFld = mpFmtFld->GetTxtFld();
SwPosition aPosition( pTxtFld->GetTxtNode() );
- aPosition.nContent = *pTxtFld->GetStart();
+ aPosition.nContent = pTxtFld->GetStart();
rUndoRedo.AppendUndo(
new SwUndoFieldFromDoc(aPosition, *pOldField, *mpFld, 0, true));
}
@@ -169,7 +169,7 @@ bool SwAnnotationWin::CalcFollow()
{
SwTxtFld* pTxtFld = mpFmtFld->GetTxtFld();
SwPosition aPosition( pTxtFld->GetTxtNode() );
- aPosition.nContent = *pTxtFld->GetStart();
+ aPosition.nContent = pTxtFld->GetStart();
SwTxtAttr * const pTxtAttr =
pTxtFld->GetTxtNode().GetTxtAttrForCharAt(
aPosition.nContent.GetIndex() - 1,
@@ -184,7 +184,7 @@ sal_uInt32 SwAnnotationWin::CountFollowing()
sal_uInt32 aCount = 1; // we start with 1, so we have to subtract one at the end again
SwTxtFld* pTxtFld = mpFmtFld->GetTxtFld();
SwPosition aPosition( pTxtFld->GetTxtNode() );
- aPosition.nContent = *pTxtFld->GetStart();
+ aPosition.nContent = pTxtFld->GetStart();
SwTxtAttr * pTxtAttr = pTxtFld->GetTxtNode().GetTxtAttrForCharAt(
aPosition.nContent.GetIndex() + 1,
@@ -267,7 +267,7 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText)
{
SwTxtFld *const pTxtFld = mpFmtFld->GetTxtFld();
SwPosition aPosition( pTxtFld->GetTxtNode() );
- aPosition.nContent = *pTxtFld->GetStart();
+ aPosition.nContent = pTxtFld->GetStart();
rUndoRedo.AppendUndo(
new SwUndoFieldFromDoc(aPosition, *pOldField, *mpFld, 0, true));
}
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
index 856d18c993d3..7f574601e827 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -660,7 +660,7 @@ void SwSidebarWin::SetPosAndSize()
SwShellTableCrsr* pTableCrsr = new SwShellTableCrsr( DocView().GetWrtShell(), aStartPos );
pTableCrsr->SetMark();
pTableCrsr->GetMark()->nNode = *pTxtNode;
- pTableCrsr->GetMark()->nContent.Assign( pTxtNode, *(pTxtAnnotationFld->GetStart())+1 );
+ pTableCrsr->GetMark()->nContent.Assign( pTxtNode, pTxtAnnotationFld->GetStart()+1 );
pTableCrsr->NewTableSelection();
pTmpCrsr = pTableCrsr;
}
@@ -669,7 +669,7 @@ void SwSidebarWin::SetPosAndSize()
SwShellCrsr* pCrsr = new SwShellCrsr( DocView().GetWrtShell(), aStartPos );
pCrsr->SetMark();
pCrsr->GetMark()->nNode = *pTxtNode;
- pCrsr->GetMark()->nContent.Assign( pTxtNode, *(pTxtAnnotationFld->GetStart())+1 );
+ pCrsr->GetMark()->nContent.Assign( pTxtNode, pTxtAnnotationFld->GetStart()+1 );
pTmpCrsr = pCrsr;
}
::boost::scoped_ptr<SwShellCrsr> pTmpCrsrForAnnotationTextRange( pTmpCrsr );
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 71e7f483c4be..e1fda396a3a2 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -3609,10 +3609,10 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
// half of the field was clicked on.
SwTxtAttr const*const pTxtFld(aFieldAtPos.pFndTxtAttr);
if (rSh.GetCurrentShellCursor().GetPoint()->nContent
- .GetIndex() != *pTxtFld->GetStart())
+ .GetIndex() != pTxtFld->GetStart())
{
assert(rSh.GetCurrentShellCursor().GetPoint()->nContent
- .GetIndex() == (*pTxtFld->GetStart() + 1));
+ .GetIndex() == (pTxtFld->GetStart() + 1));
rSh.Left( CRSR_SKIP_CHARS, false, 1, false );
}
// don't go into the !bOverSelect block below - it moves
@@ -4507,7 +4507,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
// select content of Input Field, but exclude CH_TXT_ATR_INPUTFIELDSTART
// and CH_TXT_ATR_INPUTFIELDEND
rSh.SttSelect();
- rSh.SelectTxt( *(aCntntAtPos.pFndTxtAttr->GetStart()) + 1,
+ rSh.SelectTxt( aCntntAtPos.pFndTxtAttr->GetStart() + 1,
*(aCntntAtPos.pFndTxtAttr->End()) - 1 );
}
else
diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
index 3760f9778446..14c96d5da3a9 100644
--- a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
+++ b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
@@ -101,7 +101,7 @@ bool SwFrmSidebarWinContainer::insert( const SwFrm& rFrm,
FrmKey aFrmKey( &rFrm );
SidebarWinContainer& rSidebarWinContainer = (*mpFrmSidebarWinContainer)[ aFrmKey ];
- SidebarWinKey aSidebarWinKey( *(rFmtFld.GetTxtFld()->GetStart()) );
+ SidebarWinKey aSidebarWinKey( rFmtFld.GetTxtFld()->GetStart() );
if ( rSidebarWinContainer.empty() ||
rSidebarWinContainer.find( aSidebarWinKey) == rSidebarWinContainer.end() )
{