diff options
| author | Herbert Dürr <hdu@apache.org> | 2014-01-06 14:10:06 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-06 16:32:20 +0000 |
| commit | 9e77ddcd19d328c54ed0fb3ebb83f585b85f0249 (patch) | |
| tree | 41843d922d70b433a0e5647b0fdcdb406fa6be0e /sd | |
| parent | 01329972d89ddfd30d197b7947c571fdb83b0cf8 (diff) | |
Resolves: #i123817# prepare codebase for updating to boost 1.55
(cherry picked from commit c31988351c10e9f3fd783730d95da34efd52c153)
Conflicts:
basic/source/comp/parser.cxx
basic/source/comp/token.cxx
dbaccess/source/ui/dlg/generalpage.cxx
sc/source/ui/unoobj/chart2uno.cxx
vcl/quartz/salbmp.cxx
Change-Id: Ic9580f2d4a44959cb3e38906eb4153b2c2a54899
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/tools/PreviewRenderer.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 30f7fdeba517..02ca215a3996 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -171,7 +171,7 @@ void SAL_CALL AccessibleSlideSorterView::disposing (void) comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( mnClientId, *this ); mnClientId = 0; } - mpImpl.reset(NULL); + mpImpl.reset(); } diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index aa40d46e1cbd..21642e5d0459 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -441,7 +441,7 @@ void PreviewRenderer::ProvideView (DrawDocShell* pDocShell) if (pDocShell != mpDocShellOfView) { // Destroy the view that is connected to the current doc shell. - mpView.reset (NULL); + mpView.reset(); // Switch our attention, i.e. listening for DYING events, to // the new doc shell. @@ -543,7 +543,7 @@ void PreviewRenderer::Notify(SfxBroadcaster&, const SfxHint& rHint) // has to be destroyed as well. The next call to // ProvideView will create a new one (for another // doc shell, of course.) - mpView.reset (NULL); + mpView.reset(); mpDocShellOfView = NULL; } } |