diff options
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/ctrlbox.cxx | 8 | ||||
-rw-r--r-- | svtools/source/control/filectrl.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/ruler.cxx | 34 | ||||
-rw-r--r-- | svtools/source/control/valueset.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/sampletext.cxx | 2 |
6 files changed, 25 insertions, 25 deletions
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 86a72f6ddb67..becd6476ef44 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -1525,7 +1525,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Po PaintEmphasis(aTextRect, bSelected, rRenderContext); if ( bShowSelection ) - vcl::RenderTools::DrawSelectionBackground(rRenderContext, *pView.get(), CalcFocusRect(pEntry), + vcl::RenderTools::DrawSelectionBackground(rRenderContext, *pView, CalcFocusRect(pEntry), bActiveSelection ? 1 : 2, false, true, false); diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index be3c00c7b860..dea1fd973289 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -466,13 +466,13 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance, aVirDev->SetFillColor( aColor1 ); double y1 = double( n1 ) / 2; - svtools::DrawLine( *aVirDev.get(), basegfx::B2DPoint( 0, y1 ), basegfx::B2DPoint( aSize.Width( ), y1 ), n1, nStyle ); + svtools::DrawLine( *aVirDev, basegfx::B2DPoint( 0, y1 ), basegfx::B2DPoint( aSize.Width( ), y1 ), n1, nStyle ); if ( n2 ) { double y2 = n1 + nDist + double( n2 ) / 2; aVirDev->SetFillColor( aColor2 ); - svtools::DrawLine( *aVirDev.get(), basegfx::B2DPoint( 0, y2 ), basegfx::B2DPoint( aSize.Width(), y2 ), n2, SvxBorderLineStyle::SOLID ); + svtools::DrawLine( *aVirDev, basegfx::B2DPoint( 0, y2 ), basegfx::B2DPoint( aSize.Width(), y2 ), n2, SvxBorderLineStyle::SOLID ); } rBmp = aVirDev->GetBitmapEx( Point(), Size( aSize.Width(), n1+nDist+n2 ) ); } @@ -1789,13 +1789,13 @@ void SvtLineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance, aVirDev->SetFillColor( aColor1 ); double y1 = double( n1 ) / 2; - svtools::DrawLine( *aVirDev.get(), basegfx::B2DPoint( 0, y1 ), basegfx::B2DPoint( aSize.Width( ), y1 ), n1, nStyle ); + svtools::DrawLine( *aVirDev, basegfx::B2DPoint( 0, y1 ), basegfx::B2DPoint( aSize.Width( ), y1 ), n1, nStyle ); if ( n2 ) { double y2 = n1 + nDist + double( n2 ) / 2; aVirDev->SetFillColor( aColor2 ); - svtools::DrawLine( *aVirDev.get(), basegfx::B2DPoint( 0, y2 ), basegfx::B2DPoint( aSize.Width(), y2 ), n2, SvxBorderLineStyle::SOLID ); + svtools::DrawLine( *aVirDev, basegfx::B2DPoint( 0, y2 ), basegfx::B2DPoint( aSize.Width(), y2 ), n2, SvxBorderLineStyle::SOLID ); } rBmp = aVirDev->GetBitmapEx( Point(), Size( aSize.Width(), n1+nDist+n2 ) ); } diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index 5a7b353e8d34..81ba9557a79f 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -228,7 +228,7 @@ IMPL_LINK_NOARG(FileControl, ButtonHdl, Button*, void) if ( aObj.GetProtocol() == INetProtocol::File ) aNewText = aObj.PathToFileName(); SetText( aNewText ); - maEdit->GetModifyHdl().Call( *maEdit.get() ); + maEdit->GetModifyHdl().Call( *maEdit ); } } } diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 33330e425d32..3d2047a60de2 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -1178,8 +1178,8 @@ void Ruler::ImplFormat(vcl::RenderContext const & rRenderContext) // top/bottom border maVirDev->SetLineColor(rStyleSettings.GetShadowColor()); - ImplVDrawLine(*maVirDev.get(), nVirLeft, nVirTop + 1, nM1, nVirTop + 1); //top left line - ImplVDrawLine(*maVirDev.get(), nM2, nVirTop + 1, nP2 - 1, nVirTop + 1); //top right line + ImplVDrawLine(*maVirDev, nVirLeft, nVirTop + 1, nM1, nVirTop + 1); //top left line + ImplVDrawLine(*maVirDev, nM2, nVirTop + 1, nP2 - 1, nVirTop + 1); //top right line nVirTop++; nVirBottom--; @@ -1188,31 +1188,31 @@ void Ruler::ImplFormat(vcl::RenderContext const & rRenderContext) maVirDev->SetLineColor(); maVirDev->SetFillColor(rStyleSettings.GetDialogColor()); if (nM1 > nVirLeft) - ImplVDrawRect(*maVirDev.get(), nP1, nVirTop + 1, nM1, nVirBottom); //left gray rectangle + ImplVDrawRect(*maVirDev, nP1, nVirTop + 1, nM1, nVirBottom); //left gray rectangle if (nM2 < nP2) - ImplVDrawRect(*maVirDev.get(), nM2, nVirTop + 1, nP2, nVirBottom); //right gray rectangle + ImplVDrawRect(*maVirDev, nM2, nVirTop + 1, nP2, nVirBottom); //right gray rectangle if (nM2 - nM1 > 0) { maVirDev->SetFillColor(rStyleSettings.GetWindowColor()); - ImplVDrawRect(*maVirDev.get(), nM1 + 1, nVirTop, nM2 - 1, nVirBottom); //center rectangle + ImplVDrawRect(*maVirDev, nM1 + 1, nVirTop, nM2 - 1, nVirBottom); //center rectangle } maVirDev->SetLineColor(rStyleSettings.GetShadowColor()); if (nM1 > nVirLeft) { - ImplVDrawLine(*maVirDev.get(), nM1, nVirTop + 1, nM1, nVirBottom); //right line of the left rectangle - ImplVDrawLine(*maVirDev.get(), nP1, nVirBottom, nM1, nVirBottom); //bottom line of the left rectangle + ImplVDrawLine(*maVirDev, nM1, nVirTop + 1, nM1, nVirBottom); //right line of the left rectangle + ImplVDrawLine(*maVirDev, nP1, nVirBottom, nM1, nVirBottom); //bottom line of the left rectangle if (nP1 >= nVirLeft) { - ImplVDrawLine(*maVirDev.get(), nP1, nVirTop + 1, nP1, nVirBottom); //left line of the left rectangle - ImplVDrawLine(*maVirDev.get(), nP1, nVirBottom, nP1 + 1, nVirBottom); //? + ImplVDrawLine(*maVirDev, nP1, nVirTop + 1, nP1, nVirBottom); //left line of the left rectangle + ImplVDrawLine(*maVirDev, nP1, nVirBottom, nP1 + 1, nVirBottom); //? } } if (nM2 < nP2) { - ImplVDrawLine(*maVirDev.get(), nM2, nVirBottom, nP2 - 1, nVirBottom); //bottom line of the right rectangle - ImplVDrawLine(*maVirDev.get(), nM2, nVirTop + 1, nM2, nVirBottom); //left line of the right rectangle + ImplVDrawLine(*maVirDev, nM2, nVirBottom, nP2 - 1, nVirBottom); //bottom line of the right rectangle + ImplVDrawLine(*maVirDev, nM2, nVirTop + 1, nM2, nVirBottom); //left line of the right rectangle if (nP2 <= nVirRight + 1) - ImplVDrawLine(*maVirDev.get(), nP2 - 1, nVirTop + 1, nP2 - 1, nVirBottom); //right line of the right rectangle + ImplVDrawLine(*maVirDev, nP2 - 1, nVirTop + 1, nP2 - 1, nVirBottom); //right line of the right rectangle } long nMin = nVirLeft; @@ -1231,19 +1231,19 @@ void Ruler::ImplFormat(vcl::RenderContext const & rRenderContext) nMax--; // Draw captions - ImplDrawTicks(*maVirDev.get(), nMin, nMax, nStart, nVirTop, nVirBottom); + ImplDrawTicks(*maVirDev, nMin, nMax, nStart, nVirTop, nVirBottom); // Draw borders if (!mpData->pBorders.empty()) - ImplDrawBorders(*maVirDev.get(), nVirLeft, nP2, nVirTop, nVirBottom); + ImplDrawBorders(*maVirDev, nVirLeft, nP2, nVirTop, nVirBottom); // Draw indents if (!mpData->pIndents.empty()) - ImplDrawIndents(*maVirDev.get(), nVirLeft, nP2, nVirTop - 1, nVirBottom + 1); + ImplDrawIndents(*maVirDev, nVirLeft, nP2, nVirTop - 1, nVirBottom + 1); // Tabs if (!mpData->pTabs.empty()) - ImplDrawTabs(*maVirDev.get(), nVirLeft, nP2, nVirTop-1, nVirBottom + 1); + ImplDrawTabs(*maVirDev, nVirLeft, nP2, nVirTop-1, nVirBottom + 1); mbFormat = false; } @@ -1325,7 +1325,7 @@ void Ruler::ImplDraw(vcl::RenderContext& rRenderContext) aOffPos.setX( RULER_OFF ); aOffPos.setY( mnVirOff ); } - rRenderContext.DrawOutDev(aOffPos, aVirDevSize, Point(), aVirDevSize, *maVirDev.get()); + rRenderContext.DrawOutDev(aOffPos, aVirDevSize, Point(), aVirDevSize, *maVirDev); // redraw positionlines ImplInvertLines(rRenderContext); diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index d0793aa997cc..a422048583c4 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -2745,7 +2745,7 @@ void SvtValueSet::ImplDraw(vcl::RenderContext& rRenderContext) Point aDefPos; Size aSize = maVirDev->GetOutputSizePixel(); - rRenderContext.DrawOutDev(aDefPos, aSize, aDefPos, aSize, *maVirDev.get()); + rRenderContext.DrawOutDev(aDefPos, aSize, aDefPos, aSize, *maVirDev); // draw parting line to the Namefield if (GetStyle() & WB_NAMEFIELD) diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index 530e2d27979b..4086fc477f79 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -1650,7 +1650,7 @@ OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const vcl::Font &r UScriptCode eScript = getScript(aFontCapabilities); if (nScriptType == css::i18n::ScriptType::ASIAN) - eScript = attemptToDisambiguateHan(eScript, *aDevice.get()); + eScript = attemptToDisambiguateHan(eScript, *aDevice); sRet = makeRepresentativeTextForScript(eScript); } |