configure.ac | 11 ++
jurt/com/sun/star/lib/uno/environments/java/java_environment.java | 3
ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java | 3
vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm | 43
+++++-----
4 files changed, 37 insertions(+), 23 deletions(-)
New commits:
commit 0b052272038873727852fbe70a3a549981373d1a
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Apr 10 16:18:46 2013 +0100
detect IBM java paths on other platforms than x86
Change-Id: I3797c48951f5b95db7248122bd62c2b2ca2e3047
diff --git a/configure.ac b/configure.ac
index 5845be8..1274a52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6444,6 +6444,17 @@ if test -n "$SOLAR_JAVA" -a \( -z "$JAVALIB" -o -z
"$JAVAINC" \); then
JAVAINC="-I$JAVA_HOME/include"
JAVAINC="$JAVAINC -I$JAVA_HOME/include/aix"
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC
-I$JAVA_HOME/include/native_thread"
+
+ case "$JDK" in
+ [Ii][Bb][Mm]*)
+ JAVA_ARCH=
+ JRE_BASE_DIR="$JAVA_HOME/jre/bin"
+ JAVALIB="-L$JRE_BASE_DIR -L$JRE_BASE_DIR/classic"
+ ;;
+ *)
+ ;;
+ esac
+
;;
cygwin*)
commit 338853c045c7c793c9d4350aedb7b1cfd4517541
Author: Herbert Dürr <h...@apache.org>
Date: Tue Feb 26 16:21:18 2013 +0000
fix the A11Y text attribute color in Aqua
Using the SalColor->CGFloat[] helper gets more of VCL into the scope
which causes conflicting declarations between css::awt and vcl-classic
font attributes so their namespace must be explicitly qualified
(cherry picked from commit 5ffbf3126f57d2f6a3dc6874bca2ffbc29b99ffb)
Conflicts:
vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
Change-Id: Icc7d7125e508188a9a389014bbc2f40e90bc3e34
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index f53170f..e3b62c7 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -20,6 +20,7 @@
#include "aqua/salinst.h"
#include "quartz/utils.h"
+#include "aqua/salgdi.h"
#include "aqua11ytextattributeswrapper.h"
@@ -28,8 +29,8 @@
#include <com/sun/star/awt/FontWeight.hpp>
#include <com/sun/star/awt/FontStrikeout.hpp>
+namespace css_awt = ::com::sun::star::awt;
using namespace ::com::sun::star::accessibility;
-using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
@@ -41,8 +42,8 @@ using namespace ::rtl;
int underlineStyle = NSNoUnderlineStyle;
sal_Int16 value = 0;
property.Value >>= value;
- if ( value != FontUnderline::NONE
- && value != FontUnderline::DONTKNOW) {
+ if ( value != ::css_awt::FontUnderline::NONE
+ && value != ::css_awt::FontUnderline::DONTKNOW) {
underlineStyle = NSSingleUnderlineStyle;
}
return underlineStyle;
@@ -52,10 +53,10 @@ using namespace ::rtl;
int boldStyle = 0;
float value = 0;
property.Value >>= value;
- if ( value == FontWeight::SEMIBOLD
- || value == FontWeight::BOLD
- || value == FontWeight::ULTRABOLD
- || value == FontWeight::BLACK ) {
+ if ( value == ::css_awt::FontWeight::SEMIBOLD
+ || value == ::css_awt::FontWeight::BOLD
+ || value == ::css_awt::FontWeight::ULTRABOLD
+ || value == ::css_awt::FontWeight::BLACK ) {
boldStyle = NSBoldFontMask;
}
return boldStyle;
@@ -63,8 +64,8 @@ using namespace ::rtl;
+(int)convertItalicStyle:(PropertyValue)property {
int italicStyle = 0;
- sal_Int16 value = property.Value.get<FontSlant>();
- if ( value == FontSlant_ITALIC ) {
+ sal_Int16 value = property.Value.get<::css_awt::FontSlant>();
+ if ( value == ::css_awt::FontSlant_ITALIC ) {
italicStyle = NSItalicFontMask;
}
return italicStyle;
@@ -74,8 +75,8 @@ using namespace ::rtl;
BOOL strikethrough = NO;
sal_Int16 value = 0;
property.Value >>= value;
- if ( value != FontStrikeout::NONE
- && value != FontStrikeout::DONTKNOW ) {
+ if ( value != ::css_awt::FontStrikeout::NONE
+ && value != ::css_awt::FontStrikeout::DONTKNOW ) {
strikethrough = YES;
}
return strikethrough;
@@ -97,13 +98,13 @@ using namespace ::rtl;
return [ NSNumber numberWithShort: value ];
}
-+(void)addColor:(sal_Int32)salColor forAttribute:(NSString *)attribute
andRange:(NSRange)range toString:(NSMutableAttributedString *)string {
- if ( salColor != -1 ) {
- CGFloat elements[] = { static_cast<CGFloat>(salColor & 0x00ff0000),
static_cast<CGFloat>(salColor & 0x0000ff00), static_cast<CGFloat>(salColor &
0x000000ff) };
- CGColorRef color = CGColorCreate ( CGColorSpaceCreateWithName (
kCGColorSpaceGenericRGB ), elements );
- [ string addAttribute: attribute value: (id) color range: range ];
- CGColorRelease ( color );
- }
++(void)addColor:(SalColor)nSalColor forAttribute:(NSString *)attribute
andRange:(NSRange)range toString:(NSMutableAttributedString *)string {
+ if( nSalColor == COL_TRANSPARENT )
+ return;
+ const RGBAColor aRGBAColor( nSalColor);
+ CGColorRef aColorRef = CGColorCreate ( CGColorSpaceCreateWithName (
kCGColorSpaceGenericRGB ), aRGBAColor.AsArray() );
+ [ string addAttribute: attribute value: (id) aColorRef range: range ];
+ CGColorRelease( aColorRef );
}
+(void)addFont:(NSFont *)font toString:(NSMutableAttributedString *)string
forRange:(NSRange)range {
@@ -112,11 +113,11 @@ using namespace ::rtl;
[ font fontName ], NSAccessibilityFontNameKey,
[ font familyName ], NSAccessibilityFontFamilyKey,
[ font displayName ], NSAccessibilityVisibleNameKey,
- [ NSNumber numberWithFloat: [ font pointSize ] ],
NSAccessibilityFontSizeKey,
+ [ NSNumber numberWithFloat: [ font pointSize ] ],
NSAccessibilityFontSizeKey,
nil
];
- [ string addAttribute: NSAccessibilityFontTextAttribute
- value: fontDictionary
+ [ string addAttribute: NSAccessibilityFontTextAttribute
+ value: fontDictionary
range: range
];
}
commit acd3b6e624d7e853374c1e9c7b894a8eb1a6f8e4
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Apr 10 09:35:19 2013 -0500
workaround IBM java 1.5.0 inconvertible types error
Change-Id: I84533723e9f42a27e2942c28b53232630db82e10
diff --git a/jurt/com/sun/star/lib/uno/environments/java/java_environment.java
b/jurt/com/sun/star/lib/uno/environments/java/java_environment.java
index 1fdfdf9..522ca8c 100644
--- a/jurt/com/sun/star/lib/uno/environments/java/java_environment.java
+++ b/jurt/com/sun/star/lib/uno/environments/java/java_environment.java
@@ -206,7 +206,8 @@ public final class java_environment implements IEnvironment
{
// must only be called while synchronized on this Registry:
private void cleanUp() {
for (;;) {
- Level2Entry l2 = (Level2Entry) queue.poll();
+ Object tmp = queue.poll();
+ Level2Entry l2 = (Level2Entry) tmp;
if (l2 == null) {
break;
}
diff --git a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java
b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java
index f532133..7f1efcf 100644
--- a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java
+++ b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java
@@ -676,7 +676,8 @@ public final class TypeDescription implements
ITypeDescription {
private void cleanUp() {
for (;;) {
- Entry e = (Entry) queue.poll();
+ Object tmp = queue.poll();
+ Entry e = (Entry)tmp;
if (e == null) {
break;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
