diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 16:19:49 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 16:20:38 +0100 |
| commit | b6f1be102c18d75099b5fdd96f5a1a2b6a271142 (patch) | |
| tree | 002f2e7979eb2130a43ff0ee0724ddd4e91a808b /sfx2 | |
| parent | 53c6beda2fb54be3d6b53da93c59311a1c10ddbf (diff) | |
loplugin:nullptr (automatic rewrite; Mac-specific code)
Change-Id: I65de14686d730743abc5becb139a296c6a4a537d
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/shutdowniconaqua.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm index 58b5c41d9fb6..dc1600b2d2ad 100644 --- a/sfx2/source/appl/shutdowniconaqua.mm +++ b/sfx2/source/appl/shutdowniconaqua.mm @@ -220,7 +220,7 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStrin ::rtl::OUString aSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) ); ::rtl::OUString aCompactedSystemPath; - oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL ); + oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, nullptr ); if ( !nError ) aMenuTitle = aCompactedSystemPath; else @@ -399,8 +399,8 @@ void aqua_init_systray() aShortcuts.clear(); pExecute = [[QSMenuExecute alloc] init]; - pDefMenu = [[NSMenuItem alloc] initWithTitle: getAutoreleasedString( pShutdownIcon->GetResString( STR_QUICKSTART_FILE ) ) action: NULL keyEquivalent: @""]; - pDockSubMenu = [[NSMenuItem alloc] initWithTitle: getAutoreleasedString( pShutdownIcon->GetResString( STR_QUICKSTART_FILE ) ) action: NULL keyEquivalent: @""]; + pDefMenu = [[NSMenuItem alloc] initWithTitle: getAutoreleasedString( pShutdownIcon->GetResString( STR_QUICKSTART_FILE ) ) action: nullptr keyEquivalent: @""]; + pDockSubMenu = [[NSMenuItem alloc] initWithTitle: getAutoreleasedString( pShutdownIcon->GetResString( STR_QUICKSTART_FILE ) ) action: nullptr keyEquivalent: @""]; NSMenu* pMenu = [[NSMenu alloc] initWithTitle: getAutoreleasedString( pShutdownIcon->GetResString( STR_QUICKSTART_FILE ) )]; [pMenu setAutoenablesItems: NO]; NSMenu* pDockMenu = [[NSMenu alloc] initWithTitle: getAutoreleasedString( pShutdownIcon->GetResString( STR_QUICKSTART_FILE ) )]; |