svtools/source/brwbox/brwbox1.cxx | 42 +++++++++++++-------------
svtools/source/brwbox/editbrowsebox.cxx | 4 +-
svtools/source/brwbox/editbrowsebox2.cxx | 2 -
svtools/source/control/inettbc.cxx | 2 -
svtools/source/misc/bindablecontrolhelper.cxx | 8 ++--
svtools/source/svhtml/parhtml.cxx | 2 -
svtools/source/table/cellvalueconversion.cxx | 2 -
svtools/source/table/tablecontrol.cxx | 2 -
svtools/source/table/tablecontrol_impl.cxx | 5 +--
svtools/source/uno/genericunodialog.cxx | 2 -
svtools/source/uno/svtxgridcontrol.cxx | 9 ++---
svtools/source/uno/unoimap.cxx | 2 -
12 files changed, 40 insertions(+), 42 deletions(-)
New commits:
commit a3f4f372aa4f6a693ae8abe829a539b9d3977de1
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue May 3 20:06:37 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue May 3 23:18:02 2022 +0200
Just use Any ctor instead of makeAny in svtools
Change-Id: Ib5a86de01abd6eab2f60d76bda50fa9407286dbc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133770
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/svtools/source/brwbox/brwbox1.cxx
b/svtools/source/brwbox/brwbox1.cxx
index 18a5f772613f..1d4a13f2c725 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -494,7 +494,7 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId,
sal_uInt16 nPos )
commitTableEvent(
TABLE_MODEL_CHANGED,
- makeAny( AccessibleTableModelChange(
+ Any( AccessibleTableModelChange(
COLUMNS_REMOVED,
-1,
-1,
@@ -507,7 +507,7 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId,
sal_uInt16 nPos )
commitTableEvent(
TABLE_MODEL_CHANGED,
- makeAny( AccessibleTableModelChange(
+ Any( AccessibleTableModelChange(
COLUMNS_INSERTED,
-1,
-1,
@@ -557,8 +557,8 @@ void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const
OUString& rTitle )
if ( isAccessibleAlive() )
{
commitTableEvent( TABLE_COLUMN_DESCRIPTION_CHANGED,
- makeAny( rTitle ),
- makeAny( sOld )
+ Any( rTitle ),
+ Any( sOld )
);
}
}
@@ -740,7 +740,7 @@ void BrowseBox::RemoveColumn( sal_uInt16 nItemId )
commitTableEvent(
TABLE_MODEL_CHANGED,
- makeAny( AccessibleTableModelChange(COLUMNS_REMOVED,
+ Any( AccessibleTableModelChange(COLUMNS_REMOVED,
-1,
-1,
nPos,
@@ -753,7 +753,7 @@ void BrowseBox::RemoveColumn( sal_uInt16 nItemId )
commitHeaderBarEvent(
CHILD,
Any(),
- makeAny( CreateAccessibleColumnHeader( nPos ) ),
+ Any( CreateAccessibleColumnHeader( nPos ) ),
true
);
}
@@ -801,20 +801,20 @@ void BrowseBox::RemoveColumns()
commitBrowseBoxEvent(
CHILD,
Any(),
-
makeAny(m_pImpl->getAccessibleHeaderBar(AccessibleBrowseBoxObjType::ColumnHeaderBar))
+
Any(m_pImpl->getAccessibleHeaderBar(AccessibleBrowseBoxObjType::ColumnHeaderBar))
);
// and now append it again
commitBrowseBoxEvent(
CHILD,
-
makeAny(m_pImpl->getAccessibleHeaderBar(AccessibleBrowseBoxObjType::ColumnHeaderBar)),
+
Any(m_pImpl->getAccessibleHeaderBar(AccessibleBrowseBoxObjType::ColumnHeaderBar)),
Any()
);
// notify a table model change
commitTableEvent(
TABLE_MODEL_CHANGED,
- makeAny ( AccessibleTableModelChange( COLUMNS_REMOVED,
+ Any ( AccessibleTableModelChange( COLUMNS_REMOVED,
-1,
-1,
0,
@@ -1121,20 +1121,20 @@ void BrowseBox::Clear()
commitBrowseBoxEvent(
CHILD,
Any(),
- makeAny( m_pImpl->getAccessibleHeaderBar(
AccessibleBrowseBoxObjType::RowHeaderBar ) )
+ Any( m_pImpl->getAccessibleHeaderBar(
AccessibleBrowseBoxObjType::RowHeaderBar ) )
);
// and now append it again
commitBrowseBoxEvent(
CHILD,
- makeAny( m_pImpl->getAccessibleHeaderBar(
AccessibleBrowseBoxObjType::RowHeaderBar ) ),
+ Any( m_pImpl->getAccessibleHeaderBar(
AccessibleBrowseBoxObjType::RowHeaderBar ) ),
Any()
);
// notify a table model change
commitTableEvent(
TABLE_MODEL_CHANGED,
- makeAny( AccessibleTableModelChange(ROWS_REMOVED,
+ Any( AccessibleTableModelChange(ROWS_REMOVED,
0,
nOldRowCount,
-1,
@@ -1220,7 +1220,7 @@ void BrowseBox::RowInserted( sal_Int32 nRow, sal_Int32
nNumRows, bool bDoPaint,
{
commitTableEvent(
TABLE_MODEL_CHANGED,
- makeAny( AccessibleTableModelChange(
+ Any( AccessibleTableModelChange(
ROWS_INSERTED,
nRow,
nRow + nNumRows,
@@ -1235,7 +1235,7 @@ void BrowseBox::RowInserted( sal_Int32 nRow, sal_Int32
nNumRows, bool bDoPaint,
{
commitHeaderBarEvent(
CHILD,
- makeAny( CreateAccessibleRowHeader( i ) ),
+ Any( CreateAccessibleRowHeader( i ) ),
Any(),
false
);
@@ -1364,25 +1364,25 @@ void BrowseBox::RowRemoved( sal_Int32 nRow, sal_Int32
nNumRows, bool bDoPaint )
commitBrowseBoxEvent(
CHILD,
Any(),
- makeAny( m_pImpl->getAccessibleHeaderBar(
AccessibleBrowseBoxObjType::RowHeaderBar ) )
+ Any( m_pImpl->getAccessibleHeaderBar(
AccessibleBrowseBoxObjType::RowHeaderBar ) )
);
// and now append it again
commitBrowseBoxEvent(
CHILD,
-
makeAny(m_pImpl->getAccessibleHeaderBar(AccessibleBrowseBoxObjType::RowHeaderBar)),
+
Any(m_pImpl->getAccessibleHeaderBar(AccessibleBrowseBoxObjType::RowHeaderBar)),
Any()
);
commitBrowseBoxEvent(
CHILD,
Any(),
- makeAny( m_pImpl->getAccessibleTable() )
+ Any( m_pImpl->getAccessibleTable() )
);
// and now append it again
commitBrowseBoxEvent(
CHILD,
- makeAny( m_pImpl->getAccessibleTable() ),
+ Any( m_pImpl->getAccessibleTable() ),
Any()
);
}
@@ -1390,7 +1390,7 @@ void BrowseBox::RowRemoved( sal_Int32 nRow, sal_Int32
nNumRows, bool bDoPaint )
{
commitTableEvent(
TABLE_MODEL_CHANGED,
- makeAny( AccessibleTableModelChange(
+ Any( AccessibleTableModelChange(
ROWS_REMOVED,
nRow,
nRow + nNumRows,
@@ -1406,7 +1406,7 @@ void BrowseBox::RowRemoved( sal_Int32 nRow, sal_Int32
nNumRows, bool bDoPaint )
commitHeaderBarEvent(
CHILD,
Any(),
- makeAny( CreateAccessibleRowHeader( i ) ),
+ Any( CreateAccessibleRowHeader( i ) ),
false
);
}
@@ -2338,7 +2338,7 @@ void BrowseBox::CursorMoved()
if ( isAccessibleAlive() && HasFocus() )
commitTableEvent(
ACTIVE_DESCENDANT_CHANGED,
- makeAny( CreateAccessibleCell( GetCurRow(),GetColumnPos(
GetCurColumnId() ) ) ),
+ Any( CreateAccessibleCell( GetCurRow(),GetColumnPos(
GetCurColumnId() ) ) ),
Any()
);
}
diff --git a/svtools/source/brwbox/editbrowsebox.cxx
b/svtools/source/brwbox/editbrowsebox.cxx
index c9267119ffda..8cadf47483f2 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -954,7 +954,7 @@ namespace svt
{
commitTableEvent(
ACTIVE_DESCENDANT_CHANGED,
- makeAny( CreateAccessibleCell( nRow, GetColumnPos( nCol
-1) ) ),
+ Any( CreateAccessibleCell( nRow, GetColumnPos( nCol -1) )
),
Any()
);
}
@@ -969,7 +969,7 @@ namespace svt
if ( isAccessibleAlive() )
{
- commitBrowseBoxEvent( CHILD, Any(), makeAny(
m_aImpl->m_xActiveCell ) );
+ commitBrowseBoxEvent( CHILD, Any(), Any( m_aImpl->m_xActiveCell )
);
m_aImpl->clearActiveCell();
}
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx
b/svtools/source/brwbox/editbrowsebox2.cxx
index aa2762871a31..0c6adee0476b 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.cxx
@@ -85,7 +85,7 @@ void EditBrowseBox::implCreateActiveAccessible( )
GetColumnPos( GetCurColumnId() )
);
- commitBrowseBoxEvent( CHILD, makeAny( m_aImpl->m_xActiveCell ), Any() );
+ commitBrowseBoxEvent( CHILD, Any( m_aImpl->m_xActiveCell ), Any() );
}
diff --git a/svtools/source/control/inettbc.cxx
b/svtools/source/control/inettbc.cxx
index c4a2b0cf5173..d2afe69cdc35 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -488,7 +488,7 @@ void SvtMatchContext_Impl::doExecute()
res = proc->execute(
css::ucb::Command(
"getPropertyValues", -1,
- css::uno::makeAny(prop)),
+ css::uno::Any(prop)),
id,
css::uno::Reference<
css::ucb::XCommandEnvironment >());
diff --git a/svtools/source/misc/bindablecontrolhelper.cxx
b/svtools/source/misc/bindablecontrolhelper.cxx
index 95cdcca2a431..ba5494975695 100644
--- a/svtools/source/misc/bindablecontrolhelper.cxx
+++ b/svtools/source/misc/bindablecontrolhelper.cxx
@@ -87,8 +87,8 @@ BindableControlHelper::ApplyListSourceAndBindableData( const
css::uno::Reference
{
// we need this service to properly convert XL notation also
// Should be easy to extend
- xConvertor->setPropertyValue( "ReferenceSheet", uno::makeAny(
nRefTab ) );
- xConvertor->setPropertyValue( "XLA1Representation", uno::makeAny(
rsCtrlSource ) );
+ xConvertor->setPropertyValue( "ReferenceSheet", uno::Any( nRefTab
) );
+ xConvertor->setPropertyValue( "XLA1Representation", uno::Any(
rsCtrlSource ) );
xConvertor->getPropertyValue( "Address" ) >>= aAddress;
}
@@ -118,8 +118,8 @@ BindableControlHelper::ApplyListSourceAndBindableData(
const css::uno::Reference
{
// we need this service to properly convert XL notation also
// Should be easy to extend
- xConvertor->setPropertyValue( "ReferenceSheet", uno::makeAny(
nRefTab ) );
- xConvertor->setPropertyValue( "XLA1Representation",
uno::makeAny( rsRowSource ) );
+ xConvertor->setPropertyValue( "ReferenceSheet", uno::Any(
nRefTab ) );
+ xConvertor->setPropertyValue( "XLA1Representation", uno::Any(
rsRowSource ) );
xConvertor->getPropertyValue( "Address" ) >>= aAddress;
}
}
diff --git a/svtools/source/svhtml/parhtml.cxx
b/svtools/source/svhtml/parhtml.cxx
index 0c6e38ee9295..c6962824b6b6 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -2065,7 +2065,7 @@ bool HTMLParser::ParseMetaOptionsImpl(
try {
xUDProps->addProperty(aName,
beans::PropertyAttribute::REMOVABLE,
- uno::makeAny(aContent));
+ uno::Any(aContent));
AddMetaUserDefined(aName);
bChanged = true;
} catch (uno::Exception &) {
diff --git a/svtools/source/table/cellvalueconversion.cxx
b/svtools/source/table/cellvalueconversion.cxx
index 03c02d8ea848..53177af0d88f 100644
--- a/svtools/source/table/cellvalueconversion.cxx
+++ b/svtools/source/table/cellvalueconversion.cxx
@@ -262,7 +262,7 @@ bool CellValueConversion::ensureNumberFormatter()
css::util::Date const aNullDate(1, 1, 1900);
Reference<XPropertySet> const
xFormatSettings(xSupplier->getNumberFormatSettings(),
UNO_SET_THROW);
- xFormatSettings->setPropertyValue("NullDate", makeAny(aNullDate));
+ xFormatSettings->setPropertyValue("NullDate", Any(aNullDate));
// knit
xFormatter->attachNumberFormatsSupplier(xSupplier);
diff --git a/svtools/source/table/tablecontrol.cxx
b/svtools/source/table/tablecontrol.cxx
index a2d49695c540..e341b1ea47b8 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -102,7 +102,7 @@ namespace svt::table
if ( m_pImpl->isAccessibleAlive() )
{
m_pImpl->commitCellEvent( AccessibleEventId::STATE_CHANGED,
- makeAny(
AccessibleStateType::FOCUSED ),
+ Any( AccessibleStateType::FOCUSED ),
Any()
);
// Huh? What the heck? Why do we unconditionally notify a
STATE_CHANGE/FOCUSED after each and every
diff --git a/svtools/source/table/tablecontrol_impl.cxx
b/svtools/source/table/tablecontrol_impl.cxx
index 9a874be2edb2..c82a272762cd 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -51,7 +51,6 @@ namespace svt::table
using ::com::sun::star::accessibility::AccessibleTableModelChange;
- using ::com::sun::star::uno::makeAny;
using ::com::sun::star::uno::Any;
using ::com::sun::star::accessibility::XAccessible;
using ::com::sun::star::uno::Reference;
@@ -325,7 +324,7 @@ namespace svt::table
if ( impl_isAccessibleAlive() )
{
impl_commitAccessibleEvent( AccessibleEventId::TABLE_MODEL_CHANGED,
- makeAny( AccessibleTableModelChange(
AccessibleTableModelChangeType::ROWS_INSERTED, i_first, i_last, -1, -1 ) )
+ Any( AccessibleTableModelChange(
AccessibleTableModelChangeType::ROWS_INSERTED, i_first, i_last, -1, -1 ) )
);
}
@@ -394,7 +393,7 @@ namespace svt::table
{
commitTableEvent(
AccessibleEventId::TABLE_MODEL_CHANGED,
- makeAny( AccessibleTableModelChange(
+ Any( AccessibleTableModelChange(
AccessibleTableModelChangeType::ROWS_REMOVED,
firstRemovedRow,
lastRemovedRow,
diff --git a/svtools/source/uno/genericunodialog.cxx
b/svtools/source/uno/genericunodialog.cxx
index 8157fd390622..b6a49365404e 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -140,7 +140,7 @@ void SAL_CALL OGenericUnoDialog::setTitle( const OUString&
_rTitle )
try
{
- setPropertyValue(UNODIALOG_PROPERTY_TITLE, makeAny(_rTitle));
+ setPropertyValue(UNODIALOG_PROPERTY_TITLE, Any(_rTitle));
}
catch(RuntimeException&)
{
diff --git a/svtools/source/uno/svtxgridcontrol.cxx
b/svtools/source/uno/svtxgridcontrol.cxx
index e394c803e42e..4aee46f2c9ea 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -43,7 +43,6 @@ using css::uno::Exception;
using css::uno::UNO_QUERY;
using css::uno::UNO_QUERY_THROW;
using css::uno::Any;
-using css::uno::makeAny;
using css::uno::Sequence;
using css::awt::grid::XGridSelectionListener;
using css::style::VerticalAlignment;
@@ -794,7 +793,7 @@ void SVTXGridControl::ProcessWindowEvent( const
VclWindowEvent& rVclWindowEvent
{
pTable->commitCellEventIfAccessibleAlive(
AccessibleEventId::STATE_CHANGED,
- makeAny( AccessibleStateType::FOCUSED ),
+ Any( AccessibleStateType::FOCUSED ),
Any()
);
pTable->commitTableEventIfAccessibleAlive(
@@ -807,7 +806,7 @@ void SVTXGridControl::ProcessWindowEvent( const
VclWindowEvent& rVclWindowEvent
{
pTable->commitTableEventIfAccessibleAlive(
AccessibleEventId::STATE_CHANGED,
- makeAny( AccessibleStateType::FOCUSED ),
+ Any( AccessibleStateType::FOCUSED ),
Any()
);
}
@@ -823,7 +822,7 @@ void SVTXGridControl::ProcessWindowEvent( const
VclWindowEvent& rVclWindowEvent
pTable->commitCellEventIfAccessibleAlive(
AccessibleEventId::STATE_CHANGED,
Any(),
- makeAny( AccessibleStateType::FOCUSED )
+ Any( AccessibleStateType::FOCUSED )
);
}
else
@@ -831,7 +830,7 @@ void SVTXGridControl::ProcessWindowEvent( const
VclWindowEvent& rVclWindowEvent
pTable->commitTableEventIfAccessibleAlive(
AccessibleEventId::STATE_CHANGED,
Any(),
- makeAny( AccessibleStateType::FOCUSED )
+ Any( AccessibleStateType::FOCUSED )
);
}
}
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index d2645a188c7f..d7e6f7be8bbf 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -638,7 +638,7 @@ Any SAL_CALL SvUnoImageMap::getByIndex( sal_Int32 nIndex )
std::advance(aIter, nIndex);
Reference< XPropertySet > xObj( *aIter );
- return makeAny( xObj );
+ return Any( xObj );
}
// XElementAccess
