diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-07-26 11:01:27 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-07-26 11:20:10 +0300 |
commit | 4f2b97d4c763b711992968f86b4cbf36342681f7 (patch) | |
tree | b9979252c939349a41633494948e49fac7e8c6ec /fpicker | |
parent | 025a10e6d60a340fed9990e8389b8cbd272207de (diff) |
WaE: convenience initializer should not invoke an initializer on 'super'
New warning from Clang 6. So get rid of the initWithOUString
initializer completely, it is called only from stringWithOUString
anyway.
Change-Id: I510101bfe1e6ac52f8f5a1d8a061082b3875419f
Diffstat (limited to 'fpicker')
-rw-r--r-- | fpicker/source/aqua/NSString_OOoAdditions.hxx | 1 | ||||
-rw-r--r-- | fpicker/source/aqua/NSString_OOoAdditions.mm | 17 |
2 files changed, 1 insertions, 17 deletions
diff --git a/fpicker/source/aqua/NSString_OOoAdditions.hxx b/fpicker/source/aqua/NSString_OOoAdditions.hxx index c921393c6b5a..08bfbd47d356 100644 --- a/fpicker/source/aqua/NSString_OOoAdditions.hxx +++ b/fpicker/source/aqua/NSString_OOoAdditions.hxx @@ -28,7 +28,6 @@ //for Cocoa types @interface NSString (OOoAdditions) + (id) stringWithOUString:(const OUString&)ouString; -- (id) initWithOUString:(const OUString&)ouString; - (OUString) OUString; @end diff --git a/fpicker/source/aqua/NSString_OOoAdditions.mm b/fpicker/source/aqua/NSString_OOoAdditions.mm index 66391a9e158b..5b4263aeb392 100644 --- a/fpicker/source/aqua/NSString_OOoAdditions.mm +++ b/fpicker/source/aqua/NSString_OOoAdditions.mm @@ -28,27 +28,12 @@ { DBG_PRINT_ENTRY(CLASS_NAME, __func__, "ouString", ouString); - NSString *string = [[NSString alloc] initWithOUString:ouString]; + NSString *string = [[NSString alloc] initWithCharacters:ouString.getStr() length:ouString.getLength()]; DBG_PRINT_EXIT(CLASS_NAME, __func__, string); return [string autorelease]; } -- (id) initWithOUString:(const rtl::OUString&)ouString -{ - DBG_PRINT_ENTRY(CLASS_NAME, __func__, "ouString", ouString); - if ((self = [super init])) { - self = [self initWithCharacters:ouString.getStr() length:ouString.getLength()]; - - DBG_PRINT_EXIT(CLASS_NAME, __func__, self); - - return self; - } - - DBG_PRINT_EXIT(CLASS_NAME, __func__, self); - return nil; -} - - (rtl::OUString) OUString { unsigned int nFileNameLength = [self length]; |