summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorJacek Fraczek <fraczek.jacek@gmail.com>2016-10-12 20:04:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-10-18 09:27:56 +0000
commit398d641664baa6eaeb34789f0aebfd21e73edef3 (patch)
treef3185bdf569f8c9454e832cc8d7f08ce75f033a2 /svx
parentc5c24f2035ef5941e83f7f0b15cb000f806983cd (diff)
tdf#89307: Removed T* SvRef::opeartor &()
Usage has been replaced with SvRef::get() or removed where applicable. Change-Id: I49f108910b668466134c40940b53fc3ab2acd816 Reviewed-on: https://gerrit.libreoffice.org/29780 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/fmcomp/gridctrl.cxx8
-rw-r--r--svx/source/gallery2/galmisc.cxx2
2 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index fbeec83f3213..b6e46a863074 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2915,7 +2915,7 @@ CellController* DbGridControl::GetController(long /*nRow*/, sal_uInt16 nColumnId
CellController* pReturn = nullptr;
if (IsFilterMode())
- pReturn = &pColumn->GetController();
+ pReturn = pColumn->GetController().get();
else
{
if (::comphelper::hasProperty(FM_PROP_ENABLED, pColumn->getModel()))
@@ -2929,7 +2929,7 @@ CellController* DbGridControl::GetController(long /*nRow*/, sal_uInt16 nColumnId
if ((bInsert && !pColumn->IsAutoValue()) || bUpdate)
{
- pReturn = &pColumn->GetController();
+ pReturn = pColumn->GetController().get();
}
}
return pReturn;
@@ -3042,7 +3042,7 @@ void DbGridControl::Undo()
EndCursorAction();
m_xDataRow->SetState(m_pDataCursor, false);
- if (&m_xPaintRow == &m_xCurrentRow)
+ if (m_xPaintRow == m_xCurrentRow)
m_xPaintRow = m_xCurrentRow = m_xDataRow;
else
m_xCurrentRow = m_xDataRow;
@@ -3087,7 +3087,7 @@ void DbGridControl::resetCurrentRow()
// update the rows
m_xDataRow->SetState(m_pDataCursor, false);
- if (&m_xPaintRow == &m_xCurrentRow)
+ if (m_xPaintRow == m_xCurrentRow)
m_xPaintRow = m_xCurrentRow = m_xDataRow;
else
m_xCurrentRow = m_xDataRow;
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 48fdd15d11ff..26521a734d97 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -514,7 +514,7 @@ bool GalleryTransferable::GetData( const datatransfer::DataFlavor& rFlavor, cons
if( ( SotClipboardFormatId::DRAWING == nFormat ) && ( SgaObjKind::SvDraw == meObjectKind ) )
{
- bRet = ( mxModelStream.Is() && SetObject( &mxModelStream, SotClipboardFormatId::NONE, rFlavor ) );
+ bRet = ( mxModelStream.Is() && SetObject( mxModelStream.get(), SotClipboardFormatId::NONE, rFlavor ) );
}
else if( ( SotClipboardFormatId::SVIM == nFormat ) && mpImageMap )
{