Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
9d9b3a61
Kaydet (Commit)
9d9b3a61
authored
Kas 13, 2017
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
MACOSX_SDK_VERSION is always at least 1090
Change-Id: I802d9aae2220ae6b8f67e3387c3b329f6b02163c
üst
791ab225
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
25 deletions
+4
-25
BluetoothServer.cxx
sd/source/ui/remotecontrol/BluetoothServer.cxx
+4
-8
a11ytextattributeswrapper.mm
vcl/osx/a11ytextattributeswrapper.mm
+0
-12
salprn.cxx
vcl/osx/salprn.cxx
+0
-5
No files found.
sd/source/ui/remotecontrol/BluetoothServer.cxx
Dosyayı görüntüle @
9d9b3a61
...
...
@@ -41,14 +41,10 @@
#ifdef MACOSX
#include <osl/conditn.hxx>
#include <premac.h>
#if MACOSX_SDK_VERSION == 1080
#import <IOBluetooth/IOBluetooth.h>
#else
#import <CoreFoundation/CoreFoundation.h>
#import <IOBluetooth/IOBluetoothUtilities.h>
#import <IOBluetooth/objc/IOBluetoothSDPUUID.h>
#import <IOBluetooth/objc/IOBluetoothSDPServiceRecord.h>
#endif
#import <CoreFoundation/CoreFoundation.h>
#import <IOBluetooth/IOBluetoothUtilities.h>
#import <IOBluetooth/objc/IOBluetoothSDPUUID.h>
#import <IOBluetooth/objc/IOBluetoothSDPServiceRecord.h>
#include <postmac.h>
#import "OSXBluetooth.h"
#include "OSXBluetoothWrapper.hxx"
...
...
vcl/osx/a11ytextattributeswrapper.mm
Dosyayı görüntüle @
9d9b3a61
...
...
@@ -108,20 +108,12 @@ using namespace ::com::sun::star::uno;
@implementation AquaA11yTextAttributesWrapper : NSObject
+(int)convertUnderlineStyle:(PropertyValue)property {
#if MACOSX_SDK_VERSION >= 1090
int underlineStyle = NSUnderlineStyleNone;
#else
int underlineStyle = NSNoUnderlineStyle;
#endif
sal_Int16 value = 0;
property.Value >>= value;
if ( value != ::css_awt::FontUnderline::NONE
&& value != ::css_awt::FontUnderline::DONTKNOW) {
#if MACOSX_SDK_VERSION >= 1090
underlineStyle = NSUnderlineStyleSingle;
#else
underlineStyle = NSSingleUnderlineStyle;
#endif
}
return underlineStyle;
}
...
...
@@ -227,11 +219,7 @@ using namespace ::com::sun::star::uno;
if ( property.Value.hasValue() ) {
if ( property.Name.equals ( attrUnderline ) ) {
int style = [ AquaA11yTextAttributesWrapper convertUnderlineStyle: property ];
#if MACOSX_SDK_VERSION >= 1090
if ( style != NSUnderlineStyleNone ) {
#else
if ( style != NSNoUnderlineStyle ) {
#endif
[ string addAttribute: NSAccessibilityUnderlineTextAttribute value: [ NSNumber numberWithInt: style ] range: range ];
}
} else if ( property.Name.equals ( attrFontname ) ) {
...
...
vcl/osx/salprn.cxx
Dosyayı görüntüle @
9d9b3a61
...
...
@@ -64,13 +64,8 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) :
{
mpPrintInfo
=
[
pShared
copy
];
[
mpPrintInfo
setPrinter
:
mpPrinter
];
#if MACOSX_SDK_VERSION >= 1090
mePageOrientation
=
([
mpPrintInfo
orientation
]
==
NSPaperOrientationPortrait
)
?
Orientation
::
Landscape
:
Orientation
::
Portrait
;
[
mpPrintInfo
setOrientation
:
NSPaperOrientationPortrait
];
#else
mePageOrientation
=
([
mpPrintInfo
orientation
]
==
NSLandscapeOrientation
)
?
Orientation
::
Landscape
:
Orientation
::
Portrait
;
[
mpPrintInfo
setOrientation
:
NSPortraitOrientation
];
#endif
}
mpGraphics
=
new
AquaSalGraphics
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment