diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-19 12:30:34 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-19 12:47:07 +0100 |
commit | 973b47a336b239cc92f1789013d28e5bd55f859f (patch) | |
tree | 6481f2803208409896aecf6745239cf07953baab /sfx2 | |
parent | Avoid app specific CreateDialogFactory code for non-DESKTOP. (diff) | |
download | core-973b47a336b239cc92f1789013d28e5bd55f859f.tar.gz core-973b47a336b239cc92f1789013d28e5bd55f859f.zip |
unotools: sal_Bool -> bool
Change-Id: I8051c0756e0474a5b4f748e0aa15a9922e82ea97
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/dialog/alienwarn.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/mgetempl.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/printopt.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/doc/SfxDocumentMetaData.cxx | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx index c041d58731e4..ab6a923a13cd 100644 --- a/sfx2/source/dialog/alienwarn.cxx +++ b/sfx2/source/dialog/alienwarn.cxx @@ -46,14 +46,14 @@ SfxAlienWarningDialog::SfxAlienWarningDialog(Window* pParent, const OUString& _r m_pKeepCurrentBtn->SetText( sInfoText ); // load value of "warning on" checkbox from save options - m_pWarningOnBox->Check( SvtSaveOptions().IsWarnAlienFormat() == sal_True ); + m_pWarningOnBox->Check( SvtSaveOptions().IsWarnAlienFormat() ); } SfxAlienWarningDialog::~SfxAlienWarningDialog() { // save value of "warning off" checkbox, if necessary SvtSaveOptions aSaveOpt; - sal_Bool bChecked = m_pWarningOnBox->IsChecked(); + bool bChecked = m_pWarningOnBox->IsChecked(); if ( aSaveOpt.IsWarnAlienFormat() != bChecked ) aSaveOpt.SetWarnAlienFormat( bChecked ); } diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 57c664243f95..6d078f072a2d 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -181,7 +181,7 @@ OUString ConvertDateTime_Impl( const OUString& rName, const OUString pDelim ( ", " ); OUString aStr( rWrapper.getDate( aD ) ); aStr += pDelim; - aStr += rWrapper.getTime( aT, sal_True, sal_False ); + aStr += rWrapper.getTime( aT, true, false ); OUString aAuthor = comphelper::string::stripStart(rName, ' '); if (!aAuthor.isEmpty()) { diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index b340f34cdcb1..14ec6760109d 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -389,7 +389,7 @@ sal_Bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet ) pStyle->SetMask( nMask ); } if(m_pAutoCB->IsVisible() && - m_pAutoCB->IsChecked() != m_pAutoCB->GetSavedValue()) + TriState(m_pAutoCB->IsChecked()) != m_pAutoCB->GetSavedValue()) { rSet.Put(SfxBoolItem(SID_ATTR_AUTO_STYLE_UPDATE, m_pAutoCB->IsChecked())); } diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 972d81970330..dcd496c5998e 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -122,12 +122,12 @@ sal_Bool SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& /*rSet*/ ) sal_Bool bModified = sal_False; - if( m_pPaperSizeCB->IsChecked() != m_pPaperSizeCB->GetSavedValue()) + if( TriState(m_pPaperSizeCB->IsChecked()) != m_pPaperSizeCB->GetSavedValue()) aWarnOptions.SetPaperSize(m_pPaperSizeCB->IsChecked()); - if( m_pPaperOrientationCB->IsChecked() != m_pPaperOrientationCB->GetSavedValue() ) + if( TriState(m_pPaperOrientationCB->IsChecked()) != m_pPaperOrientationCB->GetSavedValue() ) aWarnOptions.SetPaperOrientation(m_pPaperOrientationCB->IsChecked()); - if( m_pTransparencyCB->IsChecked() != m_pTransparencyCB->GetSavedValue() ) + if( TriState(m_pTransparencyCB->IsChecked()) != m_pTransparencyCB->GetSavedValue() ) aWarnOptions.SetTransparency( m_pTransparencyCB->IsChecked() ); ImplSaveControls( m_pPrinterOutputRB->IsChecked() ? &maPrinterOptions : &maPrintFileOptions ); @@ -235,7 +235,7 @@ void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOpt (sal_uInt16)( (sizeof (aDPIArray) / sizeof (aDPIArray[0])) - 1 ) ) ] ); pCurrentOptions->SetReducedBitmapIncludesTransparency( m_pReduceBitmapsTransparencyCB->IsChecked() ); pCurrentOptions->SetConvertToGreyscales( m_pConvertToGreyscalesCB->IsChecked() ); - sal_Bool bOrigBackEnd = pCurrentOptions->IsPDFAsStandardPrintJobFormat(); + bool bOrigBackEnd = pCurrentOptions->IsPDFAsStandardPrintJobFormat(); if (bOrigBackEnd != m_pPDFCB->IsChecked()) { pCurrentOptions->SetPDFAsStandardPrintJobFormat( m_pPDFCB->IsChecked() ); diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 4618ac93d517..856177d7acfc 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -2031,7 +2031,7 @@ SfxDocumentMetaData::loadFromMedium(const OUString & URL, if (!URL.isEmpty()) { md[ utl::MediaDescriptor::PROP_URL() ] <<= URL; } - if (sal_True == md.addInputStream()) { + if (md.addInputStream()) { md[ utl::MediaDescriptor::PROP_INPUTSTREAM() ] >>= xIn; } css::uno::Reference<css::embed::XStorage> xStorage; |