summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-08-17 08:14:36 +0200
committerStephan Bergmann <sbergman@redhat.com>2020-08-17 09:42:00 +0200
commitdaa7d18222e14ef0c7ce66b5ded58f72e1fdaf84 (patch)
treeca7a890940db645c54af5dd920b4857270ceec3f /vcl
parent3f2e85ae2c6cd8a775587524788f61e4c93676b9 (diff)
"loplugin:stringstatic also look for local statics" macOS redux
...plus addressing follow-up loplugin:stringconstant when inlining the literals at their sole call sites Change-Id: I727e2d3fe53e85af328afc5fba92e52fb63c49b4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100839 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/osx/a11ytextattributeswrapper.mm40
1 files changed, 13 insertions, 27 deletions
diff --git a/vcl/osx/a11ytextattributeswrapper.mm b/vcl/osx/a11ytextattributeswrapper.mm
index 897514b559f7..f5d826dbc0b1 100644
--- a/vcl/osx/a11ytextattributeswrapper.mm
+++ b/vcl/osx/a11ytextattributeswrapper.mm
@@ -194,20 +194,6 @@ using namespace ::com::sun::star::uno;
+(void)applyAttributesFrom:(Sequence < PropertyValue > const &)attributes toString:(NSMutableAttributedString *)string forRange:(NSRange)range fontDescriptor:(AquaA11yFontDescriptor*)fontDescriptor {
NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
- // constants
- 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");
- static const OUString attrTextAlignment("ParaAdjust");
// vars
sal_Int32 underlineColor = 0;
bool underlineHasColor = false;
@@ -216,40 +202,40 @@ using namespace ::com::sun::star::uno;
// TODO: NSAccessibilityMisspelledTextAttribute, NSAccessibilityAttachmentTextAttribute, NSAccessibilityLinkTextAttribute
// NSAccessibilityStrikethroughColorTextAttribute is unsupported by UNP-API
if ( property.Value.hasValue() ) {
- if ( property.Name.equals ( attrUnderline ) ) {
+ if ( property.Name == "CharUnderline" ) {
int style = [ AquaA11yTextAttributesWrapper convertUnderlineStyle: property ];
if ( style != NSUnderlineStyleNone ) {
[ string addAttribute: NSAccessibilityUnderlineTextAttribute value: [ NSNumber numberWithInt: style ] range: range ];
}
- } else if ( property.Name.equals ( attrFontname ) ) {
+ } else if ( property.Name == "CharFontName" ) {
OUString fontname;
property.Value >>= fontname;
[fontDescriptor setName:CreateNSString(fontname)];
- } else if ( property.Name.equals ( attrBold ) ) {
+ } else if ( property.Name == "CharWeight" ) {
[fontDescriptor setBold:[AquaA11yTextAttributesWrapper convertBoldStyle:property]];
- } else if ( property.Name.equals ( attrItalic ) ) {
+ } else if ( property.Name == "CharPosture" ) {
[fontDescriptor setItalic:[AquaA11yTextAttributesWrapper convertItalicStyle:property]];
- } else if ( property.Name.equals ( attrHeight ) ) {
+ } else if ( property.Name == "CharHeight" ) {
float size;
property.Value >>= size;
[fontDescriptor setSize:size];
- } else if ( property.Name.equals ( attrStrikethrough ) ) {
+ } else if ( property.Name == "CharStrikeout" ) {
if ( [ AquaA11yTextAttributesWrapper isStrikethrough: property ] ) {
[ string addAttribute: NSAccessibilityStrikethroughTextAttribute value: [ NSNumber numberWithBool: YES ] range: range ];
}
- } else if ( property.Name.equals ( attrShadow ) ) {
+ } else if ( property.Name == "CharShadowed" ) {
if ( [ AquaA11yTextAttributesWrapper convertBoolean: property ] ) {
[ string addAttribute: NSAccessibilityShadowTextAttribute value: [ NSNumber numberWithBool: YES ] range: range ];
}
- } else if ( property.Name.equals ( attrUnderlineColor ) ) {
+ } else if ( property.Name == "CharUnderlineColor" ) {
property.Value >>= underlineColor;
- } else if ( property.Name.equals ( attrUnderlineHasColor ) ) {
+ } else if ( property.Name == "CharUnderlineHasColor" ) {
underlineHasColor = [ AquaA11yTextAttributesWrapper convertBoolean: property ];
- } else if ( property.Name.equals ( attrForegroundColor ) ) {
+ } else if ( property.Name == "CharColor" ) {
[ AquaA11yTextAttributesWrapper addColor: property.Value.get<sal_Int32>() forAttribute: NSAccessibilityForegroundColorTextAttribute andRange: range toString: string ];
- } else if ( property.Name.equals ( attrBackgroundColor ) ) {
+ } else if ( property.Name == "CharBackColor" ) {
[ AquaA11yTextAttributesWrapper addColor: property.Value.get<sal_Int32>() forAttribute: NSAccessibilityBackgroundColorTextAttribute andRange: range toString: string ];
- } else if ( property.Name.equals ( attrSuperscript ) ) {
+ } else if ( property.Name == "CharEscapement" ) {
// values < zero mean subscript
// values > zero mean superscript
// this is true for both NSAccessibility-API and UNO-API
@@ -257,7 +243,7 @@ using namespace ::com::sun::star::uno;
if ( [ number shortValue ] != 0 ) {
[ string addAttribute: NSAccessibilitySuperscriptTextAttribute value: number range: range ];
}
- } else if ( property.Name.equals ( attrTextAlignment ) ) {
+ } else if ( property.Name == "ParaAdjust" ) {
sal_Int32 alignment;
property.Value >>= alignment;
NSNumber *textAlignment = nil;