diff options
Diffstat (limited to 'svtools/source/misc')
| -rw-r--r-- | svtools/source/misc/dialogcontrolling.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/misc/ehdl.cxx | 10 | ||||
| -rw-r--r-- | svtools/source/misc/sampletext.cxx | 14 |
3 files changed, 14 insertions, 14 deletions
diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index 987e841d01ce..b381c43d4bd7 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -50,7 +50,7 @@ namespace svt struct DialogController_Data { vcl::Window& rInstigator; - ::std::vector< vcl::Window* > aConcernedWindows; + ::std::vector< VclPtr<vcl::Window> > aConcernedWindows; PWindowEventFilter pEventFilter; PWindowOperator pOperator; @@ -111,7 +111,7 @@ namespace svt void DialogController::impl_updateAll( const VclWindowEvent& _rTriggerEvent ) { - for ( ::std::vector< vcl::Window* >::iterator loop = m_pImpl->aConcernedWindows.begin(); + for ( auto loop = m_pImpl->aConcernedWindows.begin(); loop != m_pImpl->aConcernedWindows.end(); ++loop ) diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 05d8b3a75bb6..fa8cf14fed01 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -89,23 +89,23 @@ static sal_uInt16 aWndFunc( aErr = aErr.replaceAll("$(ACTION)", aAction); aErr = aErr.replaceAll("$(ERROR)", rErr); - boost::scoped_ptr<MessBox> pBox; + VclPtr<MessBox> pBox; switch ( nFlags & 0xf000 ) { case ERRCODE_MSG_ERROR: - pBox.reset(new ErrorBox(pWin, eBits, aErr)); + pBox.reset(VclPtr<ErrorBox>::Create(pWin, eBits, aErr)); break; case ERRCODE_MSG_WARNING: - pBox.reset(new WarningBox(pWin, eBits, aErr)); + pBox.reset(VclPtr<WarningBox>::Create(pWin, eBits, aErr)); break; case ERRCODE_MSG_INFO: - pBox.reset(new InfoBox(pWin, aErr)); + pBox.reset(VclPtr<InfoBox>::Create(pWin, aErr)); break; case ERRCODE_MSG_QUERY: - pBox.reset(new QueryBox(pWin, eBits, aErr)); + pBox.reset(VclPtr<QueryBox>::Create(pWin, eBits, aErr)); break; default: diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index 40f5d7d45121..63d8c9a9346f 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -1623,12 +1623,12 @@ OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const vcl::Font &r { OUString sRet(makeRepresentativeTextForLanguage(rFont.GetLanguage())); - VirtualDevice aDevice; - if (sRet.isEmpty() || (-1 != aDevice.HasGlyphs(rFont, sRet))) + ScopedVclPtrInstance< VirtualDevice > aDevice; + if (sRet.isEmpty() || (-1 != aDevice->HasGlyphs(rFont, sRet))) { - aDevice.SetFont(rFont); + aDevice->SetFont(rFont); vcl::FontCapabilities aFontCapabilities; - if (aDevice.GetFontCapabilities(aFontCapabilities)) + if (aDevice->GetFontCapabilities(aFontCapabilities)) { #if OSL_DEBUG_LEVEL > 2 lcl_dump_unicode_coverage(aFontCapabilities.maUnicodeRange); @@ -1655,7 +1655,7 @@ OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const vcl::Font &r UScriptCode eScript = getScript(aFontCapabilities); if (nScriptType == com::sun::star::i18n::ScriptType::ASIAN) - eScript = attemptToDisambiguateHan(eScript, aDevice); + eScript = attemptToDisambiguateHan(eScript, *aDevice.get()); sRet = makeRepresentativeTextForScript(eScript); } @@ -1665,10 +1665,10 @@ OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const vcl::Font &r if (nScriptType == com::sun::star::i18n::ScriptType::COMPLEX) { sRet = makeRepresentativeTextForScript(USCRIPT_HEBREW); - if (-1 != aDevice.HasGlyphs(rFont, sRet)) + if (-1 != aDevice->HasGlyphs(rFont, sRet)) { sRet = makeMinimalTextForScript(USCRIPT_HEBREW); - if (-1 != aDevice.HasGlyphs(rFont, sRet)) + if (-1 != aDevice->HasGlyphs(rFont, sRet)) sRet = makeRepresentativeTextForScript(USCRIPT_ARABIC); } } |