Skip to content

C
core
Kaydet (Commit) 0e0619c8 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

-Werror,-Wnon-literal-null-conversion (GetDrawOutliner(* pObj=NULL)) 

Change-Id: Id7c6b45411f0786e416bab7e70570d5d921bf216
üst 99c2a1c6
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
sd/source/ui/app/sdmod2.cxx
Dosyayı görüntüle @ 0e0619c8
...@@ -685,7 +685,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) ...@@ -685,7 +685,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet )
sal_uInt32 nCntrl; sal_uInt32 nCntrl;
SdDrawDocument* pDocument = pDocSh->GetDoc(); SdDrawDocument* pDocument = pDocSh->GetDoc();
SdrOutliner& rOutl = pDocument->GetDrawOutliner( sal_False ); SdrOutliner& rOutl = pDocument->GetDrawOutliner();
nCntrl = rOutl.GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION; nCntrl = rOutl.GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION;
rOutl.SetControlWord( nCntrl | nSum ); rOutl.SetControlWord( nCntrl | nSum );
::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False );
......
sd/source/ui/unoidl/UnoDocumentSettings.cxx
Dosyayı görüntüle @ 0e0619c8
...@@ -787,7 +787,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c ...@@ -787,7 +787,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
pDoc->SetSummationOfParagraphs( bIsSummationOfParagraphs ); pDoc->SetSummationOfParagraphs( bIsSummationOfParagraphs );
SdDrawDocument* pDocument = pDocSh->GetDoc(); SdDrawDocument* pDocument = pDocSh->GetDoc();
SdrOutliner& rOutl = pDocument->GetDrawOutliner( sal_False ); SdrOutliner& rOutl = pDocument->GetDrawOutliner();
nCntrl = rOutl.GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION; nCntrl = rOutl.GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION;
rOutl.SetControlWord( nCntrl | nSum ); rOutl.SetControlWord( nCntrl | nSum );
::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False );
...@@ -816,7 +816,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c ...@@ -816,7 +816,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
pDoc->SetCharCompressType( (sal_uInt16)nCharCompressType ); pDoc->SetCharCompressType( (sal_uInt16)nCharCompressType );
SdDrawDocument* pDocument = pDocSh->GetDoc(); SdDrawDocument* pDocument = pDocSh->GetDoc();
SdrOutliner& rOutl = pDocument->GetDrawOutliner( sal_False ); SdrOutliner& rOutl = pDocument->GetDrawOutliner();
rOutl.SetAsianCompressionMode( (sal_uInt16)nCharCompressType ); rOutl.SetAsianCompressionMode( (sal_uInt16)nCharCompressType );
::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False );
if( pOutl ) if( pOutl )
...@@ -841,7 +841,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c ...@@ -841,7 +841,7 @@ void DocumentSettings::_setPropertyValues( const PropertyMapEntry** ppEntries, c
pDoc->SetKernAsianPunctuation( bAsianPunct ); pDoc->SetKernAsianPunctuation( bAsianPunct );
SdDrawDocument* pDocument = pDocSh->GetDoc(); SdDrawDocument* pDocument = pDocSh->GetDoc();
SdrOutliner& rOutl = pDocument->GetDrawOutliner( sal_False ); SdrOutliner& rOutl = pDocument->GetDrawOutliner();
rOutl.SetKernAsianPunctuation( bAsianPunct ); rOutl.SetKernAsianPunctuation( bAsianPunct );
::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False );
if( pOutl ) if( pOutl )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment