Remove unnecessary bool2any

Change-Id: Ie2caee1d5a7912011d76172539c2f8f37eaee5cf

5 files changed, 23 insertions, 24 deletions

diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx
index c111cf4776f4..8df12719df3b 100644
--- a/sc/source/filter/xml/xmlsorti.cxx
+++ b/sc/source/filter/xml/xmlsorti.cxx
@@ -27,7 +27,6 @@
 
 #include <xmloff/xmltkmap.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <comphelper/extract.hxx>
 #include <xmloff/xmltoken.hxx>
 
 #define SC_USERLIST "UserList"
@@ -142,13 +141,13 @@ void ScXMLSortContext::EndElement()
         ++i;
     uno::Sequence <beans::PropertyValue> aSortDescriptor(7 + i);
     aSortDescriptor[0].Name = OUString(SC_UNONAME_BINDFMT);
-    aSortDescriptor[0].Value = ::cppu::bool2any(bBindFormatsToContent);
+    aSortDescriptor[0].Value = css::uno::makeAny(bBindFormatsToContent);
     aSortDescriptor[1].Name = OUString(SC_UNONAME_COPYOUT);
-    aSortDescriptor[1].Value = ::cppu::bool2any(bCopyOutputData);
+    aSortDescriptor[1].Value = css::uno::makeAny(bCopyOutputData);
     aSortDescriptor[2].Name = OUString(SC_UNONAME_ISCASE);
-    aSortDescriptor[2].Value = ::cppu::bool2any(bIsCaseSensitive);
+    aSortDescriptor[2].Value = css::uno::makeAny(bIsCaseSensitive);
     aSortDescriptor[3].Name = OUString(SC_UNONAME_ISULIST);
-    aSortDescriptor[3].Value = ::cppu::bool2any(bEnabledUserList);
+    aSortDescriptor[3].Value = css::uno::makeAny(bEnabledUserList);
     aSortDescriptor[4].Name = OUString(SC_UNONAME_OUTPOS);
     aSortDescriptor[4].Value <<= aOutputPosition;
     aSortDescriptor[5].Name = OUString(SC_UNONAME_UINDEX);
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index c36708d42bf9..baec1f43d44e 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -1814,13 +1814,13 @@ bool XmlScPropHdl_BreakBefore::importXML(
     if (IsXMLToken(rStrImpValue, XML_AUTO))
     {
         bValue = false;
-        rValue = ::cppu::bool2any(bValue);
+        rValue <<= bValue;
         bRetval = true;
     }
     else if (IsXMLToken(rStrImpValue, XML_PAGE))
     {
         bValue = true;
-        rValue = ::cppu::bool2any(bValue);
+        rValue <<= bValue;
         bRetval = true;
     }
 
@@ -1868,12 +1868,12 @@ bool XmlScPropHdl_IsTextWrapped::importXML(
 
     if (IsXMLToken(rStrImpValue, XML_WRAP))
     {
-        rValue = ::cppu::bool2any(true);
+        rValue <<= true;
         bRetval = true;
     }
     else if (IsXMLToken(rStrImpValue, XML_NO_WRAP))
     {
-        rValue = ::cppu::bool2any(false);
+        rValue <<= false;
         bRetval = true;
     }
 
@@ -1937,12 +1937,12 @@ bool XmlScPropHdl_Vertical::importXML(
 
     if (IsXMLToken(rStrImpValue, XML_AUTO))
     {
-        rValue = ::cppu::bool2any(true);
+        rValue <<= true;
         bRetval = true;
     }
     else if (IsXMLToken(rStrImpValue, XML_0))
     {
-        rValue = ::cppu::bool2any(false);
+        rValue <<= false;
         bRetval = true;
     }
 
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 7daa392e9ca7..58b13ca1c9a0 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -271,7 +271,7 @@ void ScXMLRowImportPropertyMapper::finished(::std::vector< XMLPropertyState >& r
     }
     else if (pHeight)
     {
-        rProperties.push_back(XMLPropertyState(maPropMapper->FindEntryIndex(CTF_SC_ROWOPTIMALHEIGHT), ::cppu::bool2any( false )));
+        rProperties.push_back(XMLPropertyState(maPropMapper->FindEntryIndex(CTF_SC_ROWOPTIMALHEIGHT), css::uno::Any(false)));
     }
     // don't access pointers to rProperties elements after push_back!
 }
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 2e33485d3326..664aa017d219 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -933,27 +933,27 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope
             OUString aNameString = aPropertyName;
             if ( aNameString.equalsAscii( SC_UNO_DP_COLGRAND ) )
             {
-                aRet = ::cppu::bool2any( aNewData.GetColumnGrand() );
+                aRet <<= aNewData.GetColumnGrand();
             }
             else if ( aNameString.equalsAscii( SC_UNO_DP_IGNORE_EMPTYROWS ) )
             {
-                aRet = ::cppu::bool2any( aNewData.GetIgnoreEmptyRows() );
+                aRet <<= aNewData.GetIgnoreEmptyRows();
             }
             else if ( aNameString.equalsAscii( SC_UNO_DP_REPEATEMPTY ) )
             {
-                aRet = ::cppu::bool2any( aNewData.GetRepeatIfEmpty() );
+                aRet <<= aNewData.GetRepeatIfEmpty();
             }
             else if ( aNameString.equalsAscii( SC_UNO_DP_ROWGRAND ) )
             {
-                aRet = ::cppu::bool2any( aNewData.GetRowGrand() );
+                aRet <<= aNewData.GetRowGrand();
             }
             else if ( aNameString.equalsAscii( SC_UNO_DP_SHOWFILTER ) )
             {
-                aRet = ::cppu::bool2any( aNewData.GetFilterButton() );
+                aRet <<= aNewData.GetFilterButton();
             }
             else if ( aNameString.equalsAscii( SC_UNO_DP_DRILLDOWN ) )
             {
-                aRet = ::cppu::bool2any( aNewData.GetDrillDown() );
+                aRet <<= aNewData.GetDrillDown();
             }
             else if ( aNameString.equalsAscii( SC_UNO_DP_GRANDTOTAL_NAME ) )
             {
@@ -2001,7 +2001,7 @@ Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyNam
     else if ( aNameString.equalsAscii( SC_UNONAME_USESELPAGE ) )
         aRet <<= getUseCurrentPage();
     else if ( aNameString.equalsAscii( SC_UNONAME_HASAUTOSHOW ) )
-        aRet = ::cppu::bool2any(getAutoShowInfo() != NULL);
+        aRet <<= (getAutoShowInfo() != NULL);
     else if ( aNameString.equalsAscii( SC_UNONAME_AUTOSHOW ) )
     {
         const DataPilotFieldAutoShowInfo* pInfo = getAutoShowInfo();
@@ -2009,7 +2009,7 @@ Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyNam
             aRet <<= DataPilotFieldAutoShowInfo(*pInfo);
     }
     else if ( aNameString.equalsAscii( SC_UNONAME_HASLAYOUTINFO ) )
-        aRet = ::cppu::bool2any(getLayoutInfo() != NULL);
+        aRet <<= (getLayoutInfo() != NULL);
     else if ( aNameString.equalsAscii( SC_UNONAME_LAYOUTINFO ) )
     {
         const DataPilotFieldLayoutInfo* pInfo = getLayoutInfo();
@@ -2017,7 +2017,7 @@ Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyNam
             aRet <<= DataPilotFieldLayoutInfo(*pInfo);
     }
     else if ( aNameString.equalsAscii( SC_UNONAME_HASREFERENCE ) )
-        aRet = ::cppu::bool2any(getReference() != NULL);
+        aRet <<= (getReference() != NULL);
     else if ( aNameString.equalsAscii( SC_UNONAME_REFERENCE ) )
     {
         const DataPilotFieldReference* pRef = getReference();
@@ -2025,7 +2025,7 @@ Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyNam
             aRet <<= DataPilotFieldReference(*pRef);
     }
     else if ( aNameString.equalsAscii( SC_UNONAME_HASSORTINFO ) )
-        aRet = ::cppu::bool2any(getSortInfo() != NULL);
+        aRet <<= (getSortInfo() != NULL);
     else if ( aNameString.equalsAscii( SC_UNONAME_SORTINFO ) )
     {
         const DataPilotFieldSortInfo* pInfo = getSortInfo();
@@ -2033,7 +2033,7 @@ Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyNam
             aRet <<= DataPilotFieldSortInfo(*pInfo);
     }
     else if ( aNameString.equalsAscii( SC_UNONAME_ISGROUP ) )
-        aRet = ::cppu::bool2any(hasGroupInfo());
+        aRet <<= (hasGroupInfo());
     else if ( aNameString.equalsAscii( SC_UNONAME_GROUPINFO ) )
     {
         aRet <<= getGroupInfo();
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 81388051b7cf..f29c941af317 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -316,7 +316,7 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq
     //  Sequence fuellen
 
     pArray[0].Name = OUString( SC_UNONAME_ISSORTCOLUMNS );
-    pArray[0].Value = ::cppu::bool2any(!rParam.bByRow);
+    pArray[0].Value <<= !rParam.bByRow;
 
     pArray[1].Name = OUString( SC_UNONAME_CONTHDR );
     ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, rParam.bHasHeader );