diff options
author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-11-30 18:33:21 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-12-10 21:12:20 +0000 |
commit | 8aac6ecc58fa2c475f34817e607efb6a31317898 (patch) | |
tree | f54e8b33783d244518c073d0615f054b8e468774 /sw/source/uibase/uiview | |
parent | 5f77059ff156ecbd69967f278d3e8f814c15958e (diff) |
Use Any specializations for bool, instead of SetValue
Change-Id: I7a5babe494bdb09a71164ea74d7be3f6bf985ff6
Reviewed-on: https://gerrit.libreoffice.org/13215
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw/source/uibase/uiview')
-rw-r--r-- | sw/source/uibase/uiview/view.cxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/uiview/view0.cxx | 5 | ||||
-rw-r--r-- | sw/source/uibase/uiview/view2.cxx | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index f0841cc194c0..5fd4deb71035 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -1508,8 +1508,7 @@ void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSe pValue++;nIndex++; pValue->Name = "ViewLayoutBookMode"; - const sal_Bool bIsViewLayoutBookMode = m_pWrtShell->GetViewOptions()->IsViewLayoutBookMode(); - pValue->Value.setValue( &bIsViewLayoutBookMode, ::getBooleanCppuType() ); + pValue->Value <<= m_pWrtShell->GetViewOptions()->IsViewLayoutBookMode(); pValue++;nIndex++; pValue->Name = "ZoomFactor"; @@ -1517,8 +1516,7 @@ void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSe pValue++;nIndex++; pValue->Name = "IsSelectedFrame"; - const bool bIsSelected = FRMTYPE_NONE != m_pWrtShell->GetSelFrmType(); - pValue->Value.setValue ( &bIsSelected, ::getBooleanCppuType() ); + pValue->Value <<= FRMTYPE_NONE != m_pWrtShell->GetSelFrmType(); nIndex++; assert(nIndex == NUM_VIEW_SETTINGS); diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx index 45f10c6205dc..78a0b6cab55e 100644 --- a/sw/source/uibase/uiview/view0.cxx +++ b/sw/source/uibase/uiview/view0.cxx @@ -353,7 +353,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq) bool bModified = GetWrtShell().IsModified(); int eState = STATE_TOGGLE; - sal_Bool bSet = sal_False; + bool bSet = false; bool bBrowseModeChanged = false; const SfxItemSet *pArgs = rReq.GetArgs(); @@ -511,11 +511,10 @@ void SwView::ExecViewOptions(SfxRequest &rReq) pOpt->SetOnlineSpell(bSet); { - uno::Any aVal( &bSet, ::getCppuBooleanType() ); OUString aPropName(UPN_IS_SPELL_AUTO); SvtLinguConfig aCfg; - aCfg.SetProperty( aPropName, aVal ); + aCfg.SetProperty( aPropName, uno::makeAny( bSet ) ); if (xLngProp.is()) xLngProp->setIsSpellAuto( bSet ); diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 8324cf0387e6..afe8916bb716 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -307,9 +307,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq ) uno::Reference < XFilePickerControlAccess > xCtrlAcc(xFP, UNO_QUERY); if(nHtmlMode & HTMLMODE_ON) { - bool bTrue = true; - Any aVal(&bTrue, ::getBooleanCppuType()); - xCtrlAcc->setValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, aVal); + xCtrlAcc->setValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, makeAny(true)); xCtrlAcc->enableControl( ExtendedFilePickerElementIds::CHECKBOX_LINK, sal_False); } |