Remove unnecessary bool2any

Change-Id: Ie2caee1d5a7912011d76172539c2f8f37eaee5cf

4 files changed, 27 insertions, 31 deletions

diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 154d61b04cc5..925e437fd823 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -27,7 +27,6 @@
 #include <sax/tools/converter.hxx>
 
 #include <list>
-#include <comphelper/extract.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnmspe.hxx>
@@ -605,7 +604,7 @@ void XMLAnimationsEffectContext::EndElement()
                 {
                     if( meKind == XMLE_HIDE && !mbTextEffect && meEffect == EK_none )
                     {
-                        aAny = bool2any( true );
+                        aAny <<= true;
                         xSet->setPropertyValue( mpImpl->msDimHide, aAny );
                     }
                     else
@@ -631,10 +630,10 @@ void XMLAnimationsEffectContext::EndElement()
                     aAny <<= maSoundURL;
                     xSet->setPropertyValue( mpImpl->msSound, aAny );
 
-                    aAny <<= bool2any( mbPlayFull );
+                    aAny <<= mbPlayFull;
                     xSet->setPropertyValue( mpImpl->msPlayFull, aAny );
 
-                    aAny <<= bool2any( true );
+                    aAny <<= true;
                     xSet->setPropertyValue( mpImpl->msSoundOn, aAny );
                 }
                 else
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index 3de70c97a674..f7158ff9c5c8 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/presentation/ClickAction.hpp>
 #include <tools/urlobj.hxx>
-#include <comphelper/extract.hxx>
 
 #include <sax/tools/converter.hxx>
 
@@ -462,7 +461,7 @@ void SdXMLEventContext::EndElement()
 
                     pProperties->Name = "PlayFull";
                     pProperties->Handle = -1;
-                    pProperties->Value = ::cppu::bool2any(mbPlayFull);
+                    pProperties->Value <<= mbPlayFull;
                     pProperties->State = beans::PropertyState_DIRECT_VALUE;
                     break;
 
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 49fe17c2b84d..d9c95a03b671 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <comphelper/extract.hxx>
 #include "ximpshap.hxx"
 #include <xmloff/XMLBase64ImportContext.hxx>
 #include <xmloff/XMLShapeStyleContext.hxx>
@@ -1680,10 +1679,10 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
                 if( xPropsInfo.is() )
                 {
                     if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject"))
-                        xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( false ) );
+                        xProps->setPropertyValue("IsEmptyPresentationObject", css::uno::Any(false) );
 
                     if( mbIsUserTransformed && xPropsInfo->hasPropertyByName("IsPlaceholderDependent"))
-                        xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) );
+                        xProps->setPropertyValue("IsPlaceholderDependent", css::uno::Any(false) );
                 }
             }
         }
@@ -2429,7 +2428,7 @@ void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno::
 
             uno::Reference< beans::XPropertySetInfo > xPropsInfo( xPropset->getPropertySetInfo() );
             if( xPropsInfo.is() && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject"))
-                xPropset->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( mbIsPlaceholder ) );
+                xPropset->setPropertyValue("IsEmptyPresentationObject", css::uno::makeAny( mbIsPlaceholder ) );
 
             if( !mbIsPlaceholder )
             {
@@ -2458,7 +2457,7 @@ void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno::
                 if( xPropsInfo.is() )
                 {
                     if( xPropsInfo->hasPropertyByName("IsPlaceholderDependent"))
-                        xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) );
+                        xProps->setPropertyValue("IsPlaceholderDependent", css::uno::Any(false) );
                 }
             }
         }
@@ -2569,7 +2568,7 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri
             {
                 uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() );
                 if( xPropsInfo.is() && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject"))
-                    xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( false ) );
+                    xProps->setPropertyValue("IsEmptyPresentationObject", css::uno::Any(false) );
 
                 uno::Any aAny;
 
@@ -2596,7 +2595,7 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri
                 if( xPropsInfo.is() )
                 {
                     if( xPropsInfo->hasPropertyByName("IsPlaceholderDependent"))
-                        xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) );
+                        xProps->setPropertyValue("IsPlaceholderDependent", css::uno::Any(false) );
                 }
             }
         }
@@ -2700,10 +2699,10 @@ void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Referen
                 if( xPropsInfo.is() )
                 {
                     if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject"))
-                        xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( false ) );
+                        xProps->setPropertyValue("IsEmptyPresentationObject", css::uno::Any(false) );
 
                     if( mbIsUserTransformed && xPropsInfo->hasPropertyByName("IsPlaceholderDependent"))
-                        xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) );
+                        xProps->setPropertyValue("IsPlaceholderDependent", css::uno::Any(false) );
                 }
             }
         }
@@ -3080,10 +3079,10 @@ void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Referen
                 if( xPropsInfo.is() )
                 {
                     if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject"))
-                        xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( false ) );
+                        xProps->setPropertyValue("IsEmptyPresentationObject", css::uno::Any(false) );
 
                     if( mbIsUserTransformed && xPropsInfo->hasPropertyByName("IsPlaceholderDependent"))
-                        xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) );
+                        xProps->setPropertyValue("IsPlaceholderDependent", css::uno::Any(false) );
                 }
             }
         }
@@ -3887,10 +3886,10 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc
                 if( xPropsInfo.is() )
                 {
                     if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject"))
-                        xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( false ) );
+                        xProps->setPropertyValue("IsEmptyPresentationObject", css::uno::Any(false) );
 
                     if( mbIsUserTransformed && xPropsInfo->hasPropertyByName("IsPlaceholderDependent"))
-                        xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) );
+                        xProps->setPropertyValue("IsPlaceholderDependent", css::uno::Any(false) );
                 }
             }
         }
diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx
index affe7823a804..055ccf3ef3f6 100644
--- a/xmloff/source/draw/ximpshow.cxx
+++ b/xmloff/source/draw/ximpshow.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <sax/tools/converter.hxx>
 #include <xmloff/xmltoken.hxx>
-#include <comphelper/extract.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmluconv.hxx>
@@ -125,57 +124,57 @@ SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport,  sal_uInt16 nPrfx, c
                 }
                 else if( IsXMLToken( aLocalName, XML_ANIMATIONS ) )
                 {
-                    aAny = bool2any( IsXMLToken( sValue, XML_ENABLED ) );
+                    aAny <<= IsXMLToken( sValue, XML_ENABLED );
                     mpImpl->mxPresProps->setPropertyValue("AllowAnimations", aAny );
                 }
                 else if( IsXMLToken( aLocalName, XML_STAY_ON_TOP ) )
                 {
-                    aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
+                    aAny <<= IsXMLToken( sValue, XML_TRUE );
                     mpImpl->mxPresProps->setPropertyValue("IsAlwaysOnTop", aAny );
                 }
                 else if( IsXMLToken( aLocalName, XML_FORCE_MANUAL ) )
                 {
-                    aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
+                    aAny <<= IsXMLToken( sValue, XML_TRUE );
                     mpImpl->mxPresProps->setPropertyValue("IsAutomatic", aAny );
                 }
                 else if( IsXMLToken( aLocalName, XML_ENDLESS ) )
                 {
-                    aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
+                    aAny <<= IsXMLToken( sValue, XML_TRUE );
                     mpImpl->mxPresProps->setPropertyValue("IsEndless", aAny );
                 }
                 else if( IsXMLToken( aLocalName, XML_FULL_SCREEN ) )
                 {
-                    aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
+                    aAny <<= IsXMLToken( sValue, XML_TRUE );
                     mpImpl->mxPresProps->setPropertyValue("IsFullScreen", aAny );
                 }
                 else if( IsXMLToken( aLocalName, XML_MOUSE_VISIBLE ) )
                 {
-                    aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
+                    aAny <<= IsXMLToken( sValue, XML_TRUE );
                     mpImpl->mxPresProps->setPropertyValue("IsMouseVisible", aAny );
                 }
                 else if( IsXMLToken( aLocalName, XML_START_WITH_NAVIGATOR ) )
                 {
-                    aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
+                    aAny <<= IsXMLToken( sValue, XML_TRUE );
                     mpImpl->mxPresProps->setPropertyValue("StartWithNavigator", aAny );
                 }
                 else if( IsXMLToken( aLocalName, XML_MOUSE_AS_PEN ) )
                 {
-                    aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
+                    aAny <<= IsXMLToken( sValue, XML_TRUE );
                     mpImpl->mxPresProps->setPropertyValue("UsePen", aAny );
                 }
                 else if( IsXMLToken( aLocalName, XML_TRANSITION_ON_CLICK ) )
                 {
-                    aAny = bool2any( IsXMLToken( sValue, XML_ENABLED ) );
+                    aAny <<= IsXMLToken( sValue, XML_ENABLED );
                     mpImpl->mxPresProps->setPropertyValue("IsTransitionOnClick", aAny );
                 }
                 else if( IsXMLToken( aLocalName, XML_SHOW_LOGO ) )
                 {
-                    aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) );
+                    aAny <<= IsXMLToken( sValue, XML_TRUE );
                     mpImpl->mxPresProps->setPropertyValue("IsShowLogo", aAny );
                 }
             }
         }
-        aAny = bool2any( bAll );
+        aAny <<= bAll;
         mpImpl->mxPresProps->setPropertyValue("IsShowAll", aAny );
     }
 }