Just use Any ctor instead of makeAny in vbahelper

Change-Id: Ie985584ad55f69817294e45b11b7c832d39c9bf7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133737
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

16 files changed, 53 insertions, 53 deletions

diff --git a/vbahelper/source/msforms/vbabutton.cxx b/vbahelper/source/msforms/vbabutton.cxx
index b1d07ba9911c..38d5c94028be 100644
--- a/vbahelper/source/msforms/vbabutton.cxx
+++ b/vbahelper/source/msforms/vbabutton.cxx
@@ -40,7 +40,7 @@ VbaButton::getCaption()
 void SAL_CALL
 VbaButton::setCaption( const OUString& _caption )
 {
-    m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) );
+    m_xProps->setPropertyValue( "Label", uno::Any( _caption ) );
 }
 
 sal_Bool SAL_CALL VbaButton::getAutoSize()
diff --git a/vbahelper/source/msforms/vbacheckbox.cxx b/vbahelper/source/msforms/vbacheckbox.cxx
index 61e2216c2f44..13922a6de7a4 100644
--- a/vbahelper/source/msforms/vbacheckbox.cxx
+++ b/vbahelper/source/msforms/vbacheckbox.cxx
@@ -40,7 +40,7 @@ ScVbaCheckbox::getCaption()
 void SAL_CALL
 ScVbaCheckbox::setCaption( const OUString& _caption )
 {
-    m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) );
+    m_xProps->setPropertyValue( "Label", uno::Any( _caption ) );
 }
 
 uno::Any SAL_CALL
@@ -53,7 +53,7 @@ ScVbaCheckbox::getValue()
 //    return uno::makeAny( nValue );
 // I must be missing something MSO says value should be -1 if selected, 0 if not
 // selected
-    return uno::makeAny( nValue == -1 );
+    return uno::Any( nValue == -1 );
 }
 
 void SAL_CALL
@@ -72,7 +72,7 @@ ScVbaCheckbox::setValue( const uno::Any& _value )
 
     if( nValue == -1)
         nValue = 1;
-    m_xProps->setPropertyValue( "State", uno::makeAny( nValue ) );
+    m_xProps->setPropertyValue( "State", uno::Any( nValue ) );
     if ( nValue != nOldValue )
         fireClickEvent();
 }
diff --git a/vbahelper/source/msforms/vbacombobox.cxx b/vbahelper/source/msforms/vbacombobox.cxx
index dc10964bf3cf..16abb6d985d3 100644
--- a/vbahelper/source/msforms/vbacombobox.cxx
+++ b/vbahelper/source/msforms/vbacombobox.cxx
@@ -76,7 +76,7 @@ ScVbaComboBox::setListIndex( const uno::Any& _value )
     if( ( nIndex >= 0 ) && ( sItems.getLength() > nIndex ) )
     {
         OUString sText = sItems[ nIndex ];
-        m_xProps->setPropertyValue( "Text", uno::makeAny( sText ) );
+        m_xProps->setPropertyValue( "Text", uno::Any( sText ) );
 
         // fire the _Change event
         if( nOldIndex != nIndex )
@@ -100,12 +100,12 @@ ScVbaComboBox::getListIndex()
             if (index != -1)
             {
                 SAL_INFO("vbahelper", "getListIndex returning " << index );
-                return uno::makeAny( index );
+                return uno::Any( index );
             }
         }
     }
     SAL_INFO("vbahelper", "getListIndex returning -1" );
-    return uno::makeAny( sal_Int32( -1 ) );
+    return uno::Any( sal_Int32( -1 ) );
 }
 
 // Value, [write]e.g. setValue sets the value in the drop down, and if the value is one
@@ -142,7 +142,7 @@ ScVbaComboBox::getText()
 void SAL_CALL
 ScVbaComboBox::setText( const OUString& _text )
 {
-    setValue( uno::makeAny( _text ) ); // seems the same
+    setValue( uno::Any( _text ) ); // seems the same
 }
 
 // Methods
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index b0b33543e059..937793c3ec23 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -305,7 +305,7 @@ ScVbaControl::getControlSource()
             uno::Reference< beans::XPropertySet > xProps( xBindable->getValueBinding(), uno::UNO_QUERY_THROW );
             table::CellAddress aAddress;
             xProps->getPropertyValue( "BoundCell" ) >>= aAddress;
-            xConvertor->setPropertyValue( "Address" , uno::makeAny( aAddress ) );
+            xConvertor->setPropertyValue( "Address" , uno::Any( aAddress ) );
             xConvertor->getPropertyValue( "XLA1Representation" ) >>= sControlSource;
         }
         catch(const uno::Exception&)
@@ -369,7 +369,7 @@ ScVbaControl::getRowSource()
             uno::Reference< beans::XPropertySet > xProps( xListSink->getListEntrySource(), uno::UNO_QUERY_THROW );
             table::CellRangeAddress aAddress;
             xProps->getPropertyValue( "CellRange" ) >>= aAddress;
-            xConvertor->setPropertyValue( "Address" , uno::makeAny( aAddress ) );
+            xConvertor->setPropertyValue( "Address" , uno::Any( aAddress ) );
             xConvertor->getPropertyValue( "XLA1Representation" ) >>= sRowSource;
         }
         catch(const uno::Exception&)
@@ -397,7 +397,7 @@ ScVbaControl::getName()
 void SAL_CALL
 ScVbaControl::setName( const OUString& _name )
 {
-    m_xProps->setPropertyValue( "Name" , uno::makeAny( _name ) );
+    m_xProps->setPropertyValue( "Name" , uno::Any( _name ) );
     }
 
 OUString SAL_CALL
@@ -411,7 +411,7 @@ ScVbaControl::getControlTipText()
 void SAL_CALL
 ScVbaControl::setControlTipText( const OUString& rsToolTip )
 {
-    m_xProps->setPropertyValue( "HelpText" , uno::makeAny( rsToolTip ) );
+    m_xProps->setPropertyValue( "HelpText" , uno::Any( rsToolTip ) );
 }
 
 OUString SAL_CALL ScVbaControl::getTag()
@@ -509,7 +509,7 @@ void SAL_CALL ScVbaControl::fireEvent( const script::ScriptEvent& rEvt )
     uno::Reference< script::XScriptListener > xScriptListener( xServiceManager->createInstanceWithContext( "ooo.vba.EventListener" , mxContext ), uno::UNO_QUERY_THROW );
 
     uno::Reference< beans::XPropertySet > xProps( xScriptListener, uno::UNO_QUERY_THROW );
-    xProps->setPropertyValue( "Model" , uno::makeAny( m_xModel ) );
+    xProps->setPropertyValue( "Model" , uno::Any( m_xModel ) );
 
     // handling for sheet control
     uno::Reference< msforms::XControl > xThisControl( this );
@@ -715,7 +715,7 @@ void ScVbaControl::setBackColor( sal_Int32 nBackColor )
     {
         nBackColor = nSysCols[ col & 0x0FF];
     }
-    m_xProps->setPropertyValue( "BackgroundColor" , uno::makeAny( XLRGBToOORGB( nBackColor ) ) );
+    m_xProps->setPropertyValue( "BackgroundColor" , uno::Any( XLRGBToOORGB( nBackColor ) ) );
 }
 
 bool ScVbaControl::getAutoSize() const
@@ -746,7 +746,7 @@ bool ScVbaControl::getLocked()
 
 void ScVbaControl::setLocked( bool bLocked )
 {
-    m_xProps->setPropertyValue( "ReadOnly" , uno::makeAny( bLocked ) );
+    m_xProps->setPropertyValue( "ReadOnly" , uno::Any( bLocked ) );
 }
 
 namespace {
diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx
index 6f36280aa26f..503c75311165 100644
--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
@@ -137,7 +137,7 @@ public:
     {
         if ( Index < 0 || Index >= static_cast< sal_Int32 >( mControls.size() ) )
             throw lang::IndexOutOfBoundsException();
-        return uno::makeAny( mControls[ Index ] );
+        return uno::Any( mControls[ Index ] );
     }
 };
 
@@ -183,7 +183,7 @@ public:
             uno::Reference< msforms::XControl > xVBAControl;
             if ( xControl.is() && m_xDlg.is() )
                 xVBAControl = ScVbaControlFactory::createUserformControl( m_xContext, xControl, m_xDlg, m_xModel, mfOffsetX, mfOffsetY );
-            return uno::makeAny( xVBAControl );
+            return uno::Any( xVBAControl );
         }
         throw container::NoSuchElementException();
     }
@@ -374,7 +374,7 @@ uno::Any SAL_CALL ScVbaControls::Add( const uno::Any& Object, const uno::Any& St
                 xModelProps->setPropertyValue( "FontStrikeout" , uno::Any( awt::FontStrikeout::NONE ) );
             }
 
-            xDialogContainer->insertByName( aNewName, uno::makeAny( xNewModel ) );
+            xDialogContainer->insertByName( aNewName, uno::Any( xNewModel ) );
             uno::Reference< awt::XControlContainer > xControlContainer( mxDialog, uno::UNO_QUERY_THROW );
             xNewControl = xControlContainer->getControl( aNewName );
 
diff --git a/vbahelper/source/msforms/vbaframe.cxx b/vbahelper/source/msforms/vbaframe.cxx
index 3af0ffee9295..88ca093d301a 100644
--- a/vbahelper/source/msforms/vbaframe.cxx
+++ b/vbahelper/source/msforms/vbaframe.cxx
@@ -49,7 +49,7 @@ OUString SAL_CALL ScVbaFrame::getCaption()
 
 void SAL_CALL ScVbaFrame::setCaption( const OUString& _caption )
 {
-    m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) );
+    m_xProps->setPropertyValue( "Label", uno::Any( _caption ) );
 }
 
 sal_Int32 SAL_CALL ScVbaFrame::getSpecialEffect()
diff --git a/vbahelper/source/msforms/vbalabel.cxx b/vbahelper/source/msforms/vbalabel.cxx
index df4ac8be08df..5b7164b45c34 100644
--- a/vbahelper/source/msforms/vbalabel.cxx
+++ b/vbahelper/source/msforms/vbalabel.cxx
@@ -40,12 +40,12 @@ ScVbaLabel::getCaption()
 void SAL_CALL
 ScVbaLabel::setCaption( const OUString& _caption )
 {
-    m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) );
+    m_xProps->setPropertyValue( "Label", uno::Any( _caption ) );
 }
 uno::Any SAL_CALL
 ScVbaLabel::getValue()
 {
-    return uno::makeAny( getCaption() );
+    return uno::Any( getCaption() );
 }
 
 void SAL_CALL
diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx
index 57ccc38b942c..40e4445f675b 100644
--- a/vbahelper/source/msforms/vbalistbox.cxx
+++ b/vbahelper/source/msforms/vbalistbox.cxx
@@ -39,7 +39,7 @@ ScVbaListBox::setListIndex( const uno::Any& _value )
     sal_Int32 nIndex = 0;
     _value >>= nIndex;
     uno::Reference< XPropValue > xPropVal( Selected( nIndex ), uno::UNO_QUERY_THROW );
-    xPropVal->setValue( uno::makeAny( true ) );
+    xPropVal->setValue( uno::Any( true ) );
 }
 
 uno::Any SAL_CALL
@@ -84,7 +84,7 @@ ScVbaListBox::setValue( const uno::Any& _value )
     uno::Sequence< sal_Int16 > nSelectedIndices { nValue };
     uno::Sequence< sal_Int16 > nOldSelectedIndices;
     m_xProps->getPropertyValue( "SelectedItems" ) >>= nOldSelectedIndices;
-    m_xProps->setPropertyValue( "SelectedItems", uno::makeAny( nSelectedIndices ) );
+    m_xProps->setPropertyValue( "SelectedItems", uno::Any( nSelectedIndices ) );
     if ( nSelectedIndices != nOldSelectedIndices )
         fireClickEvent();
 }
@@ -100,7 +100,7 @@ ScVbaListBox::getText()
 void SAL_CALL
 ScVbaListBox::setText( const OUString& _text )
 {
-    setValue( uno::makeAny( _text ) ); // seems the same
+    setValue( uno::Any( _text ) ); // seems the same
 }
 
 sal_Int32 SAL_CALL
@@ -129,7 +129,7 @@ ScVbaListBox::setMultiSelect( sal_Int32 _multiselect )
             throw lang::IllegalArgumentException();
             break;
     }
-    m_xProps->setPropertyValue( "MultiSelection" , uno::makeAny( bBoolVal ) );
+    m_xProps->setPropertyValue( "MultiSelection" , uno::Any( bBoolVal ) );
 }
 
 
@@ -145,7 +145,7 @@ ScVbaListBox::Selected( sal_Int32 index )
     if( nIndex < 0 || nIndex >= nLength )
         throw uno::RuntimeException( "Error Number." );
     m_nIndex = nIndex;
-    return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( this ) ) );
+    return uno::Any( uno::Reference< XPropValue > ( new ScVbaPropValue( this ) ) );
 }
 
 // Methods
@@ -195,7 +195,7 @@ ScVbaListBox::setValueEvent( const uno::Any& value )
                 nList.realloc( nLength - 1 );
                 //m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) );
                 fireClickEvent();
-                m_xProps->setPropertyValue( "SelectedItems", uno::makeAny( nList ) );
+                m_xProps->setPropertyValue( "SelectedItems", uno::Any( nList ) );
             }
             return;
         }
@@ -214,7 +214,7 @@ ScVbaListBox::setValueEvent( const uno::Any& value )
     }
     //m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) );
     fireClickEvent();
-    m_xProps->setPropertyValue( "SelectedItems", uno::makeAny( nList ) );
+    m_xProps->setPropertyValue( "SelectedItems", uno::Any( nList ) );
 }
 
 // this is called when something like the following vba code is used
@@ -229,7 +229,7 @@ ScVbaListBox::getValueEvent()
     sal_Int32 nIndex = m_nIndex;
     bool bRet = std::find(std::cbegin(nList), std::cend(nList), nIndex) != std::cend(nList);
 
-    return uno::makeAny( bRet );
+    return uno::Any( bRet );
 }
 
 void SAL_CALL
diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.cxx b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
index 9e45b5cc81e0..71f5e2c42015 100644
--- a/vbahelper/source/msforms/vbalistcontrolhelper.cxx
+++ b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
@@ -129,7 +129,7 @@ ListControlHelper::AddItem( const uno::Any& pvargItem, const uno::Any& pvargInde
         std::copy(sVec.begin(), sVec.end(), std::next(sList.getArray(), nIndex));
     }
 
-    m_xProps->setPropertyValue( "StringItemList", uno::makeAny( sList ) );
+    m_xProps->setPropertyValue( "StringItemList", uno::Any( sList ) );
 }
 
 void
@@ -155,7 +155,7 @@ ListControlHelper::removeItem( const uno::Any& index )
         comphelper::removeElementAt(sList, nIndex);
     }
 
-    m_xProps->setPropertyValue( "StringItemList", uno::makeAny( sList ) );
+    m_xProps->setPropertyValue( "StringItemList", uno::Any( sList ) );
 }
 
 void
@@ -163,7 +163,7 @@ ListControlHelper::Clear(  )
 {
     // urk, setValue doesn't seem to work !!
     //setValue( uno::makeAny( sal_Int16() ) );
-    m_xProps->setPropertyValue( "StringItemList", uno::makeAny( uno::Sequence< OUString >() ) );
+    m_xProps->setPropertyValue( "StringItemList", uno::Any( uno::Sequence< OUString >() ) );
 }
 
 void
@@ -184,7 +184,7 @@ ListControlHelper::getListCount()
 uno::Any
 ListControlHelper::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn )
 {
-    return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( new ListPropListener( m_xProps, pvargIndex, pvarColumn ) ) ) );
+    return uno::Any( uno::Reference< XPropValue > ( new ScVbaPropValue( new ListPropListener( m_xProps, pvargIndex, pvarColumn ) ) ) );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx
index 6387f285a554..183a93b667d4 100644
--- a/vbahelper/source/msforms/vbamultipage.cxx
+++ b/vbahelper/source/msforms/vbamultipage.cxx
@@ -39,7 +39,7 @@ public:
     {
         if ( Index < 0 || Index > mnPages )
             throw lang::IndexOutOfBoundsException();
-        return uno::makeAny( uno::Reference< uno::XInterface >() );
+        return uno::Any( uno::Reference< uno::XInterface >() );
     }
     // XElementAccess
     virtual uno::Type SAL_CALL getElementType() override
@@ -82,7 +82,7 @@ ScVbaMultiPage::setValue( const sal_Int32 _value )
     // Openoffice 1 based tab index
     sal_Int32 nVal = _value + 1;
     sal_Int32 nOldVal = getValue();
-    m_xProps->setPropertyValue( SVALUE, uno::makeAny( nVal ) );
+    m_xProps->setPropertyValue( SVALUE, uno::Any( nVal ) );
     if ( nVal != nOldVal )
         fireChangeEvent();
 }
@@ -100,7 +100,7 @@ ScVbaMultiPage::Pages( const uno::Any& index )
     uno::Reference< container::XNameContainer > xContainer( m_xProps, uno::UNO_QUERY_THROW );
     uno::Reference< XCollection > xColl( new ScVbaPages( this, mxContext, new PagesImpl( xContainer->getElementNames().getLength() ) ) );
     if ( !index.hasValue() )
-        return uno::makeAny( xColl );
+        return uno::Any( xColl );
     return xColl->Item( index, uno::Any() );
 }
 
diff --git a/vbahelper/source/msforms/vbaradiobutton.cxx b/vbahelper/source/msforms/vbaradiobutton.cxx
index 5a00c21e0d98..7a3e624bf041 100644
--- a/vbahelper/source/msforms/vbaradiobutton.cxx
+++ b/vbahelper/source/msforms/vbaradiobutton.cxx
@@ -40,7 +40,7 @@ ScVbaRadioButton::getCaption()
 void SAL_CALL
 ScVbaRadioButton::setCaption( const OUString& _caption )
 {
-    m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) );
+    m_xProps->setPropertyValue( "Label", uno::Any( _caption ) );
 }
 
 uno::Any SAL_CALL
@@ -53,7 +53,7 @@ ScVbaRadioButton::getValue()
 //    return uno::makeAny( nValue );
 // I must be missing something MSO says value should be -1 if selected, 0 if not
 // selected
-    return uno::makeAny( nValue == -1 );
+    return uno::Any( nValue == -1 );
 
 }
 
@@ -74,7 +74,7 @@ ScVbaRadioButton::setValue( const uno::Any& _value )
 
     if( nValue == -1)
         nValue = 1;
-    m_xProps->setPropertyValue( "State", uno::makeAny( nValue ) );
+    m_xProps->setPropertyValue( "State", uno::Any( nValue ) );
     if ( nValue != nOldValue )
     {
         fireChangeEvent();
diff --git a/vbahelper/source/msforms/vbascrollbar.cxx b/vbahelper/source/msforms/vbascrollbar.cxx
index 4968c72826b6..229bfad51bce 100644
--- a/vbahelper/source/msforms/vbascrollbar.cxx
+++ b/vbahelper/source/msforms/vbascrollbar.cxx
@@ -51,7 +51,7 @@ ScVbaScrollBar::getMax()
 void SAL_CALL
 ScVbaScrollBar::setMax( sal_Int32 nVal )
 {
-    m_xProps->setPropertyValue( "ScrollValueMax", uno::makeAny( nVal ) );
+    m_xProps->setPropertyValue( "ScrollValueMax", uno::Any( nVal ) );
 }
 
 ::sal_Int32 SAL_CALL
@@ -65,13 +65,13 @@ ScVbaScrollBar::getMin()
 void SAL_CALL
 ScVbaScrollBar::setMin( sal_Int32 nVal )
 {
-    m_xProps->setPropertyValue( "ScrollValueMin", uno::makeAny( nVal ) );
+    m_xProps->setPropertyValue( "ScrollValueMin", uno::Any( nVal ) );
 }
 
 void SAL_CALL
 ScVbaScrollBar::setLargeChange( ::sal_Int32 _largechange )
 {
-    m_xProps->setPropertyValue( "BlockIncrement", uno::makeAny( _largechange ) );
+    m_xProps->setPropertyValue( "BlockIncrement", uno::Any( _largechange ) );
 }
 
 ::sal_Int32 SAL_CALL
@@ -93,7 +93,7 @@ ScVbaScrollBar::getSmallChange()
 void SAL_CALL
 ScVbaScrollBar::setSmallChange( ::sal_Int32 _smallchange )
 {
-    m_xProps->setPropertyValue( "LineIncrement", uno::makeAny( _smallchange ) );
+    m_xProps->setPropertyValue( "LineIncrement", uno::Any( _smallchange ) );
 }
 
 OUString
diff --git a/vbahelper/source/msforms/vbaspinbutton.cxx b/vbahelper/source/msforms/vbaspinbutton.cxx
index 3180f4861e83..07514a46afb1 100644
--- a/vbahelper/source/msforms/vbaspinbutton.cxx
+++ b/vbahelper/source/msforms/vbaspinbutton.cxx
@@ -51,7 +51,7 @@ ScVbaSpinButton::getMax()
 void SAL_CALL
 ScVbaSpinButton::setMax( sal_Int32 nVal )
 {
-    m_xProps->setPropertyValue( "SpinValueMax", uno::makeAny( nVal ) );
+    m_xProps->setPropertyValue( "SpinValueMax", uno::Any( nVal ) );
 }
 
 ::sal_Int32 SAL_CALL
@@ -65,7 +65,7 @@ ScVbaSpinButton::getMin()
 void SAL_CALL
 ScVbaSpinButton::setMin( sal_Int32 nVal )
 {
-    m_xProps->setPropertyValue( "SpinValueMin", uno::makeAny( nVal ) );
+    m_xProps->setPropertyValue( "SpinValueMin", uno::Any( nVal ) );
 }
 
 OUString
diff --git a/vbahelper/source/msforms/vbatextbox.cxx b/vbahelper/source/msforms/vbatextbox.cxx
index 59f736d48dcc..f01e9dc1def4 100644
--- a/vbahelper/source/msforms/vbatextbox.cxx
+++ b/vbahelper/source/msforms/vbatextbox.cxx
@@ -35,7 +35,7 @@ ScVbaTextBox::ScVbaTextBox( const uno::Reference< ov::XHelperInterface >& xParen
 uno::Any SAL_CALL
 ScVbaTextBox::getValue()
 {
-    return uno::makeAny( getText() );
+    return uno::Any( getText() );
 }
 
 void SAL_CALL
@@ -66,7 +66,7 @@ ScVbaTextBox::setText( const OUString& _text )
         xTextRange->setString( _text );
     }
     else
-        m_xProps->setPropertyValue( "Text" , uno::makeAny( _text ) );
+        m_xProps->setPropertyValue( "Text" , uno::Any( _text ) );
     if ( oldText != _text )
         fireChangeEvent();
 }
diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx b/vbahelper/source/msforms/vbatogglebutton.cxx
index fbb7c267a428..07008541fa3a 100644
--- a/vbahelper/source/msforms/vbatogglebutton.cxx
+++ b/vbahelper/source/msforms/vbatogglebutton.cxx
@@ -28,7 +28,7 @@ ScVbaToggleButton::ScVbaToggleButton( const css::uno::Reference< ov::XHelperInte
     : ToggleButtonImpl_BASE( xParent, xContext, xControl, xModel, std::move(pGeomHelper) )
 {
     SAL_INFO("vbahelper", "ScVbaToggleButton(ctor)");
-    m_xProps->setPropertyValue( "Toggle", uno::makeAny( true ) );
+    m_xProps->setPropertyValue( "Toggle", uno::Any( true ) );
 }
 
 ScVbaToggleButton::~ScVbaToggleButton()
@@ -48,7 +48,7 @@ ScVbaToggleButton::getCaption()
 void SAL_CALL
 ScVbaToggleButton::setCaption( const OUString& _caption )
 {
-    m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) );
+    m_xProps->setPropertyValue( "Label", uno::Any( _caption ) );
 }
 
 uno::Any SAL_CALL
@@ -56,7 +56,7 @@ ScVbaToggleButton::getValue()
 {
     sal_Int16 nState = 0;
     m_xProps->getPropertyValue( "State" ) >>= nState;
-    return uno::makeAny( nState ? sal_Int16( -1 ) : sal_Int16( 0 ) );
+    return uno::Any( nState ? sal_Int16( -1 ) : sal_Int16( 0 ) );
 }
 
 
@@ -74,7 +74,7 @@ ScVbaToggleButton::setValue( const uno::Any& _value )
     SAL_INFO("vbahelper", "nState - " << nState );
     nState = ( nState == -1 ) ?  1 : 0;
     SAL_INFO("vbahelper", "nState - " << nState );
-    m_xProps->setPropertyValue( "State", uno::makeAny(   nState ) );
+    m_xProps->setPropertyValue( "State", uno::Any(   nState ) );
 }
 
 sal_Bool SAL_CALL ScVbaToggleButton::getAutoSize()
diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx
index c82a84fd1035..66aa6eff7198 100644
--- a/vbahelper/source/msforms/vbauserform.cxx
+++ b/vbahelper/source/msforms/vbauserform.cxx
@@ -110,7 +110,7 @@ ScVbaUserForm::getCaption()
 void
 ScVbaUserForm::setCaption( const OUString& _caption )
 {
-    m_xProps->setPropertyValue( "Title", uno::makeAny( _caption ) );
+    m_xProps->setPropertyValue( "Title", uno::Any( _caption ) );
 }
 
 sal_Bool SAL_CALL
@@ -278,7 +278,7 @@ ScVbaUserForm::Controls( const uno::Any& index )
     uno::Reference< XCollection > xControls( new ScVbaControls( this, mxContext, xDialogControl, m_xModel, mpGeometryHelper->getOffsetX(), mpGeometryHelper->getOffsetY() ) );
     if ( index.hasValue() )
         return xControls->Item( index, uno::Any() );
-    return uno::makeAny( xControls );
+    return uno::Any( xControls );
 }
 
 sal_Bool SAL_CALL