Remove unnecessary ScUnoHelpFunctions::SetBoolInAny

Change-Id: I4814618758bbb2fe1ed3fbf279b0bbbb370d5cef

11 files changed, 133 insertions, 139 deletions

diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 7987b3fe050a..4d86cd21048e 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 9b04fb1b45ae..4a3c984a0499 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 a2ccffdaeba2..129e0f29c40f 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 60401b936362..ed79338a329b 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 7f1e02f12ebb..bf5292ccc523 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 99ad13521269..2abcfb96fcf6 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 bc20a47e8e72..a6256fcf54fb 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 a78d6185c0d1..925af4e63c26 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 eb17c17af103..3e51113d4296 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 bde202b44554..d5942b056c52 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 3725b8240b31..4c2ffcb9cc64 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 ) );