diff options
| author | Jacek Fraczek <fraczek.jacek@gmail.com> | 2016-10-05 22:00:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-10 08:48:30 +0000 |
| commit | f004aa99514d385f3ee254bba735f5eaeb7d9ad8 (patch) | |
| tree | aacd5792f553b8e9cbf029cc7e0797ed0dd423fe /dbaccess | |
| parent | tdf#101442 Change "hyperlink" to "link" (diff) | |
| download | core-f004aa99514d385f3ee254bba735f5eaeb7d9ad8.tar.gz core-f004aa99514d385f3ee254bba735f5eaeb7d9ad8.zip | |
tdf#89307: Removed SvRef::operator T*()
Conditional statements are using SvRef::Is() method.
Changed static_cast<T*>(svRef<T>) occurances to svRef.get().
Added operator == and != to SvRef.
SbxObject::Execute is using SbxVariableRef internally.
SbxObject::FindQualified is using SbxVariableRef internally.
Change-Id: I45b553e35d8fca9bf71163e6eefc60802a066395
Reviewed-on: https://gerrit.libreoffice.org/29621
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/misc/TableCopyHelper.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index 527072d59c04..40ce52a4a74a 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -242,7 +242,7 @@ bool OTableCopyHelper::copyTagTable(OTableCopyHelper::DropDescriptor& _rDesc, bo pImport = new ORTFImportExport(_xConnection,getNumberFormatter(_xConnection, m_pController->getORB()),m_pController->getORB()); xEvt = pImport; - SvStream* pStream = static_cast<SvStream*>(static_cast<SotStorageStream*>(_rDesc.aHtmlRtfStorage)); + SvStream* pStream = static_cast<SvStream*>(_rDesc.aHtmlRtfStorage.get()); if ( _bCheck ) pImport->enableCheckOnly(); @@ -288,7 +288,7 @@ bool OTableCopyHelper::copyTagTable(const TransferableDataHelper& _aDroppedData _rAsyncDrop.aUrl = aTmp.GetURL(); ::tools::SvRef<SotStorageStream> aNew = new SotStorageStream( aTmp.GetFileName() ); _rAsyncDrop.aHtmlRtfStorage->Seek(STREAM_SEEK_TO_BEGIN); - _rAsyncDrop.aHtmlRtfStorage->CopyTo( aNew ); + _rAsyncDrop.aHtmlRtfStorage->CopyTo( aNew.get() ); aNew->Commit(); _rAsyncDrop.aHtmlRtfStorage = aNew; } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 60e6ea3b62ec..4f26fc9287df 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -1162,7 +1162,7 @@ bool OSelectionBrowseBox::SaveModified() bAppendRow = true; } } - if(!bError && Controller()) + if( !bError && Controller().Is() ) Controller()->ClearModified(); RowModified(GetCurRow(), GetCurColumnId()); |