Skip to content

C
core
Kaydet (Commit) c9023860 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

fftester: cut out middle man in deref null ptr and get address 

Change-Id: Iba157f47e847cb2eba1d771a6f357019d68b4f13
üst af652b80
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 7 deletions
sw/inc/unocrsr.hxx
Dosyayı görüntüle @ c9023860
...@@ -144,10 +144,12 @@ namespace sw ...@@ -144,10 +144,12 @@ namespace sw
if(!GetRegisteredIn()) if(!GetRegisteredIn())
m_pCursor.reset(); m_pCursor.reset();
}; };
SwUnoCursor& operator*() const SwUnoCursor* get() const
{ return *m_pCursor.get(); }
SwUnoCursor* operator->() const
{ return m_pCursor.get(); } { return m_pCursor.get(); }
SwUnoCursor* operator->() const
{ return get(); }
SwUnoCursor& operator*() const
{ return *get(); }
UnoCursorPointer& operator=(UnoCursorPointer aOther) UnoCursorPointer& operator=(UnoCursorPointer aOther)
{ {
if(aOther.m_pCursor) if(aOther.m_pCursor)
......
sw/source/core/unocore/unoobj.cxx
Dosyayı görüntüle @ c9023860
...@@ -690,10 +690,10 @@ SwUnoCursor& SwXTextCursor::GetCursor() ...@@ -690,10 +690,10 @@ SwUnoCursor& SwXTextCursor::GetCursor()
{ return *m_pImpl->m_pUnoCursor; } { return *m_pImpl->m_pUnoCursor; }
SwPaM const* SwXTextCursor::GetPaM() const SwPaM const* SwXTextCursor::GetPaM() const
{ return &(*m_pImpl->m_pUnoCursor); } { return m_pImpl->m_pUnoCursor.get(); }
SwPaM* SwXTextCursor::GetPaM() SwPaM* SwXTextCursor::GetPaM()
{ return &(*m_pImpl->m_pUnoCursor); } { return m_pImpl->m_pUnoCursor.get(); }
SwDoc const* SwXTextCursor::GetDoc() const SwDoc const* SwXTextCursor::GetDoc() const
{ return m_pImpl->m_pUnoCursor ? m_pImpl->m_pUnoCursor->GetDoc() : nullptr; } { return m_pImpl->m_pUnoCursor ? m_pImpl->m_pUnoCursor->GetDoc() : nullptr; }
...@@ -726,8 +726,8 @@ SwXTextCursor::~SwXTextCursor() ...@@ -726,8 +726,8 @@ SwXTextCursor::~SwXTextCursor()
void SwXTextCursor::DeleteAndInsert(const OUString& rText, void SwXTextCursor::DeleteAndInsert(const OUString& rText,
const bool bForceExpandHints) const bool bForceExpandHints)
{ {
auto pUnoCursor = static_cast<SwCursor*>(&(*m_pImpl->m_pUnoCursor)); auto pUnoCursor = static_cast<SwCursor*>(m_pImpl->m_pUnoCursor.get());
if(pUnoCursor) if (pUnoCursor)
{ {
// Start/EndAction // Start/EndAction
SwDoc* pDoc = pUnoCursor->GetDoc(); SwDoc* pDoc = pUnoCursor->GetDoc();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment