include/vbahelper/vbacollectionimpl.hxx | 6 +-
vbahelper/source/msforms/vbabutton.cxx | 2
vbahelper/source/msforms/vbacheckbox.cxx | 6 +-
vbahelper/source/msforms/vbacombobox.cxx | 8 +-
vbahelper/source/msforms/vbacontrol.cxx | 14 ++--
vbahelper/source/msforms/vbacontrols.cxx | 6 +-
vbahelper/source/msforms/vbaframe.cxx | 2
vbahelper/source/msforms/vbalabel.cxx | 4 -
vbahelper/source/msforms/vbalistbox.cxx | 16 ++---
vbahelper/source/msforms/vbalistcontrolhelper.cxx | 8 +-
vbahelper/source/msforms/vbamultipage.cxx | 6 +-
vbahelper/source/msforms/vbaradiobutton.cxx | 6 +-
vbahelper/source/msforms/vbascrollbar.cxx | 8 +-
vbahelper/source/msforms/vbaspinbutton.cxx | 4 -
vbahelper/source/msforms/vbatextbox.cxx | 4 -
vbahelper/source/msforms/vbatogglebutton.cxx | 8 +-
vbahelper/source/msforms/vbauserform.cxx | 4 -
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 4 -
vbahelper/source/vbahelper/vbacolorformat.cxx | 4 -
vbahelper/source/vbahelper/vbacommandbar.cxx | 6 +-
vbahelper/source/vbahelper/vbacommandbarcontrol.cxx | 12 ++--
vbahelper/source/vbahelper/vbacommandbarcontrols.cxx | 8 +-
vbahelper/source/vbahelper/vbacommandbars.cxx | 2
vbahelper/source/vbahelper/vbadocumentsbase.cxx | 10 +--
vbahelper/source/vbahelper/vbafillformat.cxx | 10 +--
vbahelper/source/vbahelper/vbafontbase.cxx | 10 +--
vbahelper/source/vbahelper/vbaglobalbase.cxx | 4 -
vbahelper/source/vbahelper/vbahelper.cxx | 6 +-
vbahelper/source/vbahelper/vbalineformat.cxx | 14 ++--
vbahelper/source/vbahelper/vbapictureformat.cxx | 4 -
vbahelper/source/vbahelper/vbashape.cxx | 28 ++++-----
vbahelper/source/vbahelper/vbashaperange.cxx | 56 +++++++++----------
vbahelper/source/vbahelper/vbashapes.cxx | 40 ++++++-------
vbahelper/source/vbahelper/vbatextframe.cxx | 8 +-
34 files changed, 169 insertions(+), 169 deletions(-)
New commits:
commit 46972be699730f4dc381a19b5d50a02eae407a71
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon May 2 22:24:37 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue May 3 13:35:43 2022 +0200
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 <sberg...@redhat.com>
diff --git a/include/vbahelper/vbacollectionimpl.hxx
b/include/vbahelper/vbacollectionimpl.hxx
index c6a0b85aee75..7b3af3e55511 100644
--- a/include/vbahelper/vbacollectionimpl.hxx
+++ b/include/vbahelper/vbacollectionimpl.hxx
@@ -167,7 +167,7 @@ private:
virtual css::uno::Any SAL_CALL nextElement( ) override
{
if ( hasMoreElements() )
- return css::uno::makeAny( *mIt++ );
+ return css::uno::Any( *mIt++ );
throw css::container::NoSuchElementException();
}
};
@@ -184,7 +184,7 @@ public:
{
if ( !hasByName(aName) )
throw css::container::NoSuchElementException();
- return css::uno::makeAny( *cachePos );
+ return css::uno::Any( *cachePos );
}
virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( )
override
{
@@ -220,7 +220,7 @@ public:
if ( Index < 0 || Index >= getCount() )
throw css::lang::IndexOutOfBoundsException();
- return css::uno::makeAny( mXNamedVec[ Index ] );
+ return css::uno::Any( mXNamedVec[ Index ] );
}
// XEnumerationAccess
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
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index dc612a8309eb..f5624d40bc9f 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -127,7 +127,7 @@ IMPL_LINK_NOARG(VbaTimer, MacroCallHdl, Timer *, void)
// must be the last call in the method since it deletes the timer
try
{
- m_xBase->OnTime( uno::makeAny( m_aTimerInfo.second.first ),
m_aTimerInfo.first, uno::makeAny( m_aTimerInfo.second.second ), uno::makeAny(
false ) );
+ m_xBase->OnTime( uno::Any( m_aTimerInfo.second.first ),
m_aTimerInfo.first, uno::Any( m_aTimerInfo.second.second ), uno::Any( false ) );
} catch( uno::Exception& )
{}
}
@@ -320,7 +320,7 @@ VbaApplicationBase::CommandBars( const uno::Any& aIndex )
uno::Reference< XCommandBars > xCommandBars( new ScVbaCommandBars( this,
mxContext, uno::Reference< container::XIndexAccess >(), getCurrentDocument() )
);
if( aIndex.hasValue() )
return xCommandBars->Item( aIndex, uno::Any() );
- return uno::makeAny( xCommandBars );
+ return uno::Any( xCommandBars );
}
OUString SAL_CALL
diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx
b/vbahelper/source/vbahelper/vbacolorformat.cxx
index ec33f899054a..56180a98fb6a 100644
--- a/vbahelper/source/vbahelper/vbacolorformat.cxx
+++ b/vbahelper/source/vbahelper/vbacolorformat.cxx
@@ -87,13 +87,13 @@ ScVbaColorFormat::setRGB( sal_Int32 _rgb )
switch( m_nColorFormatType )
{
case ColorFormatType::LINEFORMAT_FORECOLOR:
- m_xPropertySet->setPropertyValue( "LineColor" , uno::makeAny( nRGB ) );
+ m_xPropertySet->setPropertyValue( "LineColor" , uno::Any( nRGB ) );
break;
case ColorFormatType::LINEFORMAT_BACKCOLOR:
// TODO BackColor not supported
break;
case ColorFormatType::FILLFORMAT_FORECOLOR:
- m_xPropertySet->setPropertyValue( "FillColor" , uno::makeAny( nRGB ) );
+ m_xPropertySet->setPropertyValue( "FillColor" , uno::Any( nRGB ) );
if( m_pFillFormat )
{
m_pFillFormat->setForeColorAndInternalStyle(nRGB);
diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx
b/vbahelper/source/vbahelper/vbacommandbar.cxx
index b9cb17e6271e..ba8f9fe21b27 100644
--- a/vbahelper/source/vbahelper/vbacommandbar.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.cxx
@@ -72,7 +72,7 @@ void SAL_CALL
ScVbaCommandBar::setName( const OUString& _name )
{
uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings,
uno::UNO_QUERY_THROW );
- xPropertySet->setPropertyValue( "UIName" , uno::makeAny( _name ) );
+ xPropertySet->setPropertyValue( "UIName" , uno::Any( _name ) );
pCBarHelper->ApplyTempChange( m_sResourceUrl, m_xBarSettings );
}
@@ -154,7 +154,7 @@ ScVbaCommandBar::Controls( const uno::Any& aIndex )
{
return xCommandBarControls->Item( aIndex, uno::Any() );
}
- return uno::makeAny( xCommandBarControls );
+ return uno::Any( xCommandBarControls );
}
sal_Int32 SAL_CALL
@@ -170,7 +170,7 @@ uno::Any SAL_CALL
ScVbaCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any&
/*aId*/, const uno::Any& /*aTag*/, const uno::Any& /*aVisible*/, const
uno::Any& /*aRecursive*/ )
{
// alwayse fail to find control
- return uno::makeAny( uno::Reference< XCommandBarControl > () );
+ return uno::Any( uno::Reference< XCommandBarControl > () );
}
OUString
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
index d7220f071e8d..2ab2794e4071 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
@@ -32,7 +32,7 @@ ScVbaCommandBarControl::ScVbaCommandBarControl( const
css::uno::Reference< ov::X
void ScVbaCommandBarControl::ApplyChange()
{
uno::Reference< container::XIndexContainer > xIndexContainer(
m_xCurrentSettings, uno::UNO_QUERY_THROW );
- xIndexContainer->replaceByIndex( m_nPosition, uno::makeAny(
m_aPropertyValues ) );
+ xIndexContainer->replaceByIndex( m_nPosition, uno::Any( m_aPropertyValues
) );
pCBarHelper->ApplyTempChange( m_sResourceUrl, m_xBarSettings );
}
@@ -49,7 +49,7 @@ void SAL_CALL
ScVbaCommandBarControl::setCaption( const OUString& _caption )
{
OUString sCaption = _caption.replace('&','~');
- setPropertyValue( m_aPropertyValues, "Label" , uno::makeAny( sCaption ) );
+ setPropertyValue( m_aPropertyValues, "Label" , uno::Any( sCaption ) );
ApplyChange();
}
@@ -71,7 +71,7 @@ ScVbaCommandBarControl::setOnAction( const OUString&
_onaction )
{
OUString aCommandURL = ooo::vba::makeMacroURL(
aResolvedMacro.msResolvedMacro );
SAL_INFO("vbahelper", "ScVbaCommandBarControl::setOnAction: " <<
aCommandURL);
- setPropertyValue( m_aPropertyValues, "CommandURL" , uno::makeAny(
aCommandURL ) );
+ setPropertyValue( m_aPropertyValues, "CommandURL" , uno::Any(
aCommandURL ) );
ApplyChange();
}
}
@@ -91,7 +91,7 @@ ScVbaCommandBarControl::setVisible( sal_Bool _visible )
uno::Any aValue = getPropertyValue( m_aPropertyValues,
ITEM_DESCRIPTOR_ISVISIBLE );
if( aValue.hasValue() )
{
- setPropertyValue( m_aPropertyValues, ITEM_DESCRIPTOR_ISVISIBLE ,
uno::makeAny( _visible ) );
+ setPropertyValue( m_aPropertyValues, ITEM_DESCRIPTOR_ISVISIBLE ,
uno::Any( _visible ) );
ApplyChange();
}
}
@@ -120,7 +120,7 @@ ScVbaCommandBarControl::setEnabled( sal_Bool _enabled )
uno::Any aValue = getPropertyValue( m_aPropertyValues,
ITEM_DESCRIPTOR_ENABLED );
if( aValue.hasValue() )
{
- setPropertyValue( m_aPropertyValues, ITEM_DESCRIPTOR_ENABLED ,
uno::makeAny( _enabled ) );
+ setPropertyValue( m_aPropertyValues, ITEM_DESCRIPTOR_ENABLED ,
uno::Any( _enabled ) );
ApplyChange();
}
else
@@ -173,7 +173,7 @@ ScVbaCommandBarControl::Controls( const uno::Any& aIndex )
{
return xCommandBarControls->Item( aIndex, uno::Any() );
}
- return uno::makeAny( xCommandBarControls );
+ return uno::Any( xCommandBarControls );
}
OUString
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index 7936247ac541..27f2d5088559 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
@@ -46,7 +46,7 @@ public:
if( !hasMoreElements() )
throw container::NoSuchElementException();
- return m_pCommandBarControls->createCollectionObject( uno::makeAny(
m_nCurrentPosition++ ) );
+ return m_pCommandBarControls->createCollectionObject( uno::Any(
m_nCurrentPosition++ ) );
}
};
@@ -127,7 +127,7 @@ ScVbaCommandBarControls::createCollectionObject( const
uno::Any& aSource )
else
pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext,
m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition );
- return uno::makeAny( uno::Reference< XCommandBarControl > (
pNewCommandBarControl ) );
+ return uno::Any( uno::Reference< XCommandBarControl > (
pNewCommandBarControl ) );
}
// Methods
@@ -151,7 +151,7 @@ ScVbaCommandBarControls::Item( const uno::Any& aIndex,
const uno::Any& /*aIndex*
throw uno::RuntimeException();
}
- return createCollectionObject( uno::makeAny( nPosition ) );
+ return createCollectionObject( uno::Any( nPosition ) );
}
uno::Reference< XCommandBarControl > SAL_CALL
@@ -205,7 +205,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const
uno::Any& Id, const un
uno::Reference< container::XIndexContainer > xIndexContainer(
m_xIndexAccess, uno::UNO_QUERY_THROW );
- xIndexContainer->insertByIndex( nPosition, uno::makeAny( aProps ) );
+ xIndexContainer->insertByIndex( nPosition, uno::Any( aProps ) );
pCBarHelper->ApplyTempChange( m_sResourceUrl, m_xBarSettings );
diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx
b/vbahelper/source/vbahelper/vbacommandbars.cxx
index 4cc3d28e0cf5..0ee8eaccfb0e 100644
--- a/vbahelper/source/vbahelper/vbacommandbars.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbars.cxx
@@ -61,7 +61,7 @@ public:
// Strange, shouldn't the Enumeration support match/share the
// iteration code? ( e.g. ScVbaCommandBars::Item(...) )
// and we at least should return here ( something ) it seems
- return uno::makeAny( xCommandBar );
+ return uno::Any( xCommandBar );
}
else
return nextElement();
diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index 2d940ed48e0f..607ad57fc582 100644
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -89,7 +89,7 @@ public:
{
throw container::NoSuchElementException();
}
- return makeAny( *(m_it++) );
+ return css::uno::Any( *(m_it++) );
}
};
@@ -150,7 +150,7 @@ public:
if ( Index < 0
|| o3tl::make_unsigned(Index) >= m_documents.size() )
throw lang::IndexOutOfBoundsException();
- return makeAny( m_documents[ Index ] ); // returns xspreadsheetdoc
+ return css::uno::Any( m_documents[ Index ] ); // returns
xspreadsheetdoc
}
//XElementAccess
@@ -170,7 +170,7 @@ public:
NameIndexHash::const_iterator it = namesToIndices.find( aName );
if ( it == namesToIndices.end() )
throw container::NoSuchElementException();
- return makeAny( m_documents[ it->second ] );
+ return css::uno::Any( m_documents[ it->second ] );
}
@@ -256,7 +256,7 @@ uno::Any VbaDocumentsBase::createDocument()
// #163808# lock document controllers and container window if specified by
application
lclSetupComponent( xComponent, bScreenUpdating, bInteractive );
- return uno::makeAny( xComponent );
+ return uno::Any( xComponent );
}
// #TODO# #FIXME# can any of the unused params below be used?
@@ -313,7 +313,7 @@ uno::Any VbaDocumentsBase::openDocument( const OUString&
rFileName, const uno::A
// #163808# lock document controllers and container window if specified by
application
lclSetupComponent( xComponent, bScreenUpdating, bInteractive );
- return uno::makeAny( xComponent );
+ return uno::Any( xComponent );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vbahelper/source/vbahelper/vbafillformat.cxx
b/vbahelper/source/vbahelper/vbafillformat.cxx
index e72be2c908fc..442efbccbf6b 100644
--- a/vbahelper/source/vbahelper/vbafillformat.cxx
+++ b/vbahelper/source/vbahelper/vbafillformat.cxx
@@ -40,7 +40,7 @@ ScVbaFillFormat::setFillStyle( drawing::FillStyle nFillStyle )
m_nFillStyle = nFillStyle;
if( m_nFillStyle == drawing::FillStyle_GRADIENT )
{
- m_xPropertySet->setPropertyValue( "FillStyle" , uno::makeAny(
drawing::FillStyle_GRADIENT ) );
+ m_xPropertySet->setPropertyValue( "FillStyle" , uno::Any(
drawing::FillStyle_GRADIENT ) );
awt::Gradient aGradient;
// AXIAL
// RADIAL
@@ -57,11 +57,11 @@ ScVbaFillFormat::setFillStyle( drawing::FillStyle
nFillStyle )
aGradient.StartIntensity = 100;
aGradient.EndIntensity = 100;
aGradient.StepCount = 1;
- m_xPropertySet->setPropertyValue( "FillGradient" , uno::makeAny(
aGradient ) );
+ m_xPropertySet->setPropertyValue( "FillGradient" , uno::Any( aGradient
) );
}
else if( m_nFillStyle == drawing::FillStyle_SOLID )
{
- m_xPropertySet->setPropertyValue( "FillStyle" ,
uno::makeAny(drawing::FillStyle_SOLID) );
+ m_xPropertySet->setPropertyValue( "FillStyle" ,
uno::Any(drawing::FillStyle_SOLID) );
}
}
@@ -90,7 +90,7 @@ ScVbaFillFormat::setVisible( sal_Bool _visible )
m_xPropertySet->getPropertyValue( "FillStyle" ) >>= aFillStyle;
if( !_visible )
{
- m_xPropertySet->setPropertyValue( "FillStyle" , uno::makeAny(
drawing::FillStyle_NONE ) );
+ m_xPropertySet->setPropertyValue( "FillStyle" , uno::Any(
drawing::FillStyle_NONE ) );
}
else
{
@@ -116,7 +116,7 @@ void SAL_CALL
ScVbaFillFormat::setTransparency( double _transparency )
{
sal_Int16 nTransparence = static_cast< sal_Int16 >( _transparency * 100 );
- m_xPropertySet->setPropertyValue( "FillTransparence" , uno::makeAny(
nTransparence ) );
+ m_xPropertySet->setPropertyValue( "FillTransparence" , uno::Any(
nTransparence ) );
}
diff --git a/vbahelper/source/vbahelper/vbafontbase.cxx
b/vbahelper/source/vbahelper/vbafontbase.cxx
index 2610bdfc7284..50bac8f92d25 100644
--- a/vbahelper/source/vbahelper/vbafontbase.cxx
+++ b/vbahelper/source/vbahelper/vbafontbase.cxx
@@ -77,7 +77,7 @@ VbaFontBase::getSuperscript()
// not supported in form controls
if( !mbFormControl )
mxFont->getPropertyValue( "CharEscapement" ) >>= nValue;
- return uno::makeAny( nValue == SUPERSCRIPT );
+ return uno::Any( nValue == SUPERSCRIPT );
}
void SAL_CALL
@@ -110,7 +110,7 @@ VbaFontBase::getSubscript()
// not supported in form controls
if( !mbFormControl )
mxFont->getPropertyValue( "CharEscapement" ) >>= nValue;
- return uno::makeAny( nValue == SUBSCRIPT );
+ return uno::Any( nValue == SUBSCRIPT );
}
void SAL_CALL
@@ -166,7 +166,7 @@ VbaFontBase::getColorIndex()
break;
}
}
- return uno::makeAny( nIndex );
+ return uno::Any( nIndex );
}
void SAL_CALL
@@ -186,7 +186,7 @@ VbaFontBase::getBold()
{
double fValue = 0.0;
mxFont->getPropertyValue( VBAFONTBASE_PROPNAME( "CharWeight", "FontWeight"
) ) >>= fValue;
- return uno::makeAny( fValue == awt::FontWeight::BOLD );
+ return uno::Any( fValue == awt::FontWeight::BOLD );
}
void SAL_CALL
@@ -237,7 +237,7 @@ VbaFontBase::getItalic()
{
awt::FontSlant aFS;
mxFont->getPropertyValue( VBAFONTBASE_PROPNAME( "CharPosture", "FontSlant"
) ) >>= aFS;
- return uno::makeAny( aFS == awt::FontSlant_ITALIC );
+ return uno::Any( aFS == awt::FontSlant_ITALIC );
}
void SAL_CALL
diff --git a/vbahelper/source/vbahelper/vbaglobalbase.cxx
b/vbahelper/source/vbahelper/vbaglobalbase.cxx
index 0e1dcf2b178a..13273f246060 100644
--- a/vbahelper/source/vbahelper/vbaglobalbase.cxx
+++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx
@@ -54,7 +54,7 @@ const uno::Reference< uno::XComponentContext >& xContext,
const OUString& sDocCt
{
::cppu::ContextEntry_Init( gsApplication, uno::Any() ),
::cppu::ContextEntry_Init( sDocCtxName, uno::Any() ),
- ::cppu::ContextEntry_Init(
"/singletons/com.sun.star.lang.theServiceManager" , uno::makeAny( aSrvMgr ) )
+ ::cppu::ContextEntry_Init(
"/singletons/com.sun.star.lang.theServiceManager" , uno::Any( aSrvMgr ) )
};
// don't pass a delegate, this seems to introduce yet another cyclic
dependency ( and
// some strange behavior
@@ -68,7 +68,7 @@ const uno::Reference< uno::XComponentContext >& xContext,
const OUString& sDocCt
{
uno::Reference< beans::XPropertySet >(
aSrvMgr, uno::UNO_QUERY_THROW )->
- setPropertyValue( "DefaultContext", uno::makeAny( mxContext ) );
+ setPropertyValue( "DefaultContext", uno::Any( mxContext ) );
}
catch ( uno::RuntimeException & )
{
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx
b/vbahelper/source/vbahelper/vbahelper.cxx
index 25da3beca4d4..b0f6b291e953 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -111,7 +111,7 @@ getTypeConverter( const uno::Reference<
uno::XComponentContext >& xContext )
const uno::Any&
aNULL()
{
- static uno::Any aNULLL = uno::makeAny( uno::Reference< uno::XInterface
>() );
+ static uno::Any aNULLL{ uno::Reference< uno::XInterface >() };
return aNULLL;
}
@@ -323,7 +323,7 @@ OORGBToXLRGB( const uno::Any& aCol )
sal_Int32 nCol(0);
aCol >>= nCol;
nCol = OORGBToXLRGB( nCol );
- return uno::makeAny( nCol );
+ return uno::Any( nCol );
}
uno::Any
XLRGBToOORGB( const uno::Any& aCol )
@@ -331,7 +331,7 @@ XLRGBToOORGB( const uno::Any& aCol )
sal_Int32 nCol(0);
aCol >>= nCol;
nCol = XLRGBToOORGB( nCol );
- return uno::makeAny( nCol );
+ return uno::Any( nCol );
}
void PrintOutHelper( SfxViewShell const * pViewShell, const uno::Any& From,
const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const
uno::Any& /*ActivePrinter*/, const uno::Any& /*PrintToFile*/, const uno::Any&
Collate, const uno::Any& PrToFileName, bool bUseSelection )
diff --git a/vbahelper/source/vbahelper/vbalineformat.cxx
b/vbahelper/source/vbahelper/vbalineformat.cxx
index d7b2ad8bf16c..2f5bf21400f3 100644
--- a/vbahelper/source/vbahelper/vbalineformat.cxx
+++ b/vbahelper/source/vbahelper/vbalineformat.cxx
@@ -118,7 +118,7 @@ void SAL_CALL
ScVbaLineFormat::setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle )
{
OUString sArrayName = convertArrowheadStyleToLineStartEndName(
_beginarrowheadstyle );
- m_xPropertySet->setPropertyValue( "LineStartName" , uno::makeAny(
sArrayName ) );
+ m_xPropertySet->setPropertyValue( "LineStartName" , uno::Any( sArrayName )
);
}
sal_Int32 SAL_CALL
@@ -216,7 +216,7 @@ ScVbaLineFormat::setWeight( double _weight )
aMillimeter.setInPoints( _weight );
sal_Int32 nLineWidth = static_cast<sal_Int32>(
aMillimeter.getInHundredthsOfOneMillimeter() );
- m_xPropertySet->setPropertyValue( "LineWidth" , uno::makeAny( nLineWidth )
);
+ m_xPropertySet->setPropertyValue( "LineWidth" , uno::Any( nLineWidth ) );
setDashStyle( m_nLineDashStyle );
}
@@ -240,7 +240,7 @@ ScVbaLineFormat::setVisible( sal_Bool _visible )
if( !_visible )
{
aLineStyle = drawing::LineStyle_NONE;
- m_xPropertySet->setPropertyValue( "LineStyle" , uno::makeAny(
aLineStyle ) );
+ m_xPropertySet->setPropertyValue( "LineStyle" , uno::Any( aLineStyle )
);
}
else
{
@@ -264,7 +264,7 @@ void SAL_CALL
ScVbaLineFormat::setTransparency( double _transparency )
{
sal_Int16 nTransparency = static_cast<sal_Int16>( _transparency * 100 );
- m_xPropertySet->setPropertyValue( "LineTransparence" , uno::makeAny(
nTransparency ) );
+ m_xPropertySet->setPropertyValue( "LineTransparence" , uno::Any(
nTransparency ) );
}
sal_Int16 SAL_CALL
@@ -343,11 +343,11 @@ ScVbaLineFormat::setDashStyle( sal_Int32 _dashstyle )
m_nLineDashStyle = _dashstyle;
if( _dashstyle == office::MsoLineDashStyle::msoLineSolid )
{
- m_xPropertySet->setPropertyValue( "LineStyle" , uno::makeAny(
drawing::LineStyle_SOLID ));
+ m_xPropertySet->setPropertyValue( "LineStyle" , uno::Any(
drawing::LineStyle_SOLID ));
}
else
{
- m_xPropertySet->setPropertyValue( "LineStyle" , uno::makeAny(
drawing::LineStyle_DASH ) );
+ m_xPropertySet->setPropertyValue( "LineStyle" , uno::Any(
drawing::LineStyle_DASH ) );
drawing::LineDash aLineDash;
Millimeter aMillimeter( m_nLineWeight );
sal_Int32 nPixel = static_cast< sal_Int32 >(
aMillimeter.getInHundredthsOfOneMillimeter() );
@@ -405,7 +405,7 @@ ScVbaLineFormat::setDashStyle( sal_Int32 _dashstyle )
default:
throw uno::RuntimeException( "this MsoLineDashStyle is not
supported." );
}
- m_xPropertySet->setPropertyValue( "LineDash" , uno::makeAny( aLineDash
) );
+ m_xPropertySet->setPropertyValue( "LineDash" , uno::Any( aLineDash ) );
}
}
diff --git a/vbahelper/source/vbahelper/vbapictureformat.cxx
b/vbahelper/source/vbahelper/vbapictureformat.cxx
index 8e3578f1d35c..a5cdcaed2cf7 100644
--- a/vbahelper/source/vbahelper/vbapictureformat.cxx
+++ b/vbahelper/source/vbahelper/vbapictureformat.cxx
@@ -59,7 +59,7 @@ ScVbaPictureFormat::setBrightness( double _brightness )
checkParameterRangeInDouble( _brightness, 0.0, 1.0 );
double fLuminance = _brightness * 200 - 100;
sal_Int16 nLuminance = static_cast< sal_Int16 >( fLuminance );
- m_xPropertySet->setPropertyValue( "AdjustLuminance" , uno::makeAny(
nLuminance ) );
+ m_xPropertySet->setPropertyValue( "AdjustLuminance" , uno::Any( nLuminance
) );
}
double SAL_CALL
@@ -78,7 +78,7 @@ ScVbaPictureFormat::setContrast( double _contrast )
checkParameterRangeInDouble( _contrast, 0.0, 1.0 );
double fContrast = _contrast * 200 - 100;
sal_Int16 nContrast = static_cast< sal_Int16 >( fContrast );
- m_xPropertySet->setPropertyValue( "AdjustContrast" , uno::makeAny(
nContrast ) );
+ m_xPropertySet->setPropertyValue( "AdjustContrast" , uno::Any( nContrast )
);
}
diff --git a/vbahelper/source/vbahelper/vbashape.cxx
b/vbahelper/source/vbahelper/vbashape.cxx
index 67998de7f6f3..1f13c70d58fc 100644
--- a/vbahelper/source/vbahelper/vbashape.cxx
+++ b/vbahelper/source/vbahelper/vbashape.cxx
@@ -280,7 +280,7 @@ ScVbaShape::setLeft( double _left )
catch( uno::Exception& )
{
sal_Int32 nLeft = Millimeter::getInHundredthsOfOneMillimeter( _left );
- m_xPropertySet->setPropertyValue( "HoriOrientPosition" , uno::makeAny(
nLeft ) );
+ m_xPropertySet->setPropertyValue( "HoriOrientPosition" , uno::Any(
nLeft ) );
}
}
@@ -311,7 +311,7 @@ ScVbaShape::setTop( double _top )
catch( uno::Exception& )
{
sal_Int32 nTop = Millimeter::getInHundredthsOfOneMillimeter( _top );
- m_xPropertySet->setPropertyValue( "VertOrientPosition" , uno::makeAny(
nTop ) );
+ m_xPropertySet->setPropertyValue( "VertOrientPosition" , uno::Any(
nTop ) );
}
}
@@ -359,7 +359,7 @@ void SAL_CALL
ScVbaShape::setRotation( double _rotation )
{
sal_Int32 nRotation = static_cast < sal_Int32 > ( _rotation * 100 );
- m_xPropertySet->setPropertyValue( "RotateAngle" , uno::makeAny( nRotation
) );
+ m_xPropertySet->setPropertyValue( "RotateAngle" , uno::Any( nRotation ) );
}
uno::Reference< msforms::XLineFormat > SAL_CALL
@@ -390,10 +390,10 @@ ScVbaShape::TextFrame()
{
uno::Reference< uno::XComponentContext > xContext =
comphelper::getProcessComponentContext();
uno::Reference< uno::XInterface > xTextFrame =
xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
"ooo.vba.excel.TextFrame" , { uno::Any(getParent()), uno::Any(m_xShape) },
xContext );
- return uno::makeAny( xTextFrame );
+ return uno::Any( xTextFrame );
}
- return uno::makeAny( uno::Reference< msforms::XTextFrame >( new
VbaTextFrame( this, mxContext, m_xShape ) ) );
+ return uno::Any( uno::Reference< msforms::XTextFrame >( new VbaTextFrame(
this, mxContext, m_xShape ) ) );
}
void SAL_CALL
@@ -412,20 +412,20 @@ ScVbaShape::ZOrder( sal_Int32 ZOrderCmd )
switch( ZOrderCmd )
{
case office::MsoZOrderCmd::msoBringToFront:
- m_xPropertySet->setPropertyValue( "ZOrder" , uno::makeAny(
SAL_MAX_INT32 ) );
+ m_xPropertySet->setPropertyValue( "ZOrder" , uno::Any( SAL_MAX_INT32 )
);
break;
case office::MsoZOrderCmd::msoSendToBack:
- m_xPropertySet->setPropertyValue( "ZOrder" , uno::makeAny(
sal_Int32(0) ) );
+ m_xPropertySet->setPropertyValue( "ZOrder" , uno::Any( sal_Int32(0) )
);
break;
case office::MsoZOrderCmd::msoBringForward:
nOrderPosition += 1;
- m_xPropertySet->setPropertyValue( "ZOrder" , uno::makeAny(
nOrderPosition ) );
+ m_xPropertySet->setPropertyValue( "ZOrder" , uno::Any( nOrderPosition
) );
break;
case office::MsoZOrderCmd::msoSendBackward:
if( nOrderPosition > 0 )
{
nOrderPosition -= 1;
- m_xPropertySet->setPropertyValue( "ZOrder" , uno::makeAny(
nOrderPosition ) );
+ m_xPropertySet->setPropertyValue( "ZOrder" , uno::Any(
nOrderPosition ) );
}
break;
// below two commands use with Writer for text and image object.
@@ -523,7 +523,7 @@ void SAL_CALL
ScVbaShape::Select( const uno::Any& /*Replace*/ )
{
uno::Reference< view::XSelectionSupplier > xSelectSupp(
m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
- xSelectSupp->select( uno::makeAny( m_xShape ) );
+ xSelectSupp->select( uno::Any( m_xShape ) );
}
// This method should not be part of Shape, what we really need to do is...
@@ -545,7 +545,7 @@ ScVbaShape::ShapeRange( const uno::Any& index )
uno::Reference< msforms::XShapeRange > xShapeRange( new ScVbaShapeRange(
mxParent, mxContext, xIndexAccess, uno::Reference< drawing::XDrawPage >(
xChild->getParent(), uno::UNO_QUERY_THROW ), m_xModel ) );
if ( index.hasValue() )
return xShapeRange->Item( index, uno::Any() );
- return uno::makeAny( xShapeRange );
+ return uno::Any( xShapeRange );
}
sal_Bool SAL_CALL
@@ -642,7 +642,7 @@ ScVbaShape::setRelativeHorizontalPosition(::sal_Int32
_relativehorizontalpositio
DebugHelper::runtimeexception(ERRCODE_BASIC_BAD_ARGUMENT);
}
}
- m_xPropertySet->setPropertyValue( "HoriOrientRelation" , uno::makeAny(
nType ) );
+ m_xPropertySet->setPropertyValue( "HoriOrientRelation" , uno::Any( nType )
);
}
sal_Int32 SAL_CALL
@@ -713,7 +713,7 @@ ScVbaShape::setRelativeVerticalPosition(::sal_Int32
_relativeverticalposition)
DebugHelper::runtimeexception(ERRCODE_BASIC_BAD_ARGUMENT);
}
}
- m_xPropertySet->setPropertyValue( "VertOrientRelation" , uno::makeAny(
nType ) );
+ m_xPropertySet->setPropertyValue( "VertOrientRelation" , uno::Any( nType )
);
}
uno::Any SAL_CALL
@@ -724,7 +724,7 @@ ScVbaShape::WrapFormat()
{
uno::Reference< uno::XComponentContext > xContext =
comphelper::getProcessComponentContext();
uno::Reference< uno::XInterface > xWrapFormat =
xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
"ooo.vba.word.WrapFormat" ,{ uno::Any(getParent()), uno::Any(m_xShape) },
xContext );
- return uno::makeAny( xWrapFormat );
+ return uno::Any( xWrapFormat );
}
throw uno::RuntimeException( "Not implemented" );
}
diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx
b/vbahelper/source/vbahelper/vbashaperange.cxx
index 7e69fc01b822..71641eef75ac 100644
--- a/vbahelper/source/vbahelper/vbashaperange.cxx
+++ b/vbahelper/source/vbahelper/vbashaperange.cxx
@@ -62,7 +62,7 @@ void SAL_CALL
ScVbaShapeRange::Select( )
{
uno::Reference< view::XSelectionSupplier > xSelectSupp(
m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
- xSelectSupp->select( uno::makeAny( getShapes() ) );
+ xSelectSupp->select( uno::Any( getShapes() ) );
}
uno::Reference< msforms::XShape > SAL_CALL
@@ -95,7 +95,7 @@ ScVbaShapeRange::IncrementRotation( double Increment )
sal_Int32 nLen = getCount();
for ( sal_Int32 index = 1; index <= nLen; ++index )
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
xShape->IncrementRotation( Increment );
}
}
@@ -106,7 +106,7 @@ ScVbaShapeRange::IncrementLeft( double Increment )
sal_Int32 nLen = getCount();
for ( sal_Int32 index = 1; index <= nLen; ++index )
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
xShape->IncrementLeft( Increment );
}
}
@@ -117,7 +117,7 @@ ScVbaShapeRange::IncrementTop( double Increment )
sal_Int32 nLen = getCount();
for ( sal_Int32 index = 1; index <= nLen; ++index )
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
xShape->IncrementTop( Increment );
}
}
@@ -128,7 +128,7 @@ OUString SAL_CALL ScVbaShapeRange::getName()
sal_Int32 index = 1;
if (index <= nLen)
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return xShape->getName( );
}
throw uno::RuntimeException();
@@ -139,7 +139,7 @@ void SAL_CALL ScVbaShapeRange::setName( const OUString&
_name )
sal_Int32 nLen = getCount();
for ( sal_Int32 index = 1; index <= nLen; ++index )
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
xShape->setName( _name );
}
}
@@ -150,7 +150,7 @@ double SAL_CALL ScVbaShapeRange::getHeight()
sal_Int32 index = 1;
if (index <= nLen)
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return xShape->getHeight( );
}
throw uno::RuntimeException();
@@ -161,7 +161,7 @@ void SAL_CALL ScVbaShapeRange::setHeight( double _height )
sal_Int32 nLen = getCount();
for ( sal_Int32 index = 1; index <= nLen; ++index )
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
xShape->setHeight( _height );
}
}
@@ -172,7 +172,7 @@ double SAL_CALL ScVbaShapeRange::getWidth()
sal_Int32 index = 1;
if (index <= nLen)
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return xShape->getWidth( );
}
throw uno::RuntimeException();
@@ -183,7 +183,7 @@ void SAL_CALL ScVbaShapeRange::setWidth( double _width )
sal_Int32 nLen = getCount();
for ( sal_Int32 index = 1; index <= nLen; ++index )
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
xShape->setWidth( _width );
}
}
@@ -194,7 +194,7 @@ double SAL_CALL ScVbaShapeRange::getLeft()
sal_Int32 index = 1;
if (index <= nLen)
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return xShape->getLeft();
}
throw uno::RuntimeException();
@@ -205,7 +205,7 @@ void SAL_CALL ScVbaShapeRange::setLeft( double _left )
sal_Int32 nLen = getCount();
for ( sal_Int32 index = 1; index <= nLen; ++index )
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
xShape->setLeft( _left );
}
}
@@ -216,7 +216,7 @@ double SAL_CALL ScVbaShapeRange::getTop()
sal_Int32 index = 1;
if (index <= nLen)
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return xShape->getTop();
}
throw uno::RuntimeException();
@@ -227,7 +227,7 @@ void SAL_CALL ScVbaShapeRange::setTop( double _top )
sal_Int32 nLen = getCount();
for ( sal_Int32 index = 1; index <= nLen; ++index )
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
xShape->setTop( _top );
}
}
@@ -238,7 +238,7 @@ uno::Reference< ov::msforms::XLineFormat > SAL_CALL
ScVbaShapeRange::getLine()
sal_Int32 index = 1;
if (index <= nLen)
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return xShape->getLine();
}
throw uno::RuntimeException();
@@ -250,7 +250,7 @@ uno::Reference< ov::msforms::XFillFormat > SAL_CALL
ScVbaShapeRange::getFill()
sal_Int32 index = 1;
if (index <= nLen)
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return xShape->getFill();
}
throw uno::RuntimeException();
@@ -262,7 +262,7 @@ sal_Bool SAL_CALL ScVbaShapeRange::getLockAspectRatio()
sal_Int32 index = 1;
if (index <= nLen)
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return xShape->getLockAspectRatio();
}
throw uno::RuntimeException();
@@ -273,7 +273,7 @@ void SAL_CALL ScVbaShapeRange::setLockAspectRatio( sal_Bool
_lockaspectratio )
sal_Int32 nLen = getCount();
for ( sal_Int32 index = 1; index <= nLen; ++index )
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
xShape->setLockAspectRatio( _lockaspectratio );
}
}
@@ -284,7 +284,7 @@ sal_Bool SAL_CALL ScVbaShapeRange::getLockAnchor()
sal_Int32 index = 1;
if (index <= nLen)
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return xShape->getLockAnchor();
}
throw uno::RuntimeException();
@@ -295,7 +295,7 @@ void SAL_CALL ScVbaShapeRange::setLockAnchor( sal_Bool
_lockanchor )
sal_Int32 nLen = getCount();
for ( sal_Int32 index = 1; index <= nLen; ++index )
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
xShape->setLockAnchor( _lockanchor );
}
}
@@ -306,7 +306,7 @@ void SAL_CALL ScVbaShapeRange::setLockAnchor( sal_Bool
_lockanchor )
sal_Int32 index = 1;
if (index <= nLen)
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return xShape->getRelativeHorizontalPosition();
}
throw uno::RuntimeException();
@@ -317,7 +317,7 @@ void SAL_CALL
ScVbaShapeRange::setRelativeHorizontalPosition( ::sal_Int32 _relat
sal_Int32 nLen = getCount();
for ( sal_Int32 index = 1; index <= nLen; ++index )
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
xShape->setRelativeHorizontalPosition( _relativehorizontalposition );
}
}
@@ -328,7 +328,7 @@ void SAL_CALL
ScVbaShapeRange::setRelativeHorizontalPosition( ::sal_Int32 _relat
sal_Int32 index = 1;
if (index <= nLen)
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return xShape->getRelativeVerticalPosition();
}
throw uno::RuntimeException();
@@ -339,7 +339,7 @@ void SAL_CALL ScVbaShapeRange::setRelativeVerticalPosition(
::sal_Int32 _relativ
sal_Int32 nLen = getCount();
for ( sal_Int32 index = 1; index <= nLen; ++index )
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
xShape->setRelativeVerticalPosition( _relativeverticalposition );
}
}
@@ -350,7 +350,7 @@ uno::Any SAL_CALL ScVbaShapeRange::TextFrame( )
sal_Int32 index = 1;
if (index <= nLen)
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return xShape->TextFrame();
}
throw uno::RuntimeException();
@@ -362,7 +362,7 @@ uno::Any SAL_CALL ScVbaShapeRange::WrapFormat( )
sal_Int32 index = 1;
if (index <= nLen)
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
return xShape->WrapFormat();
}
throw uno::RuntimeException();
@@ -373,7 +373,7 @@ void SAL_CALL ScVbaShapeRange::ZOrder( sal_Int32 ZOrderCmd )
sal_Int32 nLen = getCount();
for ( sal_Int32 index = 1; index <= nLen; ++index )
{
- uno::Reference< msforms::XShape > xShape( Item( uno::makeAny( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
+ uno::Reference< msforms::XShape > xShape( Item( uno::Any( index ),
uno::Any() ), uno::UNO_QUERY_THROW );
xShape->ZOrder( ZOrderCmd );
}
}
@@ -397,7 +397,7 @@ ScVbaShapeRange:: createCollectionObject( const
css::uno::Any& aSource )
// #TODO #FIXME Shape parent should always be the sheet the shapes belong
// to
uno::Reference< msforms::XShape > xVbShape( new ScVbaShape(
uno::Reference< XHelperInterface >(), mxContext, xShape, getShapes(), m_xModel,
ScVbaShape::getType( xShape ) ) );
- return uno::makeAny( xVbShape );
+ return uno::Any( xVbShape );
}
OUString
diff --git a/vbahelper/source/vbahelper/vbashapes.cxx
b/vbahelper/source/vbahelper/vbashapes.cxx
index 552365da3861..951c913d2664 100644
--- a/vbahelper/source/vbahelper/vbashapes.cxx
+++ b/vbahelper/source/vbahelper/vbashapes.cxx
@@ -106,7 +106,7 @@ ScVbaShapes::createCollectionObject( const css::uno::Any&
aSource )
if( aSource.hasValue() )
{
uno::Reference< drawing::XShape > xShape( aSource,
uno::UNO_QUERY_THROW );
- return uno::makeAny( uno::Reference< msforms::XShape >( new
ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel,
ScVbaShape::getType( xShape ) ) ) );
+ return uno::Any( uno::Reference< msforms::XShape >( new ScVbaShape(
getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType(
xShape ) ) ) );
}
return uno::Any();
}
@@ -194,7 +194,7 @@ ScVbaShapes::SelectAll()
uno::Reference< view::XSelectionSupplier > xSelectSupp(
m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
try
{
- xSelectSupp->select( uno::makeAny( m_xShapes ) );
+ xSelectSupp->select( uno::Any( m_xShapes ) );
}
// viewuno.cxx ScTabViewObj::select will throw IllegalArgumentException
// if one of the shapes is no 'markable' e.g. a button
@@ -239,7 +239,7 @@ ScVbaShapes::AddRectangle(sal_Int32 startX, sal_Int32
startY, sal_Int32 nLineWid
xShape->setSize( size );
rtl::Reference<ScVbaShape> pScVbaShape = new ScVbaShape( getParent(),
mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) );
- return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
+ return uno::Any( uno::Reference< msforms::XShape > ( pScVbaShape ) );
}
uno::Any
@@ -281,7 +281,7 @@ ScVbaShapes::AddEllipse(sal_Int32 startX, sal_Int32 startY,
sal_Int32 nLineWidth
xShape->setSize(size);
rtl::Reference<ScVbaShape> pScVbaShape = new ScVbaShape( getParent(),
mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) );
- return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
+ return uno::Any( uno::Reference< msforms::XShape > ( pScVbaShape ) );
}
//helperapi calc
@@ -316,7 +316,7 @@ ScVbaShapes::AddLine( sal_Int32 StartX, sal_Int32 StartY,
sal_Int32 endX, sal_In
xShape->setSize(size);
rtl::Reference<ScVbaShape> pScVbaShape = new ScVbaShape( getParent(),
mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) );
- return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
+ return uno::Any( uno::Reference< msforms::XShape > ( pScVbaShape ) );
}
uno::Any SAL_CALL
@@ -366,33 +366,33 @@ ScVbaShapes::AddTextboxInWriter( sal_Int32 _nLeft,
sal_Int32 _nTop, sal_Int32 _n
xShape->setSize(size);
uno::Reference< beans::XPropertySet > xShapeProps( xShape,
uno::UNO_QUERY_THROW );
- xShapeProps->setPropertyValue( "AnchorType", uno::makeAny(
text::TextContentAnchorType_AT_PAGE ) );
- xShapeProps->setPropertyValue( "HoriOrientRelation", uno::makeAny(
text::RelOrientation::PAGE_LEFT ) );
- xShapeProps->setPropertyValue( "HoriOrient", uno::makeAny(
text::HoriOrientation::NONE ) );
- xShapeProps->setPropertyValue( "HoriOrientPosition", uno::makeAny( nXPos )
);
+ xShapeProps->setPropertyValue( "AnchorType", uno::Any(
text::TextContentAnchorType_AT_PAGE ) );
+ xShapeProps->setPropertyValue( "HoriOrientRelation", uno::Any(
text::RelOrientation::PAGE_LEFT ) );
+ xShapeProps->setPropertyValue( "HoriOrient", uno::Any(
text::HoriOrientation::NONE ) );
+ xShapeProps->setPropertyValue( "HoriOrientPosition", uno::Any( nXPos ) );
- xShapeProps->setPropertyValue( "VertOrientRelation", uno::makeAny(
text::RelOrientation::PAGE_FRAME ) );
- xShapeProps->setPropertyValue( "VertOrient", uno::makeAny(
text::VertOrientation::NONE ) );
- xShapeProps->setPropertyValue( "VertOrientPosition", uno::makeAny( nYPos )
);
+ xShapeProps->setPropertyValue( "VertOrientRelation", uno::Any(
text::RelOrientation::PAGE_FRAME ) );
+ xShapeProps->setPropertyValue( "VertOrient", uno::Any(
text::VertOrientation::NONE ) );
+ xShapeProps->setPropertyValue( "VertOrientPosition", uno::Any( nYPos ) );
// set to visible
- xShapeProps->setPropertyValue( "LineStyle", uno::makeAny(
drawing::LineStyle_SOLID ) );
+ xShapeProps->setPropertyValue( "LineStyle", uno::Any(
drawing::LineStyle_SOLID ) );
// set to font
- xShapeProps->setPropertyValue( "LayerID", uno::makeAny( sal_Int16(1) ) );
- xShapeProps->setPropertyValue( "LayerName", uno::makeAny(
OUString("Heaven") ) );
+ xShapeProps->setPropertyValue( "LayerID", uno::Any( sal_Int16(1) ) );
+ xShapeProps->setPropertyValue( "LayerName", uno::Any( OUString("Heaven") )
);
rtl::Reference<ScVbaShape> pScVbaShape = new ScVbaShape( getParent(),
mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) );
- return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) );
+ return uno::Any( uno::Reference< msforms::XShape > ( pScVbaShape ) );
}
void
ScVbaShapes::setDefaultShapeProperties( const uno::Reference< drawing::XShape
>& xShape )
{
uno::Reference< beans::XPropertySet > xPropertySet( xShape,
uno::UNO_QUERY_THROW );
- xPropertySet->setPropertyValue( "FillStyle", uno::makeAny(
OUString("SOLID") ) );
- xPropertySet->setPropertyValue( "FillColor", uno::makeAny(
sal_Int32(0xFFFFFF) ) );
- xPropertySet->setPropertyValue( "TextWordWrap", uno::makeAny(
text::WrapTextMode_THROUGH ) );
+ xPropertySet->setPropertyValue( "FillStyle", uno::Any( OUString("SOLID") )
);
+ xPropertySet->setPropertyValue( "FillColor", uno::Any( sal_Int32(0xFFFFFF)
) );
+ xPropertySet->setPropertyValue( "TextWordWrap", uno::Any(
text::WrapTextMode_THROUGH ) );
//not find in OOo2.3
//xPropertySet->setPropertyValue("Opaque", uno::makeAny( sal_True ) );
}
@@ -403,7 +403,7 @@ ScVbaShapes::setShape_NameProperty( const uno::Reference<
css::drawing::XShape >
uno::Reference< beans::XPropertySet > xPropertySet( xShape,
uno::UNO_QUERY_THROW );
try
{
- xPropertySet->setPropertyValue( "Name", uno::makeAny( sName ) );
+ xPropertySet->setPropertyValue( "Name", uno::Any( sName ) );
}
catch(const script::BasicErrorException&)
{
diff --git a/vbahelper/source/vbahelper/vbatextframe.cxx
b/vbahelper/source/vbahelper/vbatextframe.cxx
index 6e19734cd0e5..d9373cb4e3b6 100644
--- a/vbahelper/source/vbahelper/vbatextframe.cxx
+++ b/vbahelper/source/vbahelper/vbatextframe.cxx
@@ -36,8 +36,8 @@ VbaTextFrame::setAsMSObehavior()
//set property TextWordWrap default as False.
// TextFitToSize control the text content. It seems we should set the
default as False.
// com.sun.star.drawing.TextFitToSizeType.NONE
- m_xPropertySet->setPropertyValue( "TextWordWrap", uno::makeAny( false ) );
- m_xPropertySet->setPropertyValue( "TextFitToSize", uno::makeAny(
drawing::TextFitToSizeType_NONE ) );
+ m_xPropertySet->setPropertyValue( "TextWordWrap", uno::Any( false ) );
+ m_xPropertySet->setPropertyValue( "TextFitToSize", uno::Any(
drawing::TextFitToSizeType_NONE ) );
}
sal_Int32 VbaTextFrame::getMargin( const OUString& sMarginType )
@@ -51,7 +51,7 @@ sal_Int32 VbaTextFrame::getMargin( const OUString&
sMarginType )
void VbaTextFrame::setMargin( const OUString& sMarginType, float fMargin )
{
sal_Int32 nMargin = Millimeter::getInHundredthsOfOneMillimeter( fMargin );
- m_xPropertySet->setPropertyValue( sMarginType, uno::makeAny( nMargin ) );
+ m_xPropertySet->setPropertyValue( sMarginType, uno::Any( nMargin ) );
}
// Attributes
@@ -71,7 +71,7 @@ void SAL_CALL
VbaTextFrame::setAutoSize( sal_Bool _autosize )
{
setAsMSObehavior();
- m_xPropertySet->setPropertyValue( "TextAutoGrowHeight", uno::makeAny(
_autosize ) );
+ m_xPropertySet->setPropertyValue( "TextAutoGrowHeight", uno::Any(
_autosize ) );
}
float SAL_CALL
