summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/Accessibility/AccessibleText.cxx8
-rw-r--r--sc/source/ui/app/inputwin.cxx5
-rw-r--r--sc/source/ui/condformat/condformatdlgentry.cxx2
-rw-r--r--sc/source/ui/dbgui/validate.cxx2
-rw-r--r--sc/source/ui/docshell/docfunc.cxx2
-rw-r--r--sc/source/ui/docshell/externalrefmgr.cxx4
-rw-r--r--sc/source/ui/miscdlgs/anyrefdg.cxx2
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx2
-rw-r--r--sc/source/ui/unoobj/chart2uno.cxx10
-rw-r--r--sc/source/ui/unoobj/notesuno.cxx2
-rw-r--r--sc/source/ui/view/gridwin.cxx4
-rw-r--r--sc/source/ui/view/spelldialog.cxx3
-rw-r--r--sc/source/ui/view/tabview3.cxx5
13 files changed, 23 insertions, 28 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 7727f9b72581..33ee6abac74a 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -632,8 +632,8 @@ IMPL_LINK(ScAccessibleTextData, NotifyHdl, EENotify&, aNotify, void)
{
::std::unique_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( &aNotify );
- if( aHint.get() )
- GetBroadcaster().Broadcast( *aHint.get() );
+ if (aHint)
+ GetBroadcaster().Broadcast(*aHint);
}
ScDocShell* ScAccessibleCellTextData::GetDocShell(ScTabViewShell* pViewShell)
@@ -731,8 +731,8 @@ IMPL_LINK(ScAccessibleEditObjectTextData, NotifyHdl, EENotify&, rNotify, void)
{
::std::unique_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( &rNotify );
- if( aHint.get() )
- GetBroadcaster().Broadcast( *aHint.get() );
+ if (aHint)
+ GetBroadcaster().Broadcast(*aHint);
}
ScAccessibleEditLineTextData::ScAccessibleEditLineTextData(EditView* pEditView, vcl::Window* pWin)
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index d116c9acc7c0..f976ea141ea5 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1017,10 +1017,7 @@ EditView* ScTextWnd::GetEditView()
return mpEditView.get();
}
-bool ScTextWnd::HasEditView() const
-{
- return mpEditView.get() != nullptr;
-}
+bool ScTextWnd::HasEditView() const { return mpEditView != nullptr; }
long ScTextWnd::GetPixelHeightForLines(long nLines)
{
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index bf0fae46c56a..0916ee4fbda4 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1156,7 +1156,7 @@ ScFormatEntry* ScDataBarFrmtEntry::createDatabarEntry() const
SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), *maLbDataBarMinType.get(), *maEdDataBarMin.get(), mpDoc, maPos, true);
SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), *maLbDataBarMaxType.get(), *maEdDataBarMax.get(), mpDoc, maPos, true);
ScDataBarFormat* pDataBar = new ScDataBarFormat(mpDoc);
- pDataBar->SetDataBarData(new ScDataBarFormatData(*mpDataBarData.get()));
+ pDataBar->SetDataBarData(new ScDataBarFormatData(*mpDataBarData));
return pDataBar;
}
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 8f9711ef28f4..08998266c7f2 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -804,7 +804,7 @@ void ScTPValidationError::Reset( const SfxItemSet* rArgSet )
else
m_xEdError->set_text( EMPTY_OUSTRING );
- SelectActionHdl( *m_xLbAction.get() );
+ SelectActionHdl(*m_xLbAction);
}
bool ScTPValidationError::FillItemSet( SfxItemSet* rArgSet )
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index dbc9ce389f37..6642cffdaf16 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1101,7 +1101,7 @@ void ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine,
ScMyRememberItemVector::iterator aItr = aRememberItems.begin();
while (aItr != aRememberItems.end())
{
- rEngine.SetParaAttribs((*aItr).get()->nIndex, (*aItr).get()->aItemSet);
+ rEngine.SetParaAttribs((*aItr)->nIndex, (*aItr)->aItemSet);
++aItr;
}
}
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 6085573db08b..f4ecb3879833 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1589,7 +1589,7 @@ static std::unique_ptr<ScTokenArray> convertToTokenArray(
// no data within specified range.
continue;
- if (pUsedRange.get())
+ if (pUsedRange)
// Make sure the used area only grows, not shrinks.
pUsedRange->ExtendTo(ScRange(nDataCol1, nDataRow1, 0, nDataCol2, nDataRow2, 0));
else
@@ -1638,7 +1638,7 @@ static std::unique_ptr<ScTokenArray> convertToTokenArray(
bFirstTab = false;
}
- if (!pUsedRange.get())
+ if (!pUsedRange)
return nullptr;
s.SetCol(pUsedRange->aStart.Col());
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 6de58331021f..56efb1cac9d7 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -569,7 +569,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula::
if( m_pRefBtn )
m_pRefBtn->SetEndImage();
- if (!m_pAccel.get())
+ if (!m_pAccel)
{
m_pAccel.reset( new Accelerator );
m_pAccel->InsertItem( 1, vcl::KeyCode( KEY_RETURN ) );
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index a21c8a5db6a1..bf4ad3870802 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -5552,7 +5552,7 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe
uno::Reference<beans::XPropertySet> xPropSet( xDescriptor, uno::UNO_QUERY );
if (xPropSet.is())
- lcl_CopyProperties( *xImpl.get(), *xPropSet.get() );
+ lcl_CopyProperties(*xImpl, *xPropSet.get());
if (pDocSh)
{
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index ead395b7f5b8..233b0fe6ba73 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -713,7 +713,7 @@ void Chart2Positioner::createPositionMap()
if (meGlue == GLUETYPE_NA && mpPositionMap.get())
mpPositionMap.reset();
- if (mpPositionMap.get())
+ if (mpPositionMap)
return;
glueState();
@@ -2411,7 +2411,7 @@ ScChart2DataSequence::~ScChart2DataSequence()
if ( m_pDocument )
{
m_pDocument->RemoveUnoObject( *this);
- if (m_pHiddenListener.get())
+ if (m_pHiddenListener)
{
ScChartListenerCollection* pCLC = m_pDocument->GetChartListenerCollection();
if (pCLC)
@@ -2432,7 +2432,7 @@ void ScChart2DataSequence::RefChanged()
if( m_pDocument )
{
ScChartListenerCollection* pCLC = nullptr;
- if (m_pHiddenListener.get())
+ if (m_pHiddenListener)
{
pCLC = m_pDocument->GetChartListenerCollection();
if (pCLC)
@@ -2765,7 +2765,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
// Bring the change back from the range list to the token list.
UpdateTokensFromRanges(aRanges);
- if (pUndoRanges.get())
+ if (pUndoRanges)
m_pDocument->AddUnoRefChange(m_nObjectId, *pUndoRanges);
}
}
@@ -3205,7 +3205,7 @@ void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< uti
if (!m_pValueListener)
m_pValueListener.reset(new ScLinkListener( LINK( this, ScChart2DataSequence, ValueListenerHdl ) ));
- if (!m_pHiddenListener.get())
+ if (!m_pHiddenListener)
m_pHiddenListener.reset(new HiddenRangeListener(*this));
if( m_pDocument )
diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx
index 796ed043e3e6..e1e2b8f25487 100644
--- a/sc/source/ui/unoobj/notesuno.cxx
+++ b/sc/source/ui/unoobj/notesuno.cxx
@@ -229,7 +229,7 @@ SvxUnoText& ScAnnotationObj::GetUnoText()
pUnoText = new SvxUnoText( &aEditSource, lcl_GetAnnotationPropertySet(),
uno::Reference<text::XText>() );
}
- return *pUnoText.get();
+ return *pUnoText;
}
const ScPostIt* ScAnnotationObj::ImplGetNote() const
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 14df2e3676aa..f3e7b40327a0 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5241,7 +5241,7 @@ bool ScGridWindow::GetEditUrl( const Point& rPos,
else
pTextObj = ScEditUtil::CreateURLObjectFromURL(rDoc, sURL, sURL);
- if (pTextObj.get())
+ if (pTextObj)
pEngine->SetText(*pTextObj);
}
@@ -5662,7 +5662,7 @@ OString ScGridWindow::getCellCursor(const Fraction& rZoomX, const Fraction& rZoo
// GridWindow stores a shown cell cursor in mpOOCursors, hence
// we can use that to determine whether we would want to be showing
// one (client-side) for tiled rendering too.
- if (!mpOOCursors.get())
+ if (!mpOOCursors)
{
return OString("EMPTY");
}
diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx
index 4e8ca58965e9..f46080430263 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -258,7 +258,8 @@ void ScSpellDialogChildWindow::Init()
bool ScSpellDialogChildWindow::IsSelectionChanged()
{
- if( !mxOldRangeList.get() || !mpViewShell || (mpViewShell != dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() )) )
+ if (!mxOldRangeList || !mpViewShell
+ || (mpViewShell != dynamic_cast<ScTabViewShell*>(SfxViewShell::Current())))
return true;
if( EditView* pEditView = mpViewData->GetSpellingView() )
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 7002d8bebc3f..d003f32d6aa8 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -840,10 +840,7 @@ void ScTabView::TestHintWindow()
}
}
-bool ScTabView::HasHintWindow() const
-{
- return mxInputHintOO.get() != nullptr;
-}
+bool ScTabView::HasHintWindow() const { return mxInputHintOO != nullptr; }
void ScTabView::RemoveHintWindow()
{