summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
Diffstat (limited to 'sc')
-rw-r--r--sc/qa/unit/tiledrendering/tiledrendering.cxx6
-rw-r--r--sc/source/core/tool/compiler.cxx2
-rw-r--r--sc/source/core/tool/interpr1.cxx4
-rw-r--r--sc/source/filter/excel/xecontent.cxx2
-rw-r--r--sc/source/filter/oox/workbookhelper.cxx2
-rw-r--r--sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx2
-rw-r--r--sc/source/ui/condformat/colorformat.cxx4
-rw-r--r--sc/source/ui/condformat/condformatdlgentry.cxx84
-rw-r--r--sc/source/ui/dbgui/csvgrid.cxx18
-rw-r--r--sc/source/ui/dbgui/csvruler.cxx8
-rw-r--r--sc/source/ui/dbgui/pvfundlg.cxx4
-rw-r--r--sc/source/ui/formdlg/dwfunctr.cxx2
-rw-r--r--sc/source/ui/inc/inputwin.hxx2
-rw-r--r--sc/source/ui/miscdlgs/autofmt.cxx4
-rw-r--r--sc/source/ui/miscdlgs/crnrdlg.cxx6
-rw-r--r--sc/source/ui/optdlg/tpusrlst.cxx12
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx2
-rw-r--r--sc/source/ui/unoobj/fielduno.cxx2
-rw-r--r--sc/source/ui/view/tabview.cxx30
-rw-r--r--sc/source/ui/view/tabview4.cxx16
-rw-r--r--sc/source/ui/view/tabview5.cxx8
21 files changed, 110 insertions, 110 deletions
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 2d76108571d2..5525e558e7a2 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1301,7 +1301,7 @@ void ScTiledRenderingTest::testInsertGraphicInvalidations()
std::vector<unsigned char> aBuffer(nCanvasWidth * nCanvasHeight * 4);
ScopedVclPtrInstance<VirtualDevice> pDevice(nullptr, Size(1, 1), DeviceFormat::DEFAULT);
pDevice->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(), aBuffer.data());
- pModelObj->paintTile(*pDevice.get(), nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/0, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
+ pModelObj->paintTile(*pDevice, nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/0, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
Scheduler::ProcessEventsToIdle();
// insert an image in view and see if both views are invalidated
@@ -1343,7 +1343,7 @@ void ScTiledRenderingTest::testDocumentSizeWithTwoViews()
std::vector<unsigned char> aBuffer1(nCanvasWidth * nCanvasHeight * 4);
ScopedVclPtrInstance<VirtualDevice> pDevice1(nullptr, Size(1, 1), DeviceFormat::DEFAULT);
pDevice1->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(), aBuffer1.data());
- pModelObj->paintTile(*pDevice1.get(), nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/291840, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
+ pModelObj->paintTile(*pDevice1, nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/291840, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
Scheduler::ProcessEventsToIdle();
// Create a new view
@@ -1352,7 +1352,7 @@ void ScTiledRenderingTest::testDocumentSizeWithTwoViews()
std::vector<unsigned char> aBuffer2(nCanvasWidth * nCanvasHeight * 4);
ScopedVclPtrInstance<VirtualDevice> pDevice2(nullptr, Size(1, 1), DeviceFormat::DEFAULT);
pDevice2->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(), aBuffer2.data());
- pModelObj->paintTile(*pDevice2.get(), nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/291840, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
+ pModelObj->paintTile(*pDevice2, nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/291840, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
Scheduler::ProcessEventsToIdle();
// Check that the tiles actually have the same content
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 63eaf937e2e4..58cdd1b7ad92 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -5251,7 +5251,7 @@ void ScCompiler::fillAddInToken(::std::vector< css::sheet::FormulaOpCodeMapEntry
bool ScCompiler::HandleColRowName()
{
- ScSingleRefData& rRef = *mpToken.get()->GetSingleRef();
+ ScSingleRefData& rRef = *mpToken->GetSingleRef();
const ScAddress aAbs = rRef.toAbs(aPos);
if (!ValidAddress(aAbs))
{
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 127a8c622a4c..e249229dca85 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8687,14 +8687,14 @@ void ScInterpreter::ScAreas()
case svSingleRef:
{
FormulaConstTokenRef xT = PopToken();
- ValidateRef( *xT.get()->GetSingleRef());
+ ValidateRef( *xT->GetSingleRef());
++nCount;
}
break;
case svDoubleRef:
{
FormulaConstTokenRef xT = PopToken();
- ValidateRef( *xT.get()->GetDoubleRef());
+ ValidateRef( *xT->GetDoubleRef());
++nCount;
}
break;
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 266461d4426d..b58231634526 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1350,7 +1350,7 @@ XclExpCondfmt::XclExpCondfmt( const XclExpRoot& rRoot, const ScConditionalFormat
XclExpExtRef pParent = xExtLst->GetItem( XclExpExtDataBarType );
if( !pParent.get() )
{
- xExtLst->AddRecord( XclExpExtRef(new XclExpExtCondFormat( *xExtLst.get() )) );
+ xExtLst->AddRecord( XclExpExtRef(new XclExpExtCondFormat( *xExtLst )) );
pParent = xExtLst->GetItem( XclExpExtDataBarType );
}
static_cast<XclExpExtCondFormat*>(xExtLst->GetItem( XclExpExtDataBarType ).get())->AddRecord(
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 798e24a36d3f..87b5fe016e39 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -131,7 +131,7 @@ public:
ScEditEngineDefaulter& getEditEngine() const
{
- return *mxEditEngine.get();
+ return *mxEditEngine;
}
ScDocument& getScDocument() { return *mpDoc; }
diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
index 845677c0522d..14d198bdde5f 100644
--- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
@@ -129,7 +129,7 @@ void ScRandomNumberGeneratorDialog::Init()
mpEnableSeed->SetToggleHdl( LINK( this, ScRandomNumberGeneratorDialog, CheckChanged ));
mpEnableRounding->SetToggleHdl( LINK( this, ScRandomNumberGeneratorDialog, CheckChanged ));
- DistributionChanged(*mpDistributionCombo.get());
+ DistributionChanged(*mpDistributionCombo);
CheckChanged(*mpEnableSeed);
}
diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx
index 290bcbad4d40..67e1f9be5eb3 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -121,8 +121,8 @@ ScDataBarSettingsDlg::ScDataBarSettingsDlg(vcl::Window* pWindow, const ScDataBar
mpLbAxisCol->SelectEntry(rData.maAxisColor);
mpCbOnlyBar->Check(rData.mbOnlyBar);
- TypeSelectHdl(*mpLbTypeMin.get());
- PosSelectHdl(*mpLbTypeMin.get());
+ TypeSelectHdl(*mpLbTypeMin);
+ PosSelectHdl(*mpLbTypeMin);
}
ScDataBarSettingsDlg::~ScDataBarSettingsDlg()
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 2478dfc6323d..47870c52f257 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -214,7 +214,7 @@ ScConditionFrmtEntry::ScConditionFrmtEntry(vcl::Window* pParent, ScDocument* pDo
if(pFormatEntry)
{
maLbStyle->SelectEntry(pFormatEntry->GetStyle());
- StyleSelectHdl(*maLbStyle.get());
+ StyleSelectHdl(*maLbStyle);
ScConditionMode eMode = pFormatEntry->GetOperation();
maLbCondType->SelectEntryPos(ConditionModeToEntryPos(eMode));
@@ -277,7 +277,7 @@ void ScConditionFrmtEntry::Init(ScCondFormatDlg* pDialogParent)
maEdVal1->SetModifyHdl( LINK( this, ScConditionFrmtEntry, OnEdChanged ) );
maEdVal2->SetModifyHdl( LINK( this, ScConditionFrmtEntry, OnEdChanged ) );
- FillStyleListBox( mpDoc, *maLbStyle.get() );
+ FillStyleListBox( mpDoc, *maLbStyle );
maLbStyle->SetSelectHdl( LINK( this, ScConditionFrmtEntry, StyleSelectHdl ) );
maLbCondType->SetSelectHdl( LINK( this, ScConditionFrmtEntry, ConditionTypeSelectHdl ) );
@@ -470,7 +470,7 @@ void ScConditionFrmtEntry::Notify(SfxBroadcaster&, const SfxHint& rHint)
if(rHint.GetId() == SfxHintId::StyleSheetModified)
{
if(!mbIsInStyleCreate)
- UpdateStyleList(*maLbStyle.get(), mpDoc);
+ UpdateStyleList(*maLbStyle, mpDoc);
}
}
@@ -543,7 +543,7 @@ void StyleSelect( ListBox& rLbStyle, const ScDocument* pDoc, SvxFontPrevWindow&
IMPL_LINK_NOARG(ScConditionFrmtEntry, StyleSelectHdl, ListBox&, void)
{
mbIsInStyleCreate = true;
- StyleSelect( *maLbStyle.get(), mpDoc, *maWdPreview.get() );
+ StyleSelect( *maLbStyle, mpDoc, *maWdPreview );
mbIsInStyleCreate = false;
}
@@ -572,7 +572,7 @@ ScFormulaFrmtEntry::ScFormulaFrmtEntry( vcl::Window* pParent, ScDocument* pDoc,
maLbStyle->SelectEntryPos(1);
}
- StyleSelectHdl(*maLbStyle.get());
+ StyleSelectHdl(*maLbStyle);
}
ScFormulaFrmtEntry::~ScFormulaFrmtEntry()
@@ -593,13 +593,13 @@ void ScFormulaFrmtEntry::Init(ScCondFormatDlg* pDialogParent)
{
maEdFormula->SetGetFocusHdl( LINK( pDialogParent, ScCondFormatDlg, RangeGetFocusHdl ) );
- FillStyleListBox( mpDoc, *maLbStyle.get() );
+ FillStyleListBox( mpDoc, *maLbStyle );
maLbStyle->SetSelectHdl( LINK( this, ScFormulaFrmtEntry, StyleSelectHdl ) );
}
IMPL_LINK_NOARG(ScFormulaFrmtEntry, StyleSelectHdl, ListBox&, void)
{
- StyleSelect( *maLbStyle.get(), mpDoc, *maWdPreview.get() );
+ StyleSelect( *maLbStyle, mpDoc, *maWdPreview );
}
ScFormatEntry* ScFormulaFrmtEntry::createFormulaEntry() const
@@ -820,9 +820,9 @@ ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( vcl::Window* pParent, ScDocument
if(pFormat)
{
ScColorScaleEntries::const_iterator itr = pFormat->begin();
- SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMin.get(), *maEdMin.get(), *maLbColMin.get(), pDoc);
+ SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMin, *maEdMin, *maLbColMin, pDoc);
++itr;
- SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMax.get(), *maEdMax.get(), *maLbColMax.get(), pDoc);
+ SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMax, *maEdMax, *maLbColMax, pDoc);
}
else
{
@@ -832,8 +832,8 @@ ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( vcl::Window* pParent, ScDocument
maLbColorFormat->SetSelectHdl( LINK( pParent, ScCondFormatList, ColFormatTypeHdl ) );
- EntryTypeHdl(*maLbEntryTypeMin.get());
- EntryTypeHdl(*maLbEntryTypeMax.get());
+ EntryTypeHdl(*maLbEntryTypeMin);
+ EntryTypeHdl(*maLbEntryTypeMax);
}
ScColorScale2FrmtEntry::~ScColorScale2FrmtEntry()
@@ -866,8 +866,8 @@ void ScColorScale2FrmtEntry::Init()
ScFormatEntry* ScColorScale2FrmtEntry::createColorscaleEntry() const
{
ScColorScaleFormat* pColorScale = new ScColorScaleFormat(mpDoc);
- pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMin.get(), *maLbColMin.get(), *maEdMin.get(), mpDoc, maPos));
- pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMax.get(), *maLbColMax.get(), *maEdMax.get(), mpDoc, maPos));
+ pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMin, *maLbColMin, *maEdMin, mpDoc, maPos));
+ pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMax, *maLbColMax, *maEdMax, mpDoc, maPos));
return pColorScale;
}
@@ -969,12 +969,12 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( vcl::Window* pParent, ScDocument
if(pFormat)
{
ScColorScaleEntries::const_iterator itr = pFormat->begin();
- SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMin.get(), *maEdMin.get(), *maLbColMin.get(), pDoc);
+ SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMin, *maEdMin, *maLbColMin, pDoc);
assert(pFormat->size() == 3);
++itr;
- SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMiddle.get(), *maEdMiddle.get(), *maLbColMiddle.get(), pDoc);
+ SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMiddle, *maEdMiddle, *maLbColMiddle, pDoc);
++itr;
- SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMax.get(), *maEdMax.get(), *maLbColMax.get(), pDoc);
+ SetColorScaleEntryTypes(*itr[0], *maLbEntryTypeMax, *maEdMax, *maLbColMax, pDoc);
}
else
{
@@ -986,9 +986,9 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( vcl::Window* pParent, ScDocument
}
maLbColorFormat->SetSelectHdl( LINK( pParent, ScCondFormatList, ColFormatTypeHdl ) );
- EntryTypeHdl(*maLbEntryTypeMin.get());
- EntryTypeHdl(*maLbEntryTypeMiddle.get());
- EntryTypeHdl(*maLbEntryTypeMax.get());
+ EntryTypeHdl(*maLbEntryTypeMin);
+ EntryTypeHdl(*maLbEntryTypeMiddle);
+ EntryTypeHdl(*maLbEntryTypeMax);
}
ScColorScale3FrmtEntry::~ScColorScale3FrmtEntry()
@@ -1026,10 +1026,10 @@ void ScColorScale3FrmtEntry::Init()
ScFormatEntry* ScColorScale3FrmtEntry::createColorscaleEntry() const
{
ScColorScaleFormat* pColorScale = new ScColorScaleFormat(mpDoc);
- pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMin.get(), *maLbColMin.get(), *maEdMin.get(), mpDoc, maPos));
+ pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMin, *maLbColMin, *maEdMin, mpDoc, maPos));
if(maLbColorFormat->GetSelectedEntryPos() == 1)
- pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMiddle.get(), *maLbColMiddle.get(), *maEdMiddle.get(), mpDoc, maPos));
- pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMax.get(), *maLbColMax.get(), *maEdMax.get(), mpDoc, maPos));
+ pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMiddle, *maLbColMiddle, *maEdMiddle, mpDoc, maPos));
+ pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMax, *maLbColMax, *maEdMax, mpDoc, maPos));
return pColorScale;
}
@@ -1185,15 +1185,15 @@ ScDataBarFrmtEntry::ScDataBarFrmtEntry( vcl::Window* pParent, ScDocument* pDoc,
if(pFormat)
{
mpDataBarData.reset(new ScDataBarFormatData(*pFormat->GetDataBarData()));
- SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, *maLbDataBarMinType.get(), *maEdDataBarMin.get(), pDoc);
- SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, *maLbDataBarMaxType.get(), *maEdDataBarMax.get(), pDoc);
- DataBarTypeSelectHdl(*maLbDataBarMinType.get());
+ SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, *maLbDataBarMinType, *maEdDataBarMin, pDoc);
+ SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, *maLbDataBarMaxType, *maEdDataBarMax, pDoc);
+ DataBarTypeSelectHdl(*maLbDataBarMinType);
}
else
{
selectType(*maLbDataBarMinType, COLORSCALE_AUTO);
selectType(*maLbDataBarMaxType, COLORSCALE_AUTO);
- DataBarTypeSelectHdl(*maLbDataBarMinType.get());
+ DataBarTypeSelectHdl(*maLbDataBarMinType);
}
Init();
@@ -1243,10 +1243,10 @@ void ScDataBarFrmtEntry::Init()
ScFormatEntry* ScDataBarFrmtEntry::createDatabarEntry() const
{
- SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), *maLbDataBarMinType.get(),
- *maEdDataBarMin.get(), mpDoc, maPos);
- SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), *maLbDataBarMaxType.get(),
- *maEdDataBarMax.get(), mpDoc, maPos);
+ SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), *maLbDataBarMinType,
+ *maEdDataBarMin, mpDoc, maPos);
+ SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), *maLbDataBarMaxType,
+ *maEdDataBarMax, mpDoc, maPos);
ScDataBarFormat* pDataBar = new ScDataBarFormat(mpDoc);
pDataBar->SetDataBarData(new ScDataBarFormatData(*mpDataBarData));
return pDataBar;
@@ -1298,17 +1298,17 @@ IMPL_LINK_NOARG( ScDataBarFrmtEntry, DataBarTypeSelectHdl, ListBox&, void )
IMPL_LINK_NOARG( ScDataBarFrmtEntry, OptionBtnHdl, Button*, void )
{
- SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), *maLbDataBarMinType.get(),
- *maEdDataBarMin.get(), mpDoc, maPos);
- SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), *maLbDataBarMaxType.get(),
- *maEdDataBarMax.get(), mpDoc, maPos);
+ SetColorScaleEntry(mpDataBarData->mpLowerLimit.get(), *maLbDataBarMinType,
+ *maEdDataBarMin, mpDoc, maPos);
+ SetColorScaleEntry(mpDataBarData->mpUpperLimit.get(), *maLbDataBarMaxType,
+ *maEdDataBarMax, mpDoc, maPos);
ScopedVclPtrInstance<ScDataBarSettingsDlg> pDlg(this, *mpDataBarData, mpDoc, maPos);
if( pDlg->Execute() == RET_OK)
{
mpDataBarData.reset(pDlg->GetData());
- SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, *maLbDataBarMinType, *maEdDataBarMin.get(), mpDoc);
- SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, *maLbDataBarMaxType.get(), *maEdDataBarMax.get(), mpDoc);
- DataBarTypeSelectHdl(*maLbDataBarMinType.get());
+ SetDataBarEntryTypes(*mpDataBarData->mpLowerLimit, *maLbDataBarMinType, *maEdDataBarMin, mpDoc);
+ SetDataBarEntryTypes(*mpDataBarData->mpUpperLimit, *maLbDataBarMaxType, *maEdDataBarMax, mpDoc);
+ DataBarTypeSelectHdl(*maLbDataBarMinType);
}
}
@@ -1334,7 +1334,7 @@ ScDateFrmtEntry::ScDateFrmtEntry(vcl::Window* pParent, ScDocument* pDoc, const S
maLbStyle->SelectEntry(pFormat->GetStyleName());
}
- StyleSelectHdl(*maLbStyle.get());
+ StyleSelectHdl(*maLbStyle);
}
ScDateFrmtEntry::~ScDateFrmtEntry()
@@ -1356,7 +1356,7 @@ void ScDateFrmtEntry::Init()
maLbDateEntry->SelectEntryPos(0);
maLbType->SelectEntryPos(3);
- FillStyleListBox( mpDoc, *maLbStyle.get() );
+ FillStyleListBox( mpDoc, *maLbStyle );
maLbStyle->SetSelectHdl( LINK( this, ScDateFrmtEntry, StyleSelectHdl ) );
maLbStyle->SelectEntryPos(1);
}
@@ -1386,7 +1386,7 @@ void ScDateFrmtEntry::Notify( SfxBroadcaster&, const SfxHint& rHint )
if(rHint.GetId() == SfxHintId::StyleSheetModified)
{
if(!mbIsInStyleCreate)
- UpdateStyleList(*maLbStyle.get(), mpDoc);
+ UpdateStyleList(*maLbStyle, mpDoc);
}
}
@@ -1407,7 +1407,7 @@ OUString ScDateFrmtEntry::GetExpressionString()
IMPL_LINK_NOARG( ScDateFrmtEntry, StyleSelectHdl, ListBox&, void )
{
mbIsInStyleCreate = true;
- StyleSelect( *maLbStyle.get(), mpDoc, *maWdPreview.get() );
+ StyleSelect( *maLbStyle, mpDoc, *maWdPreview );
mbIsInStyleCreate = false;
}
@@ -1574,7 +1574,7 @@ ScIconSetFrmtEntry::ScIconSetFrmtEntry(vcl::Window* pParent, ScDocument* pDoc, c
maEntries[0]->SetFirstEntry();
}
else
- IconSetTypeHdl(*maLbIconSetType.get());
+ IconSetTypeHdl(*maLbIconSetType);
}
ScIconSetFrmtEntry::~ScIconSetFrmtEntry()
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index c49eb3a0c79e..e16b7f8b8b96 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -1037,7 +1037,7 @@ void ScCsvGrid::ImplRedraw()
ImplDrawBackgrDev();
ImplDrawGridDev();
}
- DrawOutDev( Point(), maWinSize, Point(), maWinSize, *mpGridDev.get() );
+ DrawOutDev( Point(), maWinSize, Point(), maWinSize, *mpGridDev );
ImplDrawTrackingRect( GetFocusColumn() );
}
}
@@ -1142,7 +1142,7 @@ void ScCsvGrid::ImplDrawColumnBackgr( sal_uInt32 nColIndex )
if( !IsVisibleColumn( nColIndex ) )
return;
- ImplSetColumnClipRegion( *mpBackgrDev.get(), nColIndex );
+ ImplSetColumnClipRegion( *mpBackgrDev, nColIndex );
// grid
mpBackgrDev->SetLineColor();
@@ -1179,7 +1179,7 @@ void ScCsvGrid::ImplDrawColumnBackgr( sal_uInt32 nColIndex )
}
// header
- ImplDrawColumnHeader( *mpBackgrDev.get(), nColIndex, maHeaderBackColor );
+ ImplDrawColumnHeader( *mpBackgrDev, nColIndex, maHeaderBackColor );
mpBackgrDev->SetClipRegion();
}
@@ -1240,8 +1240,8 @@ void ScCsvGrid::ImplDrawBackgrDev()
void ScCsvGrid::ImplDrawColumnSelection( sal_uInt32 nColIndex )
{
ImplInvertCursor( GetRulerCursorPos() );
- ImplSetColumnClipRegion( *mpGridDev.get(), nColIndex );
- mpGridDev->DrawOutDev( Point(), maWinSize, Point(), maWinSize, *mpBackgrDev.get() );
+ ImplSetColumnClipRegion( *mpGridDev, nColIndex );
+ mpGridDev->DrawOutDev( Point(), maWinSize, Point(), maWinSize, *mpBackgrDev );
if( IsSelected( nColIndex ) )
{
@@ -1253,7 +1253,7 @@ void ScCsvGrid::ImplDrawColumnSelection( sal_uInt32 nColIndex )
mpGridDev->SetLineColor();
if( maHeaderBackColor.IsDark() )
// redraw with light gray background in dark mode
- ImplDrawColumnHeader( *mpGridDev.get(), nColIndex, COL_LIGHTGRAY );
+ ImplDrawColumnHeader( *mpGridDev, nColIndex, COL_LIGHTGRAY );
else
{
// use transparent active color
@@ -1263,7 +1263,7 @@ void ScCsvGrid::ImplDrawColumnSelection( sal_uInt32 nColIndex )
// column selection
aRect = tools::Rectangle( nX1, GetHdrHeight() + 1, nX2, GetY( GetLastVisLine() + 1 ) - 1 );
- ImplInvertRect( *mpGridDev.get(), aRect );
+ ImplInvertRect( *mpGridDev, aRect );
}
mpGridDev->SetClipRegion();
@@ -1348,10 +1348,10 @@ void ScCsvGrid::ImplInvertCursor( sal_Int32 nPos )
{
sal_Int32 nX = GetX( nPos ) - 1;
tools::Rectangle aRect( Point( nX, 0 ), Size( 3, GetHdrHeight() ) );
- ImplInvertRect( *mpGridDev.get(), aRect );
+ ImplInvertRect( *mpGridDev, aRect );
aRect.SetTop( GetHdrHeight() + 1 );
aRect.SetBottom( GetY( GetLastVisLine() + 1 ) );
- ImplInvertRect( *mpGridDev.get(), aRect );
+ ImplInvertRect( *mpGridDev, aRect );
}
}
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index a9904be48f88..2046a770d7c1 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -536,7 +536,7 @@ void ScCsvRuler::ImplRedraw()
ImplDrawBackgrDev();
ImplDrawRulerDev();
}
- DrawOutDev( Point(), maWinSize, Point(), maWinSize, *maRulerDev.get() );
+ DrawOutDev( Point(), maWinSize, Point(), maWinSize, *maRulerDev );
/* Draws directly tracking rectangle to the column with the specified index. */
if( HasFocus() )
InvertTracking( tools::Rectangle( 0, 0, GetWidth() - 1, GetHeight() - 2 ),
@@ -619,14 +619,14 @@ void ScCsvRuler::ImplEraseSplit( sal_Int32 nPos )
ImplInvertCursor( GetRulerCursorPos() );
Point aPos( GetX( nPos ) - mnSplitSize / 2, 0 );
Size aSize( mnSplitSize, GetHeight() );
- maRulerDev->DrawOutDev( aPos, aSize, aPos, aSize, *maBackgrDev.get() );
+ maRulerDev->DrawOutDev( aPos, aSize, aPos, aSize, *maBackgrDev );
ImplInvertCursor( GetRulerCursorPos() );
}
}
void ScCsvRuler::ImplDrawRulerDev()
{
- maRulerDev->DrawOutDev( Point(), maWinSize, Point(), maWinSize, *maBackgrDev.get() );
+ maRulerDev->DrawOutDev( Point(), maWinSize, Point(), maWinSize, *maBackgrDev );
ImplInvertCursor( GetRulerCursorPos() );
sal_uInt32 nFirst = maSplits.LowerBound( GetFirstVisPos() );
@@ -640,7 +640,7 @@ void ScCsvRuler::ImplInvertCursor( sal_Int32 nPos )
{
if( IsVisibleSplitPos( nPos ) )
{
- ImplInvertRect( *maRulerDev.get(), tools::Rectangle( Point( GetX( nPos ) - 1, 0 ), Size( 3, GetHeight() - 1 ) ) );
+ ImplInvertRect( *maRulerDev, tools::Rectangle( Point( GetX( nPos ) - 1, 0 ), Size( 3, GetHeight() - 1 ) ) );
if( HasSplit( nPos ) )
ImplDrawSplit( nPos );
}
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 41af9f861003..c6998ce26b31 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -284,13 +284,13 @@ void ScDPFunctionDlg::Init( const ScDPLabelData& rLabelData, const ScPivotFuncDa
// select field reference type
mxLbTypeWrp->SetControlValue( rFuncData.maFieldRef.ReferenceType );
- SelectHdl( *mpLbType.get() ); // enables base field/item list boxes
+ SelectHdl( *mpLbType ); // enables base field/item list boxes
// select base field
mpLbBaseField->SelectEntry(aSelectedEntry);
if( mpLbBaseField->GetSelectedEntryPos() >= mpLbBaseField->GetEntryCount() )
mpLbBaseField->SelectEntryPos( 0 );
- SelectHdl( *mpLbBaseField.get() ); // fills base item list, selects base item
+ SelectHdl( *mpLbBaseField ); // fills base item list, selects base item
// select base item
switch( rFuncData.maFieldRef.ReferenceItemType )
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index c9879e60b515..980fd83b70de 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -84,7 +84,7 @@ ScFunctionWin::ScFunctionWin(vcl::Window* pParent, const css::uno::Reference<css
aCatBox->SelectEntryPos(0);
- SelHdl(*aCatBox.get());
+ SelHdl(*aCatBox);
}
/*************************************************************************
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 14ccb55dd4f3..01b9390d4d55 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -200,7 +200,7 @@ public:
void SetFormulaMode( bool bSet ) override;
void MakeDialogEditView() override;
bool IsInputActive() override;
- ScrollBar& GetScrollBar() { return *maScrollbar.get(); }
+ ScrollBar& GetScrollBar() { return *maScrollbar; }
void IncrementVerticalSize();
void DecrementVerticalSize();
long GetNumLines() { return maTextWnd->GetNumLines(); }
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index 4d7209ab2fca..ae3978f70f07 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -517,7 +517,7 @@ void ScAutoFmtPreview::DoPaint(vcl::RenderContext& rRenderContext)
aVD->SetOutputSize(aWndSize);
aVD->DrawRect(aRect);
- PaintCells(*aVD.get());
+ PaintCells(*aVD);
rRenderContext.SetLineColor();
rRenderContext.SetFillColor(aBackCol);
@@ -526,7 +526,7 @@ void ScAutoFmtPreview::DoPaint(vcl::RenderContext& rRenderContext)
Point aPos((aWndSize.Width() - aPrvSize.Width()) / 2, (aWndSize.Height() - aPrvSize.Height()) / 2);
if (AllSettings::GetLayoutRTL())
aPos.setX( -aPos.X() );
- rRenderContext.DrawOutDev(aPos, aWndSize, Point(), aWndSize, *aVD.get());
+ rRenderContext.DrawOutDev(aPos, aWndSize, Point(), aWndSize, *aVD);
aVD->SetDrawMode(nOldDrawMode);
}
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 12a02e4ecf8f..3f9a5f68e2f7 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -171,7 +171,7 @@ void ScColRowNameRangesDlg::Init()
pEdAssign->GrabFocus();
pRbAssign->Enable();
- Range1SelectHdl( *pLbRange.get() );
+ Range1SelectHdl( *pLbRange );
}
// set data range of a labeled range to default values and set the
@@ -577,7 +577,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl, Button*, void)
pEdAssign2->SetText( EMPTY_OUSTRING );
theCurArea = ScRange();
theCurData = theCurArea;
- Range1SelectHdl( *pLbRange.get() );
+ Range1SelectHdl( *pLbRange );
}
else
{
@@ -643,7 +643,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void)
pBtnColHead->Check();
pBtnRowHead->Check( false );
pEdAssign2->SetText( EMPTY_OUSTRING );
- Range1SelectHdl( *pLbRange.get() );
+ Range1SelectHdl( *pLbRange );
}
}
}
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index b1bcaaba9246..5ede955f67b4 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -509,7 +509,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
if ( mpLbLists->GetEntryCount() > 0 )
{
mpLbLists->SelectEntryPos( nCancelPos );
- LbSelectHdl( *mpLbLists.get() );
+ LbSelectHdl( *mpLbLists );
mpFtLists->Enable();
mpLbLists->Enable();
}
@@ -546,7 +546,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
AddNewList( theEntriesStr );
UpdateUserListBox();
mpLbLists->SelectEntryPos( mpLbLists->GetEntryCount()-1 );
- LbSelectHdl( *mpLbLists.get() );
+ LbSelectHdl( *mpLbLists );
mpFtLists->Enable();
mpLbLists->Enable();
}
@@ -555,7 +555,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
if ( mpLbLists->GetEntryCount() > 0 )
{
mpLbLists->SelectEntryPos( nCancelPos );
- LbSelectHdl( *mpLbLists.get() );
+ LbSelectHdl( *mpLbLists );
mpLbLists->Enable();
mpLbLists->Enable();
}
@@ -583,7 +583,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
else
{
mpLbLists->SelectEntryPos( 0 );
- LbSelectHdl( *mpLbLists.get() );
+ LbSelectHdl( *mpLbLists );
}
mpBtnNew->Show();
@@ -631,7 +631,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
( nRemovePos >= mpLbLists->GetEntryCount() )
? mpLbLists->GetEntryCount()-1
: nRemovePos );
- LbSelectHdl( *mpLbLists.get() );
+ LbSelectHdl( *mpLbLists );
}
else
{
@@ -688,7 +688,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void )
CopyListFromArea( theStartPos, theEndPos );
UpdateUserListBox();
mpLbLists->SelectEntryPos( mpLbLists->GetEntryCount()-1 );
- LbSelectHdl( *mpLbLists.get() );
+ LbSelectHdl( *mpLbLists );
mpEdCopyFrom->SetText( theAreaStr );
mpEdCopyFrom->Disable();
mpBtnCopy->Disable();
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 191c22cfc3bf..998e4c968d58 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -5538,7 +5538,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, *xPropSet.get());
+ lcl_CopyProperties(*xImpl, *xPropSet);
if (pDocSh)
{
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index e1e6ce3dfc27..99a6c2395174 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -617,7 +617,7 @@ SvxFieldData& ScEditFieldObj::getData()
mpData.reset(new SvxFieldData);
}
}
- return *mpData.get();
+ return *mpData;
}
void ScEditFieldObj::setPropertyValueURL(const OUString& rName, const css::uno::Any& rVal)
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 32e443bc914d..d61b42d00812 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -400,7 +400,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner )
}
// window at the bottom right
- lcl_SetPosSize( *aScrollBarBox.get(), Point( nPosX+nSizeX, nPosY+nSizeY ), Size( nBarX, nBarY ),
+ lcl_SetPosSize( *aScrollBarBox, Point( nPosX+nSizeX, nPosY+nSizeY ), Size( nBarX, nBarY ),
nTotalWidth, bLayoutRTL );
if (bHScroll) // Scrollbars horizontal
@@ -464,39 +464,39 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner )
{
Point aTabPoint(nPosX, nPosY + nSizeY);
Size aTabSize(nTabSize, nBarY);
- lcl_SetPosSize(*pTabControl.get(), aTabPoint, aTabSize, nTotalWidth, bLayoutRTL);
+ lcl_SetPosSize(*pTabControl, aTabPoint, aTabSize, nTotalWidth, bLayoutRTL);
pTabControl->SetSheetLayoutRTL(bLayoutRTL);
Point aHScrollLeftPoint(nPosX + nTabSize, nPosY + nSizeY);
Size aHScrollLeftSize(nSizeLt, nBarY);
- lcl_SetPosSize(*aHScrollLeft.get(), aHScrollLeftPoint, aHScrollLeftSize, nTotalWidth, bLayoutRTL);
+ lcl_SetPosSize(*aHScrollLeft, aHScrollLeftPoint, aHScrollLeftSize, nTotalWidth, bLayoutRTL);
Point aHSplitterPoint(nPosX + nTabSize + nSizeLt, nPosY + nSizeY);
Size aHSplitterSize(nSizeSp, nBarY);
- lcl_SetPosSize(*pHSplitter.get(), aHSplitterPoint, aHSplitterSize, nTotalWidth, bLayoutRTL);
+ lcl_SetPosSize(*pHSplitter, aHSplitterPoint, aHSplitterSize, nTotalWidth, bLayoutRTL);
Point aHScrollRightPoint(nPosX + nTabSize + nSizeLt + nSizeSp, nPosY + nSizeY);
Size aHScrollRightSize(nSizeRt, nBarY);
- lcl_SetPosSize(*aHScrollRight.get(), aHScrollRightPoint, aHScrollRightSize, nTotalWidth, bLayoutRTL);
+ lcl_SetPosSize(*aHScrollRight, aHScrollRightPoint, aHScrollRightSize, nTotalWidth, bLayoutRTL);
}
else
{
Point aTabPoint(nPosX, nPosY + nSizeY + nScrollBarSize);
Size aTabSize(nSizeX, nTabWidth);
- lcl_SetPosSize(*pTabControl.get(), aTabPoint, aTabSize, nTotalWidth, bLayoutRTL);
+ lcl_SetPosSize(*pTabControl, aTabPoint, aTabSize, nTotalWidth, bLayoutRTL);
pTabControl->SetSheetLayoutRTL(bLayoutRTL);
Point aHScrollLeftPoint(nPosX, nPosY + nSizeY);
Size aHScrollLeftSize(nSizeLt, nScrollBarSize);
- lcl_SetPosSize(*aHScrollLeft.get(), aHScrollLeftPoint, aHScrollLeftSize, nTotalWidth, bLayoutRTL);
+ lcl_SetPosSize(*aHScrollLeft, aHScrollLeftPoint, aHScrollLeftSize, nTotalWidth, bLayoutRTL);
Point aHSplitterPoint(nPosX + nSizeLt, nPosY + nSizeY);
Size aHSplitterSize(nSizeSp, nScrollBarSize);
- lcl_SetPosSize(*pHSplitter.get(), aHSplitterPoint, aHSplitterSize, nTotalWidth, bLayoutRTL);
+ lcl_SetPosSize(*pHSplitter, aHSplitterPoint, aHSplitterSize, nTotalWidth, bLayoutRTL);
Point aHScrollRightPoint(nPosX + nSizeLt + nSizeSp, nPosY + nSizeY);
Size aHScrollRightSize(nSizeRt, nScrollBarSize);
- lcl_SetPosSize(*aHScrollRight.get(), aHScrollRightPoint, aHScrollRightSize, nTotalWidth, bLayoutRTL);
+ lcl_SetPosSize(*aHScrollRight, aHScrollRightPoint, aHScrollRightSize, nTotalWidth, bLayoutRTL);
}
// SetDragRectPixel is done below
}
@@ -524,11 +524,11 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner )
}
nSizeDn = nSizeY - nSizeUp - nSizeSp;
- lcl_SetPosSize( *aVScrollTop.get(), Point(nPosX + nSizeX, nPosY),
+ lcl_SetPosSize( *aVScrollTop, Point(nPosX + nSizeX, nPosY),
Size(nBarX, nSizeUp), nTotalWidth, bLayoutRTL );
lcl_SetPosSize( *pVSplitter, Point( nPosX + nSizeX, nPosY+nSizeUp ),
Size( nBarX, nSizeSp ), nTotalWidth, bLayoutRTL );
- lcl_SetPosSize( *aVScrollBottom.get(), Point(nPosX + nSizeX,
+ lcl_SetPosSize( *aVScrollBottom, Point(nPosX + nSizeX,
nPosY + nSizeUp + nSizeSp),
Size(nBarX, nSizeDn), nTotalWidth, bLayoutRTL );
@@ -554,10 +554,10 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner )
long nTabSize = nSize1;
if (nTabSize < 0) nTabSize = 0;
- lcl_SetPosSize( *pTabControl.get(), Point(nPosX, nPosY+nSizeY-nBarY),
+ lcl_SetPosSize( *pTabControl, Point(nPosX, nPosY+nSizeY-nBarY),
Size(nTabSize, nBarY), nTotalWidth, bLayoutRTL );
nSizeY -= nBarY;
- lcl_SetPosSize( *aScrollBarBox.get(), Point( nPosX+nSizeX, nPosY+nSizeY ), Size( nBarX, nBarY ),
+ lcl_SetPosSize( *aScrollBarBox, Point( nPosX+nSizeX, nPosY+nSizeY ), Size( nBarX, nBarY ),
nTotalWidth, bLayoutRTL );
if( bVScroll )
@@ -678,7 +678,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner )
}
if (bHOutline && bVOutline)
{
- lcl_SetPosSize( *aTopButton.get(), Point(nOutPosX,nOutPosY), Size(nOutlineX,nOutlineY), nTotalWidth, bLayoutRTL );
+ lcl_SetPosSize( *aTopButton, Point(nOutPosX,nOutPosY), Size(nOutlineX,nOutlineY), nTotalWidth, bLayoutRTL );
aTopButton->Show();
}
else
@@ -698,7 +698,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner )
lcl_SetPosSize( *pRowBar[SC_SPLIT_BOTTOM],
Point(nPosX-nBarX,nSplitPosY), Size(nBarX,nBottomSize), nTotalWidth, bLayoutRTL );
- lcl_SetPosSize( *aCornerButton.get(), Point(nPosX-nBarX,nPosY-nBarY), Size(nBarX,nBarY), nTotalWidth, bLayoutRTL );
+ lcl_SetPosSize( *aCornerButton, Point(nPosX-nBarX,nPosY-nBarY), Size(nBarX,nBarY), nTotalWidth, bLayoutRTL );
aCornerButton->Show();
pColBar[SC_SPLIT_LEFT]->Show();
pRowBar[SC_SPLIT_BOTTOM]->Show();
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 250f71b32b3a..ba390881d6f6 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -405,41 +405,41 @@ void ScTabView::UpdateScrollBars( HeaderType eHeaderType )
nVisXL = aViewData.VisibleCellsX( SC_SPLIT_LEFT );
long nMaxXL = lcl_GetScrollRange( nUsedX, aViewData.GetPosX(SC_SPLIT_LEFT), nVisXL, MAXCOL, 0 );
- SetScrollBar( *aHScrollLeft.get(), nMaxXL, nVisXL, aViewData.GetPosX( SC_SPLIT_LEFT ), bLayoutRTL );
+ SetScrollBar( *aHScrollLeft, nMaxXL, nVisXL, aViewData.GetPosX( SC_SPLIT_LEFT ), bLayoutRTL );
nVisYB = aViewData.VisibleCellsY( SC_SPLIT_BOTTOM );
long nMaxYB = lcl_GetScrollRange( nUsedY, aViewData.GetPosY(SC_SPLIT_BOTTOM), nVisYB, MAXROW, nStartY );
- SetScrollBar( *aVScrollBottom.get(), nMaxYB, nVisYB, aViewData.GetPosY( SC_SPLIT_BOTTOM ) - nStartY, bLayoutRTL );
+ SetScrollBar( *aVScrollBottom, nMaxYB, nVisYB, aViewData.GetPosY( SC_SPLIT_BOTTOM ) - nStartY, bLayoutRTL );
if (bRight)
{
nVisXR = aViewData.VisibleCellsX( SC_SPLIT_RIGHT );
long nMaxXR = lcl_GetScrollRange( nUsedX, aViewData.GetPosX(SC_SPLIT_RIGHT), nVisXR, MAXCOL, nStartX );
- SetScrollBar( *aHScrollRight.get(), nMaxXR, nVisXR, aViewData.GetPosX( SC_SPLIT_RIGHT ) - nStartX, bLayoutRTL );
+ SetScrollBar( *aHScrollRight, nMaxXR, nVisXR, aViewData.GetPosX( SC_SPLIT_RIGHT ) - nStartX, bLayoutRTL );
}
if (bTop)
{
nVisYT = aViewData.VisibleCellsY( SC_SPLIT_TOP );
long nMaxYT = lcl_GetScrollRange( nUsedY, aViewData.GetPosY(SC_SPLIT_TOP), nVisYT, MAXROW, 0 );
- SetScrollBar( *aVScrollTop.get(), nMaxYT, nVisYT, aViewData.GetPosY( SC_SPLIT_TOP ), bLayoutRTL );
+ SetScrollBar( *aVScrollTop, nMaxYT, nVisYT, aViewData.GetPosY( SC_SPLIT_TOP ), bLayoutRTL );
}
// test the range
- nDiff = lcl_UpdateBar( *aHScrollLeft.get(), nVisXL );
+ nDiff = lcl_UpdateBar( *aHScrollLeft, nVisXL );
if (nDiff) ScrollX( nDiff, SC_SPLIT_LEFT );
if (bRight)
{
- nDiff = lcl_UpdateBar( *aHScrollRight.get(), nVisXR );
+ nDiff = lcl_UpdateBar( *aHScrollRight, nVisXR );
if (nDiff) ScrollX( nDiff, SC_SPLIT_RIGHT );
}
- nDiff = lcl_UpdateBar( *aVScrollBottom.get(), nVisYB );
+ nDiff = lcl_UpdateBar( *aVScrollBottom, nVisYB );
if (nDiff) ScrollY( nDiff, SC_SPLIT_BOTTOM );
if (bTop)
{
- nDiff = lcl_UpdateBar( *aVScrollTop.get(), nVisYT );
+ nDiff = lcl_UpdateBar( *aVScrollTop, nVisYT );
if (nDiff) ScrollY( nDiff, SC_SPLIT_TOP );
}
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 4262c03a1e17..f1ca737b3f1c 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -111,10 +111,10 @@ void ScTabView::Init()
explicitly because the parent frame window is already RTL disabled. */
pTabControl->EnableRTL( AllSettings::GetLayoutRTL() );
- InitScrollBar( *aHScrollLeft.get(), MAXCOL+1 );
- InitScrollBar( *aHScrollRight.get(), MAXCOL+1 );
- InitScrollBar( *aVScrollTop.get(), MAXROW+1 );
- InitScrollBar( *aVScrollBottom.get(), MAXROW+1 );
+ InitScrollBar( *aHScrollLeft, MAXCOL+1 );
+ InitScrollBar( *aHScrollRight, MAXCOL+1 );
+ InitScrollBar( *aVScrollTop, MAXROW+1 );
+ InitScrollBar( *aVScrollBottom, MAXROW+1 );
/* #i97900# scrollbars remain in correct RTL mode, needed mirroring etc.
is now handled correctly at the respective places. */
generated by cgit (git 2.34.1) at 2024-12-26 14:12:03 +0000