Just use Any ctor instead of makeAny in xmlscript

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

4 files changed, 71 insertions, 71 deletions

diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index 3b52f683b1e0..12da217242de 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -486,13 +486,13 @@ public:
         try
         {
             _pImport->_xDialogModel->insertByName(
-                _aId, css::uno::makeAny(
+                _aId, css::uno::Any(
                     css::uno::Reference<css::awt::XControlModel>::query(
                         _xControlModel ) ) );
         }
         catch(const css::container::ElementExistException &e)
         {
-            throw css::lang::WrappedTargetRuntimeException("", e.Context, makeAny(e));
+            throw css::lang::WrappedTargetRuntimeException("", e.Context, css::uno::Any(e));
         }
     }
 };
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index 6a7af3fc3d85..cc561a08d3ca 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -937,7 +937,7 @@ void ElementDescriptor::readDataAwareAttr( OUString const & rAttrName )
             {
                 table::CellAddress aAddress;
                 xBindable->getPropertyValue( "BoundCell" ) >>= aAddress;
-                xConvertor->setPropertyValue( "Address", makeAny( aAddress ) );
+                xConvertor->setPropertyValue( "Address", Any( aAddress ) );
                 OUString sAddress;
                 xConvertor->getPropertyValue( "PersistentRepresentation" ) >>= sAddress;
                 if ( !sAddress.isEmpty() )
@@ -967,7 +967,7 @@ void ElementDescriptor::readDataAwareAttr( OUString const & rAttrName )
         xListSource->getPropertyValue( "CellRange" ) >>= aAddress;
 
         OUString sAddress;
-        xConvertor->setPropertyValue( "Address", makeAny( aAddress ) );
+        xConvertor->setPropertyValue( "Address", Any( aAddress ) );
         xConvertor->getPropertyValue( "PersistentRepresentation" ) >>= sAddress;
         SAL_INFO("xmlscript.xmldlg","**** cell range source list " << sAddress );
         if ( !sAddress.isEmpty() )
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 66a69a2b5518..e74e35ece9e2 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -86,7 +86,7 @@ void Frame::endElement()
     ctx.importDefaults( 0, 0, _xAttributes ); // inherited from BulletinBoardElement
     if (!_label.isEmpty())
     {
-        xControlModel->setPropertyValue( "Label" , makeAny( _label ) );
+        xControlModel->setPropertyValue( "Label" , Any( _label ) );
     }
     ctx.importEvents( _events );
     // avoid ring-reference:
@@ -468,7 +468,7 @@ void FormattedFieldElement::endElement()
     ctx.importShortProperty( "MaxTextLen", "maxlength", _xAttributes );
     ctx.importBooleanProperty( "Spin",  "spin", _xAttributes );
     if (ctx.importLongProperty( "RepeatDelay", "repeat", _xAttributes ))
-        ctx.getControlModel()->setPropertyValue( "Repeat" , makeAny(true) );
+        ctx.getControlModel()->setPropertyValue( "Repeat" , Any(true) );
 
     OUString sDefault(_xAttributes->getValueByUidName(m_pImport->XMLNS_DIALOGS_UID, "value-default") );
     if (!sDefault.isEmpty())
@@ -476,16 +476,16 @@ void FormattedFieldElement::endElement()
         double d = sDefault.toDouble();
         if (d != 0.0 || sDefault == "0" || sDefault == "0.0" )
         {
-            ctx.getControlModel()->setPropertyValue( "EffectiveDefault", makeAny( d ) );
+            ctx.getControlModel()->setPropertyValue( "EffectiveDefault", Any( d ) );
         }
         else // treat as string
         {
-            ctx.getControlModel()->setPropertyValue( "EffectiveDefault", makeAny( sDefault ) );
+            ctx.getControlModel()->setPropertyValue( "EffectiveDefault", Any( sDefault ) );
         }
     }
 
     // format spec
-    ctx.getControlModel()->setPropertyValue("FormatsSupplier", makeAny( m_pImport->getNumberFormatsSupplier() ) );
+    ctx.getControlModel()->setPropertyValue("FormatsSupplier", Any( m_pImport->getNumberFormatsSupplier() ) );
 
     OUString sFormat( _xAttributes->getValueByUidName(m_pImport->XMLNS_DIALOGS_UID, "format-code" ) );
     if (!sFormat.isEmpty())
@@ -530,7 +530,7 @@ void FormattedFieldElement::endElement()
             {
                 nKey = xFormats->addNew( sFormat, locale );
             }
-            ctx.getControlModel()->setPropertyValue("FormatKey", makeAny( nKey ) );
+            ctx.getControlModel()->setPropertyValue("FormatKey", Any( nKey ) );
         }
         catch (const util::MalformedNumberFormatException & exc)
         {
@@ -593,7 +593,7 @@ void TimeFieldElement::endElement()
     ctx.importTimeProperty( "TimeMax", "value-max", _xAttributes );
     ctx.importBooleanProperty( "Spin", "spin", _xAttributes );
     if (ctx.importLongProperty( "RepeatDelay", "repeat", _xAttributes ))
-        ctx.getControlModel()->setPropertyValue("Repeat", makeAny(true) );
+        ctx.getControlModel()->setPropertyValue("Repeat", Any(true) );
     ctx.importStringProperty( "Text", "text" , _xAttributes );
     ctx.importBooleanProperty( "EnforceFormat", "enforce-format" , _xAttributes );
 
@@ -650,7 +650,7 @@ void NumericFieldElement::endElement()
     ctx.importDoubleProperty( "ValueStep", "value-step", _xAttributes );
     ctx.importBooleanProperty( "Spin", "spin", _xAttributes );
     if (ctx.importLongProperty( "RepeatDelay", "repeat",  _xAttributes ))
-        ctx.getControlModel()->setPropertyValue("Repeat", makeAny(true) );
+        ctx.getControlModel()->setPropertyValue("Repeat", Any(true) );
     ctx.importBooleanProperty( "EnforceFormat", "enforce-format", _xAttributes );
     ctx.importEvents( _events );
     // avoid ring-reference:
@@ -702,7 +702,7 @@ void DateFieldElement::endElement()
     ctx.importDateProperty( "DateMax", "value-max", _xAttributes );
     ctx.importBooleanProperty( "Spin", "spin", _xAttributes );
     if (ctx.importLongProperty( "RepeatDelay", "repeat", _xAttributes ))
-        ctx.getControlModel()->setPropertyValue( "Repeat", makeAny(true) );
+        ctx.getControlModel()->setPropertyValue( "Repeat", Any(true) );
     ctx.importBooleanProperty( "Dropdown", "dropdown", _xAttributes );
     ctx.importStringProperty( "Text", "text", _xAttributes );
     ctx.importBooleanProperty( "EnforceFormat", "enforce-format", _xAttributes );
@@ -758,7 +758,7 @@ void CurrencyFieldElement::endElement()
     ctx.importDoubleProperty( "ValueStep", "value-step", _xAttributes );
     ctx.importBooleanProperty( "Spin", "spin", _xAttributes );
     if (ctx.importLongProperty( "RepeatDelay", "repeat", _xAttributes ))
-        ctx.getControlModel()->setPropertyValue( "Repeat", makeAny(true) );
+        ctx.getControlModel()->setPropertyValue( "Repeat", Any(true) );
     ctx.importBooleanProperty( "PrependCurrencySymbol", "prepend-symbol", _xAttributes );
     ctx.importBooleanProperty( "EnforceFormat", "enforce-format", _xAttributes );
     ctx.importEvents( _events );
@@ -1041,7 +1041,7 @@ void TextFieldElement::endElement()
         {
             nChar = static_cast<sal_Int16>(aValue[ 0 ]);
         }
-        xControlModel->setPropertyValue( "EchoChar", makeAny( nChar ) );
+        xControlModel->setPropertyValue( "EchoChar", Any( nChar ) );
     }
 
     ctx.importEvents( _events );
@@ -1108,7 +1108,7 @@ void TitledBoxElement::endElement()
 
         if (!_label.isEmpty())
         {
-            xControlModel->setPropertyValue( "Label", makeAny( _label ) );
+            xControlModel->setPropertyValue( "Label", Any( _label ) );
         }
 
         ctx.importEvents( _events );
@@ -1154,7 +1154,7 @@ void TitledBoxElement::endElement()
         {
             nVal = 1;
         }
-        xControlModel->setPropertyValue( "State", makeAny( nVal ) );
+        xControlModel->setPropertyValue( "State", Any( nVal ) );
         ctx.importDataAwareProperty( "linked-cell" , xAttributes );
         ::std::vector< Reference< xml::input::XElement > > & radioEvents =
             static_cast< RadioElement * >( xRadio.get() )->getEvents();
@@ -1244,7 +1244,7 @@ void RadioGroupElement::endElement()
         {
             nVal = 1;
         }
-        xControlModel->setPropertyValue( "State", makeAny( nVal ) );
+        xControlModel->setPropertyValue( "State", Any( nVal ) );
 
         ctx.importDataAwareProperty( "linked-cell", xAttributes );
 
@@ -1369,9 +1369,9 @@ void MenuListElement::endElement()
     {
         MenuPopupElement * p = static_cast< MenuPopupElement * >( _popup.get() );
         if ( !bHasSrcRange )
-            xControlModel->setPropertyValue( "StringItemList", makeAny( p->getItemValues() ) );
+            xControlModel->setPropertyValue( "StringItemList", Any( p->getItemValues() ) );
         if ( !bHasLinkedCell )
-            xControlModel->setPropertyValue( "SelectedItems", makeAny( p->getSelectedItems() ) );
+            xControlModel->setPropertyValue( "SelectedItems", Any( p->getSelectedItems() ) );
 
     }
     ctx.importEvents( _events );
@@ -1438,7 +1438,7 @@ void ComboBoxElement::endElement()
     if (_popup.is() && !bHasSrcRange )
     {
         MenuPopupElement * p = static_cast< MenuPopupElement * >( _popup.get() );
-        xControlModel->setPropertyValue( "StringItemList", makeAny( p->getItemValues() ) );
+        xControlModel->setPropertyValue( "StringItemList", Any( p->getItemValues() ) );
     }
 
     ctx.importEvents( _events );
@@ -1491,19 +1491,19 @@ void CheckBoxElement::endElement()
     sal_Bool bTriState = false;
     if (getBoolAttr( &bTriState, "tristate", _xAttributes, m_pImport->XMLNS_DIALOGS_UID ))
     {
-        xControlModel->setPropertyValue( "TriState", makeAny( bTriState ) );
+        xControlModel->setPropertyValue( "TriState", Any( bTriState ) );
     }
     sal_Bool bChecked = false;
     if (getBoolAttr( &bChecked, "checked", _xAttributes, m_pImport->XMLNS_DIALOGS_UID ))
     {
         // has "checked" attribute
         sal_Int16 nVal = (bChecked ? 1 : 0);
-        xControlModel->setPropertyValue( "State", makeAny( nVal ) );
+        xControlModel->setPropertyValue( "State", Any( nVal ) );
     }
     else
     {
         sal_Int16 nVal = (bTriState ? 2 : 0); // if tristate set, but checked omitted => don't know!
-        xControlModel->setPropertyValue( "State", makeAny( nVal ) );
+        xControlModel->setPropertyValue( "State", Any( nVal ) );
     }
 
     ctx.importEvents( _events );
@@ -1554,17 +1554,17 @@ void ButtonElement::endElement()
     ctx.importImagePositionProperty( "ImagePosition", "image-position", _xAttributes );
     ctx.importImageAlignProperty( "ImageAlign", "image-align", _xAttributes );
     if (ctx.importLongProperty( "RepeatDelay", "repeat", _xAttributes ))
-        ctx.getControlModel()->setPropertyValue( "Repeat", makeAny(true) );
+        ctx.getControlModel()->setPropertyValue( "Repeat", Any(true) );
     sal_Int32 toggled = 0;
     if (getLongAttr( &toggled, "toggled", _xAttributes, m_pImport->XMLNS_DIALOGS_UID ) && toggled == 1)
-        ctx.getControlModel()->setPropertyValue( "Toggle" , makeAny(true));
+        ctx.getControlModel()->setPropertyValue( "Toggle" , Any(true));
     ctx.importBooleanProperty( "FocusOnClick", "grab-focus", _xAttributes );
     ctx.importBooleanProperty( "MultiLine", "multiline", _xAttributes );
     // State
     sal_Bool bChecked = false;
     if (getBoolAttr( &bChecked, "checked", _xAttributes, m_pImport->XMLNS_DIALOGS_UID ) && bChecked)
     {
-        ctx.getControlModel()->setPropertyValue( "State" , makeAny( sal_Int16(1) ) );
+        ctx.getControlModel()->setPropertyValue( "State" , Any( sal_Int16(1) ) );
     }
 
     ctx.importEvents( _events );
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index 2bad2426c9ab..5cac12605faf 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -130,7 +130,7 @@ void StyleElement::importTextColorStyle(
     {
         if ((_hasValue & 0x2) != 0)
         {
-            xProps->setPropertyValue("TextColor", makeAny( _textColor ) );
+            xProps->setPropertyValue("TextColor", Any( _textColor ) );
         }
         return;
     }
@@ -139,7 +139,7 @@ void StyleElement::importTextColorStyle(
     if (getLongAttr( &_textColor, "text-color", _xAttributes, m_pImport->XMLNS_DIALOGS_UID ))
     {
         _hasValue |= 0x2;
-        xProps->setPropertyValue( "TextColor", makeAny( _textColor ) );
+        xProps->setPropertyValue( "TextColor", Any( _textColor ) );
         return;
     }
 }
@@ -151,7 +151,7 @@ void StyleElement::importTextLineColorStyle(
     {
         if ((_hasValue & 0x20) != 0)
         {
-            xProps->setPropertyValue( "TextLineColor", makeAny( _textLineColor ) );
+            xProps->setPropertyValue( "TextLineColor", Any( _textLineColor ) );
         }
         return;
     }
@@ -160,7 +160,7 @@ void StyleElement::importTextLineColorStyle(
     if (getLongAttr( &_textLineColor, "textline-color", _xAttributes, m_pImport->XMLNS_DIALOGS_UID ))
     {
         _hasValue |= 0x20;
-        xProps->setPropertyValue( "TextLineColor", makeAny( _textLineColor ) );
+        xProps->setPropertyValue( "TextLineColor", Any( _textLineColor ) );
     }
 }
 
@@ -171,7 +171,7 @@ void StyleElement::importFillColorStyle(
     {
         if ((_hasValue & 0x10) != 0)
         {
-            xProps->setPropertyValue( "FillColor", makeAny( _fillColor ) );
+            xProps->setPropertyValue( "FillColor", Any( _fillColor ) );
         }
         return;
     }
@@ -180,7 +180,7 @@ void StyleElement::importFillColorStyle(
     if (getLongAttr( &_fillColor, "fill-color", _xAttributes, m_pImport->XMLNS_DIALOGS_UID ))
     {
         _hasValue |= 0x10;
-        xProps->setPropertyValue( "FillColor", makeAny( _fillColor ) );
+        xProps->setPropertyValue( "FillColor", Any( _fillColor ) );
     }
 }
 
@@ -191,7 +191,7 @@ void StyleElement::importBackgroundColorStyle(
     {
         if ((_hasValue & 0x1) != 0)
         {
-            xProps->setPropertyValue( "BackgroundColor", makeAny( _backgroundColor ) );
+            xProps->setPropertyValue( "BackgroundColor", Any( _backgroundColor ) );
         }
         return;
     }
@@ -200,7 +200,7 @@ void StyleElement::importBackgroundColorStyle(
     if (getLongAttr( &_backgroundColor, "background-color", _xAttributes, m_pImport->XMLNS_DIALOGS_UID ))
     {
         _hasValue |= 0x1;
-        xProps->setPropertyValue( "BackgroundColor", makeAny( _backgroundColor ) );
+        xProps->setPropertyValue( "BackgroundColor", Any( _backgroundColor ) );
     }
 }
 
@@ -211,9 +211,9 @@ void StyleElement::importBorderStyle(
     {
         if ((_hasValue & 0x4) != 0)
         {
-            xProps->setPropertyValue( "Border", makeAny( _border == BORDER_SIMPLE_COLOR ? BORDER_SIMPLE : _border ) );
+            xProps->setPropertyValue( "Border", Any( _border == BORDER_SIMPLE_COLOR ? BORDER_SIMPLE : _border ) );
             if (_border == BORDER_SIMPLE_COLOR)
-                xProps->setPropertyValue( "BorderColor", makeAny(_borderColor) );
+                xProps->setPropertyValue( "BorderColor", Any(_borderColor) );
         }
         return;
     }
@@ -245,7 +245,7 @@ void StyleElement::importVisualEffectStyle(
     {
         if ((_hasValue & 0x40) != 0)
         {
-            xProps->setPropertyValue( "VisualEffect", makeAny(_visualEffect) );
+            xProps->setPropertyValue( "VisualEffect", Any(_visualEffect) );
         }
         return;
     }
@@ -271,15 +271,15 @@ void StyleElement::importVisualEffectStyle(
         OSL_ASSERT( false );
 
     _hasValue |= 0x40;
-    xProps->setPropertyValue( "VisualEffect", makeAny(_visualEffect) );
+    xProps->setPropertyValue( "VisualEffect", Any(_visualEffect) );
 }
 
 void StyleElement::setFontProperties(
     Reference< beans::XPropertySet > const & xProps ) const
 {
-    xProps->setPropertyValue("FontDescriptor", makeAny( _descr ) );
-    xProps->setPropertyValue("FontEmphasisMark", makeAny( _fontEmphasisMark ) );
-    xProps->setPropertyValue("FontRelief", makeAny( _fontRelief ) );
+    xProps->setPropertyValue("FontDescriptor", Any( _descr ) );
+    xProps->setPropertyValue("FontEmphasisMark", Any( _fontEmphasisMark ) );
+    xProps->setPropertyValue("FontRelief", Any( _fontRelief ) );
 }
 
 void StyleElement::importFontStyle(
@@ -674,7 +674,7 @@ bool ImportContext::importStringProperty(
             _pImport->XMLNS_DIALOGS_UID, rAttrName ) );
     if (!aValue.isEmpty())
     {
-        _xControlModel->setPropertyValue( rPropName, makeAny( aValue ) );
+        _xControlModel->setPropertyValue( rPropName, Any( aValue ) );
         return true;
     }
     return false;
@@ -689,7 +689,7 @@ bool ImportContext::importDoubleProperty(
             _pImport->XMLNS_DIALOGS_UID, rAttrName ) );
     if (!aValue.isEmpty())
     {
-        _xControlModel->setPropertyValue( rPropName, makeAny( aValue.toDouble() ) );
+        _xControlModel->setPropertyValue( rPropName, Any( aValue.toDouble() ) );
         return true;
     }
     return false;
@@ -703,7 +703,7 @@ bool ImportContext::importBooleanProperty(
     if (getBoolAttr(
             &bBool, rAttrName, xAttributes, _pImport->XMLNS_DIALOGS_UID ))
     {
-        _xControlModel->setPropertyValue( rPropName, makeAny( bBool ) );
+        _xControlModel->setPropertyValue( rPropName, Any( bBool ) );
         return true;
     }
     return false;
@@ -718,7 +718,7 @@ bool ImportContext::importLongProperty(
             _pImport->XMLNS_DIALOGS_UID, rAttrName ) );
     if (!aValue.isEmpty())
     {
-        _xControlModel->setPropertyValue( rPropName, makeAny( toInt32( aValue ) ) );
+        _xControlModel->setPropertyValue( rPropName, Any( toInt32( aValue ) ) );
         return true;
     }
     return false;
@@ -734,7 +734,7 @@ bool ImportContext::importLongProperty(
             _pImport->XMLNS_DIALOGS_UID, rAttrName ) );
     if (!aValue.isEmpty())
     {
-        _xControlModel->setPropertyValue( rPropName, makeAny( toInt32( aValue ) + nOffset ) );
+        _xControlModel->setPropertyValue( rPropName, Any( toInt32( aValue ) + nOffset ) );
         return true;
     }
     return false;
@@ -749,7 +749,7 @@ bool ImportContext::importHexLongProperty(
             _pImport->XMLNS_DIALOGS_UID, rAttrName ) );
     if (!aValue.isEmpty())
     {
-        _xControlModel->setPropertyValue( rPropName, makeAny( toInt32( aValue ) ) );
+        _xControlModel->setPropertyValue( rPropName, Any( toInt32( aValue ) ) );
         return true;
     }
     return false;
@@ -764,7 +764,7 @@ bool ImportContext::importShortProperty(
             _pImport->XMLNS_DIALOGS_UID, rAttrName ) );
     if (!aValue.isEmpty())
     {
-        _xControlModel->setPropertyValue( rPropName, makeAny( static_cast<sal_Int16>(toInt32( aValue )) ) );
+        _xControlModel->setPropertyValue( rPropName, Any( static_cast<sal_Int16>(toInt32( aValue )) ) );
         return true;
     }
     return false;
@@ -801,7 +801,7 @@ bool ImportContext::importAlignProperty(
             throw xml::sax::SAXException("invalid align value!", Reference< XInterface >(), Any() );
         }
 
-        _xControlModel->setPropertyValue( rPropName, makeAny( nAlign ) );
+        _xControlModel->setPropertyValue( rPropName, Any( nAlign ) );
         return true;
     }
     return false;
@@ -835,7 +835,7 @@ bool ImportContext::importVerticalAlignProperty(
             throw xml::sax::SAXException( "invalid vertical align value!", Reference< XInterface >(), Any() );
         }
 
-        _xControlModel->setPropertyValue( rPropName, makeAny( eAlign ) );
+        _xControlModel->setPropertyValue( rPropName, Any( eAlign ) );
         return true;
     }
     return false;
@@ -876,7 +876,7 @@ bool ImportContext::importGraphicOrImageProperty(
             Reference<beans::XPropertySet> xProps = getControlModel();
             if (xProps.is())
             {
-                xProps->setPropertyValue("Graphic", makeAny(xGraphic));
+                xProps->setPropertyValue("Graphic", Any(xGraphic));
                 return true;
             }
         }
@@ -887,7 +887,7 @@ bool ImportContext::importGraphicOrImageProperty(
             Reference<beans::XPropertySet> xProps = getControlModel();
             if (xProps.is())
             {
-                xProps->setPropertyValue("ImageURL", makeAny(sURL));
+                xProps->setPropertyValue("ImageURL", Any(sURL));
                 return true;
             }
         }
@@ -917,7 +917,7 @@ bool ImportContext::importDataAwareProperty(
             if ( xBindable.is() && xConvertor.is() )
             {
                 table::CellAddress aAddress;
-                xConvertor->setPropertyValue( "PersistentRepresentation" , uno::makeAny( sLinkedCell ) );
+                xConvertor->setPropertyValue( "PersistentRepresentation" , uno::Any( sLinkedCell ) );
                 xConvertor->getPropertyValue( "Address" ) >>= aAddress;
                 beans::NamedValue aArg1;
                 aArg1.Name = "BoundCell";
@@ -936,7 +936,7 @@ bool ImportContext::importDataAwareProperty(
             if ( xListEntrySink.is() && xConvertor.is() )
             {
                 table::CellRangeAddress aAddress;
-                xConvertor->setPropertyValue( "PersistentRepresentation" , uno::makeAny( sCellRange ) );
+                xConvertor->setPropertyValue( "PersistentRepresentation" , uno::Any( sCellRange ) );
                 xConvertor->getPropertyValue( "Address" ) >>= aAddress;
                 beans::NamedValue aArg1;
                 aArg1.Name = "CellRange";
@@ -982,7 +982,7 @@ bool ImportContext::importImageAlignProperty(
             throw xml::sax::SAXException( "invalid image align value!", Reference< XInterface >(), Any() );
         }
 
-        _xControlModel->setPropertyValue( rPropName, makeAny( nAlign ) );
+        _xControlModel->setPropertyValue( rPropName, Any( nAlign ) );
         return true;
     }
     return false;
@@ -1055,7 +1055,7 @@ bool ImportContext::importImagePositionProperty(
             throw xml::sax::SAXException( "invalid image position value!", Reference< XInterface >(), Any() );
         }
 
-        _xControlModel->setPropertyValue( rPropName, makeAny( nPosition ) );
+        _xControlModel->setPropertyValue( rPropName, Any( nPosition ) );
         return true;
     }
     return false;
@@ -1092,7 +1092,7 @@ bool ImportContext::importButtonTypeProperty(
             throw xml::sax::SAXException( "invalid button-type value!", Reference< XInterface >(), Any() );
         }
 
-        _xControlModel->setPropertyValue( rPropName, makeAny( static_cast<sal_Int16>(nButtonType) ) );
+        _xControlModel->setPropertyValue( rPropName, Any( static_cast<sal_Int16>(nButtonType) ) );
         return true;
     }
     return false;
@@ -1161,7 +1161,7 @@ bool ImportContext::importDateFormatProperty(
             throw xml::sax::SAXException( "invalid date-format value!", Reference< XInterface >(), Any() );
         }
 
-        _xControlModel->setPropertyValue( rPropName, makeAny( nFormat ) );
+        _xControlModel->setPropertyValue( rPropName, Any( nFormat ) );
         return true;
     }
     return false;
@@ -1178,7 +1178,7 @@ bool ImportContext::importTimeProperty(
     {
         ::tools::Time aTTime(toInt32( aValue ) * ::tools::Time::nanoPerCenti);
         util::Time aUTime(aTTime.GetUNOTime());
-        _xControlModel->setPropertyValue( rPropName, makeAny( aUTime ) );
+        _xControlModel->setPropertyValue( rPropName, Any( aUTime ) );
         return true;
     }
     return false;
@@ -1195,7 +1195,7 @@ bool ImportContext::importDateProperty(
     {
         ::Date aTDate(toInt32( aValue ));
         util::Date aUDate(aTDate.GetUNODate());
-        _xControlModel->setPropertyValue( rPropName, makeAny( aUDate ) );
+        _xControlModel->setPropertyValue( rPropName, Any( aUDate ) );
         return true;
     }
     return false;
@@ -1240,7 +1240,7 @@ bool ImportContext::importTimeFormatProperty(
             throw xml::sax::SAXException( "invalid time-format value!", Reference< XInterface >(), Any() );
         }
 
-        _xControlModel->setPropertyValue( rPropName, makeAny( nFormat ) );
+        _xControlModel->setPropertyValue( rPropName, Any( nFormat ) );
         return true;
     }
     return false;
@@ -1269,7 +1269,7 @@ bool ImportContext::importOrientationProperty(
             throw xml::sax::SAXException( "invalid orientation value!", Reference< XInterface >(), Any() );
         }
 
-        _xControlModel->setPropertyValue( rPropName, makeAny( nOrient ) );
+        _xControlModel->setPropertyValue( rPropName, Any( nOrient ) );
         return true;
     }
     return false;
@@ -1302,7 +1302,7 @@ bool ImportContext::importLineEndFormatProperty(
             throw xml::sax::SAXException( "invalid line end format value!", Reference< XInterface >(), Any() );
         }
 
-        _xControlModel->setPropertyValue( rPropName, makeAny( nFormat ) );
+        _xControlModel->setPropertyValue( rPropName, Any( nFormat ) );
         return true;
     }
     return false;
@@ -1340,7 +1340,7 @@ bool ImportContext::importSelectionTypeProperty(
             throw xml::sax::SAXException( "invalid selection type value!", Reference< XInterface >(), Any() );
         }
 
-        _xControlModel->setPropertyValue( rPropName, makeAny( eSelectionType ) );
+        _xControlModel->setPropertyValue( rPropName, Any( eSelectionType ) );
         return true;
     }
     return false;
@@ -1375,7 +1375,7 @@ bool ImportContext::importImageScaleModeProperty(
                 Reference< XInterface >(), Any() );
         }
 
-        _xControlModel->setPropertyValue( rPropName, makeAny( nImageScaleMode ) );
+        _xControlModel->setPropertyValue( rPropName, Any( nImageScaleMode ) );
         return true;
     }
     return false;
@@ -1532,7 +1532,7 @@ void ImportContext::importEvents(
             getStringAttr( &descr.AddListenerParam, "param", xAttributes, _pImport->XMLNS_DIALOGS_UID );
         }
 
-        xEvents->insertByName( descr.ListenerType + "::" + descr.EventMethod, makeAny( descr ) );
+        xEvents->insertByName( descr.ListenerType + "::" + descr.EventMethod, Any( descr ) );
     }
 }
 void ImportContext::importScollableSettings(
@@ -1563,14 +1563,14 @@ void ImportContext::importDefaults(
     Reference< xml::input::XAttributes > const & xAttributes,
     bool supportPrintable )
 {
-    _xControlModel->setPropertyValue( "Name", makeAny( _aId ) );
+    _xControlModel->setPropertyValue( "Name", Any( _aId ) );
 
     importShortProperty( "TabIndex", "tab-index", xAttributes );
 
     sal_Bool bDisable = false;
     if (getBoolAttr( &bDisable,"disabled", xAttributes, _pImport->XMLNS_DIALOGS_UID ) && bDisable)
     {
-        _xControlModel->setPropertyValue( "Enabled", makeAny( false ) );
+        _xControlModel->setPropertyValue( "Enabled", Any( false ) );
     }
 
     sal_Bool bVisible = true;
@@ -1578,7 +1578,7 @@ void ImportContext::importDefaults(
     {
         try
         {
-                _xControlModel->setPropertyValue( "EnableVisible", makeAny( false ) );
+                _xControlModel->setPropertyValue( "EnableVisible", Any( false ) );
         }
         catch( Exception& )
         {
@@ -1604,7 +1604,7 @@ void ImportContext::importDefaults(
     {
         nLong = 0;
     }
-    _xControlModel->setPropertyValue( "Step", makeAny( nLong ) );
+    _xControlModel->setPropertyValue( "Step", Any( nLong ) );
 
     importStringProperty("Tag", "tag", xAttributes );
     importStringProperty( "HelpText", "help-text", xAttributes );