diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-16 12:51:21 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-16 12:51:21 +0200 |
| commit | e413403590c3fb68a62db6d34d202e320fd99017 (patch) | |
| tree | 3f217fd8f23a3bfe45b4bb2aafaca84c3457e964 | |
| parent | a7ba47243cb70b78c8d8674558ed6db35b79da99 (diff) | |
fdo#53061: Work around boost::ptr_vector.insert(..., nullptr) problem
At least with certain versions of Boost and Clang, and when NULL is defined as
nullptr, compilation failed here. To me, looks like an error of either Boost or
Clang; replacing "NULL" with "0" appears to be a good enough workaround.
(Identified by Jung-uk Kim.)
Change-Id: I702587abfabad6dba55a2b4c65a53e332b4ab048
| -rw-r--r-- | svx/source/items/clipfmtitem.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index 1af4be820855..e2879661ab84 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -132,7 +132,7 @@ void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos ) if( nPos > pImpl->aFmtNms.size() ) nPos = pImpl->aFmtNms.size(); - pImpl->aFmtNms.insert(pImpl->aFmtNms.begin() + nPos, NULL); + pImpl->aFmtNms.insert(pImpl->aFmtNms.begin() + nPos, 0); pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId ); } |