mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:nullptr (macOS)

Browse Source 
Change-Id: Ibd4bd34fc73f80aea7aaf2a5e524cf877822ee6b
Reviewed-on: https://gerrit.libreoffice.org/73587
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2019-06-06 10:05:21 +02:00
parent 5e5372145e
commit ffed2de3e4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sfx2/source/appl/sfxhelp.cxx
View File

@@ -725,8 +725,8 @@ static bool impl_showOnlineHelp( const OUString& rURL )
CFStringCreateWithCString(kCFAllocatorDefault, CFStringCreateWithCString(kCFAllocatorDefault,
aHelpLink.toUtf8().getStr(), aHelpLink.toUtf8().getStr(),
kCFStringEncodingUTF8), kCFStringEncodingUTF8),
NULL), nullptr),
NULL); nullptr);
#else #else
sfx2::openUriExternally(aHelpLink, false); sfx2::openUriExternally(aHelpLink, false);
#endif #endif
@@ -953,8 +953,8 @@ static bool impl_showOfflineHelp( const OUString& rURL )
CFStringCreateWithCString(kCFAllocatorDefault, CFStringCreateWithCString(kCFAllocatorDefault,
aTempFile.GetURL().toUtf8().getStr(), aTempFile.GetURL().toUtf8().getStr(),
kCFStringEncodingUTF8), kCFStringEncodingUTF8),
NULL), nullptr),
NULL); nullptr);
#else #else
sfx2::openUriExternally(aTempFile.GetURL(), false); sfx2::openUriExternally(aTempFile.GetURL(), false);
#endif #endif
@@ -1077,8 +1077,8 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, const
CFURLCreateWithString( CFURLCreateWithString(
kCFAllocatorDefault, kCFAllocatorDefault,
static_cast<CFStringRef>(@"https://www.libreoffice.org"), static_cast<CFStringRef>(@"https://www.libreoffice.org"),
NULL), nullptr),
kLSRolesAll, NULL); kLSRolesAll, nullptr);
if([static_cast<NSString*>(CFURLGetString(pBrowser)) isEqualToString:@"file:///Applications/Safari.app/"]) { if([static_cast<NSString*>(CFURLGetString(pBrowser)) isEqualToString:@"file:///Applications/Safari.app/"]) {
impl_showOnlineHelp( aHelpURL ); impl_showOnlineHelp( aHelpURL );
return true; return true;