diff options
Diffstat (limited to 'vcl/aqua')
| -rw-r--r-- | vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm | 24 | ||||
| -rw-r--r-- | vcl/aqua/source/app/salinst.cxx | 2 | ||||
| -rw-r--r-- | vcl/aqua/source/gdi/atsui/salgdi.cxx | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm index db4e94e6dc93..9ac7876bf98a 100644 --- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm @@ -124,18 +124,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(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")); + static const OUString attrUnderline("CharUnderline"); + static const OUString attrBold("CharWeight"); + static const OUString attrFontname("CharFontName"); + static const OUString attrItalic("CharPosture"); + static const OUString attrHeight("CharHeight"); + static const OUString attrStrikethrough("CharStrikeout"); + static const OUString attrShadow("CharShadowed"); + static const OUString attrUnderlineColor("CharUnderlineColor"); + static const OUString attrUnderlineHasColor("CharUnderlineHasColor"); + static const OUString attrForegroundColor("CharColor"); + static const OUString attrBackgroundColor("CharBackColor"); + static const OUString attrSuperscript("CharEscapement"); // vars OUString fontname; int fonttraits = 0; diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index c0bc111e947f..40a0e5579062 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -265,7 +265,7 @@ void InitSalData() const ::rtl::OUString& SalGetDesktopEnvironment() { - static OUString aDesktopEnvironment(RTL_CONSTASCII_USTRINGPARAM( "MacOSX" )); + static OUString aDesktopEnvironment( "MacOSX" ); return aDesktopEnvironment; } diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx index 904ba91024aa..af86b28644a8 100644 --- a/vcl/aqua/source/gdi/atsui/salgdi.cxx +++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx @@ -487,7 +487,7 @@ static bool AddLocalTempFontDirs( void ) // add private font files - rtl::OUString aBrandStr( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR" ) ); + rtl::OUString aBrandStr( "$BRAND_BASE_DIR" ); rtl_bootstrap_expandMacros( &aBrandStr.pData ); rtl::OUString aBrandSysPath; OSL_VERIFY( osl_getSystemPathFromFileURL( aBrandStr.pData, &aBrandSysPath.pData ) == osl_File_E_None ); |