summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/html/SwAppletImpl.cxx14
-rw-r--r--sw/source/filter/html/htmlform.cxx10
-rw-r--r--sw/source/filter/html/htmlplug.cxx32
-rw-r--r--sw/source/filter/ww8/docxexport.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx6
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par.cxx12
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx4
-rw-r--r--sw/source/filter/ww8/ww8toolbar.cxx8
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx2
-rw-r--r--sw/source/filter/xml/swxml.cxx28
-rw-r--r--sw/source/filter/xml/wrtxml.cxx18
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx4
-rw-r--r--sw/source/filter/xml/xmlimp.cxx50
-rw-r--r--sw/source/filter/xml/xmltexte.cxx6
-rw-r--r--sw/source/filter/xml/xmltexti.cxx24
18 files changed, 116 insertions, 116 deletions
diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx
index 1b18d54a3f6f..16766d9a3b8a 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -131,14 +131,14 @@ void SwApplet_Impl::CreateApplet( const OUString& rCode, const OUString& rName,
uno::Reference < beans::XPropertySet > xSet( m_xApplet->getComponent(), uno::UNO_QUERY );
if ( xSet.is() )
{
- xSet->setPropertyValue("AppletCode", uno::makeAny( rCode ) );
- xSet->setPropertyValue("AppletName", uno::makeAny( rName ) );
- xSet->setPropertyValue("AppletIsScript", uno::makeAny( bMayScript ) );
- xSet->setPropertyValue("AppletDocBase", uno::makeAny( sDocBase ) );
+ xSet->setPropertyValue("AppletCode", uno::Any( rCode ) );
+ xSet->setPropertyValue("AppletName", uno::Any( rName ) );
+ xSet->setPropertyValue("AppletIsScript", uno::Any( bMayScript ) );
+ xSet->setPropertyValue("AppletDocBase", uno::Any( sDocBase ) );
if ( !rCodeBase.isEmpty() )
- xSet->setPropertyValue("AppletCodeBase", uno::makeAny( rCodeBase ) );
+ xSet->setPropertyValue("AppletCodeBase", uno::Any( rCodeBase ) );
else
- xSet->setPropertyValue("AppletCodeBase", uno::makeAny( sDocBase ) );
+ xSet->setPropertyValue("AppletCodeBase", uno::Any( sDocBase ) );
}
}
#if HAVE_FEATURE_JAVA
@@ -179,7 +179,7 @@ void SwApplet_Impl::FinishApplet()
{
uno::Sequence < beans::PropertyValue > aProps;
m_aCommandList.FillSequence( aProps );
- xSet->setPropertyValue("AppletCommands", uno::makeAny( aProps ) );
+ xSet->setPropertyValue("AppletCommands", uno::Any( aProps ) );
}
}
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 12a5a8c912dd..e45f2b7db018 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -1616,7 +1616,7 @@ void SwHTMLParser::InsertInput()
if( bDisabled )
{
- xPropSet->setPropertyValue("Enabled", makeAny(false) );
+ xPropSet->setPropertyValue("Enabled", Any(false) );
}
}
@@ -2010,7 +2010,7 @@ void SwHTMLParser::NewTextArea()
if( bDisabled )
{
- xPropSet->setPropertyValue("Enabled", makeAny(false) );
+ xPropSet->setPropertyValue("Enabled", Any(false) );
}
OSL_ENSURE( m_pFormImpl->GetText().isEmpty(), "Text is not empty!" );
@@ -2267,14 +2267,14 @@ void SwHTMLParser::NewSelect()
if( bDisabled )
{
- xPropSet->setPropertyValue("Enabled", makeAny(false) );
+ xPropSet->setPropertyValue("Enabled", Any(false) );
}
Size aTextSz( 0, 0 );
bool bMinWidth = true, bMinHeight = true;
if( !bMultiple && 1==m_nSelectEntryCnt )
{
- xPropSet->setPropertyValue("Dropdown", makeAny(true) );
+ xPropSet->setPropertyValue("Dropdown", Any(true) );
}
else
{
@@ -2283,7 +2283,7 @@ void SwHTMLParser::NewSelect()
if( bMultiple )
{
- xPropSet->setPropertyValue("MultiSelection", makeAny(true) );
+ xPropSet->setPropertyValue("MultiSelection", Any(true) );
}
aTextSz.setHeight( m_nSelectEntryCnt );
bMinHeight = false;
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index eacb1647361f..bd8446c9ca1e 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -539,13 +539,13 @@ bool SwHTMLParser::InsertEmbed()
if ( xSet.is() )
{
if( bHasURL )
- xSet->setPropertyValue("PluginURL", uno::makeAny( aURL ) );
+ xSet->setPropertyValue("PluginURL", uno::Any( aURL ) );
if( bHasType )
- xSet->setPropertyValue("PluginMimeType", uno::makeAny( aType ) );
+ xSet->setPropertyValue("PluginMimeType", uno::Any( aType ) );
uno::Sequence < beans::PropertyValue > aProps;
aCmdLst.FillSequence( aProps );
- xSet->setPropertyValue("PluginCommands", uno::makeAny( aProps ) );
+ xSet->setPropertyValue("PluginCommands", uno::Any( aProps ) );
}
}
@@ -582,9 +582,9 @@ bool SwHTMLParser::InsertEmbed()
if (bOwnFormat)
{
uno::Sequence<beans::PropertyValue> aMedium = comphelper::InitPropertySequence(
- { { "InputStream", uno::makeAny(xInStream) },
- { "URL", uno::makeAny(OUString("private:stream")) },
- { "DocumentBaseURL", uno::makeAny(m_sBaseURL) } });
+ { { "InputStream", uno::Any(xInStream) },
+ { "URL", uno::Any(OUString("private:stream")) },
+ { "DocumentBaseURL", uno::Any(m_sBaseURL) } });
xObj = aCnt.InsertEmbeddedObject(aMedium, aName, &m_sBaseURL);
}
else
@@ -612,7 +612,7 @@ bool SwHTMLParser::InsertEmbed()
// Set media type of the native data.
uno::Reference<beans::XPropertySet> xOutStreamProps(xOutStream, uno::UNO_QUERY);
if (xOutStreamProps.is())
- xOutStreamProps->setPropertyValue("MediaType", uno::makeAny(aType));
+ xOutStreamProps->setPropertyValue("MediaType", uno::Any(aType));
}
}
xObj = aCnt.GetEmbeddedObject(aObjName);
@@ -651,7 +651,7 @@ bool SwHTMLParser::InsertEmbed()
// during parsing.
uno::Sequence<beans::PropertyValue> aValues{ comphelper::makePropertyValue("StreamReadOnly",
true) };
- uno::Sequence<uno::Any> aArguments{ uno::makeAny(aValues) };
+ uno::Sequence<uno::Any> aArguments{ uno::Any(aValues) };
xObjInitialization->initialize(aArguments);
}
SwFrameFormat* pFlyFormat =
@@ -662,7 +662,7 @@ bool SwHTMLParser::InsertEmbed()
{
uno::Sequence<beans::PropertyValue> aValues{ comphelper::makePropertyValue("StreamReadOnly",
false) };
- uno::Sequence<uno::Any> aArguments{ uno::makeAny(aValues) };
+ uno::Sequence<uno::Any> aArguments{ uno::Any(aValues) };
xObjInitialization->initialize(aArguments);
}
@@ -1097,24 +1097,24 @@ void SwHTMLParser::InsertFloatingFrame()
bool bHasBorder = aFrameDesc.HasFrameBorder();
Size aMargin = aFrameDesc.GetMargin();
- xSet->setPropertyValue("FrameURL", uno::makeAny( aFrameDesc.GetURL().GetMainURL( INetURLObject::DecodeMechanism::NONE ) ) );
- xSet->setPropertyValue("FrameName", uno::makeAny( aName ) );
+ xSet->setPropertyValue("FrameURL", uno::Any( aFrameDesc.GetURL().GetMainURL( INetURLObject::DecodeMechanism::NONE ) ) );
+ xSet->setPropertyValue("FrameName", uno::Any( aName ) );
if ( eScroll == ScrollingMode::Auto )
xSet->setPropertyValue("FrameIsAutoScroll",
- uno::makeAny( true ) );
+ uno::Any( true ) );
else
xSet->setPropertyValue("FrameIsScrollingMode",
- uno::makeAny( eScroll == ScrollingMode::Yes ) );
+ uno::Any( eScroll == ScrollingMode::Yes ) );
xSet->setPropertyValue("FrameIsBorder",
- uno::makeAny( bHasBorder ) );
+ uno::Any( bHasBorder ) );
xSet->setPropertyValue("FrameMarginWidth",
- uno::makeAny( sal_Int32( aMargin.Width() ) ) );
+ uno::Any( sal_Int32( aMargin.Width() ) ) );
xSet->setPropertyValue("FrameMarginHeight",
- uno::makeAny( sal_Int32( aMargin.Height() ) ) );
+ uno::Any( sal_Int32( aMargin.Height() ) ) );
}
}
}
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 7c30e25e4f55..b86655365162 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -1523,7 +1523,7 @@ void DocxExport::WriteGlossary()
gId = gId.copy(3); //"rId" only save the numeric value
PropertySet aProps(xOutputStream);
- aProps.setAnyProperty( PROP_RelId, uno::makeAny( gId.toInt32() ));
+ aProps.setAnyProperty( PROP_RelId, uno::Any( gId.toInt32() ));
m_rFilter.addRelation( xOutputStream, gType, gTarget);
uno::Reference< xml::sax::XSAXSerializable > gserializer( xDom, uno::UNO_QUERY );
writer->setOutputStream(GetFilter().openFragmentStream( "word/glossary/" + gTarget, contentType ) );
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index dbbe0d67fc9d..5da3ca9fbee5 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -3352,13 +3352,13 @@ void MSWordExportBase::UpdateTocSectionNodeProperties(const SwSectionNode& rSect
{
uno::Sequence<beans::PropertyValue> aDocPropertyValues(comphelper::InitPropertySequence(
{
- {"ooxml:CT_SdtDocPart_docPartGallery", uno::makeAny(OUString("Table of Contents"))},
- {"ooxml:CT_SdtDocPart_docPartUnique", uno::makeAny(OUString("true"))},
+ {"ooxml:CT_SdtDocPart_docPartGallery", uno::Any(OUString("Table of Contents"))},
+ {"ooxml:CT_SdtDocPart_docPartUnique", uno::Any(OUString("true"))},
}));
uno::Sequence<beans::PropertyValue> aSdtPrPropertyValues(comphelper::InitPropertySequence(
{
- {"ooxml:CT_SdtPr_docPartObj", uno::makeAny(aDocPropertyValues)},
+ {"ooxml:CT_SdtPr_docPartObj", uno::Any(aDocPropertyValues)},
}));
SfxGrabBagItem aGrabBag(RES_PARATR_GRABBAG);
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 132fb02bff50..faa25df0ec62 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3440,7 +3440,7 @@ bool SwWW8Writer::InitStd97CodecUpdateMedium( ::msfilter::MSCodec_Std97& rCodec
rCodec.InitKey( aPassword, pDocId );
aEncryptionData = rCodec.GetEncryptionData();
- mpMedium->GetItemSet()->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aEncryptionData ) ) );
+ mpMedium->GetItemSet()->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData ) ) );
}
}
@@ -3722,7 +3722,7 @@ ErrCode SwWW8Writer::WriteStorage()
{
uno::Reference<uno::XComponentContext> xComponentContext(comphelper::getProcessComponentContext());
uno::Sequence<uno::Any> aArguments{
- uno::makeAny(beans::NamedValue("Binary", uno::makeAny(true))) };
+ uno::Any(beans::NamedValue("Binary", uno::Any(true))) };
xPackageEncryption.set(
xComponentContext->getServiceManager()->createInstanceWithArgumentsAndContext(
"com.sun.star.comp.oox.crypto." + sCryptoType, aArguments, xComponentContext), uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 292b4475a216..35a3568b1dd7 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1847,7 +1847,7 @@ void SwWW8ImplReader::ImportDop()
uno::Reference< uno::XComponentContext > xComponentContext(comphelper::getProcessComponentContext());
uno::Reference<container::XIndexContainer> xBox = document::IndexedPropertyValues::create(xComponentContext);
- xBox->insertByIndex(sal_Int32(0), uno::makeAny(aViewProps));
+ xBox->insertByIndex(sal_Int32(0), uno::Any(aViewProps));
uno::Reference<document::XViewDataSupplier> xViewDataSupplier(m_pDocShell->GetModel(), uno::UNO_QUERY);
xViewDataSupplier->setViewData(xBox);
}
@@ -1905,7 +1905,7 @@ void SwWW8ImplReader::ImportDop()
if (xInfo.is())
{
if (xInfo->hasPropertyByName("ApplyFormDesignMode"))
- xDocProps->setPropertyValue("ApplyFormDesignMode", css::uno::makeAny(false));
+ xDocProps->setPropertyValue("ApplyFormDesignMode", css::uno::Any(false));
}
}
@@ -4897,7 +4897,7 @@ static void lcl_createTemplateToProjectEntry( const uno::Reference< container::X
if ( nIndex != -1 )
{
OUString templateName = templateNameWithExt.copy( 0, nIndex );
- xPrjNameCache->insertByName( templateName, uno::makeAny( sVBAProjName ) );
+ xPrjNameCache->insertByName( templateName, uno::Any( sVBAProjName ) );
}
}
catch( const uno::Exception& )
@@ -5865,7 +5865,7 @@ ErrCode SwWW8ImplReader::LoadThroughDecryption(WW8Glossary *pGloss)
}
pMedium->GetItemSet()->ClearItem( SID_PASSWORD );
- pMedium->GetItemSet()->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aEncryptionData ) ) );
+ pMedium->GetItemSet()->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData ) ) );
}
}
break;
@@ -5929,7 +5929,7 @@ ErrCode SwWW8ImplReader::LoadThroughDecryption(WW8Glossary *pGloss)
}
pMedium->GetItemSet()->ClearItem( SID_PASSWORD );
- pMedium->GetItemSet()->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aEncryptionData ) ) );
+ pMedium->GetItemSet()->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::Any( aEncryptionData ) ) );
}
}
break;
@@ -6477,7 +6477,7 @@ ErrCode WW8Reader::DecryptDRMPackage()
// Set the media descriptor data
uno::Sequence<beans::NamedValue> aEncryptionData = xPackageEncryption->createEncryptionData("");
- m_pMedium->GetItemSet()->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, uno::makeAny(aEncryptionData)));
+ m_pMedium->GetItemSet()->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, uno::Any(aEncryptionData)));
}
catch (const std::exception&)
{
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 0d1c634d9839..db67528cdf5a 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2432,7 +2432,7 @@ bool WW8FormulaListBox::Import(const uno::Reference <
xPropSet->setPropertyValue("HelpText", aTmp );
}
- xPropSet->setPropertyValue("Dropdown", css::uno::makeAny(true));
+ xPropSet->setPropertyValue("Dropdown", css::uno::Any(true));
if (!maListEntries.empty())
{
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index a55495404760..5b29666a9ee2 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -657,11 +657,11 @@ sal_uInt16 SwWW8ImplReader::End_Field()
pFieldmark->GetParameters()->insert(
std::pair< OUString, uno::Any > (
ODF_ID_PARAM,
- uno::makeAny( sFieldId ) ) );
+ uno::Any( sFieldId ) ) );
pFieldmark->GetParameters()->insert(
std::pair< OUString, uno::Any > (
ODF_CODE_PARAM,
- uno::makeAny( aCode ) ) );
+ uno::Any( aCode ) ) );
if ( m_aFieldStack.back().mnObjLocFc > 0 )
{
@@ -696,7 +696,7 @@ sal_uInt16 SwWW8ImplReader::End_Field()
// Store the OLE Id as a parameter
pFieldmark->GetParameters()->insert(
std::pair< OUString, uno::Any >(
- ODF_OLE_PARAM, uno::makeAny( sOleId ) ) );
+ ODF_OLE_PARAM, uno::Any( sOleId ) ) );
}
}
}
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 963fecb13c0a..4795205762fa 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4130,7 +4130,7 @@ void SwWW8ImplReader::Read_CharShadow( sal_uInt16, const sal_uInt8* pData, shor
// Add a marker to the grabbag indicating that character background was imported from MSO shading
SfxGrabBagItem aGrabBag = *static_cast<const SfxGrabBagItem*>(GetFormatAttr(RES_CHRATR_GRABBAG));
std::map<OUString, css::uno::Any>& rMap = aGrabBag.GetGrabBag();
- rMap.insert(std::pair<OUString, css::uno::Any>("CharShadingMarker",uno::makeAny(true)));
+ rMap.insert(std::pair<OUString, css::uno::Any>("CharShadingMarker",uno::Any(true)));
NewAttr(aGrabBag);
}
}
@@ -4152,7 +4152,7 @@ void SwWW8ImplReader::Read_TextBackColor(sal_uInt16, const sal_uInt8* pData, sho
// Add a marker to the grabbag indicating that character background was imported from MSO shading
SfxGrabBagItem aGrabBag = *static_cast<const SfxGrabBagItem*>(GetFormatAttr(RES_CHRATR_GRABBAG));
std::map<OUString, css::uno::Any>& rMap = aGrabBag.GetGrabBag();
- rMap.insert(std::pair<OUString, css::uno::Any>("CharShadingMarker",uno::makeAny(true)));
+ rMap.insert(std::pair<OUString, css::uno::Any>("CharShadingMarker",uno::Any(true)));
NewAttr(aGrabBag);
}
}
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index aca7004f086a..a28d28be559e 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -303,7 +303,7 @@ bool Customization::ImportMenu( SwCTBWrapper& rWrapper, CustomToolBarImportHelpe
if ( pCust->customizationDataCTB && !pCust->customizationDataCTB->ImportMenuTB( rWrapper, xMenuContainer, helper ) )
return false;
SAL_INFO("sw.ww8","** there are " << xIndexContainer->getCount() << " menu items on the bar, inserting after that");
- xIndexContainer->insertByIndex( xIndexContainer->getCount(), uno::makeAny( aPopupMenu ) );
+ xIndexContainer->insertByIndex( xIndexContainer->getCount(), uno::Any( aPopupMenu ) );
if ( bHasSettings )
helper.getCfgManager()->replaceSettings( sMenuBar, uno::Reference< container::XIndexAccess >( xIndexContainer, uno::UNO_QUERY_THROW ) );
@@ -434,7 +434,7 @@ bool SwCTB::ImportCustomToolBar( SwCTBWrapper& rWrapper, CustomToolBarImportHelp
uno::Reference< beans::XPropertySet > xProps( xIndexContainer, uno::UNO_QUERY_THROW );
// set UI name for toolbar
- xProps->setPropertyValue( "UIName", uno::makeAny( name.getString() ) );
+ xProps->setPropertyValue( "UIName", uno::Any( name.getString() ) );
const OUString sToolBarName = "private:resource/toolbar/custom_" + name.getString();
for ( auto& rItem : rTBC )
@@ -591,10 +591,10 @@ SwTBC::ImportToolBarControl( SwCTBWrapper& rWrapper, const css::uno::Reference<
// insert spacer
uno::Sequence< beans::PropertyValue > sProps{ comphelper::makePropertyValue(
"Type", ui::ItemType::SEPARATOR_LINE) };
- toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( sProps ) );
+ toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::Any( sProps ) );
}
- toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::makeAny( comphelper::containerToSequence(props) ) );
+ toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::Any( comphelper::containerToSequence(props) ) );
}
return true;
}
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 18c72567c30e..6d1aaa9b37af 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -275,7 +275,7 @@ XMLRedlineImportHelper::XMLRedlineImportHelper(
// set redline mode to "don't record changes"
if( bHandleRecordChanges )
{
- m_xModelPropertySet->setPropertyValue( g_sRecordChanges, makeAny(false) );
+ m_xModelPropertySet->setPropertyValue( g_sRecordChanges, Any(false) );
}
}
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 234a802a4753..fb6fe1f1d733 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -303,7 +303,7 @@ ErrCode ReadThroughComponent(
OSL_ENSURE( xInfoSet.is(), "missing property set" );
if( xInfoSet.is() )
{
- xInfoSet->setPropertyValue( "StreamName", makeAny( sStreamName ) );
+ xInfoSet->setPropertyValue( "StreamName", Any( sStreamName ) );
}
try
@@ -642,7 +642,7 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con
xInfoSet->setPropertyValue("ProgressRange", aProgRange);
Reference< container::XNameAccess > xLateInitSettings( document::NamedPropertyValues::create(xContext), UNO_QUERY_THROW );
- beans::NamedValue aLateInitSettings( "LateInitSettings", makeAny( xLateInitSettings ) );
+ beans::NamedValue aLateInitSettings( "LateInitSettings", Any( xLateInitSettings ) );
xInfoSet->setPropertyValue( "SourceStorage", Any( xStorage ) );
@@ -684,16 +684,16 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con
*pSeq++ = "NumberingStyles";
xInfoSet->setPropertyValue( "StyleInsertModeFamilies",
- makeAny(aFamiliesSeq) );
+ Any(aFamiliesSeq) );
- xInfoSet->setPropertyValue( "StyleInsertModeOverwrite", makeAny(!m_aOption.IsMerge()) );
+ xInfoSet->setPropertyValue( "StyleInsertModeOverwrite", Any(!m_aOption.IsMerge()) );
}
else if( m_bInsertMode )
{
const uno::Reference<text::XTextRange> xInsertTextRange =
SwXTextRange::CreateXTextRange(rDoc, *rPaM.GetPoint(), nullptr);
xInfoSet->setPropertyValue( "TextInsertModeRange",
- makeAny(xInsertTextRange) );
+ Any(xInsertTextRange) );
}
else
{
@@ -703,11 +703,11 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con
if( IsBlockMode() )
{
- xInfoSet->setPropertyValue( "AutoTextMode", makeAny(true) );
+ xInfoSet->setPropertyValue( "AutoTextMode", Any(true) );
}
if( IsOrganizerMode() )
{
- xInfoSet->setPropertyValue( "OrganizerMode", makeAny(true) );
+ xInfoSet->setPropertyValue( "OrganizerMode", Any(true) );
}
// Set base URI
@@ -716,7 +716,7 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con
SfxMedium* pMedDescrMedium = m_pMedium ? m_pMedium : pDocSh->GetMedium();
OSL_ENSURE( pMedDescrMedium, "There is no medium to get MediaDescriptor from!" );
- xInfoSet->setPropertyValue( "BaseURI", makeAny( rBaseURL ) );
+ xInfoSet->setPropertyValue( "BaseURI", Any( rBaseURL ) );
// TODO/LATER: separate links from usual embedded objects
OUString StreamPath;
@@ -736,7 +736,7 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con
if( !StreamPath.isEmpty() )
{
- xInfoSet->setPropertyValue( "StreamRelPath", makeAny( StreamPath ) );
+ xInfoSet->setPropertyValue( "StreamRelPath", Any( StreamPath ) );
}
}
@@ -748,11 +748,11 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con
static const OUStringLiteral sRecordChanges(u"RecordChanges");
static const OUStringLiteral sRedlineProtectionKey(u"RedlineProtectionKey");
xInfoSet->setPropertyValue( sShowChanges,
- makeAny(IDocumentRedlineAccess::IsShowChanges(rDoc.getIDocumentRedlineAccess().GetRedlineFlags())) );
+ Any(IDocumentRedlineAccess::IsShowChanges(rDoc.getIDocumentRedlineAccess().GetRedlineFlags())) );
xInfoSet->setPropertyValue( sRecordChanges,
- makeAny(IDocumentRedlineAccess::IsRedlineOn(rDoc.getIDocumentRedlineAccess().GetRedlineFlags())) );
+ Any(IDocumentRedlineAccess::IsRedlineOn(rDoc.getIDocumentRedlineAccess().GetRedlineFlags())) );
xInfoSet->setPropertyValue( sRedlineProtectionKey,
- makeAny(rDoc.getIDocumentRedlineAccess().GetRedlinePassword()) );
+ Any(rDoc.getIDocumentRedlineAccess().GetRedlinePassword()) );
// force redline mode to "none"
rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( RedlineFlags::NONE );
@@ -763,13 +763,13 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, con
const bool bShapePositionInHoriL2R = !bOASIS;
xInfoSet->setPropertyValue(
"ShapePositionInHoriL2R",
- makeAny( bShapePositionInHoriL2R ) );
+ Any( bShapePositionInHoriL2R ) );
}
{
const bool bTextDocInOOoFileFormat = !bOASIS;
xInfoSet->setPropertyValue(
"TextDocInOOoFileFormat",
- makeAny( bTextDocInOOoFileFormat ) );
+ Any( bTextDocInOOoFileFormat ) );
}
ErrCode nWarnRDF = ERRCODE_NONE;
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index bd9a4c4c8be5..6c553a6fc567 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -188,7 +188,7 @@ ErrCode SwXMLWriter::Write_(const SfxItemSet* pMediumItemSet)
xInfoSet->setPropertyValue( "TargetStorage", Any( m_xStg ) );
- xInfoSet->setPropertyValue("NoEmbDataSet", makeAny(bNoEmbDS));
+ xInfoSet->setPropertyValue("NoEmbDataSet", Any(bNoEmbDS));
if (m_bShowProgress)
{
@@ -204,7 +204,7 @@ ErrCode SwXMLWriter::Write_(const SfxItemSet* pMediumItemSet)
xInfoSet->setPropertyValue("ProgressMax", Any(static_cast < sal_Int32 >( -1 )));
}
- xInfoSet->setPropertyValue( "UsePrettyPrinting", makeAny(officecfg::Office::Common::Save::Document::PrettyPrinting::get()) );
+ xInfoSet->setPropertyValue( "UsePrettyPrinting", Any(officecfg::Office::Common::Save::Document::PrettyPrinting::get()) );
uno::Reference<lang::XComponent> const xModelComp(m_pDoc->GetDocShell()->GetModel());
uno::Reference<drawing::XDrawPageSupplier> const xDPS(xModelComp, uno::UNO_QUERY);
@@ -218,14 +218,14 @@ ErrCode SwXMLWriter::Write_(const SfxItemSet* pMediumItemSet)
// TODO: ideally this would be stored per-view...
SwRootFrame const*const pLayout(m_pDoc->getIDocumentLayoutAccess().GetCurrentLayout());
isShowChanges = pLayout == nullptr || !pLayout->IsHideRedlines();
- xInfoSet->setPropertyValue("ShowChanges", makeAny(isShowChanges));
+ xInfoSet->setPropertyValue("ShowChanges", Any(isShowChanges));
// ... and hide redlines for export
nRedlineFlags &= ~RedlineFlags::ShowMask;
nRedlineFlags |= RedlineFlags::ShowInsert;
m_pDoc->getIDocumentRedlineAccess().SetRedlineFlags( nRedlineFlags );
// Set base URI
- xInfoSet->setPropertyValue( "BaseURI", makeAny( GetBaseURL() ) );
+ xInfoSet->setPropertyValue( "BaseURI", Any( GetBaseURL() ) );
if( SfxObjectCreateMode::EMBEDDED == m_pDoc->GetDocShell()->GetCreateMode() )
{
@@ -233,12 +233,12 @@ ErrCode SwXMLWriter::Write_(const SfxItemSet* pMediumItemSet)
? aDocHierarchicalName
: OUString( "dummyObjectName" ) );
- xInfoSet->setPropertyValue( "StreamRelPath", makeAny( aName ) );
+ xInfoSet->setPropertyValue( "StreamRelPath", Any( aName ) );
}
if( m_bBlock )
{
- xInfoSet->setPropertyValue( "AutoTextMode", makeAny(true) );
+ xInfoSet->setPropertyValue( "AutoTextMode", Any(true) );
}
// #i69627#
@@ -246,7 +246,7 @@ ErrCode SwXMLWriter::Write_(const SfxItemSet* pMediumItemSet)
if ( bOASIS &&
docfunc::HasOutlineStyleToBeWrittenAsNormalListStyle( *m_pDoc ) )
{
- xInfoSet->setPropertyValue( "OutlineStyleAsNormalListStyle", makeAny( true ) );
+ xInfoSet->setPropertyValue( "OutlineStyleAsNormalListStyle", Any( true ) );
}
// filter arguments
@@ -508,7 +508,7 @@ bool SwXMLWriter::WriteThroughComponent(
xSet->setPropertyValue("MediaType", Any(OUString("text/xml")) );
// even plain stream should be encrypted in encrypted documents
- xSet->setPropertyValue( "UseCommonStoragePasswordEncryption", makeAny(true) );
+ xSet->setPropertyValue( "UseCommonStoragePasswordEncryption", Any(true) );
// set buffer and create outputstream
uno::Reference< io::XOutputStream > xOutputStream = xStream->getOutputStream();
@@ -520,7 +520,7 @@ bool SwXMLWriter::WriteThroughComponent(
OSL_ENSURE( xInfoSet.is(), "missing property set" );
if( xInfoSet.is() )
{
- xInfoSet->setPropertyValue( "StreamName", makeAny( sStreamName ) );
+ xInfoSet->setPropertyValue( "StreamName", Any( sStreamName ) );
}
// write the stuff
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index d107828a2981..9f5ee3cf0dc1 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -333,7 +333,7 @@ SwXMLTextStyleContext_Impl::Finish( bool bOverwrite )
try
{
- xPropSet->setPropertyValue(UNO_NAME_PARA_STYLE_CONDITIONS, uno::makeAny(aSeq));
+ xPropSet->setPropertyValue(UNO_NAME_PARA_STYLE_CONDITIONS, uno::Any(aSeq));
}
catch (uno::Exception const&)
{
@@ -473,7 +473,7 @@ void SwXMLCellStyleContext::AddDataFormat()
if (aIter != GetProperties().end())
aIter->maValue <<= nNumberFormat;
else
- GetProperties().push_back(XMLPropertyState(nIndex, makeAny(nNumberFormat)));
+ GetProperties().push_back(XMLPropertyState(nIndex, Any(nNumberFormat)));
}
void SwXMLCellStyleContext::FillPropertySet(const css::uno::Reference<css::beans::XPropertySet>& rPropSet)
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 97d0d5bd385a..a3b7485fd9d3 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1431,42 +1431,42 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
if( ! bAddExternalLeading )
{
- xProps->setPropertyValue( "AddExternalLeading", makeAny( false ) );
+ xProps->setPropertyValue( "AddExternalLeading", Any( false ) );
}
if( ! bUseFormerLineSpacing )
{
- xProps->setPropertyValue( "UseFormerLineSpacing", makeAny( true ) );
+ xProps->setPropertyValue( "UseFormerLineSpacing", Any( true ) );
}
if( !bUseFormerObjectPositioning )
{
- xProps->setPropertyValue( "UseFormerObjectPositioning", makeAny( true ) );
+ xProps->setPropertyValue( "UseFormerObjectPositioning", Any( true ) );
}
if( !bUseOldNumbering )
{
- xProps->setPropertyValue( "UseOldNumbering", makeAny(true) );
+ xProps->setPropertyValue( "UseOldNumbering", Any(true) );
}
if( !bAddParaSpacingToTableCells )
{
xProps->setPropertyValue( "AddParaSpacingToTableCells",
- makeAny( false ) );
+ Any( false ) );
}
if (!bAddParaLineSpacingToTableCells)
{
- xProps->setPropertyValue("AddParaLineSpacingToTableCells", makeAny(false));
+ xProps->setPropertyValue("AddParaLineSpacingToTableCells", Any(false));
}
if( !bUseFormerTextWrapping )
{
- xProps->setPropertyValue( "UseFormerTextWrapping", makeAny( true ) );
+ xProps->setPropertyValue( "UseFormerTextWrapping", Any( true ) );
}
if (!bConsiderWrapOnObjPos && bAreUserSettingsFromDocument)
{
- xProps->setPropertyValue( "ConsiderTextWrapOnObjPos", makeAny( false ) );
+ xProps->setPropertyValue( "ConsiderTextWrapOnObjPos", Any( false ) );
}
// #i47448#
@@ -1483,40 +1483,40 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
if( !bIgnoreFirstLineIndentInNumbering && bDocumentPriorSO8 )
{
xProps->setPropertyValue( "IgnoreFirstLineIndentInNumbering",
- makeAny( true ) );
+ Any( true ) );
}
// This flag has to be set for all documents < SO8
if ( !bDoNotJustifyLinesWithManualBreak && bDocumentPriorSO8 )
{
xProps->setPropertyValue( "DoNotJustifyLinesWithManualBreak",
- makeAny( true ) );
+ Any( true ) );
}
// This flag has to be set for all documents < SO8
if ( !bDoNotResetParaAttrsForNumFont && bDocumentPriorSO8 )
{
xProps->setPropertyValue( "DoNotResetParaAttrsForNumFont",
- makeAny( true ) );
+ Any( true ) );
}
// This flag has to be set for all documents < SO8
if ( !bDoNotCaptureDrawObjsOnPage && bDocumentPriorSO8 )
{
xProps->setPropertyValue( "DoNotCaptureDrawObjsOnPage",
- makeAny( true ) );
+ Any( true ) );
}
// This flag has to be set for all documents < SO8
if ( !bClipAsCharacterAnchoredWriterFlyFrames && bDocumentPriorSO8 )
{
xProps->setPropertyValue( "ClipAsCharacterAnchoredWriterFlyFrames",
- makeAny( true ) );
+ Any( true ) );
}
if ( !bUnixForceZeroExtLeading )
{
- xProps->setPropertyValue( "UnxForceZeroExtLeading", makeAny( true ) );
+ xProps->setPropertyValue( "UnxForceZeroExtLeading", Any( true ) );
}
// Old LO versions had 66 as the value for small caps percentage, later changed to 80.
@@ -1525,12 +1525,12 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
// are considered to be old files, so set the compatibility option too.
if ( !bSmallCapsPercentage66 )
{
- xProps->setPropertyValue( "SmallCapsPercentage66", makeAny( true ) );
+ xProps->setPropertyValue( "SmallCapsPercentage66", Any( true ) );
}
if ( !bTabOverflow )
{
- xProps->setPropertyValue( "TabOverflow", makeAny( false ) );
+ xProps->setPropertyValue( "TabOverflow", Any( false ) );
}
if (bTabOverMarginValue)
@@ -1542,19 +1542,19 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
uno::Any(document::PrinterIndependentLayout::HIGH_RESOLUTION));
if (!bPropLineSpacingShrinksFirstLine)
- xProps->setPropertyValue("PropLineSpacingShrinksFirstLine", makeAny(false));
+ xProps->setPropertyValue("PropLineSpacingShrinksFirstLine", Any(false));
if (!bSubtractFlysAnchoredAtFlys && bAreUserSettingsFromDocument)
- xProps->setPropertyValue("SubtractFlysAnchoredAtFlys", makeAny(true));
+ xProps->setPropertyValue("SubtractFlysAnchoredAtFlys", Any(true));
if (!bEmptyDbFieldHidesPara && bAreUserSettingsFromDocument)
- xProps->setPropertyValue("EmptyDbFieldHidesPara", makeAny(false));
+ xProps->setPropertyValue("EmptyDbFieldHidesPara", Any(false));
if (!bCollapseEmptyCellPara)
- xProps->setPropertyValue("CollapseEmptyCellPara", makeAny(false));
+ xProps->setPropertyValue("CollapseEmptyCellPara", Any(false));
if (!bAutoFirstLineIndentDisregardLineSpace)
- xProps->setPropertyValue("AutoFirstLineIndentDisregardLineSpace", makeAny(false));
+ xProps->setPropertyValue("AutoFirstLineIndentDisregardLineSpace", Any(false));
SwDoc *pDoc = getDoc();
SfxPrinter *pPrinter = pDoc->getIDocumentDeviceAccess().getPrinter( false );
@@ -1587,11 +1587,11 @@ void SwXMLImport::SetDocumentSpecificSettings(
{
if ( m_xLateInitSettings->hasByName( _rSettingsGroupName ) )
{
- m_xLateInitSettings->replaceByName( _rSettingsGroupName, makeAny( _rSettings ) );
+ m_xLateInitSettings->replaceByName( _rSettingsGroupName, Any( _rSettings ) );
OSL_FAIL( "SwXMLImport::SetDocumentSpecificSettings: already have settings for this model!" );
}
else
- m_xLateInitSettings->insertByName( _rSettingsGroupName, makeAny( _rSettings ) );
+ m_xLateInitSettings->insertByName( _rSettingsGroupName, Any( _rSettings ) );
}
catch( const Exception& )
{
@@ -1779,8 +1779,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportDOCX(SvStream &rStream)
uno::Reference<document::XImporter> xImporter(xFilter, uno::UNO_QUERY_THROW);
uno::Sequence<beans::PropertyValue> aArgs(comphelper::InitPropertySequence(
{
- { "InputStream", uno::makeAny(xStream) },
- { "InputMode", uno::makeAny(true) },
+ { "InputStream", uno::Any(xStream) },
+ { "InputMode", uno::Any(true) },
}));
xImporter->setTargetDocument(xModel);
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 140204d3dcb6..2fd9e9c40376 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -117,7 +117,7 @@ static void lcl_addAspect(
{
sal_Int64 nAspect = rObj.GetViewAspect();
if ( nAspect )
- rStates.emplace_back( rMapper->FindEntryIndex( CTF_OLE_DRAW_ASPECT ), uno::makeAny( nAspect ) );
+ rStates.emplace_back( rMapper->FindEntryIndex( CTF_OLE_DRAW_ASPECT ), uno::Any( nAspect ) );
}
static void lcl_addOutplaceProperties(
@@ -174,9 +174,9 @@ static void lcl_addFrameProperties(
aAny >>= nHeight;
if( !bIsAutoScroll )
- rStates.emplace_back( rMapper->FindEntryIndex( CTF_FRAME_DISPLAY_SCROLLBAR ), makeAny(bIsScrollingMode) );
+ rStates.emplace_back( rMapper->FindEntryIndex( CTF_FRAME_DISPLAY_SCROLLBAR ), Any(bIsScrollingMode) );
if( !bIsAutoBorder )
- rStates.emplace_back( rMapper->FindEntryIndex( CTF_FRAME_DISPLAY_BORDER ), makeAny(bIsBorderSet) );
+ rStates.emplace_back( rMapper->FindEntryIndex( CTF_FRAME_DISPLAY_BORDER ), Any(bIsBorderSet) );
if( SIZE_NOT_SET != nWidth )
rStates.emplace_back( rMapper->FindEntryIndex( CTF_FRAME_MARGIN_HORI ), Any(nWidth) );
if( SIZE_NOT_SET != nHeight )
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 1c48efe3eae6..43f1a98abe56 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -696,10 +696,10 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin(
{
if( bValidURL )
xSet->setPropertyValue("PluginURL",
- makeAny( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ) );
+ Any( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ) );
if( bValidMimeType )
xSet->setPropertyValue("PluginMimeType",
- makeAny( rMimeType ) );
+ Any( rMimeType ) );
}
SwFrameFormat *const pFrameFormat =
@@ -824,31 +824,31 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
if ( xSet.is() )
{
xSet->setPropertyValue("FrameURL",
- makeAny( URIHelper::SmartRel2Abs(
+ Any( URIHelper::SmartRel2Abs(
INetURLObject( GetXMLImport().GetBaseURL() ), rHRef ) ) );
xSet->setPropertyValue("FrameName",
- makeAny( rName ) );
+ Any( rName ) );
if ( eScrollMode == ScrollingMode::Auto )
xSet->setPropertyValue("FrameIsAutoScroll",
- makeAny( true ) );
+ Any( true ) );
else
xSet->setPropertyValue("FrameIsScrollingMode",
- makeAny( eScrollMode == ScrollingMode::Yes ) );
+ Any( eScrollMode == ScrollingMode::Yes ) );
if ( bIsBorderSet )
xSet->setPropertyValue("FrameIsBorder",
- makeAny( bHasBorder ) );
+ Any( bHasBorder ) );
else
xSet->setPropertyValue("FrameIsAutoBorder",
- makeAny( true ) );
+ Any( true ) );
xSet->setPropertyValue("FrameMarginWidth",
- makeAny( sal_Int32( aMargin.Width() ) ) );
+ Any( sal_Int32( aMargin.Width() ) ) );
xSet->setPropertyValue("FrameMarginHeight",
- makeAny( sal_Int32( aMargin.Height() ) ) );
+ Any( sal_Int32( aMargin.Height() ) ) );
}
SwFrameFormat *const pFrameFormat =
@@ -914,14 +914,14 @@ void SwXMLTextImportHelper::endAppletOrPlugin(
OUString aParaName("AppletCommands");
try
{
- xSet->setPropertyValue( aParaName, makeAny( aCommandSequence ) );
+ xSet->setPropertyValue( aParaName, Any( aCommandSequence ) );
}
catch ( uno::Exception& )
{
aParaName = "PluginCommands";
try
{
- xSet->setPropertyValue( aParaName, makeAny( aCommandSequence ) );
+ xSet->setPropertyValue( aParaName, Any( aCommandSequence ) );
}
catch ( uno::Exception& )
{
generated by cgit (git 2.34.1) at 2024-07-16 00:01:41 +0000