diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 22:39:36 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 22:40:06 +0200 |
| commit | d798ee8f82dcbdada49ef0c745ff234d936bb3f6 (patch) | |
| tree | ec620c5d4120e5ecee61371fae734f2d9b6f0af9 /vcl | |
| parent | cd41fa43089d0977cbf62071c9bfe2322de5d012 (diff) | |
loplugin:vclwidgets (best guess)
Change-Id: I682a0970fd667eacda781e799a941a11593ade90
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/osx/a11yfocustracker.hxx | 2 | ||||
| -rw-r--r-- | vcl/osx/printaccessoryview.mm | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx index e45f74aad21a..6f1efd6946de 100644 --- a/vcl/inc/osx/a11yfocustracker.hxx +++ b/vcl/inc/osx/a11yfocustracker.hxx @@ -84,7 +84,7 @@ private: rtl::Reference< KeyboardFocusListener > m_aFocusListener; // the list of Windows that need deeper (focus) investigation - std::set< vcl::Window *> m_aDocumentWindowList; + std::set<VclPtr<vcl::Window>> m_aDocumentWindowList; // the link object needed for Application::addEventListener Link m_aWindowEventLink; diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm index 81b3194a1072..cd37d5fc4119 100644 --- a/vcl/osx/printaccessoryview.mm +++ b/vcl/osx/printaccessoryview.mm @@ -299,14 +299,14 @@ class ControllerProperties { GDIMetaFile aMtf; PrinterController::PageSize aPageSize( mpController->getFilteredPageFile( i_nPage, aMtf, false ) ); - VirtualDevice aDev; + auto aDev(VclPtr<VirtualDevice>::Create()); if( mpController->getPrinter()->GetPrinterOptions().IsConvertToGreyscales() ) - aDev.SetDrawMode( aDev.GetDrawMode() | ( DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_GRAYTEXT | + aDev->SetDrawMode( aDev->GetDrawMode() | ( DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_GRAYTEXT | DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT ) ); // see salprn.cxx, currently we pretend to be a 720dpi device on printers - aDev.SetReferenceDevice( 720, 720 ); - aDev.EnableOutput( TRUE ); - Size aLogicSize( aDev.PixelToLogic( aPixelSize, MapMode( MAP_100TH_MM ) ) ); + aDev->SetReferenceDevice( 720, 720 ); + aDev->EnableOutput( TRUE ); + Size aLogicSize( aDev->PixelToLogic( aPixelSize, MapMode( MAP_100TH_MM ) ) ); double fScaleX = double(aLogicSize.Width())/double(aPageSize.aSize.Width()); double fScaleY = double(aLogicSize.Height())/double(aPageSize.aSize.Height()); double fScale = (fScaleX < fScaleY) ? fScaleX : fScaleY; @@ -321,13 +321,13 @@ class ControllerProperties aMtf.WindStart(); aLogicSize.Width() = long(double(aPageSize.aSize.Width()) * fScale); aLogicSize.Height() = long(double(aPageSize.aSize.Height()) * fScale); - aPixelSize = aDev.LogicToPixel( aLogicSize, MapMode( MAP_100TH_MM ) ); - aDev.SetOutputSizePixel( aPixelSize ); + aPixelSize = aDev->LogicToPixel( aLogicSize, MapMode( MAP_100TH_MM ) ); + aDev->SetOutputSizePixel( aPixelSize ); aMtf.WindStart(); - aDev.SetMapMode( MapMode( MAP_100TH_MM ) ); - aMtf.Play( &aDev, Point( 0, 0 ), aLogicSize ); - aDev.EnableMapMode( FALSE ); - Image aImage( aDev.GetBitmap( Point( 0, 0 ), aPixelSize ) ); + aDev->SetMapMode( MapMode( MAP_100TH_MM ) ); + aMtf.Play( aDev.get(), Point( 0, 0 ), aLogicSize ); + aDev->EnableMapMode( FALSE ); + Image aImage( aDev->GetBitmap( Point( 0, 0 ), aPixelSize ) ); NSImage* pImage = CreateNSImage( aImage ); [mpPreview setImage: [pImage autorelease]]; } |