sd/qa/unit/export-tests-ooxml2.cxx | 6
sd/qa/unit/export-tests-ooxml3.cxx | 6
sd/qa/unit/export-tests.cxx | 2
sd/qa/unit/misc-tests.cxx | 6
sd/qa/unit/uiimpress.cxx | 44 ++--
sd/source/core/CustomAnimationCloner.cxx | 12 -
sd/source/core/CustomAnimationEffect.cxx | 38 ++--
sd/source/core/EffectMigration.cxx | 10 -
sd/source/core/sdpage_animations.cxx | 6
sd/source/filter/eppt/pptx-animations.cxx | 2
sd/source/filter/eppt/pptx-epptooxml.cxx | 2
sd/source/filter/ppt/ppt97animations.cxx | 6
sd/source/filter/ppt/pptinanimations.cxx | 32 +--
sd/source/filter/sdpptwrp.cxx | 6
sd/source/filter/xml/sdxmlwrp.cxx | 20 +-
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 4
sd/source/ui/animations/CustomAnimationDialog.cxx | 89 ++++------
sd/source/ui/animations/CustomAnimationPane.cxx | 54 +++---
sd/source/ui/dlg/copydlg.cxx | 2
sd/source/ui/framework/factories/BasicPaneFactory.cxx | 4
sd/source/ui/framework/module/SlideSorterModule.cxx | 4
sd/source/ui/framework/module/ToolBarModule.cxx | 8
sd/source/ui/framework/module/ViewTabBarModule.cxx | 6
sd/source/ui/remotecontrol/Receiver.cxx | 8
sd/source/ui/remotecontrol/Server.cxx | 4
sd/source/ui/sidebar/MasterPageContainer.cxx | 2
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 4
sd/source/ui/slideshow/slideshowviewimpl.cxx | 2
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 4
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 4
sd/source/ui/tools/ConfigurationAccess.cxx | 4
sd/source/ui/tools/EventMultiplexer.cxx | 6
sd/source/ui/unoidl/DrawController.cxx | 12 -
sd/source/ui/unoidl/unomodel.cxx | 2
sd/source/ui/unoidl/unopage.cxx | 8
sd/source/ui/view/PresentationViewShellBase.cxx | 2
sd/source/ui/view/frmview.cxx | 76 ++++----
sd/source/ui/view/sdview3.cxx | 4
39 files changed, 256 insertions(+), 257 deletions(-)
New commits:
commit aebfe0e9432e37936bbdd040fe8a0f099a0d22a5
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue May 3 23:23:15 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed May 4 06:55:14 2022 +0200
Just use Any ctor instead of makeAny in sd
Change-Id: I0cd03dcfef02b0ef3bce6bfb88aee4c04d7f6f98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133785
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index dd3dbd286803..b9c1f437c64c 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -733,10 +733,10 @@ void SdOOXMLExportTest2::testTdf92527()
xShape1->setPosition(awt::Point(1000, 1000));
uno::Sequence<beans::PropertyValue>
aShapeGeometry(comphelper::InitPropertySequence(
{
- {"Type", uno::makeAny(OUString("diamond"))},
+ {"Type", uno::Any(OUString("diamond"))},
}));
uno::Reference<beans::XPropertySet> xPropertySet1(xShape1, uno::UNO_QUERY);
- xPropertySet1->setPropertyValue("CustomShapeGeometry",
uno::makeAny(aShapeGeometry));
+ xPropertySet1->setPropertyValue("CustomShapeGeometry",
uno::Any(aShapeGeometry));
xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
@@ -1503,7 +1503,7 @@ void SdOOXMLExportTest2::testSmartartRotation2()
// code to support this for now
uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0,
xDocShRef));
uno::Sequence<beans::PropertyValue> aInteropGrabBag;
- xShape->setPropertyValue("InteropGrabBag", uno::makeAny(aInteropGrabBag));
+ xShape->setPropertyValue("InteropGrabBag", uno::Any(aInteropGrabBag));
utl::TempFile tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
diff --git a/sd/qa/unit/export-tests-ooxml3.cxx
b/sd/qa/unit/export-tests-ooxml3.cxx
index 63c7ea278595..c53abe6b363a 100644
--- a/sd/qa/unit/export-tests-ooxml3.cxx
+++ b/sd/qa/unit/export-tests-ooxml3.cxx
@@ -1306,7 +1306,7 @@ void SdOOXMLExportTest3::testTdf125360()
uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0,
xDocShRef));
- xShape->setPropertyValue("FillTransparence",
uno::makeAny(static_cast<sal_Int32>(23)));
+ xShape->setPropertyValue("FillTransparence",
uno::Any(static_cast<sal_Int32>(23)));
utl::TempFile tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
@@ -1329,7 +1329,7 @@ void SdOOXMLExportTest3::testTdf125360_1()
uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0,
xDocShRef));
- xShape->setPropertyValue("FillTransparence",
uno::makeAny(static_cast<sal_Int32>(23)));
+ xShape->setPropertyValue("FillTransparence",
uno::Any(static_cast<sal_Int32>(23)));
utl::TempFile tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
@@ -1356,7 +1356,7 @@ void SdOOXMLExportTest3::testTdf125360_2()
xShape->getPropertyValue("FillTransparence") >>= nTransparence;
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(82), nTransparence);
- xShape->setPropertyValue("FillTransparence",
uno::makeAny(static_cast<sal_Int32>(23)));
+ xShape->setPropertyValue("FillTransparence",
uno::Any(static_cast<sal_Int32>(23)));
utl::TempFile tempFile;
xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index be1b2d08c6ab..2e1a3ad5ec30 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -667,7 +667,7 @@ void SdExportTest::testTdf128985()
xPropSet->getPropertyValue( "WritingMode" ) >>= nWritingMode;
CPPUNIT_ASSERT_EQUAL(text::WritingMode2::RL_TB, nWritingMode);
- xPropSet->setPropertyValue("WritingMode",
uno::makeAny(text::WritingMode2::LR_TB));
+ xPropSet->setPropertyValue("WritingMode",
uno::Any(text::WritingMode2::LR_TB));
xDocShRef = saveAndReload( xDocShRef.get(), ODP );
}
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index 1dcc2566afb4..f864dfa6b938 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -372,8 +372,8 @@ void SdMiscTest::testFillGradient()
awt::Gradient aGradient;
aGradient.StartColor = sal_Int32(Color(255, 0, 0));
aGradient.EndColor = sal_Int32(Color(0, 255, 0));
- xPropSet->setPropertyValue("FillStyle",
uno::makeAny(drawing::FillStyle_GRADIENT));
- xPropSet->setPropertyValue("FillGradient", uno::makeAny(aGradient));
+ xPropSet->setPropertyValue("FillStyle",
uno::Any(drawing::FillStyle_GRADIENT));
+ xPropSet->setPropertyValue("FillGradient", uno::Any(aGradient));
// Add the rectangle to the page.
xShapes->add(xShape1);
@@ -469,7 +469,7 @@ void SdMiscTest::testTdf120527()
xFactory->createInstance("com.sun.star.drawing.BitmapTable"),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xBitmaps.is());
OUString aGraphicURL =
m_directories.getURLFromSrc(u"/sd/qa/unit/data/tdf120527.jpg");
- xBitmaps->insertByName("test", uno::makeAny(aGraphicURL));
+ xBitmaps->insertByName("test", uno::Any(aGraphicURL));
// Create a graphic.
uno::Reference<drawing::XShape> xShape(
diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx
index 41664efb3497..f035c1f68fac 100644
--- a/sd/qa/unit/uiimpress.cxx
+++ b/sd/qa/unit/uiimpress.cxx
@@ -195,9 +195,9 @@ static void lcl_search(const OUString& rKey, bool bFindAll
= false, bool bBackwa
SvxSearchCmd eSearch = bFindAll ? SvxSearchCmd::FIND_ALL :
SvxSearchCmd::FIND;
uno::Sequence<beans::PropertyValue>
aPropertyValues(comphelper::InitPropertySequence({
- { "SearchItem.SearchString", uno::makeAny(rKey) },
- { "SearchItem.Backward", uno::makeAny(bBackwards) },
- { "SearchItem.Command", uno::makeAny(sal_uInt16(eSearch)) },
+ { "SearchItem.SearchString", uno::Any(rKey) },
+ { "SearchItem.Backward", uno::Any(bBackwards) },
+ { "SearchItem.Command", uno::Any(sal_uInt16(eSearch)) },
}));
comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
@@ -341,7 +341,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf143412)
OUString aImageURL =
m_directories.getURLFromSrc(u"sd/qa/unit/data/tdf143412.svg");
uno::Sequence<beans::PropertyValue>
aArgs(comphelper::InitPropertySequence({
- { "FileName", uno::makeAny(aImageURL) },
+ { "FileName", uno::Any(aImageURL) },
}));
dispatchCommand(mxComponent, ".uno:InsertGraphic", aArgs);
@@ -530,10 +530,10 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testmoveSlides)
sd::ViewShell* pViewShell =
pXImpressDocument->GetDocShell()->GetViewShell();
uno::Sequence<beans::PropertyValue> aArgs(
- comphelper::InitPropertySequence({ { "PageName",
uno::makeAny(OUString("Test 1")) },
- { "WhatLayout",
uno::makeAny(sal_Int32(1)) },
- { "IsPageBack", uno::makeAny(false)
},
- { "IsPageObj", uno::makeAny(false)
} }));
+ comphelper::InitPropertySequence({ { "PageName",
uno::Any(OUString("Test 1")) },
+ { "WhatLayout",
uno::Any(sal_Int32(1)) },
+ { "IsPageBack", uno::Any(false) },
+ { "IsPageObj", uno::Any(false) }
}));
dispatchCommand(mxComponent, ".uno:InsertPage", aArgs);
Scheduler::ProcessEventsToIdle();
@@ -541,10 +541,10 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testmoveSlides)
CPPUNIT_ASSERT_EQUAL(OUString("Test 1"),
pViewShell->GetActualPage()->GetName());
- aArgs = comphelper::InitPropertySequence({ { "PageName",
uno::makeAny(OUString("Test 2")) },
- { "WhatLayout",
uno::makeAny(sal_Int32(1)) },
- { "IsPageBack",
uno::makeAny(false) },
- { "IsPageObj",
uno::makeAny(false) } });
+ aArgs = comphelper::InitPropertySequence({ { "PageName",
uno::Any(OUString("Test 2")) },
+ { "WhatLayout",
uno::Any(sal_Int32(1)) },
+ { "IsPageBack", uno::Any(false)
},
+ { "IsPageObj", uno::Any(false)
} });
dispatchCommand(mxComponent, ".uno:InsertPage", aArgs);
Scheduler::ProcessEventsToIdle();
@@ -591,7 +591,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf141703)
auto pXImpressDocument =
dynamic_cast<SdXImpressDocument*>(mxComponent.get());
uno::Sequence<beans::PropertyValue> aArgs(comphelper::InitPropertySequence(
- { { "Rows", uno::makeAny(sal_Int32(2)) }, { "Columns",
uno::makeAny(sal_Int32(2)) } }));
+ { { "Rows", uno::Any(sal_Int32(2)) }, { "Columns",
uno::Any(sal_Int32(2)) } }));
dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
Scheduler::ProcessEventsToIdle();
@@ -656,7 +656,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf127481)
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), pActualPage->GetObjCount());
uno::Sequence<beans::PropertyValue> aArgs(comphelper::InitPropertySequence(
- { { "Rows", uno::makeAny(sal_Int32(1)) }, { "Columns",
uno::makeAny(sal_Int32(1)) } }));
+ { { "Rows", uno::Any(sal_Int32(1)) }, { "Columns",
uno::Any(sal_Int32(1)) } }));
dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
Scheduler::ProcessEventsToIdle();
@@ -690,7 +690,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testPageFillColor)
// Set FillPageColor
uno::Sequence<beans::PropertyValue>
aPropertyValues(comphelper::InitPropertySequence({
- { "Color", uno::makeAny(OUString("ff0000")) },
+ { "Color", uno::Any(OUString("ff0000")) },
}));
dispatchCommand(mxComponent, ".uno:FillPageColor", aPropertyValues);
@@ -717,7 +717,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testPageFillGradient)
uno::Sequence<beans::PropertyValue>
aPropertyValues(comphelper::InitPropertySequence({
{ "FillPageGradientJSON",
- uno::makeAny(
+ uno::Any(
OUString("{\"style\":\"LINEAR\",\"startcolor\":\"ff0000\",\"endcolor\":\"0000ff\","
"\"angle\":\"300\",\"border\":\"0\",\"x\":\"0\",\"y\":\"0\",\"intensstart\":"
"\"100\",\"intensend\":\"100\",\"stepcount\":\"0\"}"))
},
@@ -772,12 +772,12 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest,
testSpellOnlineParameter)
bool bSet = pImpressDocument->GetDoc()->GetOnlineSpell();
uno::Sequence<beans::PropertyValue> params(
- comphelper::InitPropertySequence({ { "Enable", uno::makeAny(!bSet) }
}));
+ comphelper::InitPropertySequence({ { "Enable", uno::Any(!bSet) } }));
dispatchCommand(mxComponent, ".uno:SpellOnline", params);
CPPUNIT_ASSERT_EQUAL(!bSet, pImpressDocument->GetDoc()->GetOnlineSpell());
// set the same state as now and we don't expect any change (no-toggle)
- params = comphelper::InitPropertySequence({ { "Enable",
uno::makeAny(!bSet) } });
+ params = comphelper::InitPropertySequence({ { "Enable", uno::Any(!bSet) }
});
dispatchCommand(mxComponent, ".uno:SpellOnline", params);
CPPUNIT_ASSERT_EQUAL(!bSet, pImpressDocument->GetDoc()->GetOnlineSpell());
}
@@ -791,7 +791,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf38669)
// Insert shape with ctrl key
uno::Sequence<beans::PropertyValue> aArgs(
- comphelper::InitPropertySequence({ { "KeyModifier",
uno::makeAny(KEY_MOD1) } }));
+ comphelper::InitPropertySequence({ { "KeyModifier", uno::Any(KEY_MOD1)
} }));
dispatchCommand(mxComponent, ".uno:BasicShapes.rectangle", aArgs);
Scheduler::ProcessEventsToIdle();
@@ -822,7 +822,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf123841)
CPPUNIT_ASSERT(pImpressDocument);
uno::Sequence<beans::PropertyValue> aArgs(
- comphelper::InitPropertySequence({ { "KeyModifier",
uno::makeAny(KEY_MOD1) } }));
+ comphelper::InitPropertySequence({ { "KeyModifier", uno::Any(KEY_MOD1)
} }));
dispatchCommand(mxComponent, ".uno:Rect_Unfilled", aArgs);
Scheduler::ProcessEventsToIdle();
@@ -915,7 +915,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testCharColorTheme)
uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
uno::Reference<view::XSelectionSupplier>
xController(xModel->getCurrentController(),
uno::UNO_QUERY);
- xController->select(uno::makeAny(xShape));
+ xController->select(uno::Any(xShape));
Scheduler::ProcessEventsToIdle();
dispatchCommand(mxComponent, ".uno:Text", {});
Scheduler::ProcessEventsToIdle();
@@ -971,7 +971,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testFillColorTheme)
uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
uno::Reference<view::XSelectionSupplier>
xController(xModel->getCurrentController(),
uno::UNO_QUERY);
- xController->select(uno::makeAny(xShape));
+ xController->select(uno::Any(xShape));
// When setting the fill color of that shape, with theme metadata:
uno::Sequence<beans::PropertyValue> aColorArgs = {
diff --git a/sd/source/core/CustomAnimationCloner.cxx
b/sd/source/core/CustomAnimationCloner.cxx
index 7f8d79ce7c89..ea42e3bac7d3 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -216,7 +216,7 @@ namespace sd
aValuePair.First = transformValue( aValuePair.First );
aValuePair.Second = transformValue( aValuePair.Second );
- return makeAny( aValuePair );
+ return Any( aValuePair );
}
else if( rValue.getValueType() == cppu::UnoType< Sequence<Any>
>::get() )
{
@@ -226,7 +226,7 @@ namespace sd
for( Any& rAny : asNonConstRange(aSequence) )
rAny = transformValue( rAny );
- return makeAny( aSequence );
+ return Any( aSequence );
}
else if( rValue.getValueTypeClass() == TypeClass_INTERFACE )
{
@@ -234,14 +234,14 @@ namespace sd
rValue >>= xShape;
if( xShape.is() )
{
- return makeAny( getClonedShape( xShape ) );
+ return Any( getClonedShape( xShape ) );
}
else
{
Reference< XAnimationNode > xNode;
rValue >>= xNode;
if( xNode.is() )
- return makeAny( getClonedNode( xNode ) );
+ return Any( getClonedNode( xNode ) );
}
}
else if( rValue.getValueType() ==
cppu::UnoType<ParagraphTarget>::get() )
@@ -251,7 +251,7 @@ namespace sd
aParaTarget.Shape = getClonedShape( aParaTarget.Shape );
- return makeAny( aParaTarget );
+ return Any( aParaTarget );
}
else if( rValue.getValueType() == cppu::UnoType<Event>::get() )
{
@@ -260,7 +260,7 @@ namespace sd
aEvent.Source = transformValue( aEvent.Source );
- return makeAny( aEvent );
+ return Any( aEvent );
}
}
catch( Exception& )
diff --git a/sd/source/core/CustomAnimationEffect.cxx
b/sd/source/core/CustomAnimationEffect.cxx
index 069439c64592..e645bbca09d5 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -763,7 +763,7 @@ void CustomAnimationEffect::setDuration( double fDuration )
if( fChildBegin != 0.0 )
{
fChildBegin *= fScale;
- xChildNode->setBegin( makeAny( fChildBegin ) );
+ xChildNode->setBegin( Any( fChildBegin ) );
}
double fChildDuration = 0.0;
@@ -771,7 +771,7 @@ void CustomAnimationEffect::setDuration( double fDuration )
if( fChildDuration != 0.0 )
{
fChildDuration *= fScale;
- xChildNode->setDuration( makeAny( fChildDuration ) );
+ xChildNode->setDuration( Any( fChildDuration ) );
}
}
}
@@ -789,7 +789,7 @@ void CustomAnimationEffect::setBegin( double fBegin )
if( mxNode.is() ) try
{
mfBegin = fBegin;
- mxNode->setBegin( makeAny( fBegin ) );
+ mxNode->setBegin( Any( fBegin ) );
}
catch( Exception& )
{
@@ -985,7 +985,7 @@ Reference< XAnimationNode >
CustomAnimationEffect::createAfterEffectNode() const
xAnimate->setTo( aTo );
xAnimate->setAttributeName( aAttributeName );
- xAnimate->setDuration( makeAny( 0.001 ) );
+ xAnimate->setDuration( Any( 0.001 ) );
xAnimate->setFill( AnimationFill::HOLD );
xAnimate->setTarget( maTarget );
@@ -1883,7 +1883,7 @@ void EffectSequenceHelper::implRebuild()
}
aEvent.Repeat = 0;
- Any aBegin( makeAny( aEvent ) );
+ Any aBegin( aEvent );
if( bFirst )
{
// if the first node is not a click action, this click
container
@@ -1903,7 +1903,7 @@ void EffectSequenceHelper::implRebuild()
{
// create a par container for the current click or after
effect node and all following with effects
Reference< XTimeContainer > xWithContainer(
ParallelTimeContainer::create( ::comphelper::getProcessComponentContext() ),
UNO_QUERY_THROW );
- xWithContainer->setBegin( makeAny( fBegin ) );
+ xWithContainer->setBegin( Any( fBegin ) );
xOnClickContainer->appendChild( xWithContainer );
double fDuration = 0.0;
@@ -1948,7 +1948,7 @@ void EffectSequenceHelper::implRebuild()
{
// empty sequence, set duration to 0.0 explicitly
// (otherwise, this sequence will never end)
- mxSequenceRoot->setDuration( makeAny(0.0) );
+ mxSequenceRoot->setDuration( Any(0.0) );
}
}
catch( Exception& )
@@ -2040,7 +2040,7 @@ void stl_process_after_effect_node_func(AfterEffectNode
const & rNode)
// this does not yet have a child container,
create one
xNextContainer.set(
ParallelTimeContainer::create(xContext), UNO_QUERY_THROW );
- xNextContainer->setBegin( makeAny( 0.0 ) );
+ xNextContainer->setBegin( Any( 0.0 ) );
xNextClickContainer->appendChild( xNextContainer );
}
DBG_ASSERT( xNextContainer.is(),
"ppt::stl_process_after_effect_node_func::operator(), could not find/create
container!" );
@@ -2055,13 +2055,13 @@ void stl_process_after_effect_node_func(AfterEffectNode
const & rNode)
Event aEvent;
aEvent.Trigger = EventTrigger::ON_NEXT;
aEvent.Repeat = 0;
- xNewClickContainer->setBegin( makeAny( aEvent ) );
+ xNewClickContainer->setBegin( Any( aEvent ) );
xSequenceContainer->insertAfter( xNewClickContainer,
xClickContainer );
xNextContainer.set( ParallelTimeContainer::create(
xContext ), UNO_QUERY_THROW );
- xNextContainer->setBegin( makeAny( 0.0 ) );
+ xNextContainer->setBegin( Any( 0.0 ) );
xNewClickContainer->appendChild( xNextContainer );
}
@@ -2317,7 +2317,7 @@ void EffectSequenceHelper::disposeTextRange( const
css::uno::Any& aTarget )
if( aIterParaTarget.Paragraph > anParaNumToDelete )
{
--aIterParaTarget.Paragraph;
- pEffect->setTarget( makeAny( aIterParaTarget ) );
+ pEffect->setTarget( Any( aIterParaTarget ) );
bChanges = true;
}
}
@@ -2482,7 +2482,7 @@ EffectSequenceHelper::createTextGroup(const
CustomAnimationEffectPtr& pEffect,
else
nSubItem = ShapeAnimationSubType::ONLY_BACKGROUND;
- pEffect->setTarget( makeAny( xTarget ) );
+ pEffect->setTarget( Any( xTarget ) );
pEffect->setTargetSubItem( nSubItem );
pEffect->setEffectSequence( this );
pEffect->setGroupId( nGroupId );
@@ -2562,7 +2562,7 @@ void
EffectSequenceHelper::createTextGroupParagraphEffects( const CustomAnimatio
}
// set target and group-id
- pNewEffect->setTarget( makeAny( aTarget ) );
+ pNewEffect->setTarget( Any( aTarget ) );
pNewEffect->setTargetSubItem( ShapeAnimationSubType::ONLY_TEXT );
pNewEffect->setGroupId( pTextGroup->mnGroupId );
pNewEffect->setEffectSequence( this );
@@ -2704,7 +2704,7 @@ void EffectSequenceHelper::setAnimateForm( const
CustomAnimationTextGroupPtr& pT
else
{
pEffect = (*aIter)->clone();
- pEffect->setTarget( makeAny( (*aIter)->getTargetShape() ) );
+ pEffect->setTarget( Any( (*aIter)->getTargetShape() ) );
pEffect->setTargetSubItem(
ShapeAnimationSubType::ONLY_BACKGROUND );
maEffects.insert( aInsertIter, pEffect );
}
@@ -2715,7 +2715,7 @@ void EffectSequenceHelper::setAnimateForm( const
CustomAnimationTextGroupPtr& pT
if( !bAnimateForm && (aEffects.size() == 1) )
{
CustomAnimationEffectPtr pEffect( *aIter );
- pEffect->setTarget( makeAny( (*aIter)->getTargetShape() ) );
+ pEffect->setTarget( Any( (*aIter)->getTargetShape() ) );
pEffect->setTargetSubItem( ShapeAnimationSubType::ONLY_TEXT );
pTextGroup->addEffect( pEffect );
}
@@ -3059,7 +3059,7 @@ MainSequence::MainSequence()
if( mxTimingRootNode.is() )
{
Sequence< css::beans::NamedValue > aUserData
- { { "node-type",
css::uno::makeAny(css::presentation::EffectNodeType::MAIN_SEQUENCE) } };
+ { { "node-type",
css::uno::Any(css::presentation::EffectNodeType::MAIN_SEQUENCE) } };
mxTimingRootNode->setUserData( aUserData );
}
init();
@@ -3147,13 +3147,13 @@ void MainSequence::createMainSequence()
mxSequenceRoot = SequenceTimeContainer::create(
::comphelper::getProcessComponentContext() );
uno::Sequence< css::beans::NamedValue > aUserData
- { { "node-type",
css::uno::makeAny(css::presentation::EffectNodeType::MAIN_SEQUENCE) } };
+ { { "node-type",
css::uno::Any(css::presentation::EffectNodeType::MAIN_SEQUENCE) } };
mxSequenceRoot->setUserData( aUserData );
// empty sequence until now, set duration to 0.0
// explicitly (otherwise, this sequence will never
// end)
- mxSequenceRoot->setDuration( makeAny(0.0) );
+ mxSequenceRoot->setDuration( Any(0.0) );
Reference< XAnimationNode > xMainSequenceNode( mxSequenceRoot,
UNO_QUERY_THROW );
mxTimingRootNode->appendChild( xMainSequenceNode );
@@ -3204,7 +3204,7 @@ InteractiveSequencePtr
MainSequence::createInteractiveSequence( const css::uno::
Reference< XTimeContainer > xISRoot = SequenceTimeContainer::create(
::comphelper::getProcessComponentContext() );
uno::Sequence< css::beans::NamedValue > aUserData
- { { "node-type",
css::uno::makeAny(css::presentation::EffectNodeType::INTERACTIVE_SEQUENCE) } };
+ { { "node-type",
css::uno::Any(css::presentation::EffectNodeType::INTERACTIVE_SEQUENCE) } };
xISRoot->setUserData( aUserData );
xISRoot->setRestart( css::animations::AnimationRestart::WHEN_NOT_ACTIVE );
diff --git a/sd/source/core/EffectMigration.cxx
b/sd/source/core/EffectMigration.cxx
index d0eac5055c39..8dd9d0905805 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -508,7 +508,7 @@ void EffectMigration::SetAnimationEffect( SvxShape* pShape,
AnimationEffect eEff
if( xNode.is() )
{
CustomAnimationEffectPtr pEffect =
std::make_shared<CustomAnimationEffect>( xNode );
- pEffect->setTarget( makeAny( xShape ) );
+ pEffect->setTarget( Any( xShape ) );
SdPage* pPage = dynamic_cast< SdPage* >(
pObj->getSdrPageFromSdrObject() );
const bool bManual = (pPage == nullptr) ||
(pPage->GetPresChange() == PresChange::Manual);
if( !bManual )
@@ -662,7 +662,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape*
pShape, AnimationEffect
if( xNode.is() )
{
pShapeEffect = std::make_shared<CustomAnimationEffect>(
xNode );
- pShapeEffect->setTarget( makeAny( xShape ) );
+ pShapeEffect->setTarget( Any( xShape ) );
pShapeEffect->setDuration( 0.1 );
pMainSequence->append( pShapeEffect );
@@ -906,7 +906,7 @@ void EffectMigration::SetDimColor( SvxShape* pShape,
sal_Int32 nColor )
if( pEffect->getTargetShape() == xShape )
{
pEffect->setHasAfterEffect( true );
- pEffect->setDimColor( makeAny( nColor ) );
+ pEffect->setDimColor( Any( nColor ) );
pEffect->setAfterEffectOnNext( true );
bNeedRebuild = true;
}
@@ -1215,7 +1215,7 @@ void EffectMigration::UpdateSoundEffect( SvxShape*
pShape, SdAnimationInfo const
{
if( !aSoundFile.isEmpty() )
{
- pEffect->createAudio( makeAny( aSoundFile ) );
+ pEffect->createAudio( Any( aSoundFile ) );
}
else
{
@@ -1280,7 +1280,7 @@ void EffectMigration::SetAnimationPath( SvxShape* pShape,
SdrPathObj const * pPa
{
std::shared_ptr< sd::MainSequence > pMainSequence(
pPage->getMainSequence() );
if( pMainSequence )
- pMainSequence->append( *pPathObj, makeAny( xShape ), -1.0, ""
);
+ pMainSequence->append( *pPathObj, Any( xShape ), -1.0, "" );
}
}
}
diff --git a/sd/source/core/sdpage_animations.cxx
b/sd/source/core/sdpage_animations.cxx
index 34a049c3dc60..c52938fd801c 100644
--- a/sd/source/core/sdpage_animations.cxx
+++ b/sd/source/core/sdpage_animations.cxx
@@ -50,7 +50,7 @@ Reference< XAnimationNode > const & SdPage::getAnimationNode()
{
mxAnimationNode.set( ParallelTimeContainer::create(
::comphelper::getProcessComponentContext() ), UNO_QUERY_THROW );
Sequence< css::beans::NamedValue > aUserData
- { { "node-type",
css::uno::makeAny(css::presentation::EffectNodeType::TIMING_ROOT) } };
+ { { "node-type",
css::uno::Any(css::presentation::EffectNodeType::TIMING_ROOT) } };
mxAnimationNode->setUserData( aUserData );
}
@@ -116,7 +116,7 @@ void SdPage::onParagraphInserted( const ::Outliner*
pOutliner, Paragraph const *
* paragraphs at a shape are unlikely... */
aTarget.Paragraph = static_cast<sal_Int16>(pOutliner->GetAbsPos( pPara
));
- getMainSequence()->insertTextRange( makeAny( aTarget ) );
+ getMainSequence()->insertTextRange( Any( aTarget ) );
}
}
@@ -131,7 +131,7 @@ void SdPage::onParagraphRemoving( const ::Outliner*
pOutliner, Paragraph const *
* paragraphs at a shape are unlikely... */
aTarget.Paragraph = static_cast<sal_Int16>(pOutliner->GetAbsPos( pPara
));
- getMainSequence()->disposeTextRange( makeAny( aTarget ) );
+ getMainSequence()->disposeTextRange( Any( aTarget ) );
}
}
diff --git a/sd/source/filter/eppt/pptx-animations.cxx
b/sd/source/filter/eppt/pptx-animations.cxx
index 43ef7ce4d55d..54dab17d1972 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -778,7 +778,7 @@ void PPTXAnimationExport::WriteAnimationCond(const Cond&
rCond)
{
mpFS->startElementNS(XML_p, XML_cond, XML_delay, rCond.getDelay(),
XML_evt,
rCond.mpEvent);
- WriteAnimationTarget(makeAny(rCond.mxShape));
+ WriteAnimationTarget(Any(rCond.mxShape));
mpFS->endElementNS(XML_p, XML_cond);
}
else if (rCond.mxNode.is() && (nId = GetAnimationNodeId(rCond.mxNode))
!= -1)
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 8823cbd00d53..e9b923264390 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1579,7 +1579,7 @@ void PowerPointExport::ImplWritePPTXLayout(sal_Int32
nOffset, sal_uInt32 nMaster
#endif
Reference< beans::XPropertySet > xPropSet(xSlide, uno::UNO_QUERY);
- xPropSet->setPropertyValue("Layout", makeAny(short(aLayoutInfo[ nOffset
].nType)));
+ xPropSet->setPropertyValue("Layout", Any(short(aLayoutInfo[ nOffset
].nType)));
#if OSL_DEBUG_LEVEL > 1
dump_pset(xPropSet);
#endif
diff --git a/sd/source/filter/ppt/ppt97animations.cxx
b/sd/source/filter/ppt/ppt97animations.cxx
index 7c623020c0a0..db3a960a78d4 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -583,7 +583,7 @@ void Ppt97Animation::createAndSetCustomAnimationEffect(
SdrObject* pObj )
//2. ------ adapt the created effect ------
// set the shape targeted by this effect
- pEffect->setTarget( makeAny( xShape ) );
+ pEffect->setTarget( css::uno::Any( xShape ) );
pEffect->setBegin( GetDelayTimeInSeconds() );
@@ -597,14 +597,14 @@ void Ppt97Animation::createAndSetCustomAnimationEffect(
SdrObject* pObj )
{
pEffect->setHasAfterEffect( true );
if( HasAfterEffect_ChangeColor() )
- pEffect->setDimColor( uno::makeAny( GetDimColor() ) );
+ pEffect->setDimColor( uno::Any( GetDimColor() ) );
else
pEffect->setAfterEffectOnNext( HasAfterEffect_DimAtNextEffect() );
}
// set sound effect
if( HasSoundEffect() )
- pEffect->createAudio( uno::makeAny( m_aSoundFileUrl ) );
+ pEffect->createAudio( uno::Any( m_aSoundFileUrl ) );
// text iteration
pEffect->setIterateType( GetTextAnimationType() );
diff --git a/sd/source/filter/ppt/pptinanimations.cxx
b/sd/source/filter/ppt/pptinanimations.cxx
index a760a0d896a5..8b38891b2878 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -597,7 +597,7 @@ bool AnimationImporter::convertAnimationNode( const
Reference< XAnimationNode >&
aEvent.Trigger = EventTrigger::END_EVENT;
aEvent.Repeat = 0;
- xNode->setBegin( makeAny( aEvent ) );
+ xNode->setBegin( Any( aEvent ) );
}
// add to after effect nodes for later processing
@@ -1316,7 +1316,7 @@ Any AnimationImporter::implGetColorAny( sal_Int32 nMode,
sal_Int32 nA, sal_Int3
dump( ",%ld", nB );
dump( ",%ld)", nC );
Color aColor( static_cast<sal_uInt8>(nA),
static_cast<sal_uInt8>(nB), static_cast<sal_uInt8>(nC) );
- return makeAny( static_cast<sal_Int32>(aColor.GetRGBColor()) );
+ return Any( static_cast<sal_Int32>(aColor.GetRGBColor()) );
}
case 1: // hsl
{
@@ -1326,7 +1326,7 @@ Any AnimationImporter::implGetColorAny( sal_Int32 nMode,
sal_Int32 nA, sal_Int3
Sequence< double > aHSL{ nA * 360.0/255.0,
nB / 255.0,
nC / 255.0 };
- return makeAny( aHSL );
+ return Any( aHSL );
}
case 2: // index
@@ -1337,7 +1337,7 @@ Any AnimationImporter::implGetColorAny( sal_Int32 nMode,
sal_Int32 nA, sal_Int3
dump( " [%ld", static_cast<sal_Int32>(aColor.GetRed()) );
dump( ",%ld", static_cast<sal_Int32>(aColor.GetGreen()) );
dump( ",%ld])", static_cast<sal_Int32>(aColor.GetBlue()) );
- return makeAny( static_cast<sal_Int32>(aColor.GetRGBColor()) );
+ return Any( static_cast<sal_Int32>(aColor.GetRGBColor()) );
}
default:
@@ -1757,7 +1757,7 @@ void AnimationImporter::importCommandContainer( const
Atom* pAtom, const Referen
if( aParamValue.Value.hasValue() )
{
Sequence< NamedValue > aParamSeq( &aParamValue, 1 );
- xCommand->setParameter( makeAny( aParamSeq ) );
+ xCommand->setParameter( Any( aParamSeq ) );
}
}
@@ -1874,7 +1874,7 @@ void AnimationImporter::importAnimateScaleContainer(
const Atom* pAtom, const Re
{
aPair.First <<= static_cast<double>(fFromX) / 100.0;
aPair.Second <<= static_cast<double>(fFromY) / 100.0;
- xTransform->setFrom( makeAny( aPair ) );
+ xTransform->setFrom( Any( aPair ) );
}
// 'to' value
@@ -1882,7 +1882,7 @@ void AnimationImporter::importAnimateScaleContainer(
const Atom* pAtom, const Re
{
aPair.First <<= static_cast<double>(fToX) / 100.0;
aPair.Second <<= static_cast<double>(fToY) / 100.0;
- xTransform->setTo( makeAny( aPair ) );
+ xTransform->setTo( Any( aPair ) );
}
// 'by' value
@@ -1894,7 +1894,7 @@ void AnimationImporter::importAnimateScaleContainer(
const Atom* pAtom, const Re
if( nBits & 2 )
{
// 'from' value given, import normally
- xTransform->setBy( makeAny( aPair ) );
+ xTransform->setBy( Any( aPair ) );
}
else
{
@@ -1903,7 +1903,7 @@ void AnimationImporter::importAnimateScaleContainer(
const Atom* pAtom, const Re
// PPT, which exports animateScale effects
// with a sole 'by' value, but with the
// semantics of a sole 'to' animation
- xTransform->setTo( makeAny( aPair ) );
+ xTransform->setTo( Any( aPair ) );
}
}
@@ -1967,13 +1967,13 @@ void AnimationImporter::importAnimateRotationContainer(
const Atom* pAtom, const
mrStCtrl.ReadUInt32( nBits ).ReadFloat( fBy ).ReadFloat( fFrom
).ReadFloat( fTo ).ReadUInt32( nU1 );
if( nBits & 1 )
- xTransform->setBy( makeAny( static_cast<double>(fBy) ) );
+ xTransform->setBy( Any( static_cast<double>(fBy) ) );
if( nBits & 2 )
- xTransform->setFrom( makeAny( static_cast<double>(fFrom) ) );
+ xTransform->setFrom( Any( static_cast<double>(fFrom) ) );
if( nBits & 4 )
- xTransform->setTo( makeAny( static_cast<double>(fTo) ) );
+ xTransform->setTo( Any( static_cast<double>(fTo) ) );
#ifdef DBG_ANIM_LOG
if( nBits & 1 )
@@ -2058,7 +2058,7 @@ void AnimationImporter::importAnimationValues( const
Atom* pAtom, const Referenc
{
float fRepeat(0.0);
mrStCtrl.ReadFloat( fRepeat );
- xNode->setRepeatCount( (fRepeat <
(float(3.40282346638528860e+38))) ? makeAny( static_cast<double>(fRepeat) ) :
makeAny( Timing_INDEFINITE ) );
+ xNode->setRepeatCount( (fRepeat <
(float(3.40282346638528860e+38))) ? Any( static_cast<double>(fRepeat) ) : Any(
Timing_INDEFINITE ) );
#ifdef DBG_ANIM_LOG
if( (fRepeat < ((float)3.40282346638528860e+38)) )
@@ -2368,7 +2368,7 @@ void AnimationImporter::importAnimationEvents( const
Atom* pAtom, const Referenc
}
if( (nBegin != 0) || (aEvent.Trigger ==
EventTrigger::NONE) )
- aEvent.Offset = (nBegin == -1) ? makeAny(
Timing_INDEFINITE ) : makeAny( nBegin / 1000.0 );
+ aEvent.Offset = (nBegin == -1) ? Any(
Timing_INDEFINITE ) : Any( nBegin / 1000.0 );
}
break;
case DFF_msofbtAnimateTargetElement:
@@ -2386,7 +2386,7 @@ void AnimationImporter::importAnimationEvents( const
Atom* pAtom, const Referenc
pChildAtom = Atom::findNextChildAtom( pChildAtom );
}
- *pEvents = oox::addToSequence( *pEvents, (aEvent.Trigger ==
EventTrigger::NONE) ? aEvent.Offset : makeAny( aEvent ) );
+ *pEvents = oox::addToSequence( *pEvents, (aEvent.Trigger ==
EventTrigger::NONE) ? aEvent.Offset : Any( aEvent ) );
}
pEventAtom = pAtom->findNextChildAtom( DFF_msofbtAnimEvent, pEventAtom
);
@@ -2448,7 +2448,7 @@ void AnimationImporter::importAnimationActions( const
Atom* pAtom, const Referen
mrStCtrl.ReadInt32( nU5 );
if( nEndSync == 1 )
- xNode->setEndSync( makeAny( AnimationEndSync::ALL ) );
+ xNode->setEndSync( Any( AnimationEndSync::ALL ) );
#ifdef DBG_ANIM_LOG
dump( " concurrent=\"%s\"", nConcurrent == 0 ? "disabled" : (nConcurrent
== 1 ? "enabled" : "unknown") );
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index d44b2fab2580..59829f854ef8 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -155,7 +155,7 @@ static tools::SvRef<SotStorage> lcl_DRMDecrypt(const
SfxMedium& rMedium, const t
// Set the media descriptor data
Sequence<NamedValue> aEncryptionData =
xPackageEncryption->createEncryptionData("");
- rMedium.GetItemSet()->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA,
makeAny(aEncryptionData)));
+ rMedium.GetItemSet()->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA,
Any(aEncryptionData)));
}
catch (const std::exception&)
{
@@ -267,7 +267,7 @@ bool SdPPTFilter::Export()
{
Reference<XComponentContext>
xComponentContext(comphelper::getProcessComponentContext());
Sequence<Any> aArguments{
- makeAny(NamedValue("Binary", makeAny(true))) };
+ Any(NamedValue("Binary", Any(true))) };
xPackageEncryption.set(
xComponentContext->getServiceManager()->createInstanceWithArgumentsAndContext(
"com.sun.star.comp.oox.crypto." + sCryptoType,
aArguments, xComponentContext), UNO_QUERY);
@@ -349,7 +349,7 @@ bool SdPPTFilter::Export()
xEncryptedRootStrg->Commit();
// Restore encryption data
-
mrMedium.GetItemSet()->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA,
makeAny(aEncryptionData)));
+
mrMedium.GetItemSet()->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA,
Any(aEncryptionData)));
}
}
}
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx
b/sd/source/filter/xml/sdxmlwrp.cxx
index fff458c854e6..0d1b14c825b4 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -342,7 +342,7 @@ ErrCode ReadThroughComponent(
DBG_ASSERT( xInfoSet.is(), "missing property set" );
if( xInfoSet.is() )
{
- xInfoSet->setPropertyValue( "StreamName", makeAny( sStreamName ) );
+ xInfoSet->setPropertyValue( "StreamName", Any( sStreamName ) );
}
try
@@ -477,7 +477,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
};
uno::Reference< beans::XPropertySet > xInfoSet(
GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) );
- xInfoSet->setPropertyValue( "Preview" , uno::makeAny(
mrDocShell.GetDoc()->IsStarDrawPreviewMode() ) );
+ xInfoSet->setPropertyValue( "Preview" , uno::Any(
mrDocShell.GetDoc()->IsStarDrawPreviewMode() ) );
// ---- get BuildId from parent container if available
@@ -557,7 +557,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
OUString const baseURI(mrMedium.GetBaseURL());
// needed for relative URLs, but in clipboard copy/paste there may be none
SAL_INFO_IF(baseURI.isEmpty(), "sd.filter", "SdXMLFilter: no base URL");
- xInfoSet->setPropertyValue("BaseURI", makeAny(baseURI));
+ xInfoSet->setPropertyValue("BaseURI", Any(baseURI));
if( ERRCODE_NONE == nRet && SfxObjectCreateMode::EMBEDDED ==
mrDocShell.GetCreateMode() )
{
@@ -577,7 +577,7 @@ bool SdXMLFilter::Import( ErrCode& nError )
}
if (SdXMLFilterMode::Organizer == meFilterMode)
- xInfoSet->setPropertyValue("OrganizerMode", uno::makeAny(true));
+ xInfoSet->setPropertyValue("OrganizerMode", uno::Any(true));
if( ERRCODE_NONE == nRet )
{
@@ -786,13 +786,13 @@ bool SdXMLFilter::Export()
uno::Reference< beans::XPropertySet > xInfoSet(
GenericPropertySet_CreateInstance( new PropertySetInfo( aExportInfoMap ) ) );
bool bUsePrettyPrinting =
officecfg::Office::Common::Save::Document::PrettyPrinting::get();
- xInfoSet->setPropertyValue( "UsePrettyPrinting", makeAny(
bUsePrettyPrinting ) );
+ xInfoSet->setPropertyValue( "UsePrettyPrinting", Any(
bUsePrettyPrinting ) );
const uno::Reference < embed::XStorage >& xStorage =
mrMedium.GetOutputStorage();
// Set base URI
OUString sPropName( "BaseURI" );
- xInfoSet->setPropertyValue( sPropName, makeAny( mrMedium.GetBaseURL(
true ) ) );
+ xInfoSet->setPropertyValue( sPropName, Any( mrMedium.GetBaseURL( true
) ) );
xInfoSet->setPropertyValue( "TargetStorage", Any( xStorage ) );
@@ -810,7 +810,7 @@ bool SdXMLFilter::Export()
if( !aName.isEmpty() )
{
sPropName = "StreamRelPath";
- xInfoSet->setPropertyValue( sPropName, makeAny( aName ) );
+ xInfoSet->setPropertyValue( sPropName, Any( aName ) );
}
}
@@ -902,7 +902,7 @@ bool SdXMLFilter::Export()
// encrypt all streams
xProps->setPropertyValue(
"UseCommonStoragePasswordEncryption",
- uno::makeAny( true ) );
+ uno::Any( true ) );
xInfoSet->setPropertyValue( "StreamName", Any( sDocName )
);
}
@@ -1029,8 +1029,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool
TestImportPPTX(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/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index fa0b5782a01d..c297184fa635 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -598,7 +598,7 @@ void AccessibleDocumentViewBase::SetAccessibleOLEObject (
CommitChange (
AccessibleEventId::CHILD,
uno::Any(),
- uno::makeAny (mxAccessibleOLEObject));
+ uno::Any (mxAccessibleOLEObject));
// Assume that the accessible OLE Object disposes itself correctly.
@@ -611,7 +611,7 @@ void AccessibleDocumentViewBase::SetAccessibleOLEObject (
if (mxAccessibleOLEObject.is())
CommitChange (
AccessibleEventId::CHILD,
- uno::makeAny (mxAccessibleOLEObject),
+ uno::Any (mxAccessibleOLEObject),
uno::Any());
}
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 2a23da8fed34..128c1eebc208 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -74,7 +74,6 @@ using namespace ::com::sun::star::presentation;
using ::com::sun::star::uno::UNO_QUERY;
using ::com::sun::star::uno::Any;
-using ::com::sun::star::uno::makeAny;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Exception;
@@ -178,7 +177,7 @@ Any SdPresetPropertyBox::getValue()
const int nIndex = mxControl->get_active();
if (nIndex == -1)
return Any();
- return makeAny(maPropertyValues[nIndex]);
+ return Any(maPropertyValues[nIndex]);
}
namespace {
@@ -234,7 +233,7 @@ void SdColorPropertyBox::setValue( const Any& rValue, const
OUString& )
Any SdColorPropertyBox::getValue()
{
- return makeAny(sal_Int32(mxControl->GetSelectEntryColor().GetRGBColor()));
+ return Any(sal_Int32(mxControl->GetSelectEntryColor().GetRGBColor()));
}
namespace {
@@ -318,7 +317,7 @@ void SdFontPropertyBox::setValue( const Any& rValue, const
OUString& )
Any SdFontPropertyBox::getValue()
{
OUString aFontName(mxControl->get_active_text());
- return makeAny(aFontName);
+ return Any(aFontName);
}
namespace {
@@ -385,7 +384,7 @@ void SdCharHeightPropertyBox::setValue( const Any& rValue,
const OUString& )
Any SdCharHeightPropertyBox::getValue()
{
- return
makeAny(static_cast<double>(mxMetric->get_value(FieldUnit::PERCENT)) / 100.0);
+ return Any(static_cast<double>(mxMetric->get_value(FieldUnit::PERCENT)) /
100.0);
}
namespace {
@@ -474,7 +473,7 @@ void SdTransparencyPropertyBox::setValue(const Any& rValue,
const OUString&)
Any SdTransparencyPropertyBox::getValue()
{
- return
makeAny(static_cast<double>(mxMetric->get_value(FieldUnit::PERCENT)) / 100.0);
+ return Any(static_cast<double>(mxMetric->get_value(FieldUnit::PERCENT)) /
100.0);
}
namespace {
@@ -577,7 +576,7 @@ void SdRotationPropertyBox::setValue( const Any& rValue,
const OUString& )
Any SdRotationPropertyBox::getValue()
{
- return
makeAny(static_cast<double>(mxMetric->get_value(FieldUnit::DEGREE)));
+ return Any(static_cast<double>(mxMetric->get_value(FieldUnit::DEGREE)));
}
namespace {
@@ -759,7 +758,7 @@ Any SdScalePropertyBox::getValue()
aValues.First <<= fValue1;
aValues.Second <<= fValue2;
- return makeAny( aValues );
+ return Any( aValues );
}
namespace {
@@ -864,7 +863,7 @@ void SdFontStylePropertyBox::setValue( const Any& rValue,
const OUString& )
Any SdFontStylePropertyBox::getValue()
{
Sequence<Any> aValues{ Any(mfFontWeight), Any(meFontSlant),
Any(mnFontUnderline) };
- return makeAny( aValues );
+ return Any( aValues );
}
class CustomAnimationEffectTabPage
@@ -1202,7 +1201,7 @@ void CustomAnimationEffectTabPage::update(
STLPropertySet* pSet )
fOldTemp = -2.0;
if( fOldTemp != fTemp )
- pSet->setPropertyValue( nHandleAccelerate, makeAny( fTemp ) );
+ pSet->setPropertyValue( nHandleAccelerate, Any( fTemp ) );
// set selected value for decelerate if different than in original set
fTemp = mxCBSmoothEnd->get_active() ? 0.5 : 0.0;
@@ -1213,7 +1212,7 @@ void CustomAnimationEffectTabPage::update(
STLPropertySet* pSet )
fOldTemp = -2.0;
if( fOldTemp != fTemp )
- pSet->setPropertyValue( nHandleDecelerate, makeAny( fTemp ) );
+ pSet->setPropertyValue( nHandleDecelerate, Any( fTemp ) );
}
auto nPos = mxLBAfterEffect->get_active();
@@ -1229,7 +1228,7 @@ void CustomAnimationEffectTabPage::update(
STLPropertySet* pSet )
bOldAfterEffect = !bAfterEffect;
if( bOldAfterEffect != bAfterEffect )
- pSet->setPropertyValue( nHandleHasAfterEffect, makeAny(
bAfterEffect ) );
+ pSet->setPropertyValue( nHandleHasAfterEffect, Any( bAfterEffect )
);
Any aDimColor;
if( nPos == 1 )
@@ -1249,7 +1248,7 @@ void CustomAnimationEffectTabPage::update(
STLPropertySet* pSet )
mpSet->getPropertyValue( nHandleAfterEffectOnNextEffect ) >>=
bOldAfterEffectOnNextEffect;
if( bAfterEffectOnNextEffect != bOldAfterEffectOnNextEffect )
- pSet->setPropertyValue( nHandleAfterEffectOnNextEffect, makeAny(
bAfterEffectOnNextEffect ) );
+ pSet->setPropertyValue( nHandleAfterEffectOnNextEffect, Any(
bAfterEffectOnNextEffect ) );
}
nPos = mxLBTextAnim->get_active();
@@ -1271,7 +1270,7 @@ void CustomAnimationEffectTabPage::update(
STLPropertySet* pSet )
mpSet->getPropertyValue( nHandleIterateType ) >>= nOldIterateType;
if( nIterateType != nOldIterateType )
- pSet->setPropertyValue( nHandleIterateType, makeAny( nIterateType
) );
+ pSet->setPropertyValue( nHandleIterateType, Any( nIterateType ) );
}
{
@@ -1282,14 +1281,14 @@ void CustomAnimationEffectTabPage::update(
STLPropertySet* pSet )
mpSet->getPropertyValue( nHandleIterateInterval ) >>=
fOldIterateInterval;
if( fIterateInterval != fOldIterateInterval )
- pSet->setPropertyValue( nHandleIterateInterval, makeAny(
fIterateInterval ) );
+ pSet->setPropertyValue( nHandleIterateInterval, Any(
fIterateInterval ) );
}
nPos = mxLBSound->get_active();
if (nPos == -1)
return;
- Any aNewSoundURL, aOldSoundURL( makeAny( sal_Int32(0) ) );
+ Any aNewSoundURL, aOldSoundURL( Any( sal_Int32(0) ) );
if( nPos == 0 )
{
@@ -1643,7 +1642,7 @@ void CustomAnimationDurationTabPage::update(
STLPropertySet* pSet )
mpSet->getPropertyValue( nHandleStart ) >>= nOldStart;
if( nStart != nOldStart )
- pSet->setPropertyValue( nHandleStart, makeAny( nStart ) );
+ pSet->setPropertyValue( nHandleStart, Any( nStart ) );
}
{
@@ -1654,7 +1653,7 @@ void CustomAnimationDurationTabPage::update(
STLPropertySet* pSet )
mpSet->getPropertyValue( nHandleBegin ) >>= fOldBegin;
if( fBegin != fOldBegin )
- pSet->setPropertyValue( nHandleBegin, makeAny( fBegin ) );
+ pSet->setPropertyValue( nHandleBegin, Any( fBegin ) );
}
nPos = mxCBRepeat->get_active();
@@ -1720,7 +1719,7 @@ void CustomAnimationDurationTabPage::update(
STLPropertySet* pSet )
mpSet->getPropertyValue( nHandleDuration ) >>= fOldDuration;
if( fDuration != fOldDuration )
- pSet->setPropertyValue( nHandleDuration, makeAny( fDuration ) );
+ pSet->setPropertyValue( nHandleDuration, Any( fDuration ) );
}
if (mxCBXRewind->get_state() != TRISTATE_INDET)
@@ -1737,7 +1736,7 @@ void CustomAnimationDurationTabPage::update(
STLPropertySet* pSet )
}
if( bSet )
- pSet->setPropertyValue( nHandleRewind, makeAny( nFill ) );
+ pSet->setPropertyValue( nHandleRewind, Any( nFill ) );
}
Reference< XShape > xTrigger;
@@ -1759,7 +1758,7 @@ void CustomAnimationDurationTabPage::update(
STLPropertySet* pSet )
if (xTrigger.is() || mxRBClickSequence->get_active())
{
- Any aNewValue( makeAny( xTrigger ) );
+ Any aNewValue( xTrigger );
Any aOldValue;
if( mpSet->getPropertyState( nHandleTrigger ) !=
STLPropertyState::Ambiguous )
@@ -1886,7 +1885,7 @@ void CustomAnimationTextAnimTabPage::update(
STLPropertySet* pSet )
mpSet->getPropertyValue( nHandleTextGrouping ) >>= nOldGrouping;
if( nTextGrouping != nOldGrouping )
- pSet->setPropertyValue( nHandleTextGrouping, makeAny(
nTextGrouping ) );
+ pSet->setPropertyValue( nHandleTextGrouping, Any( nTextGrouping )
);
}
if (nPos != 0)
@@ -1898,7 +1897,7 @@ void CustomAnimationTextAnimTabPage::update(
STLPropertySet* pSet )
mpSet->getPropertyValue( nHandleTextReverse ) >>= bOldTextReverse;
if( bTextReverse != bOldTextReverse )
- pSet->setPropertyValue( nHandleTextReverse, makeAny( bTextReverse
) );
+ pSet->setPropertyValue( nHandleTextReverse, Any( bTextReverse ) );
if( nPos > 1 )
{
@@ -1909,7 +1908,7 @@ void CustomAnimationTextAnimTabPage::update(
STLPropertySet* pSet )
mpSet->getPropertyValue( nHandleTextGroupingAuto ) >>=
fOldTextGroupingAuto;
if( fTextGroupingAuto != fOldTextGroupingAuto )
- pSet->setPropertyValue( nHandleTextGroupingAuto, makeAny(
fTextGroupingAuto ) );
+ pSet->setPropertyValue( nHandleTextGroupingAuto, Any(
fTextGroupingAuto ) );
}
}
//#i120049# impress crashes when modifying the "Random effects" animation
@@ -1924,7 +1923,7 @@ void CustomAnimationTextAnimTabPage::update(
STLPropertySet* pSet )
mpSet->getPropertyValue( nHandleAnimateForm ) >>= bOldAnimateForm;
if( bAnimateForm != bOldAnimateForm )
- pSet->setPropertyValue( nHandleAnimateForm, makeAny( bAnimateForm
) );
+ pSet->setPropertyValue( nHandleAnimateForm, Any( bAnimateForm ) );
}
}
@@ -1997,46 +1996,46 @@ std::unique_ptr<STLPropertySet>
CustomAnimationDialog::createDefaultSet()
Any aEmpty;
std::unique_ptr<STLPropertySet> pSet(new STLPropertySet());
- pSet->setPropertyDefaultValue( nHandleMaxParaDepth, makeAny( sal_Int32(-1)
) );
+ pSet->setPropertyDefaultValue( nHandleMaxParaDepth, Any( sal_Int32(-1) ) );
- pSet->setPropertyDefaultValue( nHandleHasAfterEffect, makeAny( false ) );
- pSet->setPropertyDefaultValue( nHandleAfterEffectOnNextEffect, makeAny(
false ) );
+ pSet->setPropertyDefaultValue( nHandleHasAfterEffect, Any( false ) );
+ pSet->setPropertyDefaultValue( nHandleAfterEffectOnNextEffect, Any( false
) );
pSet->setPropertyDefaultValue( nHandleDimColor, aEmpty );
- pSet->setPropertyDefaultValue( nHandleIterateType, makeAny( sal_Int16(0) )
);
- pSet->setPropertyDefaultValue( nHandleIterateInterval, makeAny( 0.0 ) );
+ pSet->setPropertyDefaultValue( nHandleIterateType, Any( sal_Int16(0) ) );
+ pSet->setPropertyDefaultValue( nHandleIterateInterval, Any( 0.0 ) );
- pSet->setPropertyDefaultValue( nHandleStart, makeAny(
sal_Int16(EffectNodeType::ON_CLICK) ) );
- pSet->setPropertyDefaultValue( nHandleBegin, makeAny( 0.0 ) );
- pSet->setPropertyDefaultValue( nHandleDuration, makeAny( 2.0 ) );
+ pSet->setPropertyDefaultValue( nHandleStart, Any(
sal_Int16(EffectNodeType::ON_CLICK) ) );
+ pSet->setPropertyDefaultValue( nHandleBegin, Any( 0.0 ) );
+ pSet->setPropertyDefaultValue( nHandleDuration, Any( 2.0 ) );
pSet->setPropertyDefaultValue( nHandleRepeat, aEmpty );
- pSet->setPropertyDefaultValue( nHandleRewind, makeAny( AnimationFill::HOLD
) );
+ pSet->setPropertyDefaultValue( nHandleRewind, Any( AnimationFill::HOLD ) );
pSet->setPropertyDefaultValue( nHandleEnd, aEmpty );
pSet->setPropertyDefaultValue( nHandlePresetId, aEmpty );
- pSet->setPropertyDefaultValue( nHandleProperty1Type, makeAny(
nPropertyTypeNone ) );
+ pSet->setPropertyDefaultValue( nHandleProperty1Type, Any(
nPropertyTypeNone ) );
pSet->setPropertyDefaultValue( nHandleProperty1Value, aEmpty );
- pSet->setPropertyDefaultValue( nHandleProperty2Type, makeAny(
nPropertyTypeNone ) );
+ pSet->setPropertyDefaultValue( nHandleProperty2Type, Any(
nPropertyTypeNone ) );
pSet->setPropertyDefaultValue( nHandleProperty2Value, aEmpty );
pSet->setPropertyDefaultValue( nHandleAccelerate, aEmpty );
pSet->setPropertyDefaultValue( nHandleDecelerate, aEmpty );
pSet->setPropertyDefaultValue( nHandleAutoReverse, aEmpty );
pSet->setPropertyDefaultValue( nHandleTrigger, aEmpty );
- pSet->setPropertyDefaultValue( nHandleHasText, makeAny( false ) );
- pSet->setPropertyDefaultValue( nHandleHasVisibleShape, makeAny( false ) );
- pSet->setPropertyDefaultValue( nHandleTextGrouping, makeAny( sal_Int32(-1)
) );
- pSet->setPropertyDefaultValue( nHandleAnimateForm, makeAny( true ) );
- pSet->setPropertyDefaultValue( nHandleTextGroupingAuto, makeAny( -1.0 ) );
- pSet->setPropertyDefaultValue( nHandleTextReverse, makeAny( false ) );
+ pSet->setPropertyDefaultValue( nHandleHasText, Any( false ) );
+ pSet->setPropertyDefaultValue( nHandleHasVisibleShape, Any( false ) );
+ pSet->setPropertyDefaultValue( nHandleTextGrouping, Any( sal_Int32(-1) ) );
+ pSet->setPropertyDefaultValue( nHandleAnimateForm, Any( true ) );
+ pSet->setPropertyDefaultValue( nHandleTextGroupingAuto, Any( -1.0 ) );
+ pSet->setPropertyDefaultValue( nHandleTextReverse, Any( false ) );
pSet->setPropertyDefaultValue( nHandleCurrentPage, aEmpty );
pSet->setPropertyDefaultValue( nHandleSoundURL, aEmpty );
- pSet->setPropertyDefaultValue( nHandleSoundVolume, makeAny( 1.0) );
- pSet->setPropertyDefaultValue( nHandleSoundEndAfterSlide, makeAny(
sal_Int32(0) ) );
+ pSet->setPropertyDefaultValue( nHandleSoundVolume, Any( 1.0) );
+ pSet->setPropertyDefaultValue( nHandleSoundEndAfterSlide, Any(
sal_Int32(0) ) );
- pSet->setPropertyDefaultValue( nHandleCommand, makeAny( sal_Int16(0) ) );
+ pSet->setPropertyDefaultValue( nHandleCommand, Any( sal_Int16(0) ) );
return pSet;
}
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 5f1364a187a4..b3248aeaa15b 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -926,7 +926,7 @@ Any CustomAnimationPane::getProperty1Value( sal_Int32
nType, const CustomAnimati
case nPropertyTypeDirection:
case nPropertyTypeSpokes:
case nPropertyTypeZoom:
- return makeAny( pEffect->getPresetSubType() );
+ return Any( pEffect->getPresetSubType() );
case nPropertyTypeColor:
case nPropertyTypeFillColor:
@@ -967,7 +967,7 @@ Any CustomAnimationPane::getProperty1Value( sal_Int32
nType, const CustomAnimati
pEffect->getProperty( AnimationNodeType::SET, u"CharPosture" ,
EValue::To ),
pEffect->getProperty( AnimationNodeType::SET, u"CharUnderline"
, EValue::To )
};
- return makeAny( aValues );
+ return Any( aValues );
}
}
@@ -1080,7 +1080,7 @@ std::unique_ptr<STLPropertySet>
CustomAnimationPane::createSelectionSet()
{
std::unique_ptr<STLPropertySet> pSet =
CustomAnimationDialog::createDefaultSet();
- pSet->setPropertyValue( nHandleCurrentPage, makeAny( mxCurrentPage ) );
+ pSet->setPropertyValue( nHandleCurrentPage, Any( mxCurrentPage ) );
sal_Int32 nMaxParaDepth = 0;
@@ -1099,10 +1099,10 @@ std::unique_ptr<STLPropertySet>
CustomAnimationPane::createSelectionSet()
nMaxParaDepth = n;
}
- addValue( pSet, nHandleHasAfterEffect, makeAny(
pEffect->hasAfterEffect() ) );
- addValue( pSet, nHandleAfterEffectOnNextEffect, makeAny(
pEffect->IsAfterEffectOnNext() ) );
+ addValue( pSet, nHandleHasAfterEffect, Any( pEffect->hasAfterEffect()
) );
+ addValue( pSet, nHandleAfterEffectOnNextEffect, Any(
pEffect->IsAfterEffectOnNext() ) );
addValue( pSet, nHandleDimColor, pEffect->getDimColor() );
- addValue( pSet, nHandleIterateType, makeAny( pEffect->getIterateType()
) );
+ addValue( pSet, nHandleIterateType, Any( pEffect->getIterateType() ) );
// convert absolute time to percentage value
// This calculation is done in float to avoid some rounding artifacts.
@@ -1110,18 +1110,18 @@ std::unique_ptr<STLPropertySet>
CustomAnimationPane::createSelectionSet()
if( pEffect->getDuration() )
fIterateInterval = static_cast<float>(fIterateInterval /
pEffect->getDuration() );
fIterateInterval *= 100.0;
- addValue( pSet, nHandleIterateInterval, makeAny(
static_cast<double>(fIterateInterval) ) );
+ addValue( pSet, nHandleIterateInterval, Any(
static_cast<double>(fIterateInterval) ) );
- addValue( pSet, nHandleBegin, makeAny( pEffect->getBegin() ) );
- addValue( pSet, nHandleDuration, makeAny( pEffect->getDuration() ) );
- addValue( pSet, nHandleStart, makeAny( pEffect->getNodeType() ) );
+ addValue( pSet, nHandleBegin, Any( pEffect->getBegin() ) );
+ addValue( pSet, nHandleDuration, Any( pEffect->getDuration() ) );
+ addValue( pSet, nHandleStart, Any( pEffect->getNodeType() ) );
addValue( pSet, nHandleRepeat, pEffect->getRepeatCount() );
addValue( pSet, nHandleEnd, pEffect->getEnd() );
- addValue( pSet, nHandleRewind, makeAny( pEffect->getFill() ) );
+ addValue( pSet, nHandleRewind, Any( pEffect->getFill() ) );
- addValue( pSet, nHandlePresetId, makeAny( pEffect->getPresetId() ) );
+ addValue( pSet, nHandlePresetId, Any( pEffect->getPresetId() ) );
- addValue( pSet, nHandleHasText, makeAny( pEffect->hasText() ) );
+ addValue( pSet, nHandleHasText, Any( pEffect->hasText() ) );
addValue( pSet, nHandleHasVisibleShape, Any( hasVisibleShape(
pEffect->getTargetShape() ) ) );
@@ -1129,7 +1129,7 @@ std::unique_ptr<STLPropertySet>
CustomAnimationPane::createSelectionSet()
if( pEffect->getAudio().is() )
{
aSoundSource = pEffect->getAudio()->getSource();
- addValue( pSet, nHandleSoundVolume, makeAny(
pEffect->getAudio()->getVolume() ) );
+ addValue( pSet, nHandleSoundVolume, Any(
pEffect->getAudio()->getVolume() ) );
// todo addValue( pSet, nHandleSoundEndAfterSlide, makeAny(
pEffect->getAudio()->getEndAfterSlide() ) );
// this is now stored at the XCommand parameter sequence
}
@@ -1144,15 +1144,15 @@ std::unique_ptr<STLPropertySet>
CustomAnimationPane::createSelectionSet()
if( nGroupId != -1 )
pTextGroup = pEffectSequence->findGroup( nGroupId );
- addValue( pSet, nHandleTextGrouping, makeAny( pTextGroup ?
pTextGroup->getTextGrouping() : sal_Int32(-1) ) );
- addValue( pSet, nHandleAnimateForm, makeAny( !pTextGroup ||
pTextGroup->getAnimateForm() ) );
- addValue( pSet, nHandleTextGroupingAuto, makeAny( pTextGroup ?
pTextGroup->getTextGroupingAuto() : -1.0 ) );
- addValue( pSet, nHandleTextReverse, makeAny( pTextGroup &&
pTextGroup->getTextReverse() ) );
+ addValue( pSet, nHandleTextGrouping, Any( pTextGroup ?
pTextGroup->getTextGrouping() : sal_Int32(-1) ) );
+ addValue( pSet, nHandleAnimateForm, Any( !pTextGroup ||
pTextGroup->getAnimateForm() ) );
+ addValue( pSet, nHandleTextGroupingAuto, Any( pTextGroup ?
pTextGroup->getTextGroupingAuto() : -1.0 ) );
+ addValue( pSet, nHandleTextReverse, Any( pTextGroup &&
pTextGroup->getTextReverse() ) );
if( pEffectSequence->getSequenceType() ==
EffectNodeType::INTERACTIVE_SEQUENCE )
{
InteractiveSequence* pIS = static_cast< InteractiveSequence* >(
pEffectSequence );
- addValue( pSet, nHandleTrigger, makeAny( pIS->getTriggerShape() )
);
+ addValue( pSet, nHandleTrigger, Any( pIS->getTriggerShape() ) );
}
CustomAnimationPresetPtr pDescriptor = rPresets.getEffectDescriptor(
pEffect->getPresetId() );
@@ -1166,28 +1166,28 @@ std::unique_ptr<STLPropertySet>
CustomAnimationPane::createSelectionSet()
if( nType != nPropertyTypeNone )
{
- addValue( pSet, nHandleProperty1Type, makeAny( nType ) );
+ addValue( pSet, nHandleProperty1Type, Any( nType ) );
addValue( pSet, nHandleProperty1Value, getProperty1Value(
nType, pEffect ) );
}
if( pDescriptor->hasProperty( u"Accelerate" ) )
{
- addValue( pSet, nHandleAccelerate, makeAny(
pEffect->getAcceleration() ) );
+ addValue( pSet, nHandleAccelerate, Any(
pEffect->getAcceleration() ) );
}
if( pDescriptor->hasProperty( u"Decelerate" ) )
{
- addValue( pSet, nHandleDecelerate, makeAny(
pEffect->getDecelerate() ) );
+ addValue( pSet, nHandleDecelerate, Any(
pEffect->getDecelerate() ) );
}
if( pDescriptor->hasProperty( u"AutoReverse" ) )
{
- addValue( pSet, nHandleAutoReverse, makeAny(
pEffect->getAutoReverse() ) );
+ addValue( pSet, nHandleAutoReverse, Any(
pEffect->getAutoReverse() ) );
}
}
}
- addValue( pSet, nHandleMaxParaDepth, makeAny( nMaxParaDepth ) );
+ addValue( pSet, nHandleMaxParaDepth, Any( nMaxParaDepth ) );
return pSet;
}
@@ -1560,7 +1560,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet
const * pResultSet, ST
// in the text group is fine.
if (nTextGrouping == -1 &&
pTextGroup->getEffects().empty())
{
- pEffect->setTarget(makeAny(pEffect->getTargetShape()));
+ pEffect->setTarget(Any(pEffect->getTargetShape()));
pEffect->setGroupId(-1);
mpMainSequence->append(pEffect);
}
@@ -1785,7 +1785,7 @@ void CustomAnimationPane::onAdd()
for( const auto& rPara : aParaList )
{
aParaTarget.Paragraph = rPara;
- aTargets.push_back( makeAny( aParaTarget ) );
+ aTargets.push_back( Any( aParaTarget ) );
}
}
}
@@ -2474,7 +2474,7 @@ void CustomAnimationPane::preview( const Reference<
XAnimationNode >& xAnimation
{
Reference< XParallelTimeContainer > xRoot = ParallelTimeContainer::create(
::comphelper::getProcessComponentContext() );
Sequence< css::beans::NamedValue > aUserData
- { { "node-type",
css::uno::makeAny(css::presentation::EffectNodeType::TIMING_ROOT) } };
+ { { "node-type",
css::uno::Any(css::presentation::EffectNodeType::TIMING_ROOT) } };
xRoot->setUserData( aUserData );
xRoot->appendChild( xAnimationNode );
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 70ccf9c4b9be..1fa8c2dab768 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -81,7 +81,7 @@ CopyDlg::~CopyDlg()
OUString::number(m_xMtrFldHeight->get_value(FieldUnit::NONE)) +
OUStringChar(TOKEN) +
OUString::number(static_cast<sal_uInt32>(m_xLbStartColor->GetSelectEntryColor()))
+ OUStringChar(TOKEN) +
OUString::number(static_cast<sal_uInt32>(m_xLbEndColor->GetSelectEntryColor()));
- aDlgOpt.SetUserItem("UserItem", css::uno::makeAny(sStr));
+ aDlgOpt.SetUserItem("UserItem", css::uno::Any(sStr));
}
/**
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 17b66d7d82c8..c01d315a3d9c 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -176,11 +176,11 @@ void SAL_CALL BasicPaneFactory::initialize (const
Sequence<Any>& aArguments)
xCC->addConfigurationChangeListener(
this,
FrameworkHelper::msConfigurationUpdateStartEvent,
- makeAny(gnConfigurationUpdateStartEvent));
+ Any(gnConfigurationUpdateStartEvent));
xCC->addConfigurationChangeListener(
this,
FrameworkHelper::msConfigurationUpdateEndEvent,
- makeAny(gnConfigurationUpdateEndEvent));
+ Any(gnConfigurationUpdateEndEvent));
}
}
catch (RuntimeException&)
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx
b/sd/source/ui/framework/module/SlideSorterModule.cxx
index b254a16dc0cd..dbe30f0d3a9c 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -68,11 +68,11 @@ SlideSorterModule::SlideSorterModule (
mxConfigurationController->addConfigurationChangeListener(
this,
FrameworkHelper::msResourceActivationRequestEvent,
- makeAny(ResourceActivationRequestEvent));
+ Any(ResourceActivationRequestEvent));
mxConfigurationController->addConfigurationChangeListener(
this,
FrameworkHelper::msResourceDeactivationRequestEvent,
- makeAny(ResourceDeactivationRequestEvent));
+ Any(ResourceDeactivationRequestEvent));
}
}
if (!mxConfigurationController.is())
diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx
b/sd/source/ui/framework/module/ToolBarModule.cxx
index 352417b33f71..3cecf7b031f0 100644
--- a/sd/source/ui/framework/module/ToolBarModule.cxx
+++ b/sd/source/ui/framework/module/ToolBarModule.cxx
@@ -61,19 +61,19 @@ ToolBarModule::ToolBarModule (
mxConfigurationController->addConfigurationChangeListener(
this,
FrameworkHelper::msConfigurationUpdateStartEvent,
- makeAny(gnConfigurationUpdateStartEvent));
+ Any(gnConfigurationUpdateStartEvent));
mxConfigurationController->addConfigurationChangeListener(
this,
FrameworkHelper::msConfigurationUpdateEndEvent,
- makeAny(gnConfigurationUpdateEndEvent));
+ Any(gnConfigurationUpdateEndEvent));
mxConfigurationController->addConfigurationChangeListener(
this,
FrameworkHelper::msResourceActivationRequestEvent,
- makeAny(gnResourceActivationRequestEvent));
+ Any(gnResourceActivationRequestEvent));
mxConfigurationController->addConfigurationChangeListener(
this,
FrameworkHelper::msResourceDeactivationRequestEvent,
- makeAny(gnResourceDeactivationRequestEvent));
+ Any(gnResourceDeactivationRequestEvent));
}
ToolBarModule::~ToolBarModule()
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx
b/sd/source/ui/framework/module/ViewTabBarModule.cxx
index 3ee872bc84a0..4f5dd4828535 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.cxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx
@@ -62,17 +62,17 @@ ViewTabBarModule::ViewTabBarModule (
mxConfigurationController->addConfigurationChangeListener(
this,
FrameworkHelper::msResourceActivationRequestEvent,
- makeAny(ResourceActivationRequestEvent));
+ Any(ResourceActivationRequestEvent));
mxConfigurationController->addConfigurationChangeListener(
this,
FrameworkHelper::msResourceDeactivationRequestEvent,
- makeAny(ResourceDeactivationRequestEvent));
+ Any(ResourceDeactivationRequestEvent));
UpdateViewTabBar(nullptr);
mxConfigurationController->addConfigurationChangeListener(
this,
FrameworkHelper::msResourceActivationEvent,
- makeAny(ResourceActivationEvent));
+ Any(ResourceActivationEvent));
}
ViewTabBarModule::~ViewTabBarModule()
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx
b/sd/source/ui/remotecontrol/Receiver.cxx
index b3480cc9b3b1..dd92e8e99d62 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -134,7 +134,7 @@ void Receiver::executeCommand( const std::vector<OString>
&aCommand )
try
{
// std::cerr << "pointer_coordination in the is" << std::endl;
-
xSlideShow->setProperty(beans::PropertyValue("PointerPosition", -1,
makeAny(pos),
+
xSlideShow->setProperty(beans::PropertyValue("PointerPosition", -1, Any(pos),
beans::PropertyState_DIRECT_VALUE));
}
catch (Exception&)
@@ -144,7 +144,7 @@ void Receiver::executeCommand( const std::vector<OString>
&aCommand )
try
{
- xSlideShow->setProperty(beans::PropertyValue("PointerVisible",
-1, makeAny(true),
+ xSlideShow->setProperty(beans::PropertyValue("PointerVisible",
-1, Any(true),
beans::PropertyState_DIRECT_VALUE));
}
catch (Exception&)
@@ -163,7 +163,7 @@ void Receiver::executeCommand( const std::vector<OString>
&aCommand )
xSlideShow->setProperty(
beans::PropertyValue( "PointerVisible" ,
-1,
- makeAny( false ),
+ Any( false ),
beans::PropertyState_DIRECT_VALUE ) );
}
catch ( Exception& )
@@ -187,7 +187,7 @@ void Receiver::executeCommand( const std::vector<OString>
&aCommand )
xSlideShow->setProperty(
beans::PropertyValue( "PointerPosition" ,
-1,
- makeAny( pos ),
+ Any( pos ),
beans::PropertyState_DIRECT_VALUE ) );
}
catch ( Exception& )
diff --git a/sd/source/ui/remotecontrol/Server.cxx
b/sd/source/ui/remotecontrol/Server.cxx
index ab583c471982..53bf0352c74b 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -283,9 +283,9 @@ bool RemoteServer::connectClient( const std::shared_ptr<
ClientInfo >& pClient,
// Check whether the client is already saved
Sequence< OUString > aNames = xConfig->getElementNames();
if (comphelper::findValue(aNames, apClient->mName) != -1)
- xConfig->replaceByName( apClient->mName, makeAny( xChild ) );
+ xConfig->replaceByName( apClient->mName, Any( xChild ) );
else
- xConfig->insertByName( apClient->mName, makeAny( xChild ) );
+ xConfig->insertByName( apClient->mName, Any( xChild ) );
aValue <<= apClient->mPin;
xChild->replaceByName("PIN", aValue);
aChanges->commit();
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx
b/sd/source/ui/sidebar/MasterPageContainer.cxx
index 40f680210ca3..20d8528077a1 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -815,7 +815,7 @@ Reference<frame::XModel>
MasterPageContainer::Implementation::GetModel()
if (xProperties.is())
xProperties->setPropertyValue(
"Layout",
- makeAny(sal_Int16(AUTOLAYOUT_TITLE)));
+ Any(sal_Int16(AUTOLAYOUT_TITLE)));
}
}
}
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index 3ca6deaad002..268658823423 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -200,7 +200,7 @@ void RecentlyUsedMasterPages::SavePersistentValues()
xChildFactory->createInstance(), UNO_QUERY);
if (xChild.is())
{
- xSet->insertByName (sKey, makeAny(xChild));
+ xSet->insertByName (sKey, Any(xChild));
aValue <<= rDescriptor.msURL;
xChild->replaceByName (sURLMemberName, aValue);
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 1d552cded0ba..5948a87f186d 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1060,7 +1060,7 @@ bool SlideshowImpl::startShowImpl( const Sequence<
beans::PropertyValue >& aProp
mxShow->setProperty(
beans::PropertyValue( "WaitSymbolBitmap" ,
-1,
- makeAny( xBitmap ),
+ Any( xBitmap ),
beans::PropertyState_DIRECT_VALUE ) );
}
@@ -1072,7 +1072,7 @@ bool SlideshowImpl::startShowImpl( const Sequence<
beans::PropertyValue >& aProp
mxShow->setProperty(
beans::PropertyValue( "PointerSymbolBitmap" ,
-1,
- makeAny( xPointerBitmap ),
+ Any( xPointerBitmap ),
beans::PropertyState_DIRECT_VALUE ) );
}
}
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx
b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index 4bc450a40ab4..d6addc3f87fe 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -128,7 +128,7 @@ SlideShowView::SlideShowView( ShowWindow& rOutputWindow,
Reference< beans::XPropertySet > xCanvasProps( getCanvas(),
uno::UNO_QUERY_THROW );
xCanvasProps->setPropertyValue("UnsafeScrolling",
- uno::makeAny( true ) );
+ uno::Any( true ) );
}
catch( uno::Exception& )
{
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
index d8117d5db145..fd08c76276c9 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
@@ -81,8 +81,8 @@ CacheConfiguration::CacheConfiguration()
// Obtain access to Impress configuration.
Sequence<Any> aCreationArguments(comphelper::InitAnyPropertySequence(
{
- {"nodepath", makeAny(OUString("/org.openoffice.Office.Impress/"))},
- {"depth", makeAny(sal_Int32(-1))}
+ {"nodepath", Any(OUString("/org.openoffice.Office.Impress/"))},
+ {"depth", Any(sal_Int32(-1))}
}));
Reference<XInterface> xRoot (xProvider->createInstanceWithArguments(
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index f0fd9fbe9dc2..5c851f1834c5 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -829,8 +829,8 @@ void SlideSorterController::PageNameHasChanged (int
nPageIndex, const OUString&
OUString sNewName (pChild->GetPage()->GetName());
pChild->FireAccessibleEvent(
css::accessibility::AccessibleEventId::NAME_CHANGED,
- makeAny(rsOldName),
- makeAny(sNewName));
+ Any(rsOldName),
+ Any(sNewName));
}
void SlideSorterController::SetDocumentSlides (const
Reference<container::XIndexAccess>& rxSlides)
diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx
b/sd/source/ui/tools/ConfigurationAccess.cxx
index 4bb4f58735b8..d359aeb189e9 100644
--- a/sd/source/ui/tools/ConfigurationAccess.cxx
+++ b/sd/source/ui/tools/ConfigurationAccess.cxx
@@ -61,8 +61,8 @@ void ConfigurationAccess::Initialize (
{
Sequence<Any> aCreationArguments(comphelper::InitAnyPropertySequence(
{
- {"nodepath", makeAny(rsRootName)},
- {"depth", makeAny(sal_Int32(-1))}
+ {"nodepath", Any(rsRootName)},
+ {"depth", Any(sal_Int32(-1))}
}));
OUString sAccessService;
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx
b/sd/source/ui/tools/EventMultiplexer.cxx
index 36c3a558c7b4..a61413ac624e 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -229,15 +229,15 @@ EventMultiplexer::Implementation::Implementation
(ViewShellBase& rBase)
xConfigurationController->addConfigurationChangeListener(
this,
FrameworkHelper::msResourceActivationEvent,
- makeAny(ResourceActivationEvent));
+ Any(ResourceActivationEvent));
xConfigurationController->addConfigurationChangeListener(
this,
FrameworkHelper::msResourceDeactivationEvent,
- makeAny(ResourceDeactivationEvent));
+ Any(ResourceDeactivationEvent));
xConfigurationController->addConfigurationChangeListener(
this,
FrameworkHelper::msConfigurationUpdateEndEvent,
- makeAny(ConfigurationUpdateEvent));
+ Any(ConfigurationUpdateEvent));
}
EventMultiplexer::Implementation::~Implementation()
diff --git a/sd/source/ui/unoidl/DrawController.cxx
b/sd/source/ui/unoidl/DrawController.cxx
index 66e1fd142f27..e4afc842a90b 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -379,8 +379,8 @@ void DrawController::FireChangeEditMode (bool
bMasterPageMode) noexcept
{
FirePropertyChange(
PROPERTY_MASTERPAGEMODE,
- makeAny(bMasterPageMode),
- makeAny(mbMasterPageMode));
+ Any(bMasterPageMode),
+ Any(mbMasterPageMode));
mbMasterPageMode = bMasterPageMode;
}
@@ -392,8 +392,8 @@ void DrawController::FireChangeLayerMode (bool bLayerMode)
noexcept
{
FirePropertyChange(
PROPERTY_LAYERMODE,
- makeAny(bLayerMode),
- makeAny(mbLayerMode));
+ Any(bLayerMode),
+ Any(mbLayerMode));
mbLayerMode = bLayerMode;
}
@@ -408,7 +408,7 @@ void DrawController::FireSwitchCurrentPage (SdPage*
pNewCurrentPage) noexcept
try
{
Any aNewValue (
-
makeAny(Reference<drawing::XDrawPage>(pNewCurrentPage->getUnoPage(),
UNO_QUERY)));
+ Any(Reference<drawing::XDrawPage>(pNewCurrentPage->getUnoPage(),
UNO_QUERY)));
Any aOldValue;
if (pCurrentPage != nullptr)
@@ -440,7 +440,7 @@ void DrawController::fireChangeLayer( css::uno::Reference<
css::drawing::XLayer>
{
sal_Int32 nHandle = PROPERTY_ACTIVE_LAYER;
- Any aNewValue (makeAny( *pCurrentLayer) );
+ Any aNewValue ( *pCurrentLayer);
Any aOldValue ;
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index c63d1362b10b..5e24a5cfcfdf 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -622,7 +622,7 @@ uno::Reference < container::XIndexAccess > SAL_CALL
SdXImpressDocument::getViewD
uno::Sequence< beans::PropertyValue > aSeq;
pFrameView->WriteUserDataSequence( aSeq );
- xCont->insertByIndex( i, uno::makeAny( aSeq ) );
+ xCont->insertByIndex( i, uno::Any( aSeq ) );
}
}
}
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index a2adb7a7f75d..8a9549c51723 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -558,7 +558,7 @@ Any SAL_CALL SdGenericDrawPage::queryInterface( const
uno::Type & rType )
const PageKind ePageKind = GetPage() ? GetPage()->GetPageKind() :
PageKind::Standard;
if( ePageKind == PageKind::Standard )
- return makeAny( Reference< XAnimationNodeSupplier >( this ) );
+ return Any( Reference< XAnimationNodeSupplier >( this ) );
}
else
return SvxDrawPage::queryInterface( rType );
@@ -1939,7 +1939,7 @@ Any SAL_CALL SdPageLinkTargets::getByName( const
OUString& aName )
if( pObj )
{
Reference< beans::XPropertySet > aRef( pObj->getUnoShape(),
uno::UNO_QUERY );
- return makeAny( aRef );
+ return Any( aRef );
}
}
@@ -2049,7 +2049,7 @@ Any SAL_CALL SdDrawPage::queryInterface( const uno::Type
& rType )
{
if( rType == cppu::UnoType<drawing::XMasterPageTarget>::get() )
{
- return makeAny( Reference< drawing::XMasterPageTarget >( this ) );
+ return Any( Reference< drawing::XMasterPageTarget >( this ) );
}
else if( IsImpressDocument()
&& rType == cppu::UnoType<presentation::XPresentationPage>::get()
)
@@ -2057,7 +2057,7 @@ Any SAL_CALL SdDrawPage::queryInterface( const uno::Type
& rType )
SdPage * p = dynamic_cast<SdPage *>(SvxDrawPage::mpPage);
if( p == nullptr || p->GetPageKind() != PageKind::Handout )
{
- return makeAny( Reference< presentation::XPresentationPage >( this
) );
+ return Any( Reference< presentation::XPresentationPage >( this ) );
}
}
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx
b/sd/source/ui/view/PresentationViewShellBase.cxx
index 56f6c27fc20b..789afbbdde86 100644
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -73,7 +73,7 @@ PresentationViewShellBase::PresentationViewShellBase (
Reference<beans::XPropertySet>
xLayouterSet(xFrameSet->getPropertyValue("LayoutManager"), UNO_QUERY);
if (xLayouterSet.is())
{
- xLayouterSet->setPropertyValue("AutomaticToolbars",
makeAny(false));
+ xLayouterSet->setPropertyValue("AutomaticToolbars", Any(false));
}
}
}
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index f76f9e6d6282..7518ba798b32 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -378,19 +378,19 @@ void FrameView::WriteUserDataSequence (
css::uno::Sequence < css::beans::Propert
{
std::vector< std::pair< OUString, Any > > aUserData;
- aUserData.emplace_back( sUNO_View_GridIsVisible, makeAny( IsGridVisible()
) );
- aUserData.emplace_back( sUNO_View_GridIsFront, makeAny( IsGridFront() ) );
- aUserData.emplace_back( sUNO_View_IsSnapToGrid, makeAny( IsGridSnap() ) );
- aUserData.emplace_back( sUNO_View_IsSnapToPageMargins, makeAny(
IsBordSnap() ) );
- aUserData.emplace_back( sUNO_View_IsSnapToSnapLines, makeAny( IsHlplSnap()
) );
- aUserData.emplace_back( sUNO_View_IsSnapToObjectFrame, makeAny(
IsOFrmSnap() ) );
- aUserData.emplace_back( sUNO_View_IsSnapToObjectPoints, makeAny(
IsOPntSnap() ) );
+ aUserData.emplace_back( sUNO_View_GridIsVisible, Any( IsGridVisible() ) );
+ aUserData.emplace_back( sUNO_View_GridIsFront, Any( IsGridFront() ) );
+ aUserData.emplace_back( sUNO_View_IsSnapToGrid, Any( IsGridSnap() ) );
+ aUserData.emplace_back( sUNO_View_IsSnapToPageMargins, Any( IsBordSnap() )
);
+ aUserData.emplace_back( sUNO_View_IsSnapToSnapLines, Any( IsHlplSnap() ) );
+ aUserData.emplace_back( sUNO_View_IsSnapToObjectFrame, Any( IsOFrmSnap() )
);
+ aUserData.emplace_back( sUNO_View_IsSnapToObjectPoints, Any( IsOPntSnap()
) );
- aUserData.emplace_back( sUNO_View_IsPlusHandlesAlwaysVisible, makeAny(
IsPlusHandlesAlwaysVisible() ) );
- aUserData.emplace_back( sUNO_View_IsFrameDragSingles, makeAny(
IsFrameDragSingles() ) );
+ aUserData.emplace_back( sUNO_View_IsPlusHandlesAlwaysVisible, Any(
IsPlusHandlesAlwaysVisible() ) );
+ aUserData.emplace_back( sUNO_View_IsFrameDragSingles, Any(
IsFrameDragSingles() ) );
- aUserData.emplace_back( sUNO_View_EliminatePolyPointLimitAngle, makeAny(
static_cast<sal_Int32>(GetEliminatePolyPointLimitAngle()) ) );
- aUserData.emplace_back( sUNO_View_IsEliminatePolyPoints, makeAny(
IsEliminatePolyPoints() ) );
+ aUserData.emplace_back( sUNO_View_EliminatePolyPointLimitAngle, Any(
static_cast<sal_Int32>(GetEliminatePolyPointLimitAngle()) ) );
+ aUserData.emplace_back( sUNO_View_IsEliminatePolyPoints, Any(
IsEliminatePolyPoints() ) );
if ( officecfg::Office::Common::Misc::WriteLayerStateAsConfigItem::get() )
{
@@ -406,28 +406,28 @@ void FrameView::WriteUserDataSequence (
css::uno::Sequence < css::beans::Propert
aUserData.emplace_back( sUNO_View_LockedLayers, aAny );
}
- aUserData.emplace_back( sUNO_View_NoAttribs, makeAny( IsNoAttribs() ) );
- aUserData.emplace_back( sUNO_View_NoColors, makeAny( IsNoColors() ) );
+ aUserData.emplace_back( sUNO_View_NoAttribs, Any( IsNoAttribs() ) );
+ aUserData.emplace_back( sUNO_View_NoColors, Any( IsNoColors() ) );
if( GetStandardHelpLines().GetCount() )
- aUserData.emplace_back( sUNO_View_SnapLinesDrawing, makeAny(
createHelpLinesString( GetStandardHelpLines() ) ) );
+ aUserData.emplace_back( sUNO_View_SnapLinesDrawing, Any(
createHelpLinesString( GetStandardHelpLines() ) ) );
if( GetNotesHelpLines().GetCount() )
- aUserData.emplace_back( sUNO_View_SnapLinesNotes, makeAny(
createHelpLinesString( GetNotesHelpLines() ) ) );
+ aUserData.emplace_back( sUNO_View_SnapLinesNotes, Any(
createHelpLinesString( GetNotesHelpLines() ) ) );
if( GetHandoutHelpLines().GetCount() )
- aUserData.emplace_back( sUNO_View_SnapLinesHandout, makeAny(
createHelpLinesString( GetHandoutHelpLines() ) ) );
+ aUserData.emplace_back( sUNO_View_SnapLinesHandout, Any(
createHelpLinesString( GetHandoutHelpLines() ) ) );
- aUserData.emplace_back( sUNO_View_RulerIsVisible, makeAny( HasRuler() ) );
- aUserData.emplace_back( sUNO_View_PageKind, makeAny(
static_cast<sal_Int16>(GetPageKind()) ) );
- aUserData.emplace_back( sUNO_View_SelectedPage, makeAny(
static_cast<sal_Int16>(GetSelectedPage()) ) );
- aUserData.emplace_back( sUNO_View_IsLayerMode, makeAny( IsLayerMode() ) );
+ aUserData.emplace_back( sUNO_View_RulerIsVisible, Any( HasRuler() ) );
+ aUserData.emplace_back( sUNO_View_PageKind, Any(
static_cast<sal_Int16>(GetPageKind()) ) );
+ aUserData.emplace_back( sUNO_View_SelectedPage, Any(
static_cast<sal_Int16>(GetSelectedPage()) ) );
+ aUserData.emplace_back( sUNO_View_IsLayerMode, Any( IsLayerMode() ) );
- aUserData.emplace_back( sUNO_View_IsDoubleClickTextEdit, makeAny(
IsDoubleClickTextEdit() ) );
- aUserData.emplace_back( sUNO_View_IsClickChangeRotation, makeAny(
IsClickChangeRotation() ) );
+ aUserData.emplace_back( sUNO_View_IsDoubleClickTextEdit, Any(
IsDoubleClickTextEdit() ) );
+ aUserData.emplace_back( sUNO_View_IsClickChangeRotation, Any(
IsClickChangeRotation() ) );
- aUserData.emplace_back( sUNO_View_SlidesPerRow, makeAny(
static_cast<sal_Int16>(GetSlidesPerRow()) ) );
- aUserData.emplace_back( sUNO_View_EditMode, makeAny(
static_cast<sal_Int32>(GetViewShEditMode()) ) );
+ aUserData.emplace_back( sUNO_View_SlidesPerRow, Any(
static_cast<sal_Int16>(GetSlidesPerRow()) ) );
+ aUserData.emplace_back( sUNO_View_EditMode, Any(
static_cast<sal_Int32>(GetViewShEditMode()) ) );
// aUserData.emplace_back( sUNO_View_EditModeStandard, makeAny(
(sal_Int32)GetViewShEditMode( PageKind::Standard ) ) );
// aUserData.emplace_back( sUNO_View_EditModeNotes, makeAny(
(sal_Int32)GetViewShEditMode( PageKind::Notes ) ) );
// aUserData.emplace_back( sUNO_View_EditModeHandout, makeAny(
(sal_Int32)GetViewShEditMode( PageKind::Handout ) ) );
@@ -435,22 +435,22 @@ void FrameView::WriteUserDataSequence (
css::uno::Sequence < css::beans::Propert
{
const ::tools::Rectangle aVisArea = GetVisArea();
- aUserData.emplace_back( sUNO_View_VisibleAreaTop, makeAny(
static_cast<sal_Int32>(aVisArea.Top()) ) );
- aUserData.emplace_back( sUNO_View_VisibleAreaLeft, makeAny(
static_cast<sal_Int32>(aVisArea.Left()) ) );
- aUserData.emplace_back( sUNO_View_VisibleAreaWidth, makeAny(
static_cast<sal_Int32>(aVisArea.GetWidth()) ) );
- aUserData.emplace_back( sUNO_View_VisibleAreaHeight, makeAny(
static_cast<sal_Int32>(aVisArea.GetHeight()) ) );
+ aUserData.emplace_back( sUNO_View_VisibleAreaTop, Any(
static_cast<sal_Int32>(aVisArea.Top()) ) );
+ aUserData.emplace_back( sUNO_View_VisibleAreaLeft, Any(
static_cast<sal_Int32>(aVisArea.Left()) ) );
+ aUserData.emplace_back( sUNO_View_VisibleAreaWidth, Any(
static_cast<sal_Int32>(aVisArea.GetWidth()) ) );
+ aUserData.emplace_back( sUNO_View_VisibleAreaHeight, Any(
static_cast<sal_Int32>(aVisArea.GetHeight()) ) );
}
- aUserData.emplace_back( sUNO_View_GridCoarseWidth, makeAny(
static_cast<sal_Int32>(GetGridCoarse().Width()) ) );
- aUserData.emplace_back( sUNO_View_GridCoarseHeight, makeAny(
static_cast<sal_Int32>(GetGridCoarse().Height()) ) );
- aUserData.emplace_back( sUNO_View_GridFineWidth, makeAny(
static_cast<sal_Int32>(GetGridFine().Width()) ) );
- aUserData.emplace_back( sUNO_View_GridFineHeight, makeAny(
static_cast<sal_Int32>(GetGridFine().Height()) ) );
- aUserData.emplace_back( sUNO_View_GridSnapWidthXNumerator, makeAny(
GetSnapGridWidthX().GetNumerator() ) );
- aUserData.emplace_back( sUNO_View_GridSnapWidthXDenominator, makeAny(
GetSnapGridWidthX().GetDenominator() ) );
- aUserData.emplace_back( sUNO_View_GridSnapWidthYNumerator, makeAny(
GetSnapGridWidthY().GetNumerator() ) );
- aUserData.emplace_back( sUNO_View_GridSnapWidthYDenominator, makeAny(
GetSnapGridWidthY().GetDenominator() ) );
- aUserData.emplace_back( sUNO_View_IsAngleSnapEnabled, makeAny(
IsAngleSnapEnabled() ) );
- aUserData.emplace_back( sUNO_View_SnapAngle, makeAny(
static_cast<sal_Int32>(GetSnapAngle()) ) );
+ aUserData.emplace_back( sUNO_View_GridCoarseWidth, Any(
static_cast<sal_Int32>(GetGridCoarse().Width()) ) );
+ aUserData.emplace_back( sUNO_View_GridCoarseHeight, Any(
static_cast<sal_Int32>(GetGridCoarse().Height()) ) );
+ aUserData.emplace_back( sUNO_View_GridFineWidth, Any(
static_cast<sal_Int32>(GetGridFine().Width()) ) );
+ aUserData.emplace_back( sUNO_View_GridFineHeight, Any(
static_cast<sal_Int32>(GetGridFine().Height()) ) );
+ aUserData.emplace_back( sUNO_View_GridSnapWidthXNumerator, Any(
GetSnapGridWidthX().GetNumerator() ) );
+ aUserData.emplace_back( sUNO_View_GridSnapWidthXDenominator, Any(
GetSnapGridWidthX().GetDenominator() ) );
+ aUserData.emplace_back( sUNO_View_GridSnapWidthYNumerator, Any(
GetSnapGridWidthY().GetNumerator() ) );
+ aUserData.emplace_back( sUNO_View_GridSnapWidthYDenominator, Any(
GetSnapGridWidthY().GetDenominator() ) );
+ aUserData.emplace_back( sUNO_View_IsAngleSnapEnabled, Any(
IsAngleSnapEnabled() ) );
+ aUserData.emplace_back( sUNO_View_SnapAngle, Any(
static_cast<sal_Int32>(GetSnapAngle()) ) );
const sal_Int32 nOldLength = rValues.getLength();
rValues.realloc( nOldLength + aUserData.size() );
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 5b0fcc424313..68941d2dd988 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -1048,8 +1048,8 @@ bool View::InsertData( const TransferableDataHelper&
rDataHelper,
( xProps->getPropertyValue(
"DisableDataTableDialog" ) >>= bDisableDataTableDialog ) &&
bDisableDataTableDialog )
{
- xProps->setPropertyValue( "DisableDataTableDialog"
, uno::makeAny( false ) );
- xProps->setPropertyValue(
"DisableComplexChartTypes" , uno::makeAny( false ) );
+ xProps->setPropertyValue( "DisableDataTableDialog"
, uno::Any( false ) );
+ xProps->setPropertyValue(
"DisableComplexChartTypes" , uno::Any( false ) );
uno::Reference< util::XModifiable > xModifiable(
xProps, uno::UNO_QUERY );
if ( xModifiable.is() )
{
