summaryrefslogtreecommitdiff
path: root/sc
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 /sc
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 'sc')
-rw-r--r--sc/inc/document.hxx4
-rw-r--r--sc/source/ui/docshell/externalrefmgr.cxx2
-rw-r--r--sc/source/ui/view/drawvie4.cxx2
3 files changed, 4 insertions, 4 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 8701a6ebe93e..3a53e6697e41 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -687,8 +687,8 @@ public:
SCTAB GetMaxTableNumber() { return static_cast<SCTAB>(maTabs.size()) - 1; }
- ScRangePairList* GetColNameRanges() { return &xColNameRanges; }
- ScRangePairList* GetRowNameRanges() { return &xRowNameRanges; }
+ ScRangePairList* GetColNameRanges() { return xColNameRanges.get(); }
+ ScRangePairList* GetRowNameRanges() { return xRowNameRanges.get(); }
ScRangePairListRef& GetColNameRangesRef() { return xColNameRanges; }
ScRangePairListRef& GetRowNameRangesRef() { return xRowNameRanges; }
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 39cc31f60f2c..5b70a5bc3647 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -3164,7 +3164,7 @@ void ScExternalRefManager::transformUnsavedRefToSavedRef( SfxObjectShell* pShell
DocShellMap::iterator itr = maUnsavedDocShells.begin();
while( itr != maUnsavedDocShells.end() )
{
- if (&(itr->second.maShell) == pShell)
+ if ( itr->second.maShell.get() == pShell )
{
// found that the shell is marked as unsaved
OUString aFileURL = pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI);
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 61fa1ab921f3..f0851b5b092a 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -126,7 +126,7 @@ void ScDrawView::BeginDrag( vcl::Window* pWindow, const Point& rStartPos )
ScDrawTransferObj* pTransferObj = new ScDrawTransferObj( pModel, pDocSh, aObjDesc );
uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj );
- pTransferObj->SetDrawPersist( &aDragShellRef ); // keep persist for ole objects alive
+ pTransferObj->SetDrawPersist( aDragShellRef.get() ); // keep persist for ole objects alive
pTransferObj->SetDragSource( this ); // copies selection
SC_MOD()->SetDragObject( nullptr, pTransferObj ); // for internal D&D