[Libreoffice-commits] core.git: Branch 'aoo/trunk' - fpicker/Library_fps_aqua.mk fpicker/source
Jim Jagielski
jim at apache.org
Mon Nov 27 17:11:08 UTC 2017
fpicker/Library_fps_aqua.mk | 8 +++++++-
fpicker/source/aqua/AquaFilePickerDelegate.cxx | 24 ++++++++++++------------
fpicker/source/aqua/CFStringUtilities.hxx | 1 +
fpicker/source/aqua/NSString_OOoAdditions.cxx | 16 ++++++++--------
fpicker/source/aqua/NSURL_OOoAdditions.cxx | 10 +++++-----
5 files changed, 33 insertions(+), 26 deletions(-)
New commits:
commit ee5a916a73aa85e06115aca56d3b2696c0cd1eac
Author: Jim Jagielski <jim at apache.org>
Date: Mon Nov 27 15:14:23 2017 +0000
Force fpicker to be treated as objC and ensure we
link to the required libs
diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index d42296d19489..0f792efe9e92 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -30,6 +30,12 @@ $(eval $(call gb_Library_set_include,fps_aqua,\
-I$(SRCDIR)/fpicker/inc/pch \
))
+$(eval $(call gb_Library_add_libs,fps_aqua,\
+ -framework Cocoa \
+ -framework Carbon \
+ -framework CoreFoundation \
+))
+
$(eval $(call gb_Library_add_api,fps_aqua,\
offapi \
udkapi \
@@ -59,7 +65,7 @@ $(eval $(call gb_Library_add_exception_objects,fps_aqua,\
))
$(eval $(call gb_Library_add_cxxflags,fps_aqua,\
- -x objective-c++ \
+ -x objective-c++ -DMACOSX_DEPLOYMENT_TARGET=10.7 \
))
# vim: set noet sw=4 ts=4:
diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.mm b/fpicker/source/aqua/AquaFilePickerDelegate.cxx
similarity index 96%
rename from fpicker/source/aqua/AquaFilePickerDelegate.mm
rename to fpicker/source/aqua/AquaFilePickerDelegate.cxx
index 0a9106288765..65f2106ebf0c 100644
--- a/fpicker/source/aqua/AquaFilePickerDelegate.mm
+++ b/fpicker/source/aqua/AquaFilePickerDelegate.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -84,35 +84,35 @@
if (sender == nil) {
return;
}
-
+
if ([sender class] != [NSPopUpButton class]) {
return;
}
-
+
if (filterHelper == NULL) {
return;
}
-
+
NSPopUpButton *popup = (NSPopUpButton*)sender;
unsigned int selectedIndex = [popup indexOfSelectedItem];
-
+
filterHelper->SetFilterAtIndex(selectedIndex);
-
+
filePicker->filterControlChanged();
}
-- (void)autoextensionChanged:(id)sender
+- (void)autoextensionChanged:(id)sender
{
if (sender == nil) {
return;
}
-
+
if ([sender class] != [NSButton class]) {
return;
}
uno::Any aValue;
aValue <<= ([((NSButton*)sender) state] == NSOnState);
-
+
filePicker->setValue(::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0, aValue);
}
diff --git a/fpicker/source/aqua/CFStringUtilities.hxx b/fpicker/source/aqua/CFStringUtilities.hxx
index 4df5b29f110b..6c9965849061 100644
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/fpicker/source/aqua/CFStringUtilities.hxx
@@ -27,6 +27,7 @@
#include <premac.h>
#include <Carbon/Carbon.h>
#include <Cocoa/Cocoa.h>
+#include <CoreFoundation/CoreFoundation.h>
#include <postmac.h>
#include <rtl/ustring.hxx>
#include <sal/types.h>
diff --git a/fpicker/source/aqua/NSString_OOoAdditions.mm b/fpicker/source/aqua/NSString_OOoAdditions.cxx
similarity index 96%
rename from fpicker/source/aqua/NSString_OOoAdditions.mm
rename to fpicker/source/aqua/NSString_OOoAdditions.cxx
index 08acb37e9c66..59c831f5c5d0 100644
--- a/fpicker/source/aqua/NSString_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSString_OOoAdditions.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -29,7 +29,7 @@
#define CLASS_NAME "NSString"
- at implementation NSString (OOoAdditions)
+ at implementation NSString (OOoAdditions)
+ (id) stringWithOUString:(const rtl::OUString&)ouString
{
@@ -46,12 +46,12 @@
DBG_PRINT_ENTRY(CLASS_NAME, __func__, "ouString", ouString);
if ((self = [super init])) {
self = [self initWithCharacters:ouString.getStr() length:ouString.getLength()];
-
+
DBG_PRINT_EXIT(CLASS_NAME, __func__, self);
-
+
return self;
}
-
+
DBG_PRINT_EXIT(CLASS_NAME, __func__, self);
return nil;
}
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm b/fpicker/source/aqua/NSURL_OOoAdditions.cxx
similarity index 99%
rename from fpicker/source/aqua/NSURL_OOoAdditions.mm
rename to fpicker/source/aqua/NSURL_OOoAdditions.cxx
index ccee11fc8a26..be2cb3008b50 100644
--- a/fpicker/source/aqua/NSURL_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -103,6 +103,6 @@ NSString* resolveAlias( NSString* i_pSystemPath )
}
CFRelease( rUrl );
}
-
+
return pResolvedPath;
}
More information about the Libreoffice-commits
mailing list