sd/source/ui/dlg/masterlayoutdlg.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
New commits: commit d19421db942cd08cc378e1b4dfea583f9bd5cd79 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Wed May 22 15:11:17 2013 +0300 WaE: unsafe mix of type 'bool' and type 'sal_Bool' Change-Id: Ief8e7c0fe01809b6059aa85a4cc8d2ba713f902a diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx index e080822..21aa64b 100644 --- a/sd/source/ui/dlg/masterlayoutdlg.cxx +++ b/sd/source/ui/dlg/masterlayoutdlg.cxx @@ -86,7 +86,7 @@ void MasterLayoutDialog::applyChanges() { mpDoc->BegUndo(GetText()); - if( (mpCurrentPage->GetPageKind() != PK_STANDARD) && (mbOldHeader != mpCBHeader->IsChecked() ) ) + if( (mpCurrentPage->GetPageKind() != PK_STANDARD) && (mbOldHeader != (bool) mpCBHeader->IsChecked() ) ) { if( mbOldHeader ) remove( PRESOBJ_HEADER ); @@ -94,7 +94,7 @@ void MasterLayoutDialog::applyChanges() create( PRESOBJ_HEADER ); } - if( mbOldFooter != mpCBFooter->IsChecked() ) + if( mbOldFooter != (bool) mpCBFooter->IsChecked() ) { if( mbOldFooter ) remove( PRESOBJ_FOOTER ); @@ -102,7 +102,7 @@ void MasterLayoutDialog::applyChanges() create( PRESOBJ_FOOTER ); } - if( mbOldDate != mpCBDate->IsChecked() ) + if( mbOldDate != (bool) mpCBDate->IsChecked() ) { if( mbOldDate ) remove( PRESOBJ_DATETIME ); @@ -110,7 +110,7 @@ void MasterLayoutDialog::applyChanges() create( PRESOBJ_DATETIME ); } - if( mbOldPageNumber != mpCBPageNumber->IsChecked() ) + if( mbOldPageNumber != (bool) mpCBPageNumber->IsChecked() ) { if( mbOldPageNumber ) remove( PRESOBJ_SLIDENUMBER ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits