diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-11 10:47:51 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-11 17:11:09 +0200 |
commit | 0e0619c80779a395987e2177a0beb5b4da1e6137 (patch) | |
tree | 96f4a87d86a264cb36f0d29eea78daf6fcc0b472 | |
parent | 99c2a1c64b3517a4cbbc0ddcf9acd3e190188d1e (diff) |
-Werror,-Wnon-literal-null-conversion (GetDrawOutliner(* pObj=NULL))
Change-Id: Id7c6b45411f0786e416bab7e70570d5d921bf216
-rw-r--r-- | sd/source/ui/app/sdmod2.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/UnoDocumentSettings.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index c0b21392883c..9a2e30989fe0 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -685,7 +685,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) sal_uInt32 nCntrl; SdDrawDocument* pDocument = pDocSh->GetDoc(); - SdrOutliner& rOutl = pDocument->GetDrawOutliner( sal_False ); + SdrOutliner& rOutl = pDocument->GetDrawOutliner(); nCntrl = rOutl.GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION; rOutl.SetControlWord( nCntrl | nSum ); ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index fa1ba0fe61de..71ae1b51307b 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -787,7 +787,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c pDoc->SetSummationOfParagraphs( bIsSummationOfParagraphs ); SdDrawDocument* pDocument = pDocSh->GetDoc(); - SdrOutliner& rOutl = pDocument->GetDrawOutliner( sal_False ); + SdrOutliner& rOutl = pDocument->GetDrawOutliner(); nCntrl = rOutl.GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION; rOutl.SetControlWord( nCntrl | nSum ); ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); @@ -816,7 +816,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c pDoc->SetCharCompressType( (sal_uInt16)nCharCompressType ); SdDrawDocument* pDocument = pDocSh->GetDoc(); - SdrOutliner& rOutl = pDocument->GetDrawOutliner( sal_False ); + SdrOutliner& rOutl = pDocument->GetDrawOutliner(); rOutl.SetAsianCompressionMode( (sal_uInt16)nCharCompressType ); ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); if( pOutl ) @@ -841,7 +841,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c pDoc->SetKernAsianPunctuation( bAsianPunct ); SdDrawDocument* pDocument = pDocSh->GetDoc(); - SdrOutliner& rOutl = pDocument->GetDrawOutliner( sal_False ); + SdrOutliner& rOutl = pDocument->GetDrawOutliner(); rOutl.SetKernAsianPunctuation( bAsianPunct ); ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); if( pOutl ) |