[Libreoffice-commits] core.git: sc/inc sc/source
Stephan Bergmann
sbergman at redhat.com
Wed May 4 10:43:13 UTC 2016
sc/inc/miscuno.hxx | 1
sc/source/core/tool/appoptio.cxx | 8 ++--
sc/source/core/tool/docoptio.cxx | 14 ++++----
sc/source/core/tool/inputopt.cxx | 22 ++++++-------
sc/source/core/tool/printopt.cxx | 6 +--
sc/source/core/tool/viewopti.cxx | 38 +++++++++++-----------
sc/source/filter/ftools/fapihelper.cxx | 2 -
sc/source/ui/dbgui/scuiasciiopt.cxx | 4 +-
sc/source/ui/miscdlgs/solveroptions.cxx | 3 -
sc/source/ui/unoobj/appluno.cxx | 24 +++++++-------
sc/source/ui/unoobj/cellsuno.cxx | 42 ++++++++++++-------------
sc/source/ui/unoobj/confuno.cxx | 28 ++++++++--------
sc/source/ui/unoobj/datauno.cxx | 53 +++++++++++++++-----------------
sc/source/ui/unoobj/docuno.cxx | 42 ++++++++++++-------------
sc/source/ui/unoobj/fmtuno.cxx | 6 +--
sc/source/ui/unoobj/miscuno.cxx | 5 ---
sc/source/ui/unoobj/optuno.cxx | 16 ++++-----
sc/source/ui/unoobj/srchuno.cxx | 22 ++++++-------
sc/source/ui/unoobj/styleuno.cxx | 6 +--
sc/source/ui/unoobj/viewuno.cxx | 28 ++++++++--------
sc/source/ui/view/viewdata.cxx | 24 +++++++-------
21 files changed, 193 insertions(+), 201 deletions(-)
New commits:
commit f153d5cb12372dddaaceaaaa0c0892f4ba3d12aa
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed May 4 12:42:40 2016 +0200
Remove unnecessary ScUnoHelpFunctions::SetBoolInAny
Change-Id: I4814618758bbb2fe1ed3fbf279b0bbbb370d5cef
diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx
index e60ea14..8bbcdbf 100644
--- a/sc/inc/miscuno.hxx
+++ b/sc/inc/miscuno.hxx
@@ -166,7 +166,6 @@ public:
static sal_Int16 GetInt16FromAny( const css::uno::Any& aAny );
static sal_Int32 GetInt32FromAny( const css::uno::Any& aAny );
static sal_Int32 GetEnumFromAny( const css::uno::Any& aAny );
- static void SetBoolInAny( css::uno::Any& rAny, bool bValue );
static void SetOptionalPropertyValue(
css::uno::Reference< css::beans::XPropertySet >& rPropSet,
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index 9ce684f..b8c05ae 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -639,7 +639,7 @@ ScAppCfg::ScAppCfg() :
pValues[nProp] <<= (sal_Int32) GetZoomType();
break;
case SCLAYOUTOPT_SYNCZOOM:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetSynchronizeZoom() );
+ pValues[nProp] <<= GetSynchronizeZoom();
break;
case SCLAYOUTOPT_STATUSBARMULTI:
pValues[nProp] <<= GetStatusFunc();
@@ -663,10 +663,10 @@ IMPL_LINK_NOARG_TYPED(ScAppCfg, InputCommitHdl, ScLinkConfigItem&, void)
lcl_GetLastFunctions( pValues[nProp], *this );
break;
case SCINPUTOPT_AUTOINPUT:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetAutoComplete() );
+ pValues[nProp] <<= GetAutoComplete();
break;
case SCINPUTOPT_DET_AUTO:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetDetectiveAuto() );
+ pValues[nProp] <<= GetDetectiveAuto();
break;
}
}
@@ -753,7 +753,7 @@ IMPL_LINK_NOARG_TYPED(ScAppCfg, MiscCommitHdl, ScLinkConfigItem&, void)
pValues[nProp] <<= (sal_Int32) GetDefaultObjectSizeHeight();
break;
case SCMISCOPT_SHOWSHAREDDOCWARN:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetShowSharedDocumentWarning() );
+ pValues[nProp] <<= GetShowSharedDocumentWarning();
break;
}
}
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index 3d4ab5b..c8ee49a 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -318,7 +318,7 @@ IMPL_LINK_NOARG_TYPED(ScDocCfg, CalcCommitHdl, ScLinkConfigItem&, void)
switch(nProp)
{
case SCCALCOPT_ITER_ITER:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], IsIter() );
+ pValues[nProp] <<= IsIter();
break;
case SCCALCOPT_ITER_STEPS:
pValues[nProp] <<= (sal_Int32) GetIterCount();
@@ -340,22 +340,22 @@ IMPL_LINK_NOARG_TYPED(ScDocCfg, CalcCommitHdl, ScLinkConfigItem&, void)
break;
case SCCALCOPT_CASESENSITIVE:
// content is reversed
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], !IsIgnoreCase() );
+ pValues[nProp] <<= !IsIgnoreCase();
break;
case SCCALCOPT_PRECISION:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], IsCalcAsShown() );
+ pValues[nProp] <<= IsCalcAsShown();
break;
case SCCALCOPT_SEARCHCRIT:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], IsMatchWholeCell() );
+ pValues[nProp] <<= IsMatchWholeCell();
break;
case SCCALCOPT_FINDLABEL:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], IsLookUpColRowNames() );
+ pValues[nProp] <<= IsLookUpColRowNames();
break;
case SCCALCOPT_REGEX :
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], IsFormulaRegexEnabled() );
+ pValues[nProp] <<= IsFormulaRegexEnabled();
break;
case SCCALCOPT_WILDCARDS :
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], IsFormulaWildcardsEnabled() );
+ pValues[nProp] <<= IsFormulaWildcardsEnabled();
break;
}
}
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index d5ce5b4..9414e9f 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -199,37 +199,37 @@ void ScInputCfg::ImplCommit()
pValues[nProp] <<= (sal_Int32) GetMoveDir();
break;
case SCINPUTOPT_MOVESEL:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetMoveSelection() );
+ pValues[nProp] <<= GetMoveSelection();
break;
case SCINPUTOPT_EDTEREDIT:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetEnterEdit() );
+ pValues[nProp] <<= GetEnterEdit();
break;
case SCINPUTOPT_EXTENDFMT:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetExtendFormat() );
+ pValues[nProp] <<= GetExtendFormat();
break;
case SCINPUTOPT_RANGEFIND:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetRangeFinder() );
+ pValues[nProp] <<= GetRangeFinder();
break;
case SCINPUTOPT_EXPANDREFS:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetExpandRefs() );
+ pValues[nProp] <<= GetExpandRefs();
break;
case SCINPUTOPT_SORT_REF_UPDATE:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetSortRefUpdate() );
+ pValues[nProp] <<= GetSortRefUpdate();
break;
case SCINPUTOPT_MARKHEADER:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetMarkHeader() );
+ pValues[nProp] <<= GetMarkHeader();
break;
case SCINPUTOPT_USETABCOL:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetUseTabCol() );
+ pValues[nProp] <<= GetUseTabCol();
break;
case SCINPUTOPT_TEXTWYSIWYG:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetTextWysiwyg() );
+ pValues[nProp] <<= GetTextWysiwyg();
break;
case SCINPUTOPT_REPLCELLSWARN:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetReplaceCellsWarn() );
+ pValues[nProp] <<= GetReplaceCellsWarn();
break;
case SCINPUTOPT_LEGACY_CELL_SELECTION:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetLegacyCellSelection() );
+ pValues[nProp] <<= GetLegacyCellSelection();
break;
}
}
diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx
index 9e9bc1c..c71ad46 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -162,13 +162,13 @@ void ScPrintCfg::ImplCommit()
{
case SCPRINTOPT_EMPTYPAGES:
// reversed
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], !GetSkipEmpty() );
+ pValues[nProp] <<= !GetSkipEmpty();
break;
case SCPRINTOPT_ALLSHEETS:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetAllSheets() );
+ pValues[nProp] <<= GetAllSheets();
break;
case SCPRINTOPT_FORCEBREAKS:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetForceBreaks() );
+ pValues[nProp] <<= GetForceBreaks();
break;
}
}
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index e540e80..dae7c42 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -533,31 +533,31 @@ IMPL_LINK_NOARG_TYPED(ScViewCfg, LayoutCommitHdl, ScLinkConfigItem&, void)
pValues[nProp] <<= (sal_Int32) GetGridColor().GetColor();
break;
case SCLAYOUTOPT_GRIDLINES:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_GRID ) );
+ pValues[nProp] <<= GetOption( VOPT_GRID );
break;
case SCLAYOUTOPT_GRID_ONCOLOR:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_GRID_ONTOP ) );
+ pValues[nProp] <<= GetOption( VOPT_GRID_ONTOP );
break;
case SCLAYOUTOPT_PAGEBREAK:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_PAGEBREAKS ) );
+ pValues[nProp] <<= GetOption( VOPT_PAGEBREAKS );
break;
case SCLAYOUTOPT_GUIDE:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_HELPLINES ) );
+ pValues[nProp] <<= GetOption( VOPT_HELPLINES );
break;
case SCLAYOUTOPT_COLROWHDR:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_HEADER ) );
+ pValues[nProp] <<= GetOption( VOPT_HEADER );
break;
case SCLAYOUTOPT_HORISCROLL:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_HSCROLL ) );
+ pValues[nProp] <<= GetOption( VOPT_HSCROLL );
break;
case SCLAYOUTOPT_VERTSCROLL:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_VSCROLL ) );
+ pValues[nProp] <<= GetOption( VOPT_VSCROLL );
break;
case SCLAYOUTOPT_SHEETTAB:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_TABCONTROLS ) );
+ pValues[nProp] <<= GetOption( VOPT_TABCONTROLS );
break;
case SCLAYOUTOPT_OUTLINE:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_OUTLINER ) );
+ pValues[nProp] <<= GetOption( VOPT_OUTLINER );
break;
}
}
@@ -575,22 +575,22 @@ IMPL_LINK_NOARG_TYPED(ScViewCfg, DisplayCommitHdl, ScLinkConfigItem&, void)
switch(nProp)
{
case SCDISPLAYOPT_FORMULA:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_FORMULAS ) );
+ pValues[nProp] <<= GetOption( VOPT_FORMULAS );
break;
case SCDISPLAYOPT_ZEROVALUE:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_NULLVALS ) );
+ pValues[nProp] <<= GetOption( VOPT_NULLVALS );
break;
case SCDISPLAYOPT_NOTETAG:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_NOTES ) );
+ pValues[nProp] <<= GetOption( VOPT_NOTES );
break;
case SCDISPLAYOPT_VALUEHI:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_SYNTAX ) );
+ pValues[nProp] <<= GetOption( VOPT_SYNTAX );
break;
case SCDISPLAYOPT_ANCHOR:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_ANCHOR ) );
+ pValues[nProp] <<= GetOption( VOPT_ANCHOR );
break;
case SCDISPLAYOPT_TEXTOVER:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_CLIPMARKS ) );
+ pValues[nProp] <<= GetOption( VOPT_CLIPMARKS );
break;
case SCDISPLAYOPT_OBJECTGRA:
pValues[nProp] <<= (sal_Int32) GetObjMode( VOBJ_TYPE_OLE );
@@ -637,16 +637,16 @@ IMPL_LINK_NOARG_TYPED(ScViewCfg, GridCommitHdl, ScLinkConfigItem&, void)
pValues[nProp] <<= (sal_Int32) rGrid.GetFieldSnapY();
break;
case SCGRIDOPT_SNAPTOGRID:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], rGrid.GetUseGridSnap() );
+ pValues[nProp] <<= rGrid.GetUseGridSnap();
break;
case SCGRIDOPT_SYNCHRON:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], rGrid.GetSynchronize() );
+ pValues[nProp] <<= rGrid.GetSynchronize();
break;
case SCGRIDOPT_VISIBLE:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], rGrid.GetGridVisible() );
+ pValues[nProp] <<= rGrid.GetGridVisible();
break;
case SCGRIDOPT_SIZETOGRID:
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], rGrid.GetEqualGrid() );
+ pValues[nProp] <<= rGrid.GetEqualGrid();
break;
}
}
diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx
index 066d783..46163fa 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -350,7 +350,7 @@ void ScfPropSetHelper::WriteValue( const Any& rAny )
void ScfPropSetHelper::WriteValue( const bool& rbValue )
{
if( Any* pAny = GetNextAny() )
- ScUnoHelpFunctions::SetBoolInAny( *pAny, rbValue );
+ *pAny <<= rbValue;
}
void ScfPropSetHelper::WriteToPropertySet( ScfPropertySet& rPropSet ) const
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 736c774..cc331b6 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -221,10 +221,10 @@ static void save_Separators(
}
aValues = aItem.GetProperties( aNames );
pProperties = aValues.getArray();
- ScUnoHelpFunctions::SetBoolInAny( pProperties[0], bMergeDelimiters );
+ pProperties[0] <<= bMergeDelimiters;
pProperties[1] <<= sFieldSeparators;
pProperties[2] <<= sTextSeparators;
- ScUnoHelpFunctions::SetBoolInAny( pProperties[3], bFixedWidth );
+ pProperties[3] <<= bFixedWidth;
if (eCall != SC_TEXTTOCOLUMNS)
{
pProperties[4] <<= nFromRow;
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 9f9481d..bbe675b 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -205,8 +205,7 @@ const uno::Sequence<beans::PropertyValue>& ScSolverOptionsDialog::GetProperties(
}
}
if ( !bHasData )
- ScUnoHelpFunctions::SetBoolInAny( rValue,
- m_pLbSettings->GetCheckButtonState( pEntry ) == SvButtonState::Checked );
+ rValue <<= ( m_pLbSettings->GetCheckButtonState( pEntry ) == SvButtonState::Checked );
}
}
else
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 7987b3f..4d86cd2 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -397,17 +397,17 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const OUString& aProp
ScInputOptions aInpOpt = pScMod->GetInputOptions();
// print options aren't loaded until needed
- if (aPropertyName == SC_UNONAME_DOAUTOCP) ScUnoHelpFunctions::SetBoolInAny( aRet, aAppOpt.GetAutoComplete() );
- else if (aPropertyName == SC_UNONAME_ENTERED ) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetEnterEdit() );
- else if (aPropertyName == SC_UNONAME_EXPREF ) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetExpandRefs() );
- else if (aPropertyName == SC_UNONAME_EXTFMT ) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetExtendFormat() );
+ if (aPropertyName == SC_UNONAME_DOAUTOCP) aRet <<= aAppOpt.GetAutoComplete();
+ else if (aPropertyName == SC_UNONAME_ENTERED ) aRet <<= aInpOpt.GetEnterEdit();
+ else if (aPropertyName == SC_UNONAME_EXPREF ) aRet <<= aInpOpt.GetExpandRefs();
+ else if (aPropertyName == SC_UNONAME_EXTFMT ) aRet <<= aInpOpt.GetExtendFormat();
else if (aPropertyName == SC_UNONAME_LINKUPD ) aRet <<= (sal_Int16) aAppOpt.GetLinkMode();
- else if (aPropertyName == SC_UNONAME_MARKHDR ) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetMarkHeader() );
- else if (aPropertyName == SC_UNONAME_MOVESEL ) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetMoveSelection() );
- else if (aPropertyName == SC_UNONAME_RANGEFIN ) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetRangeFinder() );
- else if (aPropertyName == SC_UNONAME_USETABCOL ) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetUseTabCol() );
- else if (aPropertyName == SC_UNONAME_PRMETRICS ) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetTextWysiwyg() );
- else if (aPropertyName == SC_UNONAME_REPLWARN ) ScUnoHelpFunctions::SetBoolInAny( aRet, aInpOpt.GetReplaceCellsWarn() );
+ else if (aPropertyName == SC_UNONAME_MARKHDR ) aRet <<= aInpOpt.GetMarkHeader();
+ else if (aPropertyName == SC_UNONAME_MOVESEL ) aRet <<= aInpOpt.GetMoveSelection();
+ else if (aPropertyName == SC_UNONAME_RANGEFIN ) aRet <<= aInpOpt.GetRangeFinder();
+ else if (aPropertyName == SC_UNONAME_USETABCOL ) aRet <<= aInpOpt.GetUseTabCol();
+ else if (aPropertyName == SC_UNONAME_PRMETRICS ) aRet <<= aInpOpt.GetTextWysiwyg();
+ else if (aPropertyName == SC_UNONAME_REPLWARN ) aRet <<= aInpOpt.GetReplaceCellsWarn();
else if (aPropertyName == SC_UNONAME_METRIC ) aRet <<= (sal_Int16) aAppOpt.GetAppMetric();
else if (aPropertyName == SC_UNONAME_MOVEDIR ) aRet <<= (sal_Int16) aInpOpt.GetMoveDir();
else if (aPropertyName == SC_UNONAME_STBFUNC ) aRet <<= (sal_Int16) aAppOpt.GetStatusFunc();
@@ -444,9 +444,9 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const OUString& aProp
}
}
else if (aPropertyName == SC_UNONAME_PRALLSH )
- ScUnoHelpFunctions::SetBoolInAny( aRet, pScMod->GetPrintOptions().GetAllSheets() );
+ aRet <<= pScMod->GetPrintOptions().GetAllSheets();
else if (aPropertyName == SC_UNONAME_PREMPTY )
- ScUnoHelpFunctions::SetBoolInAny( aRet, !pScMod->GetPrintOptions().GetSkipEmpty() ); // reversed
+ aRet <<= !pScMod->GetPrintOptions().GetSkipEmpty(); // reversed
return aRet;
}
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 9b04fb1..4a3c984 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -2062,7 +2062,7 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const OUString& aPropert
{
case SC_WID_UNO_CHCOLHDR:
case SC_WID_UNO_CHROWHDR:
- ScUnoHelpFunctions::SetBoolInAny( aAny, false );
+ aAny <<= false;
break;
case SC_WID_UNO_CELLSTYL:
aAny <<= OUString( ScStyleNameConversion::DisplayToProgrammaticName(
@@ -2527,10 +2527,10 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
switch ( pEntry->nWID )
{
case SC_WID_UNO_CHCOLHDR:
- ScUnoHelpFunctions::SetBoolInAny( rAny, bChartColAsHdr );
+ rAny <<= bChartColAsHdr;
break;
case SC_WID_UNO_CHROWHDR:
- ScUnoHelpFunctions::SetBoolInAny( rAny, bChartRowAsHdr );
+ rAny <<= bChartRowAsHdr;
break;
case SC_WID_UNO_CELLSTYL:
{
@@ -8460,7 +8460,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
else if ( pEntry->nWID == SC_WID_UNO_CELLVIS )
{
bool bVis = rDoc.IsVisible( nTab );
- ScUnoHelpFunctions::SetBoolInAny( rAny, bVis );
+ rAny <<= bVis;
}
else if ( pEntry->nWID == SC_WID_UNO_LINKDISPBIT )
{
@@ -8475,7 +8475,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
else if ( pEntry->nWID == SC_WID_UNO_ISACTIVE )
{
if (rDoc.IsScenario(nTab))
- ScUnoHelpFunctions::SetBoolInAny( rAny, rDoc.IsActiveScenario( nTab ));
+ rAny <<= rDoc.IsActiveScenario( nTab );
}
else if ( pEntry->nWID == SC_WID_UNO_BORDCOL )
{
@@ -8498,7 +8498,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
sal_uInt16 nFlags;
rDoc.GetScenarioData( nTab, aComment, aColor, nFlags );
- ScUnoHelpFunctions::SetBoolInAny( rAny, (nFlags & SC_SCENARIO_PROTECT) != 0 );
+ rAny <<= ((nFlags & SC_SCENARIO_PROTECT) != 0);
}
}
else if ( pEntry->nWID == SC_WID_UNO_SHOWBORD )
@@ -8510,7 +8510,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
sal_uInt16 nFlags;
rDoc.GetScenarioData( nTab, aComment, aColor, nFlags );
- ScUnoHelpFunctions::SetBoolInAny( rAny, (nFlags & SC_SCENARIO_SHOWFRAME) != 0 );
+ rAny <<= ((nFlags & SC_SCENARIO_SHOWFRAME) != 0);
}
}
else if ( pEntry->nWID == SC_WID_UNO_PRINTBORD )
@@ -8522,7 +8522,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
sal_uInt16 nFlags;
rDoc.GetScenarioData( nTab, aComment, aColor, nFlags );
- ScUnoHelpFunctions::SetBoolInAny( rAny, (nFlags & SC_SCENARIO_PRINTFRAME) != 0 );
+ rAny <<= ((nFlags & SC_SCENARIO_PRINTFRAME) != 0);
}
}
else if ( pEntry->nWID == SC_WID_UNO_COPYBACK )
@@ -8534,7 +8534,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
sal_uInt16 nFlags;
rDoc.GetScenarioData( nTab, aComment, aColor, nFlags );
- ScUnoHelpFunctions::SetBoolInAny( rAny, (nFlags & SC_SCENARIO_TWOWAY) != 0 );
+ rAny <<= ((nFlags & SC_SCENARIO_TWOWAY) != 0);
}
}
else if ( pEntry->nWID == SC_WID_UNO_COPYSTYL )
@@ -8546,7 +8546,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
sal_uInt16 nFlags;
rDoc.GetScenarioData( nTab, aComment, aColor, nFlags );
- ScUnoHelpFunctions::SetBoolInAny( rAny, (nFlags & SC_SCENARIO_ATTRIB) != 0 );
+ rAny <<= ((nFlags & SC_SCENARIO_ATTRIB) != 0);
}
}
else if ( pEntry->nWID == SC_WID_UNO_COPYFORM )
@@ -8558,7 +8558,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
sal_uInt16 nFlags;
rDoc.GetScenarioData( nTab, aComment, aColor, nFlags );
- ScUnoHelpFunctions::SetBoolInAny( rAny, !(nFlags & SC_SCENARIO_VALUE));
+ rAny <<= !(nFlags & SC_SCENARIO_VALUE);
}
}
else if ( pEntry->nWID == SC_WID_UNO_TABLAYOUT )
@@ -8571,7 +8571,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
else if ( pEntry->nWID == SC_WID_UNO_AUTOPRINT )
{
bool bAutoPrint = rDoc.IsPrintEntireSheet( nTab );
- ScUnoHelpFunctions::SetBoolInAny( rAny, bAutoPrint );
+ rAny <<= bAutoPrint;
}
else if ( pEntry->nWID == SC_WID_UNO_TABCOLOR )
{
@@ -8833,23 +8833,23 @@ void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
else if ( pEntry->nWID == SC_WID_UNO_CELLVIS )
{
bool bHidden = rDoc.ColHidden(nCol, nTab);
- ScUnoHelpFunctions::SetBoolInAny( rAny, !bHidden );
+ rAny <<= !bHidden;
}
else if ( pEntry->nWID == SC_WID_UNO_OWIDTH )
{
//! momentan immer gesetzt ??!?!
bool bOpt = !(rDoc.GetColFlags( nCol, nTab ) & CR_MANUALSIZE);
- ScUnoHelpFunctions::SetBoolInAny( rAny, bOpt );
+ rAny <<= bOpt;
}
else if ( pEntry->nWID == SC_WID_UNO_NEWPAGE )
{
ScBreakType nBreak = rDoc.HasColBreak(nCol, nTab);
- ScUnoHelpFunctions::SetBoolInAny( rAny, nBreak != BREAK_NONE );
+ rAny <<= (nBreak != BREAK_NONE);
}
else if ( pEntry->nWID == SC_WID_UNO_MANPAGE )
{
ScBreakType nBreak = rDoc.HasColBreak(nCol, nTab);
- ScUnoHelpFunctions::SetBoolInAny(rAny, (nBreak & BREAK_MANUAL) != 0);
+ rAny <<= ((nBreak & BREAK_MANUAL) != 0);
}
else
ScCellRangeObj::GetOnePropertyValue(pEntry, rAny);
@@ -8982,27 +8982,27 @@ void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
else if ( pEntry->nWID == SC_WID_UNO_CELLVIS )
{
bool bHidden = rDoc.RowHidden(nRow, nTab);
- ScUnoHelpFunctions::SetBoolInAny( rAny, !bHidden );
+ rAny <<= !bHidden;
}
else if ( pEntry->nWID == SC_WID_UNO_CELLFILT )
{
bool bVis = rDoc.RowFiltered(nRow, nTab);
- ScUnoHelpFunctions::SetBoolInAny( rAny, bVis );
+ rAny <<= bVis;
}
else if ( pEntry->nWID == SC_WID_UNO_OHEIGHT )
{
bool bOpt = !(rDoc.GetRowFlags( nRow, nTab ) & CR_MANUALSIZE);
- ScUnoHelpFunctions::SetBoolInAny( rAny, bOpt );
+ rAny <<= bOpt;
}
else if ( pEntry->nWID == SC_WID_UNO_NEWPAGE )
{
ScBreakType nBreak = rDoc.HasRowBreak(nRow, nTab);
- ScUnoHelpFunctions::SetBoolInAny( rAny, nBreak != BREAK_NONE );
+ rAny <<= (nBreak != BREAK_NONE);
}
else if ( pEntry->nWID == SC_WID_UNO_MANPAGE )
{
bool bBreak = (rDoc.HasRowBreak(nRow, nTab) & BREAK_MANUAL) != 0;
- ScUnoHelpFunctions::SetBoolInAny( rAny, bBreak );
+ rAny <<= bBreak;
}
else
ScCellRangeObj::GetOnePropertyValue(pEntry, rAny);
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index a2ccffd..129e0f2 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -374,15 +374,15 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr
/*Stampit enable/disable print cancel */
if ( aPropertyName == SC_UNO_ALLOWPRINTJOBCANCEL )
- ScUnoHelpFunctions::SetBoolInAny( aRet, pDocShell->Stamp_GetPrintCancelState() );
+ aRet <<= pDocShell->Stamp_GetPrintCancelState();
/*Stampit enable/disable print cancel */
else if ( aPropertyName == SC_UNO_SHOWZERO )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aViewOpt.GetOption( VOPT_NULLVALS ) );
+ aRet <<= aViewOpt.GetOption( VOPT_NULLVALS );
else if ( aPropertyName == SC_UNO_SHOWNOTES )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aViewOpt.GetOption( VOPT_NOTES ) );
+ aRet <<= aViewOpt.GetOption( VOPT_NOTES );
else if ( aPropertyName == SC_UNO_SHOWGRID )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aViewOpt.GetOption( VOPT_GRID ) );
+ aRet <<= aViewOpt.GetOption( VOPT_GRID );
else if ( aPropertyName == SC_UNO_GRIDCOLOR )
{
OUString aColorName;
@@ -390,17 +390,17 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr
aRet <<= static_cast<sal_Int64>(aColor.GetColor());
}
else if ( aPropertyName == SC_UNO_SHOWPAGEBR )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aViewOpt.GetOption( VOPT_PAGEBREAKS ) );
+ aRet <<= aViewOpt.GetOption( VOPT_PAGEBREAKS );
else if ( aPropertyName == SC_UNONAME_LINKUPD )
aRet <<= static_cast<sal_Int16> ( rDoc.GetLinkMode() );
else if ( aPropertyName == SC_UNO_COLROWHDR )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aViewOpt.GetOption( VOPT_HEADER ) );
+ aRet <<= aViewOpt.GetOption( VOPT_HEADER );
else if ( aPropertyName == SC_UNO_SHEETTABS )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aViewOpt.GetOption( VOPT_TABCONTROLS ) );
+ aRet <<= aViewOpt.GetOption( VOPT_TABCONTROLS );
else if ( aPropertyName == SC_UNO_OUTLSYMB )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aViewOpt.GetOption( VOPT_OUTLINER ) );
+ aRet <<= aViewOpt.GetOption( VOPT_OUTLINER );
else if ( aPropertyName == SC_UNO_AUTOCALC )
- ScUnoHelpFunctions::SetBoolInAny( aRet, rDoc.GetAutoCalc() );
+ aRet <<= rDoc.GetAutoCalc();
else if ( aPropertyName == SC_UNO_PRINTERNAME )
{
// #i75610# don't create the printer, return empty string if no printer created yet
@@ -439,7 +439,7 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr
else if ( aPropertyName == SC_UNO_CHARCOMP )
aRet <<= static_cast<sal_Int16> ( rDoc.GetAsianCompression() );
else if ( aPropertyName == SC_UNO_ASIANKERN )
- ScUnoHelpFunctions::SetBoolInAny( aRet, rDoc.GetAsianKerning() );
+ aRet <<= rDoc.GetAsianKerning();
else if ( aPropertyName == SCSAVEVERSION )
aRet <<= pDocShell->IsSaveVersionOnClose();
else if ( aPropertyName == SC_UNO_UPDTEMPL )
@@ -449,7 +449,7 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr
else if ( aPropertyName == SC_UNO_SHAREDOC )
{
#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
- ScUnoHelpFunctions::SetBoolInAny( aRet, pDocShell->HasSharedXMLFlagSet() );
+ aRet <<= pDocShell->HasSharedXMLFlagSet();
#endif
}
else if ( aPropertyName == SC_UNO_MODIFYPASSWORDINFO )
@@ -502,9 +502,9 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr
{
const ScGridOptions& aGridOpt = aViewOpt.GetGridOptions();
if ( aPropertyName == SC_UNO_SNAPTORASTER )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aGridOpt.GetUseGridSnap() );
+ aRet <<= aGridOpt.GetUseGridSnap();
else if ( aPropertyName == SC_UNO_RASTERVIS )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aGridOpt.GetGridVisible() );
+ aRet <<= aGridOpt.GetGridVisible();
else if ( aPropertyName == SC_UNO_RASTERRESX )
aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawX() );
else if ( aPropertyName == SC_UNO_RASTERRESY )
@@ -514,7 +514,7 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr
else if ( aPropertyName == SC_UNO_RASTERSUBY )
aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionY() );
else if ( aPropertyName == SC_UNO_RASTERSYNC )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aGridOpt.GetSynchronize() );
+ aRet <<= aGridOpt.GetSynchronize();
else
throw beans::UnknownPropertyException();
}
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 60401b9..ed79338 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -197,7 +197,7 @@ void ScImportDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rS
pArray[2].Value <<= rParam.aStatement;
pArray[3].Name = SC_UNONAME_ISNATIVE;
- ScUnoHelpFunctions::SetBoolInAny( pArray[3].Value, rParam.bNative );
+ pArray[3].Value <<= rParam.bNative;
}
void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequence<beans::PropertyValue>& rSeq )
@@ -297,7 +297,7 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq
pArray[0].Value <<= !rParam.bByRow;
pArray[1].Name = SC_UNONAME_CONTHDR;
- ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, rParam.bHasHeader );
+ pArray[1].Value <<= rParam.bHasHeader;
pArray[2].Name = SC_UNONAME_MAXFLD;
pArray[2].Value <<= static_cast<sal_Int32>( rParam.GetSortKeyCount() );
@@ -306,16 +306,16 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq
pArray[3].Value <<= aFields;
pArray[4].Name = SC_UNONAME_BINDFMT;
- ScUnoHelpFunctions::SetBoolInAny( pArray[4].Value, rParam.bIncludePattern );
+ pArray[4].Value <<= rParam.bIncludePattern;
pArray[5].Name = SC_UNONAME_COPYOUT;
- ScUnoHelpFunctions::SetBoolInAny( pArray[5].Value, !rParam.bInplace );
+ pArray[5].Value <<= !rParam.bInplace;
pArray[6].Name = SC_UNONAME_OUTPOS;
pArray[6].Value <<= aOutPos;
pArray[7].Name = SC_UNONAME_ISULIST;
- ScUnoHelpFunctions::SetBoolInAny( pArray[7].Value, rParam.bUserDef );
+ pArray[7].Value <<= rParam.bUserDef;
pArray[8].Name = SC_UNONAME_UINDEX;
pArray[8].Value <<= static_cast<sal_Int32>( rParam.nUserIndex );
@@ -728,17 +728,17 @@ uno::Any SAL_CALL ScSubTotalDescriptorBase::getPropertyValue( const OUString& aP
// some old property names are for 5.2 compatibility
if (aPropertyName == SC_UNONAME_CASE || aPropertyName == SC_UNONAME_ISCASE )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aParam.bCaseSens );
+ aRet <<= aParam.bCaseSens;
else if (aPropertyName == SC_UNONAME_FORMATS || aPropertyName == SC_UNONAME_BINDFMT )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aParam.bIncludePattern );
+ aRet <<= aParam.bIncludePattern;
else if (aPropertyName == SC_UNONAME_ENABSORT )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aParam.bDoSort );
+ aRet <<= aParam.bDoSort;
else if (aPropertyName == SC_UNONAME_SORTASC )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aParam.bAscending );
+ aRet <<= aParam.bAscending;
else if (aPropertyName == SC_UNONAME_INSBRK )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aParam.bPagebreak );
+ aRet <<= aParam.bPagebreak;
else if (aPropertyName == SC_UNONAME_ULIST || aPropertyName == SC_UNONAME_ENUSLIST )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aParam.bUserDef );
+ aRet <<= aParam.bUserDef;
else if (aPropertyName == SC_UNONAME_UINDEX || aPropertyName == SC_UNONAME_USINDEX )
aRet <<= (sal_Int32) aParam.nUserIndex;
else if (aPropertyName == SC_UNONAME_MAXFLD )
@@ -1484,11 +1484,11 @@ uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const OUString& aPro
uno::Any aRet;
if (aPropertyName == SC_UNONAME_CONTHDR )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aParam.bHasHeader );
+ aRet <<= aParam.bHasHeader;
else if (aPropertyName == SC_UNONAME_COPYOUT )
- ScUnoHelpFunctions::SetBoolInAny( aRet, !(aParam.bInplace) );
+ aRet <<= !(aParam.bInplace);
else if (aPropertyName == SC_UNONAME_ISCASE )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aParam.bCaseSens );
+ aRet <<= aParam.bCaseSens;
else if (aPropertyName == SC_UNONAME_MAXFLD )
aRet <<= (sal_Int32) aParam.GetEntryCount();
else if (aPropertyName == SC_UNONAME_ORIENT )
@@ -1506,11 +1506,11 @@ uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const OUString& aPro
aRet <<= aOutPos;
}
else if (aPropertyName == SC_UNONAME_SAVEOUT )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aParam.bDestPers );
+ aRet <<= aParam.bDestPers;
else if (aPropertyName == SC_UNONAME_SKIPDUP )
- ScUnoHelpFunctions::SetBoolInAny( aRet, !(aParam.bDuplicate) );
+ aRet <<= !(aParam.bDuplicate);
else if (aPropertyName == SC_UNONAME_USEREGEX )
- ScUnoHelpFunctions::SetBoolInAny( aRet, aParam.eSearchType == utl::SearchParam::SRCH_REGEXP );
+ aRet <<= (aParam.eSearchType == utl::SearchParam::SRCH_REGEXP);
return aRet;
}
@@ -2096,16 +2096,15 @@ uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const OUString& aPropert
if ( pData )
{
if ( aPropertyName == SC_UNONAME_KEEPFORM )
- ScUnoHelpFunctions::SetBoolInAny( aRet, pData->IsKeepFmt() );
+ aRet <<= pData->IsKeepFmt();
else if ( aPropertyName == SC_UNONAME_MOVCELLS )
- ScUnoHelpFunctions::SetBoolInAny( aRet, pData->IsDoSize() );
+ aRet <<= pData->IsDoSize();
else if ( aPropertyName == SC_UNONAME_STRIPDAT )
- ScUnoHelpFunctions::SetBoolInAny( aRet, pData->IsStripData() );
+ aRet <<= pData->IsStripData();
else if ( aPropertyName == SC_UNONAME_ISUSER )
{
// all database ranges except "unnamed" are user defined
- ScUnoHelpFunctions::SetBoolInAny(
- aRet, pData->GetName() != STR_DB_LOCAL_NONAME);
+ aRet <<= (pData->GetName() != STR_DB_LOCAL_NONAME);
}
else if ( aPropertyName == SC_UNO_LINKDISPBIT )
{
@@ -2118,14 +2117,14 @@ uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const OUString& aPropert
{
bool bAutoFilter(GetDBData_Impl()->HasAutoFilter());
- ScUnoHelpFunctions::SetBoolInAny( aRet, bAutoFilter );
+ aRet <<= bAutoFilter;
}
else if (aPropertyName == SC_UNONAME_USEFLTCRT )
{
ScRange aRange;
bool bIsAdvancedSource(GetDBData_Impl()->GetAdvancedQuerySource(aRange));
- ScUnoHelpFunctions::SetBoolInAny( aRet, bIsAdvancedSource );
+ aRet <<= bIsAdvancedSource;
}
else if (aPropertyName == SC_UNONAME_FLTCRT )
{
@@ -2138,7 +2137,7 @@ uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const OUString& aPropert
}
else if (aPropertyName == SC_UNONAME_FROMSELECT )
{
- ScUnoHelpFunctions::SetBoolInAny( aRet, GetDBData_Impl()->HasImportSelection() );
+ aRet <<= GetDBData_Impl()->HasImportSelection();
}
else if (aPropertyName == SC_UNONAME_REFPERIOD )
{
@@ -2157,13 +2156,13 @@ uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const OUString& aPropert
{
bool bTotals(GetDBData_Impl()->HasTotals());
- ScUnoHelpFunctions::SetBoolInAny( aRet, bTotals );
+ aRet <<= bTotals;
}
else if (aPropertyName == SC_UNONAME_CONTHDR )
{
bool bHeader(GetDBData_Impl()->HasHeader());
- ScUnoHelpFunctions::SetBoolInAny( aRet, bHeader );
+ aRet <<= bHeader;
}
}
return aRet;
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 7f1e02f..bf5292c 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -348,7 +348,7 @@ void ScPrintUIOptions::SetDefaults()
}
else if ( aPropertyValue.Name == "IsSuppressEmptyPages" )
{
- ScUnoHelpFunctions::SetBoolInAny( aPropertyValue.Value, bSuppress );
+ aPropertyValue.Value <<= bSuppress;
aUIProp[nPropPos].Value <<= aPropertyValue;
}
}
@@ -2332,14 +2332,14 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const OUString& aPropertyName )
// default for no model is TRUE
ScDrawLayer* pModel = rDoc.GetDrawLayer();
bool bOpenInDesign = pModel == nullptr || pModel->GetOpenInDesignMode();
- ScUnoHelpFunctions::SetBoolInAny( aRet, bOpenInDesign );
+ aRet <<= bOpenInDesign;
}
else if ( aPropertyName == SC_UNO_AUTOCONTFOC )
{
// default for no model is FALSE
ScDrawLayer* pModel = rDoc.GetDrawLayer();
bool bAutoControlFocus = pModel && pModel->GetAutoControlFocus();
- ScUnoHelpFunctions::SetBoolInAny( aRet, bAutoControlFocus );
+ aRet <<= bAutoControlFocus;
}
else if ( aPropertyName == SC_UNO_FORBIDDEN )
{
@@ -2347,7 +2347,7 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const OUString& aPropertyName )
}
else if ( aPropertyName == SC_UNO_HASDRAWPAGES )
{
- ScUnoHelpFunctions::SetBoolInAny( aRet, (pDocShell->GetDocument().GetDrawLayer() != nullptr) );
+ aRet <<= (pDocShell->GetDocument().GetDrawLayer() != nullptr);
}
else if ( aPropertyName == SC_UNO_BASICLIBRARIES )
{
@@ -2376,31 +2376,31 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const OUString& aPropertyName )
}
else if ( aPropertyName == SC_UNO_ISLOADED )
{
- ScUnoHelpFunctions::SetBoolInAny( aRet, !pDocShell->IsEmpty() );
+ aRet <<= !pDocShell->IsEmpty();
}
else if ( aPropertyName == SC_UNO_ISUNDOENABLED )
{
- ScUnoHelpFunctions::SetBoolInAny( aRet, rDoc.IsUndoEnabled() );
+ aRet <<= rDoc.IsUndoEnabled();
}
else if ( aPropertyName == SC_UNO_RECORDCHANGES )
{
- ScUnoHelpFunctions::SetBoolInAny( aRet, pDocShell->IsChangeRecording() );
+ aRet <<= pDocShell->IsChangeRecording();
}
else if ( aPropertyName == SC_UNO_ISRECORDCHANGESPROTECTED )
{
- ScUnoHelpFunctions::SetBoolInAny( aRet, pDocShell->HasChangeRecordProtection() );
+ aRet <<= pDocShell->HasChangeRecordProtection();
}
else if ( aPropertyName == SC_UNO_ISADJUSTHEIGHTENABLED )
{
- ScUnoHelpFunctions::SetBoolInAny( aRet, rDoc.IsAdjustHeightEnabled() );
+ aRet <<= rDoc.IsAdjustHeightEnabled();
}
else if ( aPropertyName == SC_UNO_ISEXECUTELINKENABLED )
{
- ScUnoHelpFunctions::SetBoolInAny( aRet, rDoc.IsExecuteLinkEnabled() );
+ aRet <<= rDoc.IsExecuteLinkEnabled();
}
else if ( aPropertyName == SC_UNO_ISCHANGEREADONLYENABLED )
{
- ScUnoHelpFunctions::SetBoolInAny( aRet, rDoc.IsChangeReadOnlyEnabled() );
+ aRet <<= rDoc.IsChangeReadOnlyEnabled();
}
else if ( aPropertyName == SC_UNO_REFERENCEDEVICE )
{
@@ -2414,7 +2414,7 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const OUString& aPropertyName )
}
else if ( aPropertyName == "InternalDocument" )
{
- ScUnoHelpFunctions::SetBoolInAny( aRet, (pDocShell->GetCreateMode() == SfxObjectCreateMode::INTERNAL) );
+ aRet <<= (pDocShell->GetCreateMode() == SfxObjectCreateMode::INTERNAL);
}
else if ( aPropertyName == SC_UNO_INTEROPGRABBAG )
{
@@ -3736,22 +3736,22 @@ uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const OUString& aProperty
else if ( aPropertyName == SC_UNONAME_CELLVIS )
{
bool bVis = !rDoc.ColHidden(nStartCol, nTab);
- ScUnoHelpFunctions::SetBoolInAny( aAny, bVis );
+ aAny <<= bVis;
}
else if ( aPropertyName == SC_UNONAME_OWIDTH )
{
bool bOpt = !(rDoc.GetColFlags( nStartCol, nTab ) & CR_MANUALSIZE);
- ScUnoHelpFunctions::SetBoolInAny( aAny, bOpt );
+ aAny <<= bOpt;
}
else if ( aPropertyName == SC_UNONAME_NEWPAGE )
{
ScBreakType nBreak = rDoc.HasColBreak(nStartCol, nTab);
- ScUnoHelpFunctions::SetBoolInAny( aAny, nBreak != BREAK_NONE );
+ aAny <<= (nBreak != BREAK_NONE);
}
else if ( aPropertyName == SC_UNONAME_MANPAGE )
{
ScBreakType nBreak = rDoc.HasColBreak(nStartCol, nTab);
- ScUnoHelpFunctions::SetBoolInAny( aAny, (nBreak & BREAK_MANUAL) != 0 );
+ aAny <<= ((nBreak & BREAK_MANUAL) != 0);
}
return aAny;
@@ -4006,27 +4006,27 @@ uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const OUString& aPropertyNam
{
SCROW nLastRow;
bool bVis = !rDoc.RowHidden(nStartRow, nTab, nullptr, &nLastRow);
- ScUnoHelpFunctions::SetBoolInAny( aAny, bVis );
+ aAny <<= bVis;
}
else if ( aPropertyName == SC_UNONAME_CELLFILT )
{
bool bVis = rDoc.RowFiltered(nStartRow, nTab);
- ScUnoHelpFunctions::SetBoolInAny( aAny, bVis );
+ aAny <<= bVis;
}
else if ( aPropertyName == SC_UNONAME_OHEIGHT )
{
bool bOpt = !(rDoc.GetRowFlags( nStartRow, nTab ) & CR_MANUALSIZE);
- ScUnoHelpFunctions::SetBoolInAny( aAny, bOpt );
+ aAny <<= bOpt;
}
else if ( aPropertyName == SC_UNONAME_NEWPAGE )
{
ScBreakType nBreak = rDoc.HasRowBreak(nStartRow, nTab);
- ScUnoHelpFunctions::SetBoolInAny( aAny, nBreak != BREAK_NONE );
+ aAny <<= (nBreak != BREAK_NONE);
}
else if ( aPropertyName == SC_UNONAME_MANPAGE )
{
ScBreakType nBreak = rDoc.HasRowBreak(nStartRow, nTab);
- ScUnoHelpFunctions::SetBoolInAny( aAny, (nBreak & BREAK_MANUAL) != 0 );
+ aAny <<= ((nBreak & BREAK_MANUAL) != 0);
}
else if ( aPropertyName == SC_UNONAME_CELLBACK || aPropertyName == SC_UNONAME_CELLTRAN )
{
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 99ad135..2abcfb9 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -947,9 +947,9 @@ uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const OUString& aPrope
SolarMutexGuard aGuard;
uno::Any aRet;
- if ( aPropertyName == SC_UNONAME_SHOWINP ) ScUnoHelpFunctions::SetBoolInAny( aRet, bShowInput );
- else if ( aPropertyName == SC_UNONAME_SHOWERR ) ScUnoHelpFunctions::SetBoolInAny( aRet, bShowError );
- else if ( aPropertyName == SC_UNONAME_IGNOREBL ) ScUnoHelpFunctions::SetBoolInAny( aRet, bIgnoreBlank );
+ if ( aPropertyName == SC_UNONAME_SHOWINP ) aRet <<= bShowInput;
+ else if ( aPropertyName == SC_UNONAME_SHOWERR ) aRet <<= bShowError;
+ else if ( aPropertyName == SC_UNONAME_IGNOREBL ) aRet <<= bIgnoreBlank;
else if ( aPropertyName == SC_UNONAME_SHOWLIST ) aRet <<= nShowList;
else if ( aPropertyName == SC_UNONAME_INPTITLE ) aRet <<= OUString( aInputTitle );
else if ( aPropertyName == SC_UNONAME_INPMESS ) aRet <<= OUString( aInputMessage );
diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx
index bc20a47..a6256fcf 100644
--- a/sc/source/ui/unoobj/miscuno.cxx
+++ b/sc/source/ui/unoobj/miscuno.cxx
@@ -162,11 +162,6 @@ sal_Int32 ScUnoHelpFunctions::GetEnumFromAny( const uno::Any& aAny )
return nRet;
}
-void ScUnoHelpFunctions::SetBoolInAny( uno::Any& rAny, bool bValue )
-{
- rAny <<= bValue;
-}
-
void ScUnoHelpFunctions::SetOptionalPropertyValue(
Reference<beans::XPropertySet>& rPropSet, const sal_Char* pPropName, const Any& rVal )
{
diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx
index a78d618..925af4e 100644
--- a/sc/source/ui/unoobj/optuno.cxx
+++ b/sc/source/ui/unoobj/optuno.cxx
@@ -137,16 +137,16 @@ uno::Any ScDocOptionsHelper::getPropertyValue(
switch( pEntry->nWID )
{
case PROP_UNO_CALCASSHOWN :
- ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsCalcAsShown() );
+ aRet <<= rOptions.IsCalcAsShown();
break;
case PROP_UNO_DEFTABSTOP :
aRet <<= (sal_Int16)( rOptions.GetTabDistance() );
break;
case PROP_UNO_IGNORECASE :
- ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsIgnoreCase() );
+ aRet <<= rOptions.IsIgnoreCase();
break;
case PROP_UNO_ITERENABLED:
- ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsIter() );
+ aRet <<= rOptions.IsIter();
break;
case PROP_UNO_ITERCOUNT:
aRet <<= (sal_Int32)( rOptions.GetIterCount() );
@@ -155,10 +155,10 @@ uno::Any ScDocOptionsHelper::getPropertyValue(
aRet <<= (double)( rOptions.GetIterEps() );
break;
case PROP_UNO_LOOKUPLABELS:
- ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsLookUpColRowNames() );
+ aRet <<= rOptions.IsLookUpColRowNames();
break;
case PROP_UNO_MATCHWHOLE:
- ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsMatchWholeCell() );
+ aRet <<= rOptions.IsMatchWholeCell();
break;
case PROP_UNO_NULLDATE:
{
@@ -169,16 +169,16 @@ uno::Any ScDocOptionsHelper::getPropertyValue(
}
break;
case PROP_UNO_SPELLONLINE:
- ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsAutoSpell() );
+ aRet <<= rOptions.IsAutoSpell();
break;
case PROP_UNO_STANDARDDEC :
aRet <<= (sal_Int16)( rOptions.GetStdPrecision() );
break;
case PROP_UNO_REGEXENABLED:
- ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsFormulaRegexEnabled() );
+ aRet <<= rOptions.IsFormulaRegexEnabled();
break;
case PROP_UNO_WILDCARDSENABLED:
- ScUnoHelpFunctions::SetBoolInAny( aRet, rOptions.IsFormulaWildcardsEnabled() );
+ aRet <<= rOptions.IsFormulaWildcardsEnabled();
break;
default:;
}
diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx
index eb17c17..3e51113 100644
--- a/sc/source/ui/unoobj/srchuno.cxx
+++ b/sc/source/ui/unoobj/srchuno.cxx
@@ -167,21 +167,21 @@ uno::Any SAL_CALL ScCellSearchObj::getPropertyValue( const OUString& aPropertyNa
SolarMutexGuard aGuard;
uno::Any aRet;
- if (aPropertyName == SC_UNO_SRCHBACK) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetBackward() );
- else if (aPropertyName == SC_UNO_SRCHBYROW) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetRowDirection() );
- else if (aPropertyName == SC_UNO_SRCHCASE) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetExact() );
- else if (aPropertyName == SC_UNO_SRCHREGEXP) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetRegExp() );
- else if (aPropertyName == SC_UNO_SRCHWILDCARD) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetWildcard() );
- else if (aPropertyName == SC_UNO_SRCHSIM) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->IsLevenshtein() );
- else if (aPropertyName == SC_UNO_SRCHSIMREL) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->IsLEVRelaxed() );
- else if (aPropertyName == SC_UNO_SRCHSTYLES) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetPattern() );
- else if (aPropertyName == SC_UNO_SRCHWORDS) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->GetWordOnly() );
+ if (aPropertyName == SC_UNO_SRCHBACK) aRet <<= pSearchItem->GetBackward();
+ else if (aPropertyName == SC_UNO_SRCHBYROW) aRet <<= pSearchItem->GetRowDirection();
+ else if (aPropertyName == SC_UNO_SRCHCASE) aRet <<= pSearchItem->GetExact();
+ else if (aPropertyName == SC_UNO_SRCHREGEXP) aRet <<= pSearchItem->GetRegExp();
+ else if (aPropertyName == SC_UNO_SRCHWILDCARD) aRet <<= pSearchItem->GetWildcard();
+ else if (aPropertyName == SC_UNO_SRCHSIM) aRet <<= pSearchItem->IsLevenshtein();
+ else if (aPropertyName == SC_UNO_SRCHSIMREL) aRet <<= pSearchItem->IsLEVRelaxed();
+ else if (aPropertyName == SC_UNO_SRCHSTYLES) aRet <<= pSearchItem->GetPattern();
+ else if (aPropertyName == SC_UNO_SRCHWORDS) aRet <<= pSearchItem->GetWordOnly();
else if (aPropertyName == SC_UNO_SRCHSIMADD) aRet <<= (sal_Int16) pSearchItem->GetLEVLonger();
else if (aPropertyName == SC_UNO_SRCHSIMEX) aRet <<= (sal_Int16) pSearchItem->GetLEVOther();
else if (aPropertyName == SC_UNO_SRCHSIMREM) aRet <<= (sal_Int16) pSearchItem->GetLEVShorter();
else if (aPropertyName == SC_UNO_SRCHTYPE) aRet <<= (sal_Int16) pSearchItem->GetCellType();
- else if (aPropertyName == SC_UNO_SRCHFILTERED) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->IsSearchFiltered() );
- else if (aPropertyName == SC_UNO_SRCHFORMATTED) ScUnoHelpFunctions::SetBoolInAny( aRet, pSearchItem->IsSearchFormatted() );
+ else if (aPropertyName == SC_UNO_SRCHFILTERED) aRet <<= pSearchItem->IsSearchFiltered();
+ else if (aPropertyName == SC_UNO_SRCHFORMATTED) aRet <<= pSearchItem->IsSearchFormatted();
return aRet;
}
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index bde202b..d5942b0 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -547,13 +547,13 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderO
beans::PropertyValue* pArray = aSequence.getArray();
pArray[0].Name = SC_UNONAME_OVERWSTL;
- ScUnoHelpFunctions::SetBoolInAny( pArray[0].Value, true );
+ pArray[0].Value <<= true;
pArray[1].Name = SC_UNONAME_LOADCELL;
- ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, true );
+ pArray[1].Value <<= true;
pArray[2].Name = SC_UNONAME_LOADPAGE;
- ScUnoHelpFunctions::SetBoolInAny( pArray[2].Value, true );
+ pArray[2].Value <<= true;
return aSequence;
}
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index 3725b82..4c2ffcb 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -1912,7 +1912,7 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const OUString& aPropertyName
if ( aPropertyName == SC_UNO_FILTERED_RANGE_SELECTION )
{
- ScUnoHelpFunctions::SetBoolInAny(aRet, bFilteredRangeSelection);
+ aRet <<= bFilteredRangeSelection;
return aRet;
}
@@ -1922,24 +1922,24 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const OUString& aPropertyName
const ScViewOptions& rOpt = pViewSh->GetViewData().GetOptions();
if ( aPropertyName == SC_UNO_COLROWHDR || aPropertyName == OLD_UNO_COLROWHDR )
- ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_HEADER ) );
+ aRet <<= rOpt.GetOption( VOPT_HEADER );
else if ( aPropertyName == SC_UNO_HORSCROLL || aPropertyName == OLD_UNO_HORSCROLL )
- ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_HSCROLL ) );
+ aRet <<= rOpt.GetOption( VOPT_HSCROLL );
else if ( aPropertyName == SC_UNO_OUTLSYMB || aPropertyName == OLD_UNO_OUTLSYMB )
- ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_OUTLINER ) );
+ aRet <<= rOpt.GetOption( VOPT_OUTLINER );
else if ( aPropertyName == SC_UNO_SHEETTABS || aPropertyName == OLD_UNO_SHEETTABS )
- ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_TABCONTROLS ) );
- else if ( aPropertyName == SC_UNO_SHOWANCHOR ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_ANCHOR ) );
- else if ( aPropertyName == SC_UNO_SHOWFORM ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_FORMULAS ) );
- else if ( aPropertyName == SC_UNO_SHOWGRID ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_GRID ) );
- else if ( aPropertyName == SC_UNO_SHOWHELP ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_HELPLINES ) );
- else if ( aPropertyName == SC_UNO_SHOWNOTES ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_NOTES ) );
- else if ( aPropertyName == SC_UNO_SHOWPAGEBR ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_PAGEBREAKS ) );
- else if ( aPropertyName == SC_UNO_SHOWZERO ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_NULLVALS ) );
+ aRet <<= rOpt.GetOption( VOPT_TABCONTROLS );
+ else if ( aPropertyName == SC_UNO_SHOWANCHOR ) aRet <<= rOpt.GetOption( VOPT_ANCHOR );
+ else if ( aPropertyName == SC_UNO_SHOWFORM ) aRet <<= rOpt.GetOption( VOPT_FORMULAS );
+ else if ( aPropertyName == SC_UNO_SHOWGRID ) aRet <<= rOpt.GetOption( VOPT_GRID );
+ else if ( aPropertyName == SC_UNO_SHOWHELP ) aRet <<= rOpt.GetOption( VOPT_HELPLINES );
+ else if ( aPropertyName == SC_UNO_SHOWNOTES ) aRet <<= rOpt.GetOption( VOPT_NOTES );
+ else if ( aPropertyName == SC_UNO_SHOWPAGEBR ) aRet <<= rOpt.GetOption( VOPT_PAGEBREAKS );
+ else if ( aPropertyName == SC_UNO_SHOWZERO ) aRet <<= rOpt.GetOption( VOPT_NULLVALS );
else if ( aPropertyName == SC_UNO_VALUEHIGH || aPropertyName == OLD_UNO_VALUEHIGH )
- ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_SYNTAX ) );
+ aRet <<= rOpt.GetOption( VOPT_SYNTAX );
else if ( aPropertyName == SC_UNO_VERTSCROLL || aPropertyName == OLD_UNO_VERTSCROLL )
- ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_VSCROLL ) );
+ aRet <<= rOpt.GetOption( VOPT_VSCROLL );
else if ( aPropertyName == SC_UNO_SHOWOBJ ) aRet <<= (sal_Int16)( rOpt.GetObjMode( VOBJ_TYPE_OLE ) );
else if ( aPropertyName == SC_UNO_SHOWCHARTS ) aRet <<= (sal_Int16)( rOpt.GetObjMode( VOBJ_TYPE_CHART ) );
else if ( aPropertyName == SC_UNO_SHOWDRAW ) aRet <<= (sal_Int16)( rOpt.GetObjMode( VOBJ_TYPE_DRAW ) );
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 5c3e552..edd2db9 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2684,36 +2684,36 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe
pSettings[SC_PAGE_VIEW_ZOOM_VALUE].Name = SC_PAGEVIEWZOOMVALUE;
pSettings[SC_PAGE_VIEW_ZOOM_VALUE].Value <<= nPageZoomValue;
pSettings[SC_PAGE_BREAK_PREVIEW].Name = SC_SHOWPAGEBREAKPREVIEW;
- ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_PAGE_BREAK_PREVIEW].Value, bPagebreak);
+ pSettings[SC_PAGE_BREAK_PREVIEW].Value <<= bPagebreak;
if (pOptions)
{
pSettings[SC_SHOWZERO].Name = SC_UNO_SHOWZERO;
- ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWZERO].Value, pOptions->GetOption( VOPT_NULLVALS ) );
+ pSettings[SC_SHOWZERO].Value <<= pOptions->GetOption( VOPT_NULLVALS );
pSettings[SC_SHOWNOTES].Name = SC_UNO_SHOWNOTES;
- ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWNOTES].Value, pOptions->GetOption( VOPT_NOTES ) );
+ pSettings[SC_SHOWNOTES].Value <<= pOptions->GetOption( VOPT_NOTES );
pSettings[SC_SHOWGRID].Name = SC_UNO_SHOWGRID;
- ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWGRID].Value, pOptions->GetOption( VOPT_GRID ) );
+ pSettings[SC_SHOWGRID].Value <<= pOptions->GetOption( VOPT_GRID );
pSettings[SC_GRIDCOLOR].Name = SC_UNO_GRIDCOLOR;
OUString aColorName;
Color aColor = pOptions->GetGridColor(&aColorName);
pSettings[SC_GRIDCOLOR].Value <<= static_cast<sal_Int64>(aColor.GetColor());
pSettings[SC_SHOWPAGEBR].Name = SC_UNO_SHOWPAGEBR;
- ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHOWPAGEBR].Value, pOptions->GetOption( VOPT_PAGEBREAKS ) );
+ pSettings[SC_SHOWPAGEBR].Value <<= pOptions->GetOption( VOPT_PAGEBREAKS );
pSettings[SC_COLROWHDR].Name = SC_UNO_COLROWHDR;
- ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_COLROWHDR].Value, pOptions->GetOption( VOPT_HEADER ) );
+ pSettings[SC_COLROWHDR].Value <<= pOptions->GetOption( VOPT_HEADER );
pSettings[SC_SHEETTABS].Name = SC_UNO_SHEETTABS;
- ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SHEETTABS].Value, pOptions->GetOption( VOPT_TABCONTROLS ) );
+ pSettings[SC_SHEETTABS].Value <<= pOptions->GetOption( VOPT_TABCONTROLS );
pSettings[SC_OUTLSYMB].Name = SC_UNO_OUTLSYMB;
- ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_OUTLSYMB].Value, pOptions->GetOption( VOPT_OUTLINER ) );
+ pSettings[SC_OUTLSYMB].Value <<= pOptions->GetOption( VOPT_OUTLINER );
pSettings[SC_VALUE_HIGHLIGHTING].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VALUEHIGH ) );
- ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_VALUE_HIGHLIGHTING].Value, pOptions->GetOption( VOPT_SYNTAX ) );
+ pSettings[SC_VALUE_HIGHLIGHTING].Value <<= pOptions->GetOption( VOPT_SYNTAX );
const ScGridOptions& aGridOpt = pOptions->GetGridOptions();
pSettings[SC_SNAPTORASTER].Name = SC_UNO_SNAPTORASTER;
- ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_SNAPTORASTER].Value, aGridOpt.GetUseGridSnap() );
+ pSettings[SC_SNAPTORASTER].Value <<= aGridOpt.GetUseGridSnap();
pSettings[SC_RASTERVIS].Name = SC_UNO_RASTERVIS;
- ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERVIS].Value, aGridOpt.GetGridVisible() );
+ pSettings[SC_RASTERVIS].Value <<= aGridOpt.GetGridVisible();
pSettings[SC_RASTERRESX].Name = SC_UNO_RASTERRESX;
pSettings[SC_RASTERRESX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawX() );
pSettings[SC_RASTERRESY].Name = SC_UNO_RASTERRESY;
@@ -2723,7 +2723,7 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe
pSettings[SC_RASTERSUBY].Name = SC_UNO_RASTERSUBY;
pSettings[SC_RASTERSUBY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionY() );
pSettings[SC_RASTERSYNC].Name = SC_UNO_RASTERSYNC;
- ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERSYNC].Value, aGridOpt.GetSynchronize() );
+ pSettings[SC_RASTERSYNC].Value <<= aGridOpt.GetSynchronize();
}
}
}
More information about the Libreoffice-commits
mailing list