diff options
Diffstat (limited to 'vcl/generic')
-rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 22 | ||||
-rw-r--r-- | vcl/generic/print/genprnpsp.cxx | 18 |
2 files changed, 20 insertions, 20 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 635abb30a671..16f123f81595 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -93,7 +93,7 @@ static FT_Library aLibFT = 0; // enable linking with old FT versions static int nFTVERSION = 0; -typedef std::unordered_map<const char*, boost::shared_ptr<FtFontFile>, rtl::CStringHash, rtl::CStringEqual> FontFileList; +typedef std::unordered_map<const char*, std::shared_ptr<FtFontFile>, rtl::CStringHash, rtl::CStringEqual> FontFileList; namespace { struct vclFontFileList : public rtl::Static< FontFileList, vclFontFileList > {}; } @@ -558,14 +558,14 @@ ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI ) mnLoadFlags |= FT_LOAD_NO_BITMAP; } -void ServerFont::SetFontOptions( boost::shared_ptr<ImplFontOptions> pFontOptions) +void ServerFont::SetFontOptions(std::shared_ptr<ImplFontOptions> xFontOptions) { - mpFontOptions = pFontOptions; + mxFontOptions = xFontOptions; - if (!mpFontOptions) + if (!mxFontOptions) return; - FontAutoHint eHint = mpFontOptions->GetUseAutoHint(); + FontAutoHint eHint = mxFontOptions->GetUseAutoHint(); if( eHint == AUTOHINT_DONTKNOW ) eHint = mbUseGamma ? AUTOHINT_TRUE : AUTOHINT_FALSE; @@ -576,11 +576,11 @@ void ServerFont::SetFontOptions( boost::shared_ptr<ImplFontOptions> pFontOptions mnLoadFlags |= FT_LOAD_NO_HINTING; mnLoadFlags |= FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; //#88334# - if( mpFontOptions->DontUseAntiAlias() ) + if (mxFontOptions->DontUseAntiAlias()) mnPrioAntiAlias = 0; - if( mpFontOptions->DontUseEmbeddedBitmaps() ) + if (mxFontOptions->DontUseEmbeddedBitmaps()) mnPrioEmbedded = 0; - if( mpFontOptions->DontUseHinting() ) + if (mxFontOptions->DontUseHinting()) mnPrioAutoHint = 0; if( mnPrioAutoHint <= 0 ) @@ -590,7 +590,7 @@ void ServerFont::SetFontOptions( boost::shared_ptr<ImplFontOptions> pFontOptions if( !(mnLoadFlags & FT_LOAD_NO_HINTING) ) { mnLoadFlags |= FT_LOAD_TARGET_NORMAL; - switch( mpFontOptions->GetHintStyle() ) + switch (mxFontOptions->GetHintStyle()) { case HINT_NONE: mnLoadFlags |= FT_LOAD_NO_HINTING; @@ -611,9 +611,9 @@ void ServerFont::SetFontOptions( boost::shared_ptr<ImplFontOptions> pFontOptions mnLoadFlags |= FT_LOAD_NO_BITMAP; } -boost::shared_ptr<ImplFontOptions> ServerFont::GetFontOptions() const +std::shared_ptr<ImplFontOptions> ServerFont::GetFontOptions() const { - return mpFontOptions; + return mxFontOptions; } const OString& ServerFont::GetFontFileName() const diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 02d2ab9ab596..02de54681adc 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -1070,14 +1070,14 @@ bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJo boost::shared_ptr<vcl::PDFWriter> pWriter; std::vector< PDFPrintFile > aPDFFiles; - boost::shared_ptr<Printer> pPrinter( i_rController.getPrinter() ); + std::shared_ptr<Printer> xPrinter(i_rController.getPrinter()); int nAllPages = i_rController.getFilteredPageCount(); i_rController.createProgressDialog(); bool bAborted = false; PDFNewJobParameters aLastParm; - aContext.DPIx = pPrinter->GetDPIX(); - aContext.DPIy = pPrinter->GetDPIY(); + aContext.DPIx = xPrinter->GetDPIX(); + aContext.DPIy = xPrinter->GetDPIY(); for( int nPage = 0; nPage < nAllPages && ! bAborted; nPage++ ) { if( nPage == nAllPages-1 ) @@ -1098,9 +1098,9 @@ bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJo } else { - pPrinter->SetMapMode( MapMode( MAP_100TH_MM ) ); - pPrinter->SetPaperSizeUser( aPageSize.aSize, true ); - PDFNewJobParameters aNewParm( pPrinter->GetPaperSize(), pPrinter->GetPaperBin() ); + xPrinter->SetMapMode( MapMode( MAP_100TH_MM ) ); + xPrinter->SetPaperSizeUser( aPageSize.aSize, true ); + PDFNewJobParameters aNewParm(xPrinter->GetPaperSize(), xPrinter->GetPaperBin()); // create PDF writer on demand // either on first page @@ -1162,7 +1162,7 @@ bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJo { if( bCollate ) { - if( aPDFFiles.size() == 1 && pPrinter->HasSupport( SUPPORT_COLLATECOPY ) ) + if (aPDFFiles.size() == 1 && xPrinter->HasSupport(SUPPORT_COLLATECOPY)) { m_aJobData.setCollate( true ); m_aJobData.m_nCopies = nCopies; @@ -1219,7 +1219,7 @@ bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJo m_aJobData.setPaperBin( aPDFFiles[i].maParameters.mnPaperBin ); // spool current file - FILE* fp = PrinterInfoManager::get().startSpool( pPrinter->GetName(), i_rController.isDirectPrint() ); + FILE* fp = PrinterInfoManager::get().startSpool(xPrinter->GetName(), i_rController.isDirectPrint()); if( fp ) { sal_uInt64 nBytesRead = 0; @@ -1242,7 +1242,7 @@ bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJo aBuf.append( sal_Int32( i + nCurJob * aPDFFiles.size() ) ); } bSuccess &= - PrinterInfoManager::get().endSpool( pPrinter->GetName(), aBuf.makeStringAndClear(), fp, m_aJobData, bFirstJob, sFaxNumber ); + PrinterInfoManager::get().endSpool(xPrinter->GetName(), aBuf.makeStringAndClear(), fp, m_aJobData, bFirstJob, sFaxNumber); bFirstJob = false; } } |