diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-11 10:58:50 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-11 17:11:10 +0200 |
| commit | 447410b25528689f01e5ff1f7059f523c93f885f (patch) | |
| tree | a14dc13f858151c550628d586924b8c824325be5 | |
| parent | 089970bbb706ac37cabec772e9bfbce5c487be7c (diff) | |
-Werror,-Wnon-literal-null-conversion (various sw)
Change-Id: Ibab710f57b599b239e3d7e0dc2faec53d994f2f5
| -rw-r--r-- | sw/source/core/docnode/node.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/docnode/node2lay.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/ftnfrm.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/unocore/unofield.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 93a0aed2aa33..c80bd0206b60 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -613,7 +613,7 @@ const SwPageDesc* SwNode::FindPageDesc( sal_Bool bCalcLay, if( n >= rFmts.size() ) { OSL_ENSURE( !this, "Fly-Section aber kein Format gefunden" ); - return sal_False; + return 0; } } } diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx index 0f6794e99d3c..b5ff192c3c41 100644 --- a/sw/source/core/docnode/node2lay.cxx +++ b/sw/source/core/docnode/node2lay.cxx @@ -204,7 +204,7 @@ SwFrm* SwNode2LayImpl::NextFrm() { SwFrm* pRet; if( !pIter ) - return sal_False; + return NULL; if( !bInit ) { pRet = pIter->First(); diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 3565c2a460be..db49c97e05bb 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -1185,7 +1185,7 @@ SwFtnFrm *SwFtnBossFrm::FindFirstFtn() pBoss = pRet->GetRef()->FindFtnBossFrm(); OSL_ENSURE( pBoss, "FindFirstFtn: No boss found" ); if( !pBoss ) - return sal_False; // ?There must be a bug, but no GPF + return NULL; // ?There must be a bug, but no GPF pPage = pBoss->FindPageFrm(); nPgNum = pPage->GetPhyPageNum(); if ( nPgNum == nRefNum ) diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index d06f6a7e8d11..72805c56078c 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -2217,7 +2217,7 @@ uno::Any SwXTextField::getPropertyValue(const OUString& rPropertyName) break; case FIELD_PROP_IS_FIELD_USED: case FIELD_PROP_IS_FIELD_DISPLAYED: - aRet.setValue( sal_False, ::getCppuBooleanType() ); + aRet <<= false; break; } } |