summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-01-25 12:03:58 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-02-02 08:02:54 +0000
commit4978328534c0f759eea7d0c196046f1d53b06925 (patch)
treecf9dcd62c4f09dcd08115bbda2a8950678a38562 /dbaccess
parent1461ebbbb5d47d90e31f0945a4878a68fbee5213 (diff)
convert method names in tools::SvRef to be more like our other..
reference classes, uno::Reference and rtl::Reference. Specifically rename Is()->is() and Clear()->clear(). Change-Id: Icb7e05e2d09cb9977121508b837ba0961dabb4ae Reviewed-on: https://gerrit.libreoffice.org/33576 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx4
-rw-r--r--dbaccess/source/ui/browser/dbexchange.cxx2
-rw-r--r--dbaccess/source/ui/browser/sbagrid.cxx12
-rw-r--r--dbaccess/source/ui/control/TableGrantCtrl.cxx2
-rw-r--r--dbaccess/source/ui/misc/TableCopyHelper.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx4
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx6
-rw-r--r--dbaccess/source/ui/tabledesign/TableUndo.cxx2
8 files changed, 18 insertions, 18 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index ab51cbabe673..46d4429b4af9 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -1462,7 +1462,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
case ID_BROWSER_CUT:
{
CellControllerRef xCurrentController = getBrowserView()->getVclControl()->Controller();
- if (xCurrentController.Is() && nullptr != dynamic_cast< const EditCellController* >(xCurrentController.get()))
+ if (xCurrentController.is() && nullptr != dynamic_cast< const EditCellController* >(xCurrentController.get()))
{
Edit& rEdit = static_cast<Edit&>(xCurrentController->GetWindow());
bool bHasLen = (rEdit.GetSelection().Len() != 0);
@@ -1941,7 +1941,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
case ID_BROWSER_PASTE:
{
CellControllerRef xCurrentController = getBrowserView()->getVclControl()->Controller();
- if (!xCurrentController.Is())
+ if (!xCurrentController.is())
// should be intercepted by GetState. Normally.
// Unfortunately ID_BROWSER_PASTE is a 'fast call' slot, which means it may be executed without checking if it is
// enabled. This would be really deadly herein if the current cell has no controller ...
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx
index 2edd7fda2975..3b32859b7f7d 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -139,7 +139,7 @@ namespace dbaui
if (nUserObjectId == SotClipboardFormatId::RTF || nUserObjectId == SotClipboardFormatId::HTML )
{
ODatabaseImportExport* pExport = static_cast<ODatabaseImportExport*>(pUserObject);
- if ( pExport && rxOStm.Is() )
+ if ( pExport && rxOStm.is() )
{
pExport->setStream(rxOStm.get());
return pExport->Write();
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 51f998e82da9..a8e8ba27dbfe 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -1248,7 +1248,7 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
if ( IsDropFormatSupported( SotClipboardFormatId::STRING ) ) do
{ // odd construction, but spares us a lot of (explicit ;) goto's
- if (!GetEmptyRow().Is())
+ if (!GetEmptyRow().is())
// without an empty row we're not in update mode
break;
@@ -1270,12 +1270,12 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
// not dropped within a cell (a cell isn't as wide as the column - the are small spaces)
break;
- if ((IsModified() || (GetCurrentRow().Is() && GetCurrentRow()->IsModified())) && (GetCurrentPos() != nRow))
+ if ((IsModified() || (GetCurrentRow().is() && GetCurrentRow()->IsModified())) && (GetCurrentPos() != nRow))
// there is a current and modified row or cell and he text is to be dropped into another one
break;
CellControllerRef xCurrentController = Controller();
- if (xCurrentController.Is() && xCurrentController->IsModified() && ((nRow != GetCurRow()) || (nCol != GetCurColumnId())))
+ if (xCurrentController.is() && xCurrentController->IsModified() && ((nRow != GetCurRow()) || (nCol != GetCurColumnId())))
// the current controller is modified and the user wants to drop in another cell -> no chance
// (when leaving the modified cell a error may occur - this is deadly while dragging)
break;
@@ -1323,7 +1323,7 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
} while (false);
- if(nAction != DND_ACTION_COPY && GetEmptyRow().Is())
+ if(nAction != DND_ACTION_COPY && GetEmptyRow().is())
{
const DataFlavorExVector& _rFlavors = GetDataFlavors();
if(::std::any_of(_rFlavors.begin(),_rFlavors.end(),SbaGridControlPrec()))
@@ -1366,7 +1366,7 @@ sal_Int8 SbaGridControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt )
ActivateCell();
CellControllerRef xCurrentController = Controller();
- if (!xCurrentController.Is() || nullptr == dynamic_cast< const EditCellController* >(xCurrentController.get()))
+ if (!xCurrentController.is() || nullptr == dynamic_cast< const EditCellController* >(xCurrentController.get()))
return DND_ACTION_NONE;
Edit& rEdit = static_cast<Edit&>(xCurrentController->GetWindow());
@@ -1384,7 +1384,7 @@ sal_Int8 SbaGridControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt )
return DND_ACTION_COPY;
}
- if(GetEmptyRow().Is())
+ if(GetEmptyRow().is())
{
const DataFlavorExVector& _rFlavors = GetDataFlavors();
if( ::std::any_of(_rFlavors.begin(),_rFlavors.end(), SbaGridControlPrec()) )
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index a077cda997d3..58de1f22855a 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -244,7 +244,7 @@ bool OTableGrantControl::SaveModified()
bErg = false;
::dbaui::showError(::dbtools::SQLExceptionInfo(e),GetParent(),m_xContext);
}
- if(bErg && Controller().Is())
+ if(bErg && Controller().is())
Controller()->ClearModified();
if(!bErg)
UpdateTables();
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx
index 0b75d816e81d..d5b059654d6c 100644
--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@@ -280,7 +280,7 @@ bool OTableCopyHelper::copyTagTable(const TransferableDataHelper& _aDroppedData
_rAsyncDrop.bHtml = bHtml;
_rAsyncDrop.bError = !copyTagTable(_rAsyncDrop,true,_xConnection);
- bRet = ( !_rAsyncDrop.bError && bOk && _rAsyncDrop.aHtmlRtfStorage.Is() );
+ bRet = ( !_rAsyncDrop.bError && bOk && _rAsyncDrop.aHtmlRtfStorage.is() );
if ( bRet )
{
// now we need to copy the stream
@@ -302,7 +302,7 @@ void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc
,const OUString& i_rDestDataSource
,const SharedConnection& _xConnection)
{
- if ( _rDesc.aHtmlRtfStorage.Is() )
+ if ( _rDesc.aHtmlRtfStorage.is() )
{
copyTagTable(_rDesc,false,_xConnection);
_rDesc.aHtmlRtfStorage = nullptr;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 40ac61745126..b9fb54822c11 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -895,7 +895,7 @@ bool OSelectionBrowseBox::SaveModified()
bool bError = false;
bool bListAction = false;
- if (pEntry.is() && Controller().Is() && Controller()->IsModified())
+ if (pEntry.is() && Controller().is() && Controller()->IsModified())
{
// for the Undo-action
OUString strOldCellContents,sNewValue;
@@ -1162,7 +1162,7 @@ bool OSelectionBrowseBox::SaveModified()
bAppendRow = true;
}
}
- if( !bError && Controller().Is() )
+ if( !bError && Controller().is() )
Controller()->ClearModified();
RowModified(GetCurRow(), GetCurColumnId());
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 80519ed295da..9d4c26304a37 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -681,7 +681,7 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId )
GetUndoManager().LeaveListAction();
RowModified(nRow);
CellControllerRef xController(Controller());
- if(xController.Is())
+ if(xController.is())
xController->SetModified();
// Set the Modify flag
@@ -776,7 +776,7 @@ void OTableEditorCtrl::InsertRows( long nRow )
{
::tools::SvRef<SotStorageStream> aStreamRef;
bool bOk = aTransferData.GetSotStorageStream(SotClipboardFormatId::SBA_TABED,aStreamRef);
- if (bOk && aStreamRef.Is())
+ if (bOk && aStreamRef.is())
{
aStreamRef->Seek(STREAM_SEEK_TO_BEGIN);
aStreamRef->ResetError();
@@ -876,7 +876,7 @@ void OTableEditorCtrl::SetControlText( long nRow, sal_uInt16 nColId, const OUStr
GoToRow( nRow );
GoToColumnId( nColId );
CellControllerRef xController = Controller();
- if(xController.Is())
+ if(xController.is())
xController->GetWindow().SetText( rText );
else
RowModified(nRow,nColId);
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx
index cec3d5349a6a..bd97f0618613 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.cxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx
@@ -90,7 +90,7 @@ void OTableDesignCellUndoAct::Undo()
if (m_pTabDgnCtrl->GetCurUndoActId() == 1)
{
CellControllerRef xController = m_pTabDgnCtrl->Controller();
- if ( xController.Is() )
+ if ( xController.is() )
xController->ClearModified();
m_pTabDgnCtrl->GetView()->getController().setModified(false);