[Libreoffice-commits] core.git: accessibility/source basic/source editeng/source extensions/test odk/examples sc/qa sc/source sd/source sfx2/source sw/source writerfilter/source xmloff/source xmlsecurity/qa
Jochen Nitschke
j.nitschke+logerrit at ok.de
Mon Oct 17 15:39:36 UTC 2016
accessibility/source/extended/accessiblelistbox.cxx | 9 +-
basic/source/runtime/methods1.cxx | 20 ++---
editeng/source/items/frmitems.cxx | 12 +--
editeng/source/items/textitem.cxx | 2
extensions/test/ole/OleClient/clientTest.cxx | 34 +++++-----
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx | 6 -
sc/qa/extras/sccondformats.cxx | 8 +-
sc/source/ui/Accessibility/AccessibleDocument.cxx | 6 -
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 12 +--
sc/source/ui/drawfunc/fuins2.cxx | 8 +-
sc/source/ui/view/cellsh1.cxx | 4 -
sd/source/ui/func/fuhhconv.cxx | 4 -
sfx2/source/dialog/dinfdlg.cxx | 16 ++--
sfx2/source/dialog/filedlghelper.cxx | 2
sw/source/core/access/accpara.cxx | 4 -
sw/source/uibase/dbui/dbmgr.cxx | 2
sw/source/uibase/shells/annotsh.cxx | 4 -
sw/source/uibase/shells/drwtxtsh.cxx | 4 -
sw/source/uibase/table/chartins.cxx | 8 +-
sw/source/uibase/uiview/viewling.cxx | 4 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 6 -
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 2
xmlsecurity/qa/unit/signing/signing.cxx | 4 -
23 files changed, 89 insertions(+), 92 deletions(-)
New commits:
commit 9ac8a57e52a25870d497241c64bff3da0272cf4d
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Sun Oct 16 09:40:42 2016 +0200
replace <<= with assign for <<= with rhs Any
makeAny and Any ctor return an Any
Change-Id: Iaa361bc315d785f80153acf1009bf47d109728ec
Reviewed-on: https://gerrit.libreoffice.org/29914
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 4436500..864167c 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -137,19 +137,19 @@ namespace accessibility
}
if( pBox && (pBox->HasFocus() || bNeedFocus) )
{
- uno::Any aOldValue, aNewValue;
+ uno::Any aNewValue;
SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() );
if ( pEntry )
{
AccessibleListBoxEntry* pEntryFocus =static_cast< AccessibleListBoxEntry* >(m_xFocusedChild.get());
if (pEntryFocus && pEntryFocus->GetSvLBoxEntry() == pEntry)
{
- aOldValue <<= uno::Any();
aNewValue <<= m_xFocusedChild;
- NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, aOldValue, aNewValue );
+ NotifyAccessibleEvent( AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, uno::Any(), aNewValue );
return ;
}
+ uno::Any aOldValue;
aOldValue <<= m_xFocusedChild;
MAP_ENTRY::iterator mi = m_mapEntry.find(pEntry);
@@ -170,9 +170,8 @@ namespace accessibility
}
else
{
- aOldValue <<= uno::Any();
aNewValue <<= AccessibleStateType::FOCUSED;
- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, uno::Any(), aNewValue );
}
}
}
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index dfd3914..1166cb7 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -2694,10 +2694,10 @@ RTLFUNC(SYD)
// retrieve non-optional params
Sequence< Any > aParams( 4 );
- aParams[ 0 ] <<= makeAny( rPar.Get(1)->GetDouble() );
- aParams[ 1 ] <<= makeAny( rPar.Get(2)->GetDouble() );
- aParams[ 2 ] <<= makeAny( rPar.Get(3)->GetDouble() );
- aParams[ 3 ] <<= makeAny( rPar.Get(4)->GetDouble() );
+ aParams[ 0 ] = makeAny( rPar.Get(1)->GetDouble() );
+ aParams[ 1 ] = makeAny( rPar.Get(2)->GetDouble() );
+ aParams[ 2 ] = makeAny( rPar.Get(3)->GetDouble() );
+ aParams[ 3 ] = makeAny( rPar.Get(4)->GetDouble() );
CallFunctionAccessFunction( aParams, "SYD", rPar.Get( 0 ) );
}
@@ -2718,9 +2718,9 @@ RTLFUNC(SLN)
// retrieve non-optional params
Sequence< Any > aParams( 3 );
- aParams[ 0 ] <<= makeAny( rPar.Get(1)->GetDouble() );
- aParams[ 1 ] <<= makeAny( rPar.Get(2)->GetDouble() );
- aParams[ 2 ] <<= makeAny( rPar.Get(3)->GetDouble() );
+ aParams[ 0 ] = makeAny( rPar.Get(1)->GetDouble() );
+ aParams[ 1 ] = makeAny( rPar.Get(2)->GetDouble() );
+ aParams[ 2 ] = makeAny( rPar.Get(3)->GetDouble() );
CallFunctionAccessFunction( aParams, "SLN", rPar.Get( 0 ) );
}
@@ -2876,7 +2876,7 @@ RTLFUNC(NPV)
}
Sequence< Any > aParams( 2 );
- aParams[ 0 ] <<= makeAny( rPar.Get(1)->GetDouble() );
+ aParams[ 0 ] = makeAny( rPar.Get(1)->GetDouble() );
Any aValues = sbxToUnoValue( rPar.Get(2),
cppu::UnoType<Sequence<double>>::get() );
@@ -2960,8 +2960,8 @@ RTLFUNC(MIRR)
aValues <<= sValues;
aParams[ 0 ] <<= aValues;
- aParams[ 1 ] <<= makeAny( rPar.Get(2)->GetDouble() );
- aParams[ 2 ] <<= makeAny( rPar.Get(3)->GetDouble() );
+ aParams[ 1 ] = makeAny( rPar.Get(2)->GetDouble() );
+ aParams[ 2 ] = makeAny( rPar.Get(3)->GetDouble() );
CallFunctionAccessFunction( aParams, "MIRR", rPar.Get( 0 ) );
}
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 7c25902..98e17c9 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1700,11 +1700,11 @@ bool SvxBoxItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
aSeq[1] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetRight(), bConvert) );
aSeq[2] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetBottom(), bConvert) );
aSeq[3] = uno::makeAny( SvxBoxItem::SvxLineToLine(GetTop(), bConvert) );
- aSeq[4] <<= uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( GetSmallestDistance()) : GetSmallestDistance()));
- aSeq[5] <<= uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( nTopDist ) : nTopDist ));
- aSeq[6] <<= uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( nBottomDist ) : nBottomDist ));
- aSeq[7] <<= uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( nLeftDist ) : nLeftDist ));
- aSeq[8] <<= uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( nRightDist ) : nRightDist ));
+ aSeq[4] = uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( GetSmallestDistance()) : GetSmallestDistance()));
+ aSeq[5] = uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( nTopDist ) : nTopDist ));
+ aSeq[6] = uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( nBottomDist ) : nBottomDist ));
+ aSeq[7] = uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( nLeftDist ) : nLeftDist ));
+ aSeq[8] = uno::makeAny( (sal_Int32)(bConvert ? convertTwipToMm100( nRightDist ) : nRightDist ));
rVal = uno::makeAny( aSeq );
return true;
}
@@ -3088,7 +3088,7 @@ bool SvxLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemId ) const
nMemId &= ~CONVERT_TWIPS;
if ( nMemId == 0 )
{
- rVal <<= uno::makeAny( SvxBoxItem::SvxLineToLine(pLine, bConvert) );
+ rVal = uno::makeAny( SvxBoxItem::SvxLineToLine(pLine, bConvert) );
return true;
}
else if ( pLine )
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index b7e4446..8ffcb44 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -1792,7 +1792,7 @@ bool SvxBackgroundColorItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) c
{
case MID_GRAPHIC_TRANSPARENT:
{
- rVal <<= css::uno::makeAny<bool>(aColor.GetTransparency() == 0xff);
+ rVal = css::uno::makeAny<bool>(aColor.GetTransparency() == 0xff);
break;
}
default:
diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx
index d2700be..675b2a6 100644
--- a/extensions/test/ole/OleClient/clientTest.cxx
+++ b/extensions/test/ole/OleClient/clientTest.cxx
@@ -144,8 +144,8 @@ bool doParameterTest(const Reference<XInvocation> & inv)
arArgs[0] <<= (sal_Int32) 123;
Sequence<Any> seqPositional2(arArgs, 1);
- arArgs[0] <<= Any();
- arArgs[1] <<= Any();
+ arArgs[0].clear();
+ arArgs[1].clear();
Sequence<Any> seqPositional3(arArgs, 2);
arArgs[0] <<= (sal_Int32) 123;
@@ -172,7 +172,7 @@ bool doParameterTest(const Reference<XInvocation> & inv)
arArgs1[3] <<= arg4;
Sequence<Any> seqMix(arArgs1, 4);
- arArgs1[0] <<= Any();
+ arArgs1[0].clear();
arArgs1[1] <<= (sal_Int32) 456;
arArgs1[2] <<= arg4;
Sequence<Any> seqMix2(arArgs1, 3);
@@ -184,7 +184,7 @@ bool doParameterTest(const Reference<XInvocation> & inv)
Sequence<Any> seqMixOut(arArgs1, 4);
arArgs1[0] <<= SCode(DISP_E_PARAMNOTFOUND);
- arArgs1[1] <<= Any();
+ arArgs1[1].clear();
arArgs1[2] <<= arg4;
Sequence<Any> seqMix2Out(arArgs1, 3);
@@ -455,17 +455,17 @@ bool doPropertyWithArgumentTest(const Reference<XInvocation> & inv)
Sequence<Any> seqOut;
Any arMultiArgs[3];
- arMultiArgs[0] <<= makeAny((sal_Int32) 0);
- arMultiArgs[1] <<= makeAny((sal_Int32) 0);
+ arMultiArgs[0] = makeAny((sal_Int32) 0);
+ arMultiArgs[1] = makeAny((sal_Int32) 0);
arMultiArgs[2] <<= PropertyPutArgument(makeAny((sal_Int32) 0));
Sequence<Any> seqMultiArgPut0(arMultiArgs, 3);
- arMultiArgs[0] <<= makeAny((sal_Int32) 1);
- arMultiArgs[1] <<= makeAny((sal_Int32) 2);
+ arMultiArgs[0] = makeAny((sal_Int32) 1);
+ arMultiArgs[1] = makeAny((sal_Int32) 2);
arMultiArgs[2] <<= PropertyPutArgument(makeAny((sal_Int32) 3));
Sequence<Any> seqMultiArgPut1(arMultiArgs, 3);
- arMultiArgs[0] <<= makeAny((sal_Int32) 1);
+ arMultiArgs[0] = makeAny((sal_Int32) 1);
arMultiArgs[1] <<= PropertyPutArgument(makeAny((sal_Int32) 3));
Sequence<Any> seqMultiArgPut2(arMultiArgs, 2);
@@ -477,26 +477,26 @@ bool doPropertyWithArgumentTest(const Reference<XInvocation> & inv)
arMultiArgs[1] <<= NamedArgument(OUString(L"val3"), makeAny((sal_Int32) 3));
Sequence<Any> seqMultiArgPut4(arMultiArgs, 2);
- arMultiArgs[0] <<= makeAny((sal_Int32) 0);
- arMultiArgs[1] <<= makeAny((sal_Int32) 0);
+ arMultiArgs[0] = makeAny((sal_Int32) 0);
+ arMultiArgs[1] = makeAny((sal_Int32) 0);
Sequence<Any> seqMultiArgGet0(arMultiArgs, 2);
- arMultiArgs[0] <<= makeAny((sal_Int32) 1);
- arMultiArgs[1] <<= makeAny((sal_Int32) 2);
+ arMultiArgs[0] = makeAny((sal_Int32) 1);
+ arMultiArgs[1] = makeAny((sal_Int32) 2);
Sequence<Any> seqMultiArgGet1(arMultiArgs, 2);
Sequence<Any> seqMultiArgGet2(arMultiArgs, 1);
- arMultiArgs[0] <<= makeAny((sal_Int32) 0);
+ arMultiArgs[0] = makeAny((sal_Int32) 0);
arMultiArgs[1] <<= PropertyPutArgument(makeAny((sal_Int32) 0));
Sequence<Any> seqMultiArgPut5(arMultiArgs, 2);
- arMultiArgs[0] <<= makeAny((sal_Int32) 1);
+ arMultiArgs[0] = makeAny((sal_Int32) 1);
arMultiArgs[1] <<= PropertyPutArgument(makeAny((sal_Int32) 2));
Sequence<Any> seqMultiArgPut6(arMultiArgs, 2);
- arMultiArgs[0] <<= Any();
- arMultiArgs[1] <<= Any();
+ arMultiArgs[0].clear();
+ arMultiArgs[1].clear();
Sequence<Any> seqMultiVoid(arMultiArgs, 2);
arMultiArgs[0] = makeAny((sal_Int32) 0);
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
index 721329d..5d3eb2c 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
@@ -306,7 +306,7 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property
aEvent.Source = (::com::sun::star::frame::XDispatch*) this;
aEvent.IsEnabled = mbButtonEnabled;
aEvent.Requery = sal_False;
- aEvent.State <<= Any();
+ aEvent.State = Any();
// Notify listener about new state
Reference < XDispatch > xDispatch = aListenerHelper.GetDispatch( mxFrame, aURL.Path );
@@ -345,7 +345,7 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener
aEvent.Source = (::com::sun::star::frame::XDispatch*) this;
aEvent.IsEnabled = mbButtonEnabled;
aEvent.Requery = sal_False;
- aEvent.State <<= Any();
+ aEvent.State = Any();
xControl->statusChanged( aEvent );
}
else if ( aURL.Path == "ComboboxCmd" )
@@ -356,7 +356,7 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener
aEvent.Source = (::com::sun::star::frame::XDispatch*) this;
aEvent.IsEnabled = sal_True;
aEvent.Requery = sal_False;
- aEvent.State <<= Any();
+ aEvent.State = Any();
xControl->statusChanged( aEvent );
}
else if ( aURL.Path == "ToggleDropdownButtonCmd" )
diff --git a/sc/qa/extras/sccondformats.cxx b/sc/qa/extras/sccondformats.cxx
index 5861824..0f81199 100644
--- a/sc/qa/extras/sccondformats.cxx
+++ b/sc/qa/extras/sccondformats.cxx
@@ -81,15 +81,15 @@ void ScConditionalFormatTest::testCondFormat()
uno::Sequence< beans::PropertyValue > aPropertyValueList(5);
aPropertyValueList[0].Name = SC_UNONAME_STYLENAME;
- aPropertyValueList[0].Value <<= uno::makeAny<OUString>("Result2");
+ aPropertyValueList[0].Value = uno::makeAny<OUString>("Result2");
aPropertyValueList[1].Name = SC_UNONAME_FORMULA1;
- aPropertyValueList[1].Value <<= uno::makeAny<OUString>("$Sheet1.$B$2");
+ aPropertyValueList[1].Value = uno::makeAny<OUString>("$Sheet1.$B$2");
aPropertyValueList[2].Name = SC_UNONAME_FORMULA2;
- aPropertyValueList[2].Value <<= uno::makeAny<OUString>("$Sheet1.$A$2");
+ aPropertyValueList[2].Value = uno::makeAny<OUString>("$Sheet1.$A$2");
aPropertyValueList[3].Name = SC_UNONAME_OPERATOR;
aPropertyValueList[3].Value <<= sheet::ConditionOperator_EQUAL;
aPropertyValueList[4].Name = SC_UNONAME_SOURCEPOS;
- aPropertyValueList[4].Value <<= uno::makeAny(table::CellAddress(0, 0, 16));
+ aPropertyValueList[4].Value = uno::makeAny(table::CellAddress(0, 0, 16));
xSheetConditionalEntries->addNew(aPropertyValueList);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xSheetConditionalEntries->getCount());
xProps->setPropertyValue(SC_UNONAME_CONDFMT, uno::makeAny(xSheetConditionalEntries));
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index b102b97..f6bcddd 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -473,7 +473,7 @@ bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentC
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(mpAccessibleDocument);
- aEvent.OldValue <<= uno::makeAny(uno::Reference<XAccessible>(pCurrentChild));
+ aEvent.OldValue = uno::makeAny(uno::Reference<XAccessible>(pCurrentChild));
mpAccessibleDocument->CommitChange(aEvent); // child is gone - event
@@ -483,7 +483,7 @@ bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentC
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(mpAccessibleDocument);
- aEvent.NewValue <<= uno::makeAny(uno::Reference<XAccessible>(pReplacement.get()));
+ aEvent.NewValue = uno::makeAny(uno::Reference<XAccessible>(pReplacement.get()));
mpAccessibleDocument->CommitChange(aEvent); // child is new - event
bResult = true;
@@ -1313,7 +1313,7 @@ void ScChildrenShapes::RemoveShape(const uno::Reference<drawing::XShape>& xShape
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(mpAccessibleDocument);
- aEvent.OldValue <<= uno::makeAny(xOldAccessible);
+ aEvent.OldValue = uno::makeAny(xOldAccessible);
mpAccessibleDocument->CommitChange(aEvent); // child is gone - event
}
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index 889e2f5..1b5a0c9 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -530,14 +530,14 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
sal_uInt16 nTab = rViewData.GetTabNo();
ScRange aMarkRange;
refScMarkData.GetMarkArea(aMarkRange);
- aEvent.OldValue <<= css::uno::Any();
+ aEvent.OldValue.clear();
//Mark All
if ( !bNewPosCellFocus &&
(bNewMarked || bIsMark || bIsMultMark ) &&
aMarkRange == ScRange( 0,0,nTab, MAXCOL,MAXROW,nTab ) )
{
aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_WITHIN;
- aEvent.NewValue <<= css::uno::Any();
+ aEvent.NewValue.clear();
CommitChange(aEvent);
return ;
}
@@ -569,7 +569,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
if( !bSelSmaller )
{
aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_WITHIN;
- aEvent.NewValue <<= css::uno::Any();
+ aEvent.NewValue.clear();
CommitChange(aEvent);
}
m_aLastWithInMarkRange = aMarkRange;
@@ -627,7 +627,7 @@ void ScAccessibleSpreadsheet::Notify( SfxBroadcaster& rBC, const SfxHint& rHint
if(CalcScRangeListDifferenceMax(mpMarkedRanges,&m_LastMarkedRanges,10,vecNew))
{
aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_WITHIN;
- aEvent.NewValue <<= css::uno::Any();
+ aEvent.NewValue.clear();
CommitChange(aEvent);
}
else
@@ -723,7 +723,6 @@ void ScAccessibleSpreadsheet::RemoveSelection(ScMarkData &refScMarkData)
{
AccessibleEventObject aEvent;
aEvent.Source = uno::Reference< XAccessible >(this);
- aEvent.OldValue <<= css::uno::Any();
MAP_ADDR_XACC::iterator miRemove = m_mapSelectionSend.begin();
for(; miRemove != m_mapSelectionSend.end() ;)
{
@@ -1610,7 +1609,7 @@ void ScAccessibleSpreadsheet::NotifyRefMode()
if ( nNewSize > 10 )
{
aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_WITHIN;
- aEvent.NewValue <<= css::uno::Any();
+ aEvent.NewValue.clear();
CommitChange(aEvent);
}
else
@@ -1646,7 +1645,6 @@ void ScAccessibleSpreadsheet::RemoveFormulaSelection(bool bRemoveAll )
{
AccessibleEventObject aEvent;
aEvent.Source = uno::Reference< XAccessible >(this);
- aEvent.OldValue <<= css::uno::Any();
MAP_ADDR_XACC::iterator miRemove = m_mapFormulaSelectionSend.begin();
for(; miRemove != m_mapFormulaSelectionSend.end() ;)
{
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 2622d61..975f9b1 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -620,12 +620,12 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV
uno::Any* pArray = aSeq.getArray();
beans::PropertyValue aParam1;
aParam1.Name = "ParentWindow";
- aParam1.Value <<= uno::makeAny(xDialogParentWindow);
+ aParam1.Value = uno::makeAny(xDialogParentWindow);
beans::PropertyValue aParam2;
aParam2.Name = "ChartModel";
- aParam2.Value <<= uno::makeAny(xChartModel);
- pArray[0] <<= uno::makeAny(aParam1);
- pArray[1] <<= uno::makeAny(aParam2);
+ aParam2.Value = uno::makeAny(xChartModel);
+ pArray[0] = uno::makeAny(aParam1);
+ pArray[1] = uno::makeAny(aParam2);
xInit->initialize( aSeq );
// try to set the dialog's position so it doesn't hide the chart
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 0fc688c..8c0040c 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1755,8 +1755,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
Any* pArray = aSeq.getArray();
PropertyValue aParam;
aParam.Name = "ParentWindow";
- aParam.Value <<= makeAny(xDialogParentWindow);
- pArray[0] <<= makeAny(aParam);
+ aParam.Value = makeAny(xDialogParentWindow);
+ pArray[0] = makeAny(aParam);
xInit->initialize( aSeq );
//execute dialog
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index 26d4026..bc68ead 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -207,8 +207,8 @@ void FuHangulHanjaConversion::StartChineseConversion()
Any* pArray = aSeq.getArray();
PropertyValue aParam;
aParam.Name = "ParentWindow";
- aParam.Value <<= makeAny(xDialogParentWindow);
- pArray[0] <<= makeAny(aParam);
+ aParam.Value = makeAny(xDialogParentWindow);
+ pArray[0] = makeAny(aParam);
xInit->initialize( aSeq );
//execute dialog
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 07f496a..8be42dd 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2019,12 +2019,12 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c
bool bIsNum = const_cast< SvNumberFormatter& >( m_aNumberFormatter ).
IsNumberFormat( pLine->m_aValueEdit->GetText(), nIndex, nValue );
if ( bIsNum )
- aPropertiesSeq[i].Value <<= makeAny( nValue );
+ aPropertiesSeq[i].Value = makeAny( nValue );
}
else if ( CUSTOM_TYPE_BOOLEAN == nType )
{
bool bValue = pLine->m_aYesNoButton->IsYesChecked();
- aPropertiesSeq[i].Value <<= makeAny( bValue );
+ aPropertiesSeq[i].Value = makeAny( bValue );
}
else if ( CUSTOM_TYPE_DATETIME == nType )
{
@@ -2066,7 +2066,7 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c
else
{
OUString sValue( pLine->m_aValueEdit->GetText() );
- aPropertiesSeq[i].Value <<= makeAny( sValue );
+ aPropertiesSeq[i].Value = makeAny( sValue );
}
}
}
@@ -2554,7 +2554,7 @@ Sequence< document::CmisProperty > CmisPropertiesWindow::GetCmisProperties() con
if ( bIsNum )
seqValue[k] = dValue;
}
- aPropertiesSeq[i].Value <<= makeAny( seqValue );
+ aPropertiesSeq[i].Value = makeAny( seqValue );
}
else if ( CMIS_TYPE_INTEGER == sType )
{
@@ -2572,7 +2572,7 @@ Sequence< document::CmisProperty > CmisPropertiesWindow::GetCmisProperties() con
if ( bIsNum )
seqValue[k] = (sal_Int64) dValue;
}
- aPropertiesSeq[i].Value <<= makeAny( seqValue );
+ aPropertiesSeq[i].Value = makeAny( seqValue );
}
else if ( CMIS_TYPE_BOOL == sType )
{
@@ -2584,7 +2584,7 @@ Sequence< document::CmisProperty > CmisPropertiesWindow::GetCmisProperties() con
bool bValue = (*it)->m_aYesButton->IsChecked();
seqValue[k] = bValue;
}
- aPropertiesSeq[i].Value <<= makeAny( seqValue );
+ aPropertiesSeq[i].Value = makeAny( seqValue );
}
else if ( CMIS_TYPE_DATETIME == sType )
@@ -2602,7 +2602,7 @@ Sequence< document::CmisProperty > CmisPropertiesWindow::GetCmisProperties() con
aTmpDate.GetYear(), true );
seqValue[k] = aDateTime;
}
- aPropertiesSeq[i].Value <<= makeAny( seqValue );
+ aPropertiesSeq[i].Value = makeAny( seqValue );
}
else
{
@@ -2614,7 +2614,7 @@ Sequence< document::CmisProperty > CmisPropertiesWindow::GetCmisProperties() con
OUString sValue( (*it)->m_aValueEdit->GetText() );
seqValue[k] = sValue;
}
- aPropertiesSeq[i].Value <<= makeAny( seqValue );
+ aPropertiesSeq[i].Value = makeAny( seqValue );
}
}
}
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index b24472d..b4a79d7 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1046,7 +1046,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
{
aInitArguments[0] <<= nTemplateDescription;
if ( mpPreferredParentWindow )
- aInitArguments[1] <<= makeAny( VCLUnoHelper::GetInterface( mpPreferredParentWindow ) );
+ aInitArguments[1] = makeAny( VCLUnoHelper::GetInterface( mpPreferredParentWindow ) );
}
else
{
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 4954ed8..0c7cb7d 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -504,8 +504,8 @@ void SwAccessibleParagraph::InvalidateCursorPos_()
if(m_bLastHasSelection || bCurSelection )
{
aEvent.EventId = AccessibleEventId::TEXT_SELECTION_CHANGED;
- aEvent.OldValue <<= uno::Any();
- aEvent.NewValue <<= uno::Any();
+ aEvent.OldValue.clear();
+ aEvent.NewValue.clear();
FireAccessibleEvent(aEvent);
}
m_bLastHasSelection =bCurSelection;
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 2f74292..55e0bcf 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2666,7 +2666,7 @@ OUString SwDBManager::LoadAndRegisterDataSource(const DBConnURITypes type, const
break;
case DBCONN_MSJET:
case DBCONN_MSACE:
- aSuppressVersionsAny <<= uno::makeAny(true);
+ aSuppressVersionsAny = uno::makeAny(true);
break;
}
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 18d60f2d..dc5f43c 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -1287,8 +1287,8 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq)
Any* pArray = aSeq.getArray();
PropertyValue aParam;
aParam.Name = "ParentWindow";
- aParam.Value <<= makeAny(xDialogParentWindow);
- pArray[0] <<= makeAny(aParam);
+ aParam.Value = makeAny(xDialogParentWindow);
+ pArray[0] = makeAny(aParam);
xInit->initialize( aSeq );
//execute dialog
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index e9f10ba..6eb617c 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -326,8 +326,8 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq)
Any* pArray = aSequence.getArray();
PropertyValue aParam;
aParam.Name = "ParentWindow";
- aParam.Value <<= makeAny(xDialogParentWindow);
- pArray[0] <<= makeAny(aParam);
+ aParam.Value = makeAny(xDialogParentWindow);
+ pArray[0] = makeAny(aParam);
xInit->initialize( aSequence );
//execute dialog
diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx
index eec72eb..1591265 100644
--- a/sw/source/uibase/table/chartins.cxx
+++ b/sw/source/uibase/table/chartins.cxx
@@ -186,12 +186,12 @@ void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings )
uno::Any* pArray = aSeq.getArray();
beans::PropertyValue aParam1;
aParam1.Name = "ParentWindow";
- aParam1.Value <<= uno::makeAny(xDialogParentWindow);
+ aParam1.Value = uno::makeAny(xDialogParentWindow);
beans::PropertyValue aParam2;
aParam2.Name = "ChartModel";
- aParam2.Value <<= uno::makeAny(xChartModel);
- pArray[0] <<= uno::makeAny(aParam1);
- pArray[1] <<= uno::makeAny(aParam2);
+ aParam2.Value = uno::makeAny(xChartModel);
+ pArray[0] = uno::makeAny(aParam1);
+ pArray[1] = uno::makeAny(aParam2);
xInit->initialize( aSeq );
// try to set the dialog's position so it doesn't hide the chart
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 866087e..f6a1a58 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -133,8 +133,8 @@ void SwView::ExecLingu(SfxRequest &rReq)
Any* pArray = aSeq.getArray();
PropertyValue aParam;
aParam.Name = "ParentWindow";
- aParam.Value <<= makeAny(xDialogParentWindow);
- pArray[0] <<= makeAny(aParam);
+ aParam.Value = makeAny(xDialogParentWindow);
+ pArray[0] = makeAny(aParam);
xInit->initialize( aSeq );
//execute dialog
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f03c3e5..980601c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -947,7 +947,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion( )
beans::PropertyValue aRet;
uno::Sequence<beans::PropertyValue> aGrabBag(1);
aRet.Name = "ParaFrameProperties";
- aRet.Value <<= uno::Any(rAppendContext.pLastParagraphProperties->IsFrameMode());
+ aRet.Value = uno::makeAny(rAppendContext.pLastParagraphProperties->IsFrameMode());
aGrabBag[0] = aRet;
aFrameProperties.push_back(comphelper::makePropertyValue("FrameInteropGrabBag", aGrabBag));
@@ -1986,7 +1986,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
uno::Sequence<beans::PropertyValue> aShapeGrabBag(1);
beans::PropertyValue aRet;
aRet.Name = "SdtEndBefore";
- aRet.Value <<= uno::makeAny(true);
+ aRet.Value = uno::makeAny(true);
aShapeGrabBag[0] = aRet;
xShapePropertySet->setPropertyValue("InteropGrabBag",uno::makeAny(aShapeGrabBag));
}
@@ -4774,7 +4774,7 @@ void DomainMapper_Impl::ImportGraphic(const writerfilter::Reference< Properties
uno::Sequence<beans::PropertyValue> aFrameGrabBag(1);
beans::PropertyValue aRet;
aRet.Name = "SdtEndBefore";
- aRet.Value <<= uno::makeAny(true);
+ aRet.Value = uno::makeAny(true);
aFrameGrabBag[0] = aRet;
xPropertySet->setPropertyValue("FrameInteropGrabBag",uno::makeAny(aFrameGrabBag));
}
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index a0d2e09..fe33c1b 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -373,7 +373,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
{
if( maChartTypeServiceName == "com.sun.star.chart2.AreaChartType" || maChartTypeServiceName == "com.sun.star.chart2.LineChartType" )
{
- aDeepProperty <<= uno::makeAny( true );
+ aDeepProperty = uno::makeAny( true );
}
}
}
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx
index c357a2d..465a25f 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -469,7 +469,7 @@ void SigningTest::test96097Calc()
aTempFileSaveCopy.EnableKillingFile();
uno::Sequence<beans::PropertyValue> descSaveACopy(2);
descSaveACopy[0].Name = "SaveACopy";
- descSaveACopy[0].Value <<= uno::makeAny(true);
+ descSaveACopy[0].Value = uno::makeAny(true);
descSaveACopy[1].Name = "FilterName";
descSaveACopy[1].Value <<= OUString("calc8");
xDocStorable->storeToURL(aTempFileSaveCopy.GetURL(), descSaveACopy);
@@ -517,7 +517,7 @@ void SigningTest::test96097Doc()
aTempFileSaveCopy.EnableKillingFile();
uno::Sequence<beans::PropertyValue> descSaveACopy(2);
descSaveACopy[0].Name = "SaveACopy";
- descSaveACopy[0].Value <<= uno::makeAny(true);
+ descSaveACopy[0].Value = uno::makeAny(true);
descSaveACopy[1].Name = "FilterName";
descSaveACopy[1].Value <<= OUString("writer8");
xDocStorable->storeToURL(aTempFileSaveCopy.GetURL(), descSaveACopy);
More information about the Libreoffice-commits
mailing list