[Libreoffice-commits] core.git: vcl/osx

rbuj robert.buj at gmail.com
Fri Jul 11 03:15:07 PDT 2014


 vcl/osx/printaccessoryview.mm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 402bde9397e98d464aa4f30a46fbff3cea958058
Author: rbuj <robert.buj at gmail.com>
Date:   Tue Jul 8 00:59:01 2014 +0200

    -Wdeprecated-declarations: first deprecated in OS X 10.10
    
    vcl/osx/printaccessoryview.mm:362:37: warning: 'NSScaleProportionally' is deprecated: first deprecated in OS X 10.10 - Use NSImageScaleProportionallyDown instead [-Wdeprecated-declarations]
    
    Available in OS X v10.0 and later. Deprecated in OS X v10.10.
    enum {
       NSScaleProportionally = 0,
       NSScaleToFit,
       NSScaleNone
    };
    
    Available in OS X v10.5 and later.
    enum {
       NSImageScaleProportionallyDown = 0,
       NSImageScaleAxesIndependently,
       NSImageScaleNone,
       NSImageScaleProportionallyUpOrDown
    };
    
    Change-Id: I457196e3e8f2ebcc10e9e0fa87755e5e3dba207c
    Reviewed-on: https://gerrit.libreoffice.org/10121
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index 1ee2190..6838232 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -359,7 +359,7 @@ class ControllerProperties
         aPreviewFrame.size.width -= 2*(aMargins.width+1);
         aPreviewFrame.size.height -= 61;
         mpPreview = [[NSImageView alloc] initWithFrame: aPreviewFrame];
-        [mpPreview setImageScaling: NSScaleProportionally];
+        [mpPreview setImageScaling: NSImageScaleProportionallyDown];
         [mpPreview setImageAlignment: NSImageAlignCenter];
         [mpPreview setImageFrameStyle: NSImageFrameNone];
         [mpPreviewBox addSubview: [mpPreview autorelease]];


More information about the Libreoffice-commits mailing list