summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/core/uwriter.cxx4
-rw-r--r--sw/qa/extras/globalfilter/globalfilter.cxx2
-rw-r--r--sw/source/core/access/accdoc.cxx6
-rw-r--r--sw/source/core/access/accpara.cxx2
-rw-r--r--sw/source/core/attr/format.cxx2
-rw-r--r--sw/source/core/crsr/bookmrk.cxx2
-rw-r--r--sw/source/core/doc/number.cxx2
-rw-r--r--sw/source/core/doc/textboxhelper.cxx2
-rw-r--r--sw/source/core/unocore/unocoll.cxx4
-rw-r--r--sw/source/core/unocore/unodraw.cxx2
-rw-r--r--sw/source/core/unocore/unostyle.cxx8
-rw-r--r--sw/source/core/unocore/unotbl.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx14
-rw-r--r--sw/source/filter/ww8/ww8toolbar.cxx4
-rw-r--r--sw/source/filter/xml/xmltexti.cxx2
-rw-r--r--sw/source/ui/vba/vbaglobals.cxx4
-rw-r--r--sw/source/ui/vba/vbaselection.cxx13
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx2
-rw-r--r--sw/source/uibase/shells/annotsh.cxx4
-rw-r--r--sw/source/uibase/shells/drwtxtsh.cxx4
-rw-r--r--sw/source/uibase/shells/textsh1.cxx2
-rw-r--r--sw/source/uibase/table/chartins.cxx8
-rw-r--r--sw/source/uibase/uiview/viewling.cxx6
-rw-r--r--sw/source/uibase/utlui/uitool.cxx2
24 files changed, 51 insertions, 54 deletions
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index e5b17891d802..9486e369e9e7 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -339,8 +339,8 @@ SwTextNode* getModelToViewTestDocument2(SwDoc *pDoc)
pMarksAccess->makeNoTextFieldBookmark(aPaM, "test", ODF_FORMDROPDOWN));
CPPUNIT_ASSERT(pFieldmark);
uno::Sequence< OUString > vListEntries { "BBBBB" };
- (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] = uno::makeAny(vListEntries);
- (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_RESULT] = uno::makeAny(sal_Int32(0));
+ (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] <<= vListEntries;
+ (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_RESULT] <<= sal_Int32(0);
pDoc->getIDocumentContentOperations().InsertString(aPaM, "CCCCC");
SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(11),
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index 4f91797c28ad..68187a49c4ab 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -623,7 +623,7 @@ void Test::testMSCharBackgroundEditing()
if (rProp.Name == "CharShadingMarker")
{
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), true, rProp.Value.get<bool>());
- rProp.Value = uno::makeAny(false);
+ rProp.Value <<= false;
}
}
xRun->setPropertyValue("CharInteropGrabBag", uno::makeAny(aGrabBag));
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 94131d5eeed5..0cd8202d849d 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -788,7 +788,7 @@ css::uno::Sequence< css::uno::Any >
if ( xSelContext->getAccessibleRole() == AccessibleRole::PARAGRAPH )
{
uno::Sequence<uno::Any> aRet( 1 );
- aRet[0] = uno::makeAny( xSel );
+ aRet[0] <<= xSel;
return aRet;
}
}
@@ -810,7 +810,7 @@ css::uno::Sequence< css::uno::Any >
if ( pAccImpl && pAccImpl->getAccessibleRole() == AccessibleRole::PARAGRAPH )
{
uno::Sequence< uno::Any > aRet(1);
- aRet[0] = uno::makeAny( xAcc );
+ aRet[0] <<= xAcc;
return aRet;
}
}
@@ -856,7 +856,7 @@ css::uno::Sequence< css::uno::Any >
SwAccessibleContext *pAccImpl = static_cast< SwAccessibleContext *>( xAcc.get() );
if ( pAccImpl && pAccImpl->getAccessibleRole() == AccessibleRole::PARAGRAPH )
{
- aRet[nIndex] = uno::makeAny( xAcc );
+ aRet[nIndex] <<= xAcc;
}
}
}
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index b44e2bc61558..39e197fc2789 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1904,7 +1904,7 @@ uno::Sequence< PropertyValue > SwAccessibleParagraph::getDefaultAttributes(
const Size a100thMMSize( 1000, 1000 );
const Size aPixelSize = GetMap()->LogicToPixel( a100thMMSize );
const float fRatio = ((float)a100thMMSize.Width()/100)/aPixelSize.Width();
- rPropVal.Value = uno::makeAny( fRatio );
+ rPropVal.Value <<= fRatio;
rPropVal.Handle = -1;
rPropVal.State = beans::PropertyState_DEFAULT_VALUE;
pValues[ aValues.getLength() - 1 ] = rPropVal;
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index f9bd0a6c37c4..279a05af976b 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -786,7 +786,7 @@ void SwFormat::GetGrabBagItem(uno::Any& rVal) const
else
{
uno::Sequence<beans::PropertyValue> aValue(0);
- rVal = uno::makeAny(aValue);
+ rVal <<= aValue;
}
}
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 69add5f044c5..b688a30c7240 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -434,7 +434,7 @@ namespace sw { namespace mark
{
if ( IsChecked() != checked )
{
- (*GetParameters())[OUString(ODF_FORMCHECKBOX_RESULT)] = makeAny(checked);
+ (*GetParameters())[OUString(ODF_FORMCHECKBOX_RESULT)] <<= checked;
// mark document as modified
SwDoc *const pDoc( GetMarkPos().GetDoc() );
if ( pDoc )
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 03f887808836..838c8c742b09 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1024,7 +1024,7 @@ void SwNumRule::GetGrabBagItem(uno::Any& rVal) const
else
{
uno::Sequence<beans::PropertyValue> aValue(0);
- rVal = uno::makeAny(aValue);
+ rVal <<= aValue;
}
}
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index 8ccc886fd1a9..bd17f1aca24a 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -386,7 +386,7 @@ void SwTextBoxHelper::getProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uI
}
break;
case MID_CHAIN_NAME:
- rValue = uno::makeAny(pFormat->GetName());
+ rValue <<= pFormat->GetName();
break;
}
}
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 0eea0338b447..2d9e4c6dc109 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -253,8 +253,8 @@ public:
if ( !hasByName( aName ) )
throw container::NoSuchElementException();
uno::Sequence< uno::Any > aArgs( 2 );
- aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
- aArgs[1] = uno::Any( mpDocShell->GetModel() );
+ aArgs[0] <<= uno::Reference< uno::XInterface >();
+ aArgs[1] <<= mpDocShell->GetModel();
uno::Reference< uno::XInterface > xDocObj = ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.word.Document" , aArgs );
SAL_INFO("sw.uno",
"Creating Object ( ooo.vba.word.Document ) 0x" << xDocObj.get());
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 6681928cce63..0b3bbc279fd3 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1580,7 +1580,7 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
break;
}
}
- aRet = uno::makeAny(nRet);
+ aRet <<= nRet;
}
else
{
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 54eca80fa57f..fbf373d9b008 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -2190,7 +2190,7 @@ uno::Any SwXStyle::GetStyleProperty<FN_UNO_PARA_STYLE_CONDITIONS>(const SfxItemP
for(auto& rNV : aSeq)
{
rNV.Name = GetCommandContextByIndex(nIndex++);
- rNV.Value = uno::makeAny(OUString());
+ rNV.Value <<= OUString();
}
SwFormat* pFormat = static_cast<SwDocStyleSheet*>(GetStyleSheetBase())->GetCollection();
if(pFormat && RES_CONDTXTFMTCOLL == pFormat->Which())
@@ -2205,7 +2205,7 @@ uno::Any SwXStyle::GetStyleProperty<FN_UNO_PARA_STYLE_CONDITIONS>(const SfxItemP
// get programmatic style name from UI style name
OUString aStyleName = pCond->GetTextFormatColl()->GetName();
SwStyleNameMapper::FillProgName(aStyleName, aStyleName, lcl_GetSwEnumFromSfxEnum(GetFamily()), true);
- pSeq[n].Value = uno::makeAny(aStyleName);
+ pSeq[n].Value <<= aStyleName;
}
}
return uno::makeAny(aSeq);
@@ -2279,7 +2279,7 @@ uno::Any SwXStyle::GetStyleProperty<HINT_BEGIN>(const SfxItemPropertySimpleEntry
//UUUU
// since the sfx uint16 item now exports a sal_Int32, we may have to fix this here
if(rEntry.aType == cppu::UnoType<sal_Int16>::get() && aResult.getValueType() == cppu::UnoType<sal_Int32>::get())
- aResult = uno::makeAny<sal_Int16>(aResult.get<sal_Int32>());
+ aResult <<= (sal_Int16)(aResult.get<sal_Int32>());
//UUUU check for needed metric translation
if(rEntry.nMemberId & SFX_METRIC_ITEM && GetDoc())
{
@@ -3207,7 +3207,7 @@ uno::Sequence<uno::Any> SwXPageStyle::GetPropertyValues_Impl(const uno::Sequence
pFrameFormat = &pDesc->GetMaster();
const uno::Reference<text::XText> xRet = lcl_makeHeaderFooter(nRes, nRes == RES_HEADER, pFrameFormat);
if (xRet.is())
- aRet[nProp] = uno::makeAny(xRet);
+ aRet[nProp] <<= xRet;
}
break;
case FN_PARAM_FTN_INFO:
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 92eb37cabc0f..27d3af746b38 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -317,7 +317,7 @@ static uno::Any lcl_GetSpecialProperty(SwFrameFormat* pFormat, const SfxItemProp
else if(FN_TABLE_RELATIVE_WIDTH == pEntry->nWID)
rSz.QueryValue(aRet, MID_FRMSIZE_REL_WIDTH);
else
- aRet = uno::makeAny<bool>(0 != rSz.GetWidthPercent());
+ aRet <<= (0 != rSz.GetWidthPercent());
return aRet;
}
@@ -1746,7 +1746,7 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
{
auto pFormat(SwUnoCursorHelper::GetCurTextFormatColl(rUnoCursor, false));
if(pFormat)
- aResult = uno::makeAny(pFormat->GetName());
+ aResult <<= pFormat->GetName();
}
break;
default:
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index e331b9de6e45..1a434c6a607e 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -148,10 +148,10 @@ eF_ResT SwWW8ImplReader::Read_F_FormTextBox( WW8FieldDesc* pF, OUString& rStr )
if (!aBookmarkName.isEmpty()) {
m_aFieldStack.back().SetBookmarkName(aBookmarkName);
m_aFieldStack.back().SetBookmarkType(ODF_FORMTEXT);
- m_aFieldStack.back().getParameters()["Description"] = uno::makeAny(OUString(aFormula.msToolTip));
- m_aFieldStack.back().getParameters()["Name"] = uno::makeAny(OUString(aFormula.msTitle));
+ m_aFieldStack.back().getParameters()["Description"] <<= aFormula.msToolTip;
+ m_aFieldStack.back().getParameters()["Name"] <<= aFormula.msTitle;
if (aFormula.mnMaxLen)
- m_aFieldStack.back().getParameters()["MaxLength"] = uno::makeAny(OUString::number(aFormula.mnMaxLen));
+ m_aFieldStack.back().getParameters()["MaxLength"] <<= OUString::number(aFormula.mnMaxLen);
}
return eF_ResT::TEXT;
}
@@ -205,8 +205,8 @@ eF_ResT SwWW8ImplReader::Read_F_FormCheckBox( WW8FieldDesc* pF, OUString& rStr )
if (pFieldmark!=nullptr) {
IFieldmark::parameter_map_t* const pParameters = pFieldmark->GetParameters();
ICheckboxFieldmark* pCheckboxFm = dynamic_cast<ICheckboxFieldmark*>(pFieldmark);
- (*pParameters)[ODF_FORMCHECKBOX_NAME] = uno::makeAny(OUString(aFormula.msTitle));
- (*pParameters)[ODF_FORMCHECKBOX_HELPTEXT] = uno::makeAny(OUString(aFormula.msToolTip));
+ (*pParameters)[ODF_FORMCHECKBOX_NAME] <<= aFormula.msTitle;
+ (*pParameters)[ODF_FORMCHECKBOX_HELPTEXT] <<= aFormula.msToolTip;
if(pCheckboxFm)
pCheckboxFm->SetChecked(aFormula.mnChecked);
@@ -278,9 +278,9 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, OUString& rStr)
{
uno::Sequence< OUString > vListEntries(aFormula.maListEntries.size());
std::copy(aFormula.maListEntries.begin(), aFormula.maListEntries.end(), vListEntries.begin());
- (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] = uno::makeAny(vListEntries);
+ (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] <<= vListEntries;
sal_Int32 nIndex = aFormula.mfDropdownIndex < aFormula.maListEntries.size() ? aFormula.mfDropdownIndex : 0;
- (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_RESULT] = uno::makeAny(nIndex);
+ (*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_RESULT] <<= nIndex;
// set field data here...
}
}
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 0d66d771058d..471e57aa618b 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -371,7 +371,7 @@ bool Customization::ImportMenu( SwCTBWrapper& rWrapper, CustomToolBarImportHelpe
// create the popup menu
uno::Sequence< beans::PropertyValue > aPopupMenu( 4 );
aPopupMenu[0].Name = "CommandURL";
- aPopupMenu[0].Value = uno::makeAny( "vnd.openoffice.org:" + sMenuName );
+ aPopupMenu[0].Value <<= "vnd.openoffice.org:" + sMenuName;
aPopupMenu[1].Name = "Label";
aPopupMenu[1].Value <<= sMenuName;
aPopupMenu[2].Name = "Type";
@@ -743,7 +743,7 @@ SwTBC::ImportToolBarControl( SwCTBWrapper& rWrapper, const css::uno::Reference<
// insert spacer
uno::Sequence< beans::PropertyValue > sProps( 1 );
sProps[ 0 ].Name = "Type";
- sProps[ 0 ].Value = uno::makeAny( ui::ItemType::SEPARATOR_LINE );
+ sProps[ 0 ].Value <<= ui::ItemType::SEPARATOR_LINE;
toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) );
}
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 73fb70565f42..a6746a4a144e 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -929,7 +929,7 @@ void SwXMLTextImportHelper::endAppletOrPlugin(
{
aCommandSequence[nIndex].Name = (*aIter).first;
aCommandSequence[nIndex].Handle = -1;
- aCommandSequence[nIndex].Value = makeAny( OUString((*aIter).second) );
+ aCommandSequence[nIndex].Value <<= (*aIter).second;
aCommandSequence[nIndex].State = beans::PropertyState_DIRECT_VALUE;
++aIter;
++nIndex;
diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx
index 3bd9c957352a..bfb0b1ba5ce6 100644
--- a/sw/source/ui/vba/vbaglobals.cxx
+++ b/sw/source/ui/vba/vbaglobals.cxx
@@ -39,9 +39,9 @@ SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Refere
SAL_INFO("sw", "SwVbaGlobals::SwVbaGlobals()");
uno::Sequence< beans::PropertyValue > aInitArgs( 2 );
aInitArgs[ 0 ].Name = "Application";
- aInitArgs[ 0 ].Value = uno::makeAny( getApplication() );
+ aInitArgs[ 0 ].Value <<= getApplication();
aInitArgs[ 1 ].Name = "WordDocumentContext";
- aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) );
+ aInitArgs[ 1 ].Value <<= getXSomethingFromArgs< frame::XModel >( aArgs, 0 );
init( aInitArgs );
}
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index fc5017d50aff..e4d9fbe82ae4 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -675,17 +675,17 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type )
{
case word::WdInformation::wdActiveEndPageNumber:
{
- result = uno::makeAny( SwVbaInformationHelper::handleWdActiveEndPageNumber( mxTextViewCursor ) );
+ result <<= SwVbaInformationHelper::handleWdActiveEndPageNumber( mxTextViewCursor );
break;
}
case word::WdInformation::wdNumberOfPagesInDocument:
{
- result = uno::makeAny( SwVbaInformationHelper::handleWdNumberOfPagesInDocument( mxModel ) );
+ result <<= SwVbaInformationHelper::handleWdNumberOfPagesInDocument( mxModel );
break;
}
case word::WdInformation::wdVerticalPositionRelativeToPage:
{
- result = uno::makeAny( SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( mxModel, mxTextViewCursor ) );
+ result <<= SwVbaInformationHelper::handleWdVerticalPositionRelativeToPage( mxModel, mxTextViewCursor );
break;
}
case word::WdInformation::wdWithInTable:
@@ -693,10 +693,7 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type )
uno::Reference< beans::XPropertySet > xCursorProps( mxTextViewCursor, uno::UNO_QUERY_THROW );
uno::Reference< text::XTextTable > xTextTable;
xCursorProps->getPropertyValue("TextTable") >>= xTextTable;
- if( xTextTable.is() )
- result = uno::makeAny( true );
- else
- result = uno::makeAny( false );
+ result <<= xTextTable.is();
break;
}
case word::WdInformation::wdHeaderFooterType:
@@ -761,7 +758,7 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type )
nHeaderFooterType = -1;
}
}
- result = uno::makeAny( nHeaderFooterType );
+ result <<= nHeaderFooterType;
break;
}
default:
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 59eff0ef64df..de9a51471a60 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2709,7 +2709,7 @@ OUString SwDBManager::LoadAndRegisterDataSource(const DBConnURITypes type, const
break;
case DBCONN_MSJET:
case DBCONN_MSACE:
- aSuppressVersionsAny = uno::makeAny(true);
+ aSuppressVersionsAny <<= true;
break;
}
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 5ddc121db500..80520635b2fb 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -1289,8 +1289,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 <<= xDialogParentWindow;
+ pArray[0] <<= aParam;
xInit->initialize( aSeq );
//execute dialog
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 4cadee411d4e..70cc06b6cb24 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -313,8 +313,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 <<= xDialogParentWindow;
+ pArray[0] <<= aParam;
xInit->initialize( aSequence );
//execute dialog
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 7da48b1dd92a..0a9c346e3c28 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1225,7 +1225,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
auto aIterator = rMap.find("CharShadingMarker");
if( aIterator != rMap.end() )
{
- aIterator->second = uno::makeAny(false);
+ aIterator->second <<= false;
}
rWrtSh.SetAttrItem( aGrabBag );
}
diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx
index 208c34f6500b..2f7d457cd56c 100644
--- a/sw/source/uibase/table/chartins.cxx
+++ b/sw/source/uibase/table/chartins.cxx
@@ -182,12 +182,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 <<= xDialogParentWindow;
beans::PropertyValue aParam2;
aParam2.Name = "ChartModel";
- aParam2.Value = uno::makeAny(xChartModel);
- pArray[0] = uno::makeAny(aParam1);
- pArray[1] = uno::makeAny(aParam2);
+ aParam2.Value <<= xChartModel;
+ pArray[0] <<= aParam1;
+ pArray[1] <<= 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 ff66a402903c..55b1c55c3726 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -132,8 +132,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 <<= xDialogParentWindow;
+ pArray[0] <<= aParam;
xInit->initialize( aSeq );
//execute dialog
@@ -898,7 +898,7 @@ IMPL_LINK( SwFieldDialog, MyListBoxHandler, ListBox&, rBox, void )
if ( selection >= 0 )
{
OUString sKey = ODF_FORMDROPDOWN_RESULT;
- (*pFieldmark->GetParameters())[ sKey ] = makeAny(selection);
+ (*pFieldmark->GetParameters())[ sKey ] <<= selection;
pFieldmark->Invalidate();
SwView& rView = static_cast<SwEditWin*>( GetParent() )->GetView();
rView.GetDocShell()->SetModified();
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index 4efd976b1bda..b62aa6577022 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -182,7 +182,7 @@ void ConvertAttrGenToChar(SfxItemSet& rSet, const SfxItemSet& rOrigSet, const sa
auto aIterator = rMap.find("CharShadingMarker");
if( aIterator != rMap.end() )
{
- aIterator->second = uno::makeAny(false);
+ aIterator->second <<= false;
}
rSet.Put( aGrabBag );
}
generated by cgit (git 2.34.1) at 2024-12-25 21:49:35 +0000