summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-19 12:30:34 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-19 12:47:07 +0100
commit973b47a336b239cc92f1789013d28e5bd55f859f (patch)
tree6481f2803208409896aecf6745239cf07953baab /sd
parent9ad3fc29dd98167c35fcb599da0b4e764ddf04dd (diff)
unotools: sal_Bool -> bool
Change-Id: I8051c0756e0474a5b4f748e0aa15a9922e82ea97
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/CustomAnimationPreset.cxx2
-rw-r--r--sd/source/ui/dlg/dlgass.cxx4
-rw-r--r--sd/source/ui/dlg/prntopts.cxx22
-rw-r--r--sd/source/ui/dlg/tpoption.cxx28
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx2
5 files changed, 29 insertions, 29 deletions
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx
index 988302774e6f..731a196af4c8 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -245,7 +245,7 @@ Reference< XAnimationNode > implImportEffects( const Reference< XMultiServiceFac
{
// create stream
SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rPath, STREAM_READ );
- Reference<XInputStream> xInputStream( new utl::OInputStreamWrapper( pIStm, sal_True ) );
+ Reference<XInputStream> xInputStream( new utl::OInputStreamWrapper( pIStm, true ) );
// prepare ParserInputSrouce
xml::sax::InputSource aParserInput;
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 4f58c96f0d4f..c47da151a5bc 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -226,7 +226,7 @@ public:
::std::auto_ptr<WindowUpdater> mpWindowUpdater;
- sal_Bool mbPreview;
+ bool mbPreview;
sal_uInt16 mnShowPage;
sal_Bool mbDocPreview;
@@ -356,7 +356,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
mbUserDataDirty(sal_False),
xDocShell (NULL),
mpWindowUpdater (new WindowUpdater()),
- mbPreview(sal_True),
+ mbPreview(true),
mnShowPage(0),
mbDocPreview(sal_False),
maAssistentFunc(5),
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index c67e42982d3a..fda191ea047d 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -82,20 +82,20 @@ SdPrintOptions::~SdPrintOptions()
sal_Bool SdPrintOptions::FillItemSet( SfxItemSet& rAttrs )
{
- if( m_pCbxDraw->GetSavedValue() != m_pCbxDraw->IsChecked() ||
- m_pCbxNotes->GetSavedValue() != m_pCbxNotes->IsChecked() ||
- m_pCbxHandout->GetSavedValue() != m_pCbxHandout->IsChecked() ||
- m_pCbxOutline->GetSavedValue() != m_pCbxOutline->IsChecked() ||
- m_pCbxDate->GetSavedValue() != m_pCbxDate->IsChecked() ||
- m_pCbxTime->GetSavedValue() != m_pCbxTime->IsChecked() ||
- m_pCbxPagename->GetSavedValue() != m_pCbxPagename->IsChecked() ||
- m_pCbxHiddenPages->GetSavedValue() != m_pCbxHiddenPages->IsChecked() ||
+ if( m_pCbxDraw->GetSavedValue() != TriState(m_pCbxDraw->IsChecked()) ||
+ m_pCbxNotes->GetSavedValue() != TriState(m_pCbxNotes->IsChecked()) ||
+ m_pCbxHandout->GetSavedValue() != TriState(m_pCbxHandout->IsChecked()) ||
+ m_pCbxOutline->GetSavedValue() != TriState(m_pCbxOutline->IsChecked()) ||
+ m_pCbxDate->GetSavedValue() != TriState(m_pCbxDate->IsChecked()) ||
+ m_pCbxTime->GetSavedValue() != TriState(m_pCbxTime->IsChecked()) ||
+ m_pCbxPagename->GetSavedValue() != TriState(m_pCbxPagename->IsChecked()) ||
+ m_pCbxHiddenPages->GetSavedValue() != TriState(m_pCbxHiddenPages->IsChecked()) ||
m_pRbtPagesize->GetSavedValue() != m_pRbtPagesize->IsChecked() ||
m_pRbtPagetile->GetSavedValue() != m_pRbtPagetile->IsChecked() ||
m_pRbtBooklet->GetSavedValue() != m_pRbtBooklet->IsChecked() ||
- m_pCbxFront->GetSavedValue() != m_pCbxFront->IsChecked() ||
- m_pCbxBack->GetSavedValue() != m_pCbxBack->IsChecked() ||
- m_pCbxPaperbin->GetSavedValue() != m_pCbxPaperbin->IsChecked() ||
+ m_pCbxFront->GetSavedValue() != TriState(m_pCbxFront->IsChecked()) ||
+ m_pCbxBack->GetSavedValue() != TriState(m_pCbxBack->IsChecked()) ||
+ m_pCbxPaperbin->GetSavedValue() != TriState(m_pCbxPaperbin->IsChecked()) ||
m_pRbtColor->GetSavedValue() != m_pRbtColor->IsChecked() ||
m_pRbtGrayscale->GetSavedValue() != m_pRbtGrayscale->IsChecked() ||
m_pRbtBlackWhite->GetSavedValue() != m_pRbtBlackWhite->IsChecked() )
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 55ba52b06ec4..95ef3be9d7f8 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -141,10 +141,10 @@ sal_Bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs )
{
sal_Bool bModified = sal_False;
- if( m_pCbxRuler->GetSavedValue() != m_pCbxRuler->IsChecked() ||
- m_pCbxMoveOutline->GetSavedValue() != m_pCbxMoveOutline->IsChecked() ||
- m_pCbxDragStripes->GetSavedValue() != m_pCbxDragStripes->IsChecked() ||
- m_pCbxHandlesBezier->GetSavedValue() != m_pCbxHandlesBezier->IsChecked() )
+ if( m_pCbxRuler->GetSavedValue() != TriState(m_pCbxRuler->IsChecked()) ||
+ m_pCbxMoveOutline->GetSavedValue() != TriState(m_pCbxMoveOutline->IsChecked()) ||
+ m_pCbxDragStripes->GetSavedValue() != TriState(m_pCbxDragStripes->IsChecked()) ||
+ m_pCbxHandlesBezier->GetSavedValue() != TriState(m_pCbxHandlesBezier->IsChecked()) )
{
SdOptionsLayoutItem aOptsItem( ATTR_OPTIONS_LAYOUT );
@@ -369,16 +369,16 @@ sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs )
{
sal_Bool bModified = sal_False;
- if( m_pCbxStartWithTemplate->GetSavedValue() != m_pCbxStartWithTemplate->IsChecked() ||
- m_pCbxMarkedHitMovesAlways->GetSavedValue()!= m_pCbxMarkedHitMovesAlways->IsChecked() ||
- m_pCbxQuickEdit->GetSavedValue() != m_pCbxQuickEdit->IsChecked() ||
- m_pCbxPickThrough->GetSavedValue() != m_pCbxPickThrough->IsChecked() ||
- m_pCbxMasterPageCache->GetSavedValue() != m_pCbxMasterPageCache->IsChecked() ||
- m_pCbxCopy->GetSavedValue() != m_pCbxCopy->IsChecked() ||
- m_pCbxEnableSdremote->GetSavedValue() != m_pCbxEnableSdremote->IsChecked() ||
- m_pCbxEnablePresenterScreen->GetSavedValue()!= m_pCbxEnablePresenterScreen->IsChecked() ||
- m_pCbxCompatibility->GetSavedValue() != m_pCbxCompatibility->IsChecked() ||
- m_pCbxUsePrinterMetrics->GetSavedValue() != m_pCbxUsePrinterMetrics->IsChecked() )
+ if( m_pCbxStartWithTemplate->GetSavedValue() != TriState(m_pCbxStartWithTemplate->IsChecked()) ||
+ m_pCbxMarkedHitMovesAlways->GetSavedValue()!= TriState(m_pCbxMarkedHitMovesAlways->IsChecked()) ||
+ m_pCbxQuickEdit->GetSavedValue() != TriState(m_pCbxQuickEdit->IsChecked()) ||
+ m_pCbxPickThrough->GetSavedValue() != TriState(m_pCbxPickThrough->IsChecked()) ||
+ m_pCbxMasterPageCache->GetSavedValue() != TriState(m_pCbxMasterPageCache->IsChecked()) ||
+ m_pCbxCopy->GetSavedValue() != TriState(m_pCbxCopy->IsChecked()) ||
+ m_pCbxEnableSdremote->GetSavedValue() != TriState(m_pCbxEnableSdremote->IsChecked()) ||
+ m_pCbxEnablePresenterScreen->GetSavedValue()!= TriState(m_pCbxEnablePresenterScreen->IsChecked()) ||
+ m_pCbxCompatibility->GetSavedValue() != TriState(m_pCbxCompatibility->IsChecked()) ||
+ m_pCbxUsePrinterMetrics->GetSavedValue() != TriState(m_pCbxUsePrinterMetrics->IsChecked()) )
{
SdOptionsMiscItem aOptsItem( ATTR_OPTIONS_MISC );
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 813aa06c68a3..25341b1c636e 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1482,7 +1482,7 @@ private:
}
if (mpOptions->IsTime())
- aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time( Time::SYSTEM ), sal_False, sal_False );
+ aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time( Time::SYSTEM ), false, false );
aInfo.maPrintSize = aInfo.mpPrinter->GetOutputSize();
maPrintSize = awt::Size(
aInfo.mpPrinter->GetPaperSize().Width(),