summaryrefslogtreecommitdiff
path: root/dtrans
diff options
context:
space:
mode:
authorHerbert Dürr <hdu@apache.org>2014-01-06 14:10:06 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-01-06 16:32:20 +0000
commit9e77ddcd19d328c54ed0fb3ebb83f585b85f0249 (patch)
tree41843d922d70b433a0e5647b0fdcdb406fa6be0e /dtrans
parent01329972d89ddfd30d197b7947c571fdb83b0cf8 (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 'dtrans')
-rw-r--r--dtrans/source/win32/clipb/WinClipboard.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx
index cd08ec64fba2..59bc8be8ccf6 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.cxx
@@ -265,7 +265,7 @@ void SAL_CALL CWinClipboard::disposing()
m_pImpl->dispose( );
// force destruction of the impl class
- m_pImpl.reset( NULL );
+ m_pImpl.reset();
}
// -------------------------------------------------