diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-05-30 06:55:50 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-05-30 06:55:50 +0000 |
| commit | d38735a4b1c203b59791509724f710697a688481 (patch) | |
| tree | 587503e63e774caa27f942e00cc5d48cf5eec826 /dtrans | |
| parent | d7a9079838e54f38c0889b6f148c282c2c1ac549 (diff) | |
INTEGRATION: CWS aquavcl07 (1.6.8); FILE MERGED
2008/04/17 05:39:39 pl 1.6.8.2: RESYNC: (1.6-1.7); FILE MERGED
2008/04/16 12:07:10 pl 1.6.8.1: #i87595# don not call on destroyed objects
Diffstat (limited to 'dtrans')
| -rw-r--r-- | dtrans/source/aqua/aqua_clipboard.cxx | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/dtrans/source/aqua/aqua_clipboard.cxx b/dtrans/source/aqua/aqua_clipboard.cxx index 5b429d3fe1e5..166afa686478 100644 --- a/dtrans/source/aqua/aqua_clipboard.cxx +++ b/dtrans/source/aqua/aqua_clipboard.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: aqua_clipboard.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -56,24 +56,29 @@ using namespace comphelper; -(EventListener*)initWithAquaClipboard: (AquaClipboard*) pcb { - self = [super init]; + self = [super init]; - if (self) - { - pAquaClipboard = pcb; - } + if (self) + pAquaClipboard = pcb; - return self; + return self; } -(void)pasteboard:(NSPasteboard*)sender provideDataForType:(NSString*)type { - pAquaClipboard->provideDataForType(sender, type); + if( pAquaClipboard ) + pAquaClipboard->provideDataForType(sender, type); } -(void)applicationDidBecomeActive:(NSNotification*)aNotification { - pAquaClipboard->applicationDidBecomeActive(aNotification); + if( pAquaClipboard ) + pAquaClipboard->applicationDidBecomeActive(aNotification); +} + +-(void)disposing +{ + pAquaClipboard = NULL; } @end @@ -161,6 +166,7 @@ AquaClipboard::~AquaClipboard() [[NSNotificationCenter defaultCenter] removeObserver: mEventListener]; } + [mEventListener disposing]; [mEventListener release]; [mPasteboard release]; } |