[Libreoffice-commits] core.git: vcl/aqua
Boris Dušek
me at dusek.me
Wed Aug 21 11:08:45 PDT 2013
vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit fe92085599aa39354f61e9adb07255aea6125674
Author: Boris Dušek <me at dusek.me>
Date: Wed Aug 21 08:23:44 2013 +0200
Fix build with compiler from OS X 10.6 SDK (hopefully)
The compiler in 10.6 SDK probably still requires methods to be defined in
such an order that one should not reference a method from a line of code
that precedes the one where the method is defined. Compilers in newer SDKs
support arbitrary order, as long as the requested method is defined
anywhere.
This is consistent with other methods in the same file that are not declared
anywhere (just defined and used apparently in the order I wrote above).
Change-Id: I14ba699056b6cdd2e804dbc87cfedaef47663664
Reviewed-on: https://gerrit.libreoffice.org/5576
Reviewed-by: Boris Dušek <me at dusek.me>
Tested-by: Boris Dušek <me at dusek.me>
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index 67ebca6..093f898f9 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -283,10 +283,6 @@ using namespace ::rtl;
[ pool release ];
}
-+(void)addMarkup:(XAccessibleTextMarkup*)markup toString:(NSMutableAttributedString*)string inRange:(NSRange)range {
- [AquaA11yTextAttributesWrapper addMarkup:markup withType:(::com::sun::star::text::TextMarkupType::SPELLCHECK) toString:string inRange:range];
-}
-
+(void)addMarkup:(XAccessibleTextMarkup*)markup withType:(long)type toString:(NSMutableAttributedString*)string inRange:(NSRange)range {
const long markupCount = markup->getTextMarkupCount(type);
for (long markupIndex = 0; markupIndex < markupCount; ++markupIndex) {
@@ -305,6 +301,10 @@ using namespace ::rtl;
}
}
++(void)addMarkup:(XAccessibleTextMarkup*)markup toString:(NSMutableAttributedString*)string inRange:(NSRange)range {
+ [AquaA11yTextAttributesWrapper addMarkup:markup withType:(::com::sun::star::text::TextMarkupType::SPELLCHECK) toString:string inRange:range];
+}
+
+(NSMutableAttributedString *)createAttributedStringForElement:(AquaA11yWrapper *)wrapper inOrigRange:(id)origRange {
static const Sequence < OUString > emptySequence;
// vars
More information about the Libreoffice-commits
mailing list