[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/aqua

Boris Dušek me at dusek.me
Fri Aug 23 21:40:30 PDT 2013


 vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 240a41f522f8d605daa3de4b9f8d026a13ab7582
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/5577
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index 3b86f79..1c98581 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -235,10 +235,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) {
@@ -257,6 +253,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