diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:47:44 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:47:44 +0200 |
| commit | 941020379b1ea1ec7c564c21e68ea1674cda7683 (patch) | |
| tree | 40fcaf109d6d585bcdc0faf7ea6c0812b3cc9a39 /vcl/aqua/source | |
| parent | 0692507dcc62e94c7af88388961db1d7d12d6dbd (diff) | |
| parent | 0d2916e03ea51529e15995830a1a8c36bd72e442 (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
basebmp/prj/d.lst
basebmp/test/basictest.cxx
basebmp/test/makefile.mk
basegfx/inc/basegfx/basegfxdllapi.h
basegfx/inc/basegfx/tools/debugplotter.hxx
basegfx/inc/basegfx/tuple/b2ituple.hxx
basegfx/prj/d.lst
basegfx/source/numeric/makefile.mk
basegfx/source/polygon/makefile.mk
basegfx/source/range/makefile.mk
basegfx/source/raster/makefile.mk
basegfx/source/tuple/makefile.mk
basegfx/source/vector/makefile.mk
basegfx/test/basegfx1d.cxx
basegfx/test/makefile.mk
basegfx/util/makefile.mk
canvas/Library_canvasfactory.mk
canvas/Module_canvas.mk
canvas/prj/build.lst
canvas/prj/d.lst
canvas/source/cairo/cairo_canvashelper_texturefill.cxx
canvas/source/cairo/makefile.mk
canvas/source/tools/makefile.mk
comphelper/qa/string/makefile.mk
cppcanvas/Module_cppcanvas.mk
cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
cppcanvas/prj/build.lst
cppcanvas/prj/d.lst
cppcanvas/source/mtfrenderer/makefile.mk
cppcanvas/util/makefile.mk
i18npool/source/search/makefile.mk
regexp/Library_regexp.mk
regexp/prj/d.lst
sax/CppunitTest_sax.mk
sax/Library_sax.mk
sax/prj/d.lst
sax/qa/cppunit/test_converter.cxx
sax/source/expatwrap/attrlistimpl.hxx
sax/util/makefile.mk
svtools/Library_svt.mk
tools/Executable_sspretty.mk
ucbhelper/prj/d.lst
ucbhelper/source/provider/configureucb.cxx
ucbhelper/source/provider/provconf.cxx
ucbhelper/util/makefile.mk
unotools/Library_utl.mk
unotools/Module_unotools.mk
unotools/Package_inc.mk
unotools/prj/build.lst
vcl/Library_desktop_detector.mk
vcl/Library_vcl.mk
vcl/Library_vclplug_gtk.mk
vcl/aqua/source/gdi/salprn.cxx
vcl/inc/aqua/saldata.hxx
vcl/unx/generic/gdi/salgdi3.cxx
Diffstat (limited to 'vcl/aqua/source')
71 files changed, 362 insertions, 335 deletions
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.h b/vcl/aqua/source/a11y/aqua11yactionwrapper.h index 94388a98e3c3..9df4fc986859 100644 --- a/vcl/aqua/source/a11y/aqua11yactionwrapper.h +++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,3 +40,5 @@ @end #endif // _SV_AQUA11ACTIONWRAPPER_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h index a1a3fbab5ce3..62ab9d7141be 100644 --- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h +++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,5 @@ @end #endif // _SV_AQUA11COMPONENTWRAPPER_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx index 1a7c72eac9ec..61bc4d44f147 100644 --- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx +++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -117,3 +118,4 @@ AquaA11yFocusListener::release() SAL_THROW(()) return ReferenceObject::release(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx index db114be14771..bdfc9085ad08 100644 --- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx +++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,8 +34,6 @@ #include "aqua/keyboardfocuslistener.hxx" #include "aqua/aquavcltypes.h" -// #include <com/sun/star/accessibility/XAccessibleContext.hpp> - class AquaA11yFocusListener : public KeyboardFocusListener, public salhelper::ReferenceObject @@ -59,4 +58,6 @@ public: virtual oslInterlockedCount SAL_CALL release() SAL_THROW(()); }; -#endif // _AQUA11YFOCUSLISTENER_HXX_
\ No newline at end of file +#endif // _AQUA11YFOCUSLISTENER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx index c901eea915a6..187e715c54f7 100644 --- a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx +++ b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -277,3 +278,5 @@ void AquaA11yFocusTracker::window_got_focus(Window *pWindow) #endif } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ylistener.cxx b/vcl/aqua/source/a11y/aqua11ylistener.cxx index 36e2c7ab2220..08b56718885a 100644 --- a/vcl/aqua/source/a11y/aqua11ylistener.cxx +++ b/vcl/aqua/source/a11y/aqua11ylistener.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -157,3 +158,5 @@ AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( if( nil != notification ) NSAccessibilityPostNotification(element, notification); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.h b/vcl/aqua/source/a11y/aqua11yrolehelper.h index c15c39903432..69404fa372a1 100644 --- a/vcl/aqua/source/a11y/aqua11yrolehelper.h +++ b/vcl/aqua/source/a11y/aqua11yrolehelper.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,5 @@ @end #endif // _SV_AQUA11ROLEHELPER_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h index 20bb99938ef0..de78565f4c4a 100644 --- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h +++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,5 @@ @end #endif // _SV_AQUA11SELECTIONWRAPPER_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm index a215bf913cf1..5b8d604f3b1a 100644 --- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm +++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,14 +49,14 @@ using namespace ::com::sun::star::uno; for ( sal_Int32 i=0 ; i < n ; ++i ) { [ children addObject: [ AquaA11yFactory wrapperForAccessible: xAccessibleSelection -> getSelectedAccessibleChild( i ) ] ]; } - + return children; - + } catch ( Exception& e) { } } - + return nil; } @@ -84,13 +84,13 @@ using namespace ::com::sun::star::uno; Reference< XAccessibleSelection > xAccessibleSelection = [ wrapper accessibleSelection ]; try { xAccessibleSelection -> clearAccessibleSelection(); - + unsigned c = [ value count ]; for ( unsigned i = 0 ; i < c ; ++i ) { xAccessibleSelection -> selectAccessibleChild( [ [ value objectAtIndex: i ] accessibleContext ] -> getAccessibleIndexInParent() ); } } catch ( Exception& e) { - } + } } @end diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.h b/vcl/aqua/source/a11y/aqua11ytablewrapper.h index ed70ed219b6e..0b41d48e10c6 100644 --- a/vcl/aqua/source/a11y/aqua11ytablewrapper.h +++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,5 @@ -(id)columnsAttribute; @end #endif // _SV_AQUA11TABLEWRAPPER_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h index 0aa271a7f1e2..a21f75e7fd5a 100644 --- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h +++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,3 +37,5 @@ +(NSMutableAttributedString *)createAttributedStringForElement:(AquaA11yWrapper *)wrapper inOrigRange:(id)origRange; @end #endif // _SV_AQUA11TEXTATTRIBUTESWRAPPER_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm index 948e0dfa95aa..2122f56e9565 100644 --- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm @@ -134,18 +134,18 @@ using namespace ::rtl; +(void)applyAttributesFrom:(Sequence < PropertyValue >)attributes toString:(NSMutableAttributedString *)string forRange:(NSRange)range storeDefaultsTo:(AquaA11yWrapper *)wrapperStore getDefaultsFrom:(AquaA11yWrapper *)wrapper { NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ]; // constants - static const OUString attrUnderline = OUString::createFromAscii("CharUnderline"); - static const OUString attrBold = OUString::createFromAscii("CharWeight"); - static const OUString attrFontname = OUString::createFromAscii("CharFontName"); - static const OUString attrItalic = OUString::createFromAscii("CharPosture"); - static const OUString attrHeight = OUString::createFromAscii("CharHeight"); - static const OUString attrStrikethrough = OUString::createFromAscii("CharStrikeout"); - static const OUString attrShadow = OUString::createFromAscii("CharShadowed"); - static const OUString attrUnderlineColor = OUString::createFromAscii("CharUnderlineColor"); - static const OUString attrUnderlineHasColor = OUString::createFromAscii("CharUnderlineHasColor"); - static const OUString attrForegroundColor = OUString::createFromAscii("CharColor"); - static const OUString attrBackgroundColor = OUString::createFromAscii("CharBackColor"); - static const OUString attrSuperscript = OUString::createFromAscii("CharEscapement"); + static const OUString attrUnderline(RTL_CONSTASCII_USTRINGPARAM("CharUnderline")); + static const OUString attrBold(RTL_CONSTASCII_USTRINGPARAM("CharWeight")); + static const OUString attrFontname(RTL_CONSTASCII_USTRINGPARAM("CharFontName")); + static const OUString attrItalic(RTL_CONSTASCII_USTRINGPARAM("CharPosture")); + static const OUString attrHeight(RTL_CONSTASCII_USTRINGPARAM("CharHeight")); + static const OUString attrStrikethrough(RTL_CONSTASCII_USTRINGPARAM("CharStrikeout")); + static const OUString attrShadow(RTL_CONSTASCII_USTRINGPARAM("CharShadowed")); + static const OUString attrUnderlineColor(RTL_CONSTASCII_USTRINGPARAM("CharUnderlineColor")); + static const OUString attrUnderlineHasColor(RTL_CONSTASCII_USTRINGPARAM("CharUnderlineHasColor")); + static const OUString attrForegroundColor(RTL_CONSTASCII_USTRINGPARAM("CharColor")); + static const OUString attrBackgroundColor(RTL_CONSTASCII_USTRINGPARAM("CharBackColor")); + static const OUString attrSuperscript(RTL_CONSTASCII_USTRINGPARAM("CharEscapement")); // vars OUString fontname; int fonttraits = 0; diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.h b/vcl/aqua/source/a11y/aqua11ytextwrapper.h index 34ba1611b7b3..dd7fa5c0411c 100644 --- a/vcl/aqua/source/a11y/aqua11ytextwrapper.h +++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,3 +63,5 @@ @end #endif // _SV_AQUA11TEXTWRAPPER_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11yutil.h b/vcl/aqua/source/a11y/aqua11yutil.h index adf565f4d9bb..5007def0487b 100644 --- a/vcl/aqua/source/a11y/aqua11yutil.h +++ b/vcl/aqua/source/a11y/aqua11yutil.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,4 +37,5 @@ +(::com::sun::star::awt::Point)nsPointToVclPoint:(NSValue *)nsPoint; @end -#endif // _SV_AQUA11YUTIL_H
\ No newline at end of file +#endif // _SV_AQUA11YUTIL_H +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h index 35573f855549..517a3014d565 100644 --- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h +++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,3 +45,5 @@ @end #endif // _SV_AQUA11VALUEWRAPPER_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h index 78c54e2c35ea..e4af22081106 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,3 +40,5 @@ @end #endif // _SV_AQUA11WRAPPERBUTTON_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h index e1016a6fe551..9c2580c19f31 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h +++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,3 +40,5 @@ @end #endif // _SV_AQUA11WRAPPERCHECKOBOX_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h index c9b71585aea3..bdcff4a981d6 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h +++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,5 @@ @end #endif // _SV_AQUA11WRAPPERCOMBOBOX_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.h b/vcl/aqua/source/a11y/aqua11ywrappergroup.h index bdbfb6e6b264..e53676d531ed 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappergroup.h +++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,5 @@ @end #endif // _SV_AQUA11WRAPPERGROUP_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.h b/vcl/aqua/source/a11y/aqua11ywrapperlist.h index db9bf7511af6..367795ff8d16 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperlist.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,3 +38,5 @@ @end #endif // _SV_AQUA11WRAPPERLIST_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h index 276f1c162e8c..1494e7dfe0b6 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,3 +40,5 @@ @end #endif // _SV_AQUA11WRAPPERRADIOGROUP_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h index 4c138372e27e..f6c05b955744 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,3 +38,5 @@ @end #endif // _SV_AQUA11WRAPPERRADIOGROUP_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.h b/vcl/aqua/source/a11y/aqua11ywrapperrow.h index deaa4f07248f..9b649ea0698d 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperrow.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,5 @@ @end #endif // _SV_AQUA11WRAPPERROW_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h index e1e37a45d36e..3d4cdd848efc 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,3 +40,5 @@ @end #endif // _SV_AQUA11WRAPPERSCROLLAREA_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h index df57418803fa..d589da51b153 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,3 +38,5 @@ @end #endif // _SV_AQUA11WRAPPERSCROLLBAR_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h index a114e6fb7a74..be6e99f8f3c8 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h +++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,3 +38,5 @@ @end #endif // _SV_AQUA11WRAPPERSPLITTER_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h index aef2957557d4..d7115b879e2a 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,5 @@ @end #endif // _SV_AQUA11WRAPPERSTATICTEXT_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h index 7fda77789015..54743abaa390 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h +++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,3 +38,5 @@ @end #endif // _SV_AQUA11WRAPPERTABGROUP_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h index e47795d976b3..7a458163e400 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h +++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,3 +38,5 @@ @end #endif // _SV_AQUA11WRAPPERTEXTAREA_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h index 4ab947484cc4..c02195c7d0fa 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h +++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,3 +38,5 @@ @end #endif // _SV_AQUA11WRAPPERTOOLBAR_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/documentfocuslistener.cxx b/vcl/aqua/source/a11y/documentfocuslistener.cxx index 02a7337ce397..964f629bff51 100644 --- a/vcl/aqua/source/a11y/documentfocuslistener.cxx +++ b/vcl/aqua/source/a11y/documentfocuslistener.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,17 +28,11 @@ #include "documentfocuslistener.hxx" -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEEVENTBROADCASTER_HPP_ #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> -#endif -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEEVENTID_HPP_ #include <com/sun/star/accessibility/AccessibleEventId.hpp> -#endif -#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLESTATETYPE_HPP_ #include <com/sun/star/accessibility/AccessibleStateType.hpp> -#endif using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::lang; @@ -251,3 +246,5 @@ void DocumentFocusListener::detachRecursive( } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/a11y/documentfocuslistener.hxx b/vcl/aqua/source/a11y/documentfocuslistener.hxx index 3f02d3fc0ada..340219ec1967 100644 --- a/vcl/aqua/source/a11y/documentfocuslistener.hxx +++ b/vcl/aqua/source/a11y/documentfocuslistener.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,4 +96,5 @@ private: AquaA11yFocusTracker& m_aFocusTracker; }; -#endif // _DOCUMENTFOCUSLISTENER_HXX_
\ No newline at end of file +#endif // _DOCUMENTFOCUSLISTENER_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/aqua/source/app/saldata.cxx index 7b8174e16703..b6f47ab440af 100644 --- a/vcl/aqua/source/app/saldata.cxx +++ b/vcl/aqua/source/app/saldata.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,7 +112,7 @@ void SalData::ensureThreadAutoreleasePool() } else { - DBG_ERROR( "no autorelease key" ); + OSL_FAIL( "no autorelease key" ); } } @@ -135,7 +136,7 @@ void SalData::drainThreadAutoreleasePool() } else { - DBG_ERROR( "no autorelease key" ); + OSL_FAIL( "no autorelease key" ); } } @@ -292,3 +293,5 @@ NSStatusItem* SalData::getStatusItem() } return pData->mpStatusItem; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index 7a07718efaac..df0d95c12f1d 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,6 +42,7 @@ #include "vcl/svapp.hxx" #include "vcl/window.hxx" #include "vcl/timer.hxx" +#include "vcl/solarmutex.hxx" #include "aqua/saldata.hxx" #include "aqua/salinst.h" @@ -77,7 +79,7 @@ using namespace ::com::sun::star; extern sal_Bool ImplSVMain(); -static sal_Bool* gpbInit = 0; +static int* gpnInit = 0; static NSMenu* pDockMenu = nil; static bool bNoSVMain = true; static bool bLeftMain = false; @@ -114,7 +116,7 @@ class AquaDelayedSettingsChanged : public Timer void AquaSalInstance::delayedSettingsChanged( bool bInvalidate ) { - vos::OGuard aGuard( *mpSalYieldMutex ); + osl::SolarGuard aGuard( *mpSalYieldMutex ); AquaDelayedSettingsChanged* pTimer = new AquaDelayedSettingsChanged( bInvalidate ); pTimer->SetTimeout( 50 ); pTimer->Start(); @@ -211,9 +213,9 @@ static void initNSApp() [NSApp activateIgnoringOtherApps: YES]; } -sal_Bool ImplSVMainHook( sal_Bool * pbInit ) +sal_Bool ImplSVMainHook( int * pnInit ) { - gpbInit = pbInit; + gpnInit = pnInit; bNoSVMain = false; initNSApp(); @@ -248,7 +250,7 @@ sal_Bool ImplSVMainHook( sal_Bool * pbInit ) } else { - DBG_ERROR( "NSApplication initialization could not be done" ); + OSL_FAIL( "NSApplication initialization could not be done" ); } return TRUE; // indicate that ImplSVMainHook is implemented @@ -308,7 +310,7 @@ void InitSalMain() { rtl::OUString urlWorkDir; rtl_uString *sysWorkDir = NULL; - if (tools::getProcessWorkingDir(&urlWorkDir)) + if (tools::getProcessWorkingDir(urlWorkDir)) { oslFileError err2 = osl_getSystemPathFromFileURL(urlWorkDir.pData, &sysWorkDir); if (err2 == osl_File_E_None) @@ -374,27 +376,27 @@ SalYieldMutex::SalYieldMutex() void SalYieldMutex::acquire() { - OMutex::acquire(); - mnThreadId = vos::OThread::getCurrentIdentifier(); + SolarMutexObject::acquire(); + mnThreadId = osl::Thread::getCurrentIdentifier(); mnCount++; } void SalYieldMutex::release() { - if ( mnThreadId == vos::OThread::getCurrentIdentifier() ) + if ( mnThreadId == osl::Thread::getCurrentIdentifier() ) { if ( mnCount == 1 ) mnThreadId = 0; mnCount--; } - OMutex::release(); + SolarMutexObject::release(); } sal_Bool SalYieldMutex::tryToAcquire() { - if ( OMutex::tryToAcquire() ) + if ( SolarMutexObject::tryToAcquire() ) { - mnThreadId = vos::OThread::getCurrentIdentifier(); + mnThreadId = osl::Thread::getCurrentIdentifier(); mnCount++; return sal_True; } @@ -474,7 +476,7 @@ AquaSalInstance::AquaSalInstance() mpSalYieldMutex = new SalYieldMutex; mpSalYieldMutex->acquire(); ::tools::SolarMutex::SetSolarMutex( mpSalYieldMutex ); - maMainThread = vos::OThread::getCurrentIdentifier(); + maMainThread = osl::Thread::getCurrentIdentifier(); mbWaitingYield = false; maUserEventListMutex = osl_createMutex(); mnActivePrintJobs = 0; @@ -529,7 +531,7 @@ void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, sal_uInt16 nType, voi // ----------------------------------------------------------------------- -vos::IMutex* AquaSalInstance::GetYieldMutex() +osl::SolarMutex* AquaSalInstance::GetYieldMutex() { return mpSalYieldMutex; } @@ -540,7 +542,7 @@ sal_uLong AquaSalInstance::ReleaseYieldMutex() { SalYieldMutex* pYieldMutex = mpSalYieldMutex; if ( pYieldMutex->GetThreadId() == - vos::OThread::getCurrentIdentifier() ) + osl::Thread::getCurrentIdentifier() ) { sal_uLong nCount = pYieldMutex->GetAcquireCount(); sal_uLong n = nCount; @@ -575,8 +577,7 @@ bool AquaSalInstance::CheckYieldMutex() bool bRet = true; SalYieldMutex* pYieldMutex = mpSalYieldMutex; - if ( pYieldMutex->GetThreadId() != - vos::OThread::getCurrentIdentifier() ) + if ( pYieldMutex->GetThreadId() != osl::Thread::getCurrentIdentifier()) { bRet = false; } @@ -588,7 +589,7 @@ bool AquaSalInstance::CheckYieldMutex() bool AquaSalInstance::isNSAppThread() const { - return vos::OThread::getCurrentIdentifier() == maMainThread; + return osl::Thread::getCurrentIdentifier() == maMainThread; } // ----------------------------------------------------------------------- @@ -605,9 +606,9 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) break; case AppExecuteSVMain: { - sal_Bool bResult = ImplSVMain(); - if( gpbInit ) - *gpbInit = bResult; + int nResult = ImplSVMain(); + if( gpnInit ) + *gpnInit = nResult; [NSApp stop: NSApp]; bLeftMain = true; if( pDockMenu ) @@ -628,7 +629,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) { if ( ((*it)->mbFullScreen == true) ) bIsFullScreenMode = true; - it++; + ++it; } switch ([pEvent data1]) @@ -685,7 +686,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) break; default: - DBG_ERROR( "unhandled NSApplicationDefined event" ); + OSL_FAIL( "unhandled NSApplicationDefined event" ); break; }; } @@ -1340,3 +1341,5 @@ NSImage* CreateNSImage( const Image& rImage ) return pImage; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx index 21da319b42b7..6bda7feae1df 100644 --- a/vcl/aqua/source/app/salsys.cxx +++ b/vcl/aqua/source/app/salsys.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,7 +41,7 @@ #include "svids.hrc" -using namespace rtl; +using ::rtl::OUString; // ======================================================================= @@ -221,3 +222,5 @@ int AquaSalSystem::ShowNativeMessageBox( const String& rTitle, return nRet; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/app/saltimer.cxx b/vcl/aqua/source/app/saltimer.cxx index b482453704af..a3907ccb9621 100644 --- a/vcl/aqua/source/app/saltimer.cxx +++ b/vcl/aqua/source/app/saltimer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -133,3 +134,4 @@ void AquaSalTimer::Stop() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx index 98cbdcc7c5e2..5c2259ff22c6 100644 --- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx +++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,12 +47,15 @@ #include <postmac.h> using namespace ::com::sun::star::datatransfer; -using namespace rtl; using namespace ::com::sun::star::uno; using namespace com::sun::star::lang; using namespace cppu; using namespace std; +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OString; + namespace // private { const Type CPPUTYPE_SEQINT8 = getCppuType((Sequence<sal_Int8>*)0); @@ -738,3 +742,5 @@ NSArray* DataFlavorMapper::getAllSupportedPboardTypes() const return [array autorelease]; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx index 9847fcbd3987..51e29efed530 100644 --- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx +++ b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,3 +142,5 @@ private: typedef boost::shared_ptr<DataFlavorMapper> DataFlavorMapperPtr_t; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/DragActionConversion.cxx b/vcl/aqua/source/dtrans/DragActionConversion.cxx index 06ce57e8748f..1e6880566c24 100644 --- a/vcl/aqua/source/dtrans/DragActionConversion.cxx +++ b/vcl/aqua/source/dtrans/DragActionConversion.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,5 @@ sal_Int8 SystemToOfficeDragActions(unsigned int dragActions) return actions; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/DragActionConversion.hxx b/vcl/aqua/source/dtrans/DragActionConversion.hxx index 7facfef794b6..d4b12ae8dce8 100644 --- a/vcl/aqua/source/dtrans/DragActionConversion.hxx +++ b/vcl/aqua/source/dtrans/DragActionConversion.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,3 +45,5 @@ unsigned int OfficeToSystemDragActions(sal_Int8 dragActions); <type>com::sun::star::datatransfer::dnd::DNDConstants</type>. */ sal_Int8 SystemToOfficeDragActions(unsigned int dragActions); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx index f3e73b765c94..2586c9ff6a79 100644 --- a/vcl/aqua/source/dtrans/DragSource.cxx +++ b/vcl/aqua/source/dtrans/DragSource.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,7 +48,6 @@ #include <memory> -using namespace rtl; using namespace cppu; using namespace osl; using namespace com::sun::star; @@ -62,6 +62,7 @@ using namespace com::sun::star::lang; using namespace comphelper; using namespace std; +using ::rtl::OUString; // For OOo internal D&D we provide the Transferable without NSDragPboard // interference as a shortcut @@ -381,3 +382,4 @@ Sequence< OUString > SAL_CALL DragSource::getSupportedServiceNames() throw (Runt +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/DragSource.hxx b/vcl/aqua/source/dtrans/DragSource.hxx index 017ca047b679..943c84c5036e 100644 --- a/vcl/aqua/source/dtrans/DragSource.hxx +++ b/vcl/aqua/source/dtrans/DragSource.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -140,3 +141,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/DragSourceContext.cxx b/vcl/aqua/source/dtrans/DragSourceContext.cxx index cd70dc55c896..4d18379e90af 100644 --- a/vcl/aqua/source/dtrans/DragSourceContext.cxx +++ b/vcl/aqua/source/dtrans/DragSourceContext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,3 +73,4 @@ void SAL_CALL DragSourceContext::transferablesFlavorsChanged( ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/DragSourceContext.hxx b/vcl/aqua/source/dtrans/DragSourceContext.hxx index 5d84c165d851..276567af3f99 100644 --- a/vcl/aqua/source/dtrans/DragSourceContext.hxx +++ b/vcl/aqua/source/dtrans/DragSourceContext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,5 @@ private: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx index b55a70872372..f5ac3b975491 100644 --- a/vcl/aqua/source/dtrans/DropTarget.cxx +++ b/vcl/aqua/source/dtrans/DropTarget.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,9 +33,7 @@ #include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp> #include <rtl/unload.h> -#ifndef COMPHELPER_MAKESEQUENCE_HXX_INCLUDED #include "comphelper/makesequence.hxx" -#endif #include <cppuhelper/interfacecontainer.hxx> #include "aqua_clipboard.hxx" @@ -53,7 +52,6 @@ #include <aqua/salframe.h> #include <aqua/salframeview.h> -using namespace rtl; using namespace cppu; using namespace osl; using namespace com::sun::star::datatransfer; @@ -65,6 +63,8 @@ using namespace com::sun::star::uno; using namespace com::sun::star; using namespace comphelper; +using ::rtl::OUString; + OUString dropTarget_getImplementationName() { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.datatransfer.dnd.OleDropTarget_V1")); @@ -604,3 +604,4 @@ void DropTarget::concludeDragOperation(id /*sender*/) return dropTarget_getSupportedServiceNames(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/DropTarget.hxx b/vcl/aqua/source/dtrans/DropTarget.hxx index 77e2a08c5de7..2ec1674a13df 100644 --- a/vcl/aqua/source/dtrans/DropTarget.hxx +++ b/vcl/aqua/source/dtrans/DropTarget.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> -#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETLISTENR_HPP_ #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> -#endif #include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetDropContext.hpp> @@ -169,3 +168,5 @@ private: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx index 3f558b0a5b4f..0bd461d81096 100644 --- a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx +++ b/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include "HtmlFmtFlt.hxx" #include <rtl/string.h> @@ -145,3 +146,5 @@ bool isHTMLFormat(const Sequence<sal_Int8>& aHtmlSequence) reinterpret_cast<const sal_Char*>(aHtmlSequence.getConstArray()), HtmlFormatStartLen) == 0; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx b/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx index 49f0cc70590c..bbf2fc5164eb 100644 --- a/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx +++ b/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef INCLUDED_HTMLFMTFLT_HXX #define INCLUDED_HTMLFMTFLT_HXX @@ -18,3 +19,5 @@ com::sun::star::uno::Sequence<sal_Int8> HTMLFormatToTextHtml(const com::sun::sta bool isHTMLFormat (const com::sun::star::uno::Sequence<sal_Int8>& aHtmlSequence); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/aqua/source/dtrans/OSXTransferable.cxx index 2e6b327de446..040c452ec6c8 100644 --- a/vcl/aqua/source/dtrans/OSXTransferable.cxx +++ b/vcl/aqua/source/dtrans/OSXTransferable.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,13 +30,10 @@ #include "precompiled_vcl.hxx" #include <sal/types.h> -#ifndef _TRANSFERABLE_HXX_ #include "OSXTransferable.hxx" -#endif #include "DataFlavorMapping.hxx" -using namespace rtl; using namespace std; using namespace osl; using namespace cppu; @@ -45,6 +43,8 @@ using namespace com::sun::star::io; using namespace com::sun::star::lang; using namespace com::sun::star::container; +using ::rtl::OUString; + const Type CPPUTYPE_SEQINT8 = getCppuType((Sequence<sal_Int8>*)0); const Type CPPUTYPE_OUSTRING = getCppuType((OUString*)0); @@ -172,7 +172,7 @@ bool OSXTransferable::compareDataFlavors(const DataFlavor& lhs, const DataFlavor } catch( IllegalArgumentException& ) { - OSL_ENSURE( sal_False, "Invalid content type detected" ); + OSL_FAIL( "Invalid content type detected" ); return false; } @@ -213,3 +213,5 @@ bool OSXTransferable::cmpAllContentTypeParameter(const Reference<XMimeContentTyp return true; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/OSXTransferable.hxx b/vcl/aqua/source/dtrans/OSXTransferable.hxx index 6601905f1610..82e8fea57e20 100644 --- a/vcl/aqua/source/dtrans/OSXTransferable.hxx +++ b/vcl/aqua/source/dtrans/OSXTransferable.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,5 @@ private: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx index 1410fc2bd66d..3eb4fb8d49fc 100644 --- a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx +++ b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -6,9 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: OSXTransferable.hxx,v $ - * $Revision: 1.4 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -199,3 +197,5 @@ bool BMPToImage( com::sun::star::uno::Sequence<sal_Int8>& aBmp, return bResult; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx b/vcl/aqua/source/dtrans/PictToBmpFlt.hxx index 12a73452ad7b..cdd0c41d5f4b 100644 --- a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx +++ b/vcl/aqua/source/dtrans/PictToBmpFlt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef INCLUDED_PICTTOBMPFLT_HXX #define INCLUDED_PICTTOBMPFLT_HXX @@ -35,3 +36,5 @@ bool BMPToImage( com::sun::star::uno::Sequence<sal_Int8>& aBmp, ); #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx index 657211be5dc8..6e47df691623 100644 --- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx +++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,10 +45,10 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace cppu; using namespace osl; -using namespace rtl; using namespace std; using namespace comphelper; +using ::rtl::OUString; @implementation EventListener; @@ -389,3 +390,4 @@ Sequence< OUString > SAL_CALL AquaClipboard::getSupportedServiceNames() throw( R return clipboard_getSupportedServiceNames(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.hxx b/vcl/aqua/source/dtrans/aqua_clipboard.hxx index 8f45f50717f3..e495ee3c239e 100644 --- a/vcl/aqua/source/dtrans/aqua_clipboard.hxx +++ b/vcl/aqua/source/dtrans/aqua_clipboard.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -179,3 +180,5 @@ private: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/dtrans/service_entry.cxx b/vcl/aqua/source/dtrans/service_entry.cxx index 327fba900508..4c4aa893ae0b 100644 --- a/vcl/aqua/source/dtrans/service_entry.cxx +++ b/vcl/aqua/source/dtrans/service_entry.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,4 @@ uno::Reference<XInterface> AquaSalInstance::CreateDropTarget() return uno::Reference<XInterface>(static_cast< XInitialization* >(new DropTarget()), UNO_QUERY); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm index 8786ed7d0013..2bb67dcc1940 100644 --- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm +++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm @@ -523,7 +523,7 @@ static void filterAccelerator( rtl::OUString& io_rText ) } else { - DBG_ERROR( "unsupported class" ); + OSL_FAIL( "unsupported class" ); } mpController->updateEnableState(); } @@ -555,7 +555,7 @@ static void filterAccelerator( rtl::OUString& io_rText ) } else { - DBG_ERROR( "unsupported class" ); + OSL_FAIL( "unsupported class" ); } mpController->updateEnableState(); } @@ -1033,7 +1033,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO aFieldRect.origin.y = rCurY - aFieldRect.size.height; [pFieldView setFrame: aFieldRect]; - if( rCtrlType.equalsAscii( "Range" ) ) + if( rCtrlType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Range" ) ) ) { // add a stepper control NSRect aStepFrame = { { aFieldRect.origin.x + aFieldRect.size.width + 5, @@ -1352,7 +1352,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO } else { - DBG_ERROR( "Unsupported UI option" ); + OSL_FAIL( "Unsupported UI option" ); } } diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx index 62e783522a88..94022b763a03 100755..100644 --- a/vcl/aqua/source/gdi/salatslayout.cxx +++ b/vcl/aqua/source/gdi/salatslayout.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -275,11 +276,7 @@ bool ATSLayout::LayoutText( ImplLayoutArgs& rArgs ) aTagSizes[0] = sizeof( nLineDirTag ); aTagValues[0] = &nLineDirTag; // set run-specific layout controls -#if 0 // why don't line-controls work as reliably as layout-controls??? - ATSUSetLineControls( maATSULayout, rArgs.mnMinCharPos, 1, aTagAttrs, aTagSizes, aTagValues ); -#else ATSUSetLayoutControls( maATSULayout, 1, aTagAttrs, aTagSizes, aTagValues ); -#endif } return true; @@ -1096,113 +1093,6 @@ void ATSLayout::InvalidateMeasurements() // ======================================================================= -#if 0 -// helper class to convert ATSUI outlines to VCL PolyPolygons -class PolyArgs -{ -public: - PolyArgs(); - ~PolyArgs(); - - void Init( PolyPolygon* pPolyPoly, long nXOffset, long nYOffset ); - void AddPoint( const Float32Point&, PolyFlags ); - void ClosePolygon(); - -private: - PolyPolygon* mpPolyPoly; - long mnXOffset, mnYOffset; - - Point* mpPointAry; - BYTE* mpFlagAry; - USHORT mnMaxPoints; - - USHORT mnPointCount; - USHORT mnPolyCount; - bool mbHasOffline; -}; - -// ----------------------------------------------------------------------- - -PolyArgs::PolyArgs() -: mpPolyPoly(NULL), - mnPointCount(0), - mnPolyCount(0), - mbHasOffline(false) -{ - mnMaxPoints = 256; - mpPointAry = new Point[ mnMaxPoints ]; - mpFlagAry = new BYTE [ mnMaxPoints ]; -} - -// ----------------------------------------------------------------------- - -PolyArgs::~PolyArgs() -{ - delete[] mpFlagAry; - delete[] mpPointAry; -} - -// ----------------------------------------------------------------------- - -void PolyArgs::Init( PolyPolygon* pPolyPoly, long nXOffset, long nYOffset ) -{ - mnXOffset = nXOffset; - mnYOffset = nYOffset; - mpPolyPoly = pPolyPoly; - - mpPolyPoly->Clear(); - mnPointCount = 0; - mnPolyCount = 0; -} - -// ----------------------------------------------------------------------- - -void PolyArgs::AddPoint( const Float32Point& rPoint, PolyFlags eFlags ) -{ - if( mnPointCount >= mnMaxPoints ) - { - // resize if needed (TODO: use STL?) - mnMaxPoints *= 4; - Point* mpNewPoints = new Point[ mnMaxPoints ]; - BYTE* mpNewFlags = new BYTE[ mnMaxPoints ]; - for( int i = 0; i < mnPointCount; ++i ) - { - mpNewPoints[ i ] = mpPointAry[ i ]; - mpNewFlags[ i ] = mpFlagAry[ i ]; - } - delete[] mpFlagAry; - delete[] mpPointAry; - mpPointAry = mpNewPoints; - mpFlagAry = mpNewFlags; - } - - // convert to pixels and add startpoint offset - int nXPos = Float32ToInt( rPoint.x ); - int nYPos = Float32ToInt( rPoint.y ); - mpPointAry[ mnPointCount ] = Point( nXPos + mnXOffset, nYPos + mnYOffset ); - // set point flags - mpFlagAry[ mnPointCount++ ]= eFlags; - mbHasOffline |= (eFlags != POLY_NORMAL); -} - -// ----------------------------------------------------------------------- - -void PolyArgs::ClosePolygon() -{ - if( !mnPolyCount++ ) - return; - - // append finished polygon - Polygon aPoly( mnPointCount, mpPointAry, (mbHasOffline ? mpFlagAry : NULL) ); - mpPolyPoly->Insert( aPoly ); - - // prepare for new polygon - mnPointCount = 0; - mbHasOffline = false; -} -#endif -// ======================================================================= - // glyph fallback is supported directly by Aqua // so methods used only by MultiSalLayout can be dummy implementated bool ATSLayout::GetGlyphOutlines( SalGraphics&, PolyPolyVector& ) const { return false; } @@ -1265,3 +1155,4 @@ SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs&, int /*nFallbackLevel // ======================================================================= +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/gdi/salatsuifontutils.cxx b/vcl/aqua/source/gdi/salatsuifontutils.cxx index 61fcd78586b3..a8ded318e1e0 100644 --- a/vcl/aqua/source/gdi/salatsuifontutils.cxx +++ b/vcl/aqua/source/gdi/salatsuifontutils.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -344,75 +345,6 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, ImplDevFontAttributes& rDF } } -#if 0 // multiple-master fonts are mostly obsolete nowadays - // if we still want to support them this should probably be done one frame higher - ItemCount nMaxInstances = 0; - rc = ATSUCountFontInstances ( nFontID, &nMaxInstances ); - for( ItemCount nInstanceIndex = 0; nInstanceIndex < nMaxInstances; ++nInstanceIndex ) - { - ItemCount nMaxVariations = 0; - rc = ATSUGetFontInstance( nFontID, nInstanceIndex, 0, NULL, NULL, &nMaxVariations ); - if( (rc == noErr) && (nMaxVariations > 0) ) - { - fprintf(stderr,"\tnMaxVariations=%d\n",(int)nMaxVariations); - typedef ::std::vector<ATSUFontVariationAxis> VariationAxisVector; - typedef ::std::vector<ATSUFontVariationValue> VariationValueVector; - VariationAxisVector aVariationAxes( nMaxVariations ); - VariationValueVector aVariationValues( nMaxVariations ); - ItemCount nVariationCount = 0; - rc = ATSUGetFontInstance ( nFontID, nInstanceIndex, nMaxVariations, - &aVariationAxes[0], &aVariationValues[0], &nVariationCount ); - fprintf(stderr,"\tnVariationCount=%d\n",(int)nVariationCount); - for( ItemCount nVariationIndex = 0; nVariationIndex < nMaxVariations; ++nVariationIndex ) - { - const char* pTag = (const char*)&aVariationAxes[nVariationIndex]; - fprintf(stderr,"\tvariation[%d] \'%c%c%c%c\' is %d\n", (int)nVariationIndex, - pTag[3],pTag[2],pTag[1],pTag[0], (int)aVariationValues[nVariationIndex]); - } - } - } -#endif - -#if 0 // selecting non-defaulted font features is not enabled yet - ByteString aFName( rDFA.maName, RTL_TEXTENCODING_UTF8 ); - ByteString aSName( rDFA.maStyleName, RTL_TEXTENCODING_UTF8 ); - ItemCount nMaxFeatures = 0; - rc = ATSUCountFontFeatureTypes( nFontID, &nMaxFeatures ); - fprintf(stderr,"Font \"%s\" \"%s\" has %d features\n",aFName.GetBuffer(),aSName.GetBuffer(),rc); - if( (rc == noErr) && (nMaxFeatures > 0) ) - { - typedef std::vector<ATSUFontFeatureType> FeatureVector; - FeatureVector aFeatureVector( nMaxFeatures ); - ItemCount nFeatureCount = 0; - rc = ATSUGetFontFeatureTypes( nFontID, nMaxFeatures, &aFeatureVector[0], &nFeatureCount ); - fprintf(stderr,"nFeatureCount=%d\n",(int)nFeatureCount); - for( ItemCount nFeatureIndex = 0; nFeatureIndex < nFeatureCount; ++nFeatureIndex ) - { - ItemCount nMaxSelectors = 0; - rc = ATSUCountFontFeatureSelectors( nFontID, aFeatureVector[nFeatureIndex], &nMaxSelectors ); - fprintf(stderr,"\tFeature[%d] = %d has %d selectors\n", - (int)nFeatureIndex, (int)aFeatureVector[nFeatureIndex], (int)nMaxSelectors ); - typedef std::vector<ATSUFontFeatureSelector> SelectorVector; - SelectorVector aSelectorVector( nMaxSelectors ); - typedef std::vector<MacOSBoolean> BooleanVector; - BooleanVector aEnabledVector( nMaxSelectors ); - BooleanVector aExclusiveVector( nMaxSelectors ); - ItemCount nSelectorCount = 0; - rc = ATSUGetFontFeatureSelectors ( nFontID, aFeatureVector[nFeatureIndex], nMaxSelectors, - &aSelectorVector[0], &aEnabledVector[0], &nSelectorCount, &aExclusiveVector[0]); - for( ItemCount nSelectorIndex = 0; nSelectorIndex < nSelectorCount; ++nSelectorIndex ) - { - FontNameCode eFontNameCode; - rc = ATSUGetFontFeatureNameCode( nFontID, aFeatureVector[nFeatureIndex], - aSelectorVector[nSelectorIndex], &eFontNameCode ); - fprintf(stderr,"\t\tselector[%d] n=%d e=%d, x=%d\n", - (int)nSelectorIndex, (int)eFontNameCode, - aEnabledVector[nSelectorIndex], aExclusiveVector[nSelectorIndex] ); - } - } - } -#endif - bool bRet = (rDFA.maName.Len() > 0); return bRet; } @@ -551,3 +483,4 @@ ImplMacFontData* SystemFontList::GetFontDataFromId( ATSUFontID nFontId ) const // ----------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx index d73b3eb25511..bfb15f0a8076 100644 --- a/vcl/aqua/source/gdi/salbmp.cxx +++ b/vcl/aqua/source/gdi/salbmp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -156,6 +157,13 @@ bool AquaSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount ) // ------------------------------------------------------------------ +bool AquaSalBitmap::Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > /*xBitmapCanvas*/, Size& /*rSize*/, bool /*bMask*/ ) +{ + return false; +} + +// ------------------------------------------------------------------ + void AquaSalBitmap::Destroy() { DestroyContext(); @@ -260,7 +268,7 @@ bool AquaSalBitmap::AllocateUserData() case 24: mnBytesPerRow = (mnWidth << 1) + mnWidth; break; case 32: mnBytesPerRow = mnWidth << 2; break; default: - DBG_ERROR("vcl::AquaSalBitmap::AllocateUserData(), illegal bitcount!"); + OSL_FAIL("vcl::AquaSalBitmap::AllocateUserData(), illegal bitcount!"); } } @@ -271,7 +279,7 @@ bool AquaSalBitmap::AllocateUserData() } catch( const std::bad_alloc& ) { - DBG_ERROR( "vcl::AquaSalBitmap::AllocateUserData: bad alloc" ); + OSL_FAIL( "vcl::AquaSalBitmap::AllocateUserData: bad alloc" ); maUserBuffer.reset( NULL ); mnBytesPerRow = 0; } @@ -905,3 +913,5 @@ bool AquaSalBitmap::GetSystemData( BitmapSystemData& rData ) return bRet; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/gdi/salcolorutils.cxx b/vcl/aqua/source/gdi/salcolorutils.cxx index 37b6ec65a108..682537771178 100755..100644 --- a/vcl/aqua/source/gdi/salcolorutils.cxx +++ b/vcl/aqua/source/gdi/salcolorutils.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,4 @@ void SetSalColor( const SalColor& rColor, float* pQuartzColor ) // ======================================================================= +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx index f4fc437186fa..3f8829b1e72b 100644 --- a/vcl/aqua/source/gdi/salgdi.cxx +++ b/vcl/aqua/source/gdi/salgdi.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,7 +32,7 @@ #include "osl/file.hxx" #include "osl/process.h" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "rtl/bootstrap.h" #include "rtl/strbuf.hxx" @@ -75,6 +76,7 @@ ImplMacFontData::ImplMacFontData( const ImplDevFontAttributes& rDFA, ATSUFontID , mbHasOs2Table( false ) , mbCmapEncodingRead( false ) , mbHasCJKSupport( false ) +, mbFontCapabilitiesRead( false ) {} // ----------------------------------------------------------------------- @@ -150,15 +152,61 @@ const ImplFontCharMap* ImplMacFontData::GetImplFontCharMap() const // parse the CMAP CmapResult aCmapResult; - if( ParseCMAP( &aBuffer[0], nRawLength, aCmapResult ) ) + if( !ParseCMAP( &aBuffer[0], nRawLength, aCmapResult ) ) + return mpCharMap; + + mpCharMap = new ImplFontCharMap( aCmapResult ); + mpCharMap->AddReference(); + return mpCharMap; +} + +bool ImplMacFontData::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const +{ + // read this only once per font + if( mbFontCapabilitiesRead ) { - // create the matching charmap - mpCharMap->DeReference(); - mpCharMap = new ImplFontCharMap( aCmapResult ); - mpCharMap->AddReference(); + rFontCapabilities = maFontCapabilities; + return !rFontCapabilities.maUnicodeRange.empty() || !rFontCapabilities.maCodePageRange.empty(); } + mbFontCapabilitiesRead = true; - return mpCharMap; + // prepare to get the GSUB table raw data + ATSFontRef rFont = FMGetATSFontRefFromFont( mnFontId ); + ByteCount nBufSize = 0; + OSStatus eStatus; + eStatus = ATSFontGetTable( rFont, GetTag("GSUB"), 0, 0, NULL, &nBufSize ); + if( eStatus == noErr ) + { + // allocate a buffer for the GSUB raw data + ByteVector aBuffer( nBufSize ); + // get the GSUB raw data + ByteCount nRawLength = 0; + eStatus = ATSFontGetTable( rFont, GetTag("GSUB"), 0, nBufSize, (void*)&aBuffer[0], &nRawLength ); + if( eStatus == noErr ) + { + const unsigned char* pGSUBTable = &aBuffer[0]; + vcl::getTTScripts(maFontCapabilities.maGSUBScriptTags, pGSUBTable, nRawLength); + } + } + eStatus = ATSFontGetTable( rFont, GetTag("OS/2"), 0, 0, NULL, &nBufSize ); + if( eStatus == noErr ) + { + // allocate a buffer for the GSUB raw data + ByteVector aBuffer( nBufSize ); + // get the OS/2 raw data + ByteCount nRawLength = 0; + eStatus = ATSFontGetTable( rFont, GetTag("OS/2"), 0, nBufSize, (void*)&aBuffer[0], &nRawLength ); + if( eStatus == noErr ) + { + const unsigned char* pOS2Table = &aBuffer[0]; + vcl::getTTCoverage( + maFontCapabilities.maUnicodeRange, + maFontCapabilities.maCodePageRange, + pOS2Table, nRawLength); + } + } + rFontCapabilities = maFontCapabilities; + return !rFontCapabilities.maUnicodeRange.empty() || !rFontCapabilities.maCodePageRange.empty(); } // ----------------------------------------------------------------------- @@ -397,17 +445,17 @@ void AquaSalGraphics::initResolution( NSWindow* ) } else { - DBG_ERROR( "no resolution found in device description" ); + OSL_FAIL( "no resolution found in device description" ); } } else { - DBG_ERROR( "no device description" ); + OSL_FAIL( "no device description" ); } } else { - DBG_ERROR( "no screen found" ); + OSL_FAIL( "no screen found" ); } // #i107076# maintaining size-WYSIWYG-ness causes many problems for @@ -456,7 +504,7 @@ void AquaSalGraphics::copyResolution( AquaSalGraphics& rGraphics ) // ----------------------------------------------------------------------- -sal_uInt16 AquaSalGraphics::GetBitCount() +sal_uInt16 AquaSalGraphics::GetBitCount() const { sal_uInt16 nBits = mnBitmapDepth ? mnBitmapDepth : 32;//24; return nBits; @@ -1152,23 +1200,6 @@ void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, l { ApplyXorContext(); -#if 0 // TODO: make AquaSalBitmap as fast as the alternative implementation below - SalBitmap* pBitmap = getBitmap( nSrcX, nSrcY, nSrcWidth, nSrcHeight ); - if( pBitmap ) - { - SalTwoRect aPosAry; - aPosAry.mnSrcX = 0; - aPosAry.mnSrcY = 0; - aPosAry.mnSrcWidth = nSrcWidth; - aPosAry.mnSrcHeight = nSrcHeight; - aPosAry.mnDestX = nDstX; - aPosAry.mnDestY = nDstY; - aPosAry.mnDestWidth = nSrcWidth; - aPosAry.mnDestHeight = nSrcHeight; - drawBitmap( &aPosAry, *pBitmap ); - delete pBitmap; - } -#else DBG_ASSERT( mxLayer!=NULL, "AquaSalGraphics::copyArea() for non-layered graphics" ); // in XOR mode the drawing context is redirected to the XOR mask @@ -1207,7 +1238,7 @@ void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, l // mark the destination rectangle as updated RefreshRect( nDstX, nDstY, nSrcWidth, nSrcHeight ); -#endif + } // ----------------------------------------------------------------------- @@ -1232,7 +1263,7 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rS void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,SalColor ) { - DBG_ERROR("not implemented for color masking!"); + OSL_FAIL("not implemented for color masking!"); drawBitmap( pPosAry, rSalBitmap ); } @@ -1780,15 +1811,16 @@ static OSStatus GgoMoveToProc( const Float32Point* pPoint, void* pData ) return eStatus; } -sal_Bool AquaSalGraphics::GetGlyphOutline( long nGlyphId, basegfx::B2DPolyPolygon& rPolyPoly ) +sal_Bool AquaSalGraphics::GetGlyphOutline( sal_GlyphId nGlyphId, basegfx::B2DPolyPolygon& rPolyPoly ) { GgoData aGgoData; aGgoData.mpPolyPoly = &rPolyPoly; rPolyPoly.clear(); ATSUStyle rATSUStyle = maATSUStyle; // TODO: handle glyph fallback when CWS pdffix02 is integrated + GlyphID aGlyphId = nGlyphId & GF_IDXMASK; OSStatus eGgoStatus = noErr; - OSStatus eStatus = ATSUGlyphGetCubicPaths( rATSUStyle, nGlyphId, + OSStatus eStatus = ATSUGlyphGetCubicPaths( rATSUStyle, aGlyphId, GgoMoveToProc, GgoLineToProc, GgoCurveToProc, GgoClosePathProc, &aGgoData, &eGgoStatus ); if( (eStatus != noErr) ) // TODO: why is (eGgoStatus!=noErr) when curves are involved? @@ -1822,10 +1854,10 @@ long AquaSalGraphics::GetGraphicsWidth() const // ----------------------------------------------------------------------- -sal_Bool AquaSalGraphics::GetGlyphBoundRect( long nGlyphId, Rectangle& rRect ) +sal_Bool AquaSalGraphics::GetGlyphBoundRect( sal_GlyphId nGlyphId, Rectangle& rRect ) { ATSUStyle rATSUStyle = maATSUStyle; // TODO: handle glyph fallback - GlyphID aGlyphId = nGlyphId; + GlyphID aGlyphId = nGlyphId & GF_IDXMASK; ATSGlyphScreenMetrics aGlyphMetrics; OSStatus eStatus = ATSUGlyphGetScreenMetrics( rATSUStyle, 1, &aGlyphId, 0, FALSE, !mbNonAntialiasedText, &aGlyphMetrics ); @@ -1997,6 +2029,14 @@ const ImplFontCharMap* AquaSalGraphics::GetImplFontCharMap() const return mpMacFontData->GetImplFontCharMap(); } +bool AquaSalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const +{ + if( !mpMacFontData ) + return false; + + return mpMacFontData->GetImplFontCapabilities(rFontCapabilities); +} + // ----------------------------------------------------------------------- // fake a SFNT font directory entry for a font table @@ -2375,20 +2415,7 @@ void AquaSalGraphics::GetGlyphWidths( const ImplFontData* pFontData, bool bVerti else if( pFontData->IsEmbeddable() ) { // get individual character widths -#if 0 // FIXME - rWidths.reserve( 224 ); - for( sal_Unicode i = 32; i < 256; ++i ) - { - int nCharWidth = 0; - if( ::GetCharWidth32W( mhDC, i, i, &nCharWidth ) ) - { - rUnicodeEnc[ i ] = rWidths.size(); - rWidths.push_back( nCharWidth ); - } - } -#else - DBG_ERROR("not implemented for non-subsettable fonts!\n"); -#endif + OSL_FAIL("not implemented for non-subsettable fonts!\n"); } } @@ -2682,3 +2709,4 @@ bool XorEmulation::UpdateTarget() // ======================================================================= +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx index 1652dadfbdfb..5480b630f373 100755..100644 --- a/vcl/aqua/source/gdi/salgdiutils.cxx +++ b/vcl/aqua/source/gdi/salgdiutils.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -300,3 +301,4 @@ void AquaSalGraphics::UpdateWindow( NSRect& ) // ----------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/gdi/salmathutils.cxx b/vcl/aqua/source/gdi/salmathutils.cxx index 1a0011068194..7c02a276e278 100755..100644 --- a/vcl/aqua/source/gdi/salmathutils.cxx +++ b/vcl/aqua/source/gdi/salmathutils.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -161,3 +162,4 @@ unsigned long Euclidian2Norm ( const LRectCoorVector pVec ) // ======================================================================= +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx index f66c7aa2b32d..81060fd38633 100644 --- a/vcl/aqua/source/gdi/salnativewidgets.cxx +++ b/vcl/aqua/source/gdi/salnativewidgets.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -341,10 +342,6 @@ sal_Bool AquaSalGraphics::IsNativeControlSupported( ControlType nType, ControlPa break; case CTRL_TOOLTIP: // ** TO DO - #if 0 - if( nPart == PART_ENTIRE_CONTROL ) // we don't currently support the tooltip - return true; - #endif break; case CTRL_MENU_POPUP: @@ -1527,3 +1524,5 @@ sal_Bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart return toReturn; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index a882e82a93fe..5011564a9065 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,6 +33,7 @@ #include "vcl/print.hxx" #include "vcl/unohelp.hxx" +#include <sal/macros.h> #include "aqua/salinst.h" #include "aqua/salprn.h" @@ -49,7 +51,6 @@ #include <algorithm> -using namespace rtl; using namespace vcl; using namespace com::sun::star; using namespace com::sun::star::uno; @@ -57,6 +58,9 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::container; +using ::rtl::OUString; +using ::rtl::OStringToOUString; + // ======================================================================= AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) : @@ -105,12 +109,6 @@ AquaSalInfoPrinter::~AquaSalInfoPrinter() delete mpGraphics; if( mpPrintInfo ) [mpPrintInfo release]; - #if 0 - // FIXME: verify that NSPrintInfo releases the printer - // else we have a leak here - if( mpPrinter ) - [mpPrinter release]; - #endif if( mrContext ) CFRelease( mrContext ); } @@ -156,7 +154,7 @@ void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const mpGraphics->SetPrinterGraphics( i_rContext, nDPIX, nDPIY, 1.0 ); } else - DBG_ERROR( "no print info in SetupPrinterGraphics" ); + OSL_FAIL( "no print info in SetupPrinterGraphics" ); } } @@ -441,7 +439,7 @@ static Size getPageSize( vcl::PrinterController& i_rController, sal_Int32 i_nPag Sequence< PropertyValue > aPageParms( i_rController.getPageParameters( i_nPage ) ); for( sal_Int32 nProperty = 0, nPropertyCount = aPageParms.getLength(); nProperty < nPropertyCount; ++nProperty ) { - if( aPageParms[ nProperty ].Name.equalsAscii( "PageSize" ) ) + if( aPageParms[ nProperty ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PageSize" ) ) ) { awt::Size aSize; aPageParms[ nProperty].Value >>= aSize; @@ -714,7 +712,7 @@ sal_Bool AquaSalPrinter::StartJob( const XubString* /*i_pFileName*/, bool /*i_bDirect*/, ImplJobSetup* ) { - DBG_ERROR( "should never be called" ); + OSL_FAIL( "should never be called" ); return sal_False; } @@ -824,3 +822,4 @@ int AquaSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx index 8e77c67c7854..af5fa82958f9 100644 --- a/vcl/aqua/source/gdi/salvd.cxx +++ b/vcl/aqua/source/gdi/salvd.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -253,3 +254,5 @@ void AquaSalVirtualDevice::GetSize( long& rWidth, long& rHeight ) rHeight = 0; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index eec0a0ec3602..6c06339445a4 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -666,12 +667,6 @@ sal_Bool AquaSalFrame::GetWindowState( SalFrameState* pState ) SAL_FRAMESTATE_MASK_Y | SAL_FRAMESTATE_MASK_WIDTH | SAL_FRAMESTATE_MASK_HEIGHT | - #if 0 - SAL_FRAMESTATE_MASK_MAXIMIZED_X | - SAL_FRAMESTATE_MASK_MAXIMIZED_Y | - SAL_FRAMESTATE_MASK_MAXIMIZED_WIDTH | - SAL_FRAMESTATE_MASK_MAXIMIZED_HEIGHT | - #endif SAL_FRAMESTATE_MASK_STATE; NSRect aStateRect = [mpWindow frame]; @@ -729,6 +724,10 @@ void AquaSalFrame::SetScreenNumber(unsigned int nScreen) } } +void AquaSalFrame::SetApplicationID( const rtl::OUString &/*rApplicationID*/ ) +{ +} + // ----------------------------------------------------------------------- void AquaSalFrame::ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay ) @@ -930,7 +929,7 @@ NSCursor* AquaSalFrame::getCurrentCursor() const pCursor = GetSalData()->getCursor( mePointerStyle ); if( pCursor == nil ) { - DBG_ERROR( "unmapped cursor" ); + OSL_FAIL( "unmapped cursor" ); pCursor = [NSCursor arrowCursor]; } break; @@ -1272,6 +1271,8 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings ) getResolution( nDPIX, nDPIY ); aAppFont = getFont( [NSFont systemFontOfSize: 0], nDPIY, aAppFont ); + aStyleSettings.SetToolbarIconSize( nDPIY > 160 ? STYLE_TOOLBAR_ICONSIZE_LARGE : STYLE_TOOLBAR_ICONSIZE_SMALL ); + // TODO: better mapping of aqua<->ooo font settings aStyleSettings.SetAppFont( aAppFont ); aStyleSettings.SetHelpFont( aAppFont ); @@ -1325,7 +1326,9 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetScrollBarSize( static_cast<long int>([NSScroller scrollerWidth]) ); // images in menus false for MacOSX - aStyleSettings.SetUseImagesInMenus( false ); + aStyleSettings.SetPreferredUseImagesInMenus( false ); + aStyleSettings.SetHideDisabledMenuItems( sal_True ); + aStyleSettings.SetAcceleratorsInContextMenus( sal_False ); rSettings.SetStyleSettings( aStyleSettings ); @@ -1550,6 +1553,17 @@ SalPointerState AquaSalFrame::GetPointerState() return state; } +SalFrame::SalIndicatorState AquaSalFrame::GetIndicatorState() +{ + SalIndicatorState aState; + aState.mnState = 0; + return aState; +} + +void AquaSalFrame::SimulateKeyPress( sal_uInt16 /*nKeyCode*/ ) +{ +} + bool AquaSalFrame::SetPluginParent( SystemParentData* ) { // plugin parent may be killed unexpectedly by @@ -1790,3 +1804,4 @@ void AquaSalFrame::EndSetClipRegion() } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm index dd2deefdeeaa..ade5594ec667 100755 --- a/vcl/aqua/source/window/salframeview.mm +++ b/vcl/aqua/source/window/salframeview.mm @@ -29,6 +29,7 @@ #include "precompiled_vcl.hxx" #include <sal/alloca.h> +#include <sal/macros.h> #include "vcl/window.hxx" #include "vcl/svapp.hxx" @@ -106,7 +107,7 @@ static sal_uInt16 ImplMapCharCode( sal_Unicode aCode ) }; sal_uInt16 nKeyCode = 0; - if( aCode < sizeof( aKeyCodeMap) / sizeof( aKeyCodeMap[0] ) ) + if( aCode < SAL_N_ELEMENTS( aKeyCodeMap) ) nKeyCode = aKeyCodeMap[ aCode ]; else if( aCode >= 0xf700 && aCode < 0xf780 ) nKeyCode = aFunctionKeyCodeMap[ aCode - 0xf700 ]; @@ -169,7 +170,7 @@ static AquaSalFrame* getMouseContainerFrame() { if( GetSalData() && GetSalData()->mpFirstInstance ) { - vos::IMutex* pMutex = GetSalData()->mpFirstInstance->GetYieldMutex(); + osl::SolarMutex* pMutex = GetSalData()->mpFirstInstance->GetYieldMutex(); if( pMutex ) { pMutex->acquire(); @@ -440,7 +441,7 @@ static AquaSalFrame* getMouseContainerFrame() return mpFrame ? (mpFrame->getClipPath() != 0 ? NO : YES) : YES; } -// helper class similar to a vos::OGuard for the SalYieldMutex +// helper class similar to a osl::SolarGuard for the SalYieldMutex // the difference is that it only does tryToAcquire instead of aquire // so dreaded deadlocks like #i93512# are prevented class TryGuard @@ -918,7 +919,7 @@ private: // Caution: should the table grow to more than 5 or 6 entries, // we must consider moving it to a kind of hash map - const unsigned int nExceptions = sizeof( aExceptionalKeys ) / sizeof( aExceptionalKeys[0] ); + const unsigned int nExceptions = SAL_N_ELEMENTS( aExceptionalKeys ); for( unsigned int i = 0; i < nExceptions; i++ ) { if( nKeyCode == aExceptionalKeys[i].nKeyCode && diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx index c237b10f1512..ef76f4cf6e61 100644 --- a/vcl/aqua/source/window/salmenu.cxx +++ b/vcl/aqua/source/window/salmenu.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -562,7 +563,7 @@ void AquaSalMenu::InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) maItems.insert( maItems.begin() + nPos, pAquaSalMenuItem ); else { - DBG_ERROR( "invalid item index in insert" ); + OSL_FAIL( "invalid item index in insert" ); return; } @@ -585,7 +586,7 @@ void AquaSalMenu::RemoveItem( unsigned nPos ) } else { - DBG_ERROR( "invalid item index in remove" ); + OSL_FAIL( "invalid item index in remove" ); return; } @@ -808,7 +809,7 @@ void AquaSalMenu::statusLayout() if( [pView isMemberOfClass: [OOStatusItemView class]] ) // well of course it is [(OOStatusItemView*)pView layout]; else - DBG_ERROR( "someone stole our status view" ); + OSL_FAIL( "someone stole our status view" ); } } @@ -965,3 +966,4 @@ AquaSalMenuItem::~AquaSalMenuItem() // ------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/aqua/source/window/salnsmenu.mm b/vcl/aqua/source/window/salnsmenu.mm index fcc2392a01a9..b86caa49d870 100755 --- a/vcl/aqua/source/window/salnsmenu.mm +++ b/vcl/aqua/source/window/salnsmenu.mm @@ -62,7 +62,7 @@ pFrame->CallCallback(SALEVENT_MENUDEACTIVATE, &aMenuEvt); } else - DBG_ERROR( "unconnected menu" ); + OSL_FAIL( "unconnected menu" ); } } } @@ -123,7 +123,7 @@ pPopupMenu->ImplSelectWithStart( pCurMenu ); } else - DBG_ERROR( "menubar item without frame !" ); + OSL_FAIL( "menubar item without frame !" ); } } @end diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx index 6b5952bee8a1..a070a8f0be12 100644 --- a/vcl/aqua/source/window/salobj.cxx +++ b/vcl/aqua/source/window/salobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -243,3 +244,4 @@ void AquaSalObject::InterceptChildWindowKeyDown( sal_Bool /*bIntercept*/ ) { } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |