svx/qa/unit/XTableImportExportTest.cxx | 2
svx/qa/unit/svdraw.cxx | 16 ++---
svx/qa/unit/unodraw.cxx | 4 -
svx/qa/unit/xoutdev.cxx | 6 +-
svx/source/accessibility/AccessibleShape.cxx | 4 -
svx/source/accessibility/AccessibleTextHelper.cxx | 18 +++---
svx/source/accessibility/ChildrenManagerImpl.cxx | 6 +-
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 6 +-
svx/source/dialog/ClassificationCommon.cxx | 4 -
svx/source/dialog/charmap.cxx | 4 -
svx/source/dialog/signaturelinehelper.cxx | 3 -
svx/source/fmcomp/dbaexchange.cxx | 6 +-
svx/source/fmcomp/dbaobjectex.cxx | 2
svx/source/fmcomp/fmgridcl.cxx | 46 +++++++--------
svx/source/fmcomp/fmgridif.cxx | 2
svx/source/fmcomp/gridcell.cxx | 12 ++--
svx/source/form/datanavi.cxx | 48 ++++++++--------
svx/source/form/fmPropBrw.cxx | 12 ++--
svx/source/form/fmcontrolbordermanager.cxx | 14 ++--
svx/source/form/fmcontrollayout.cxx | 9 +--
svx/source/form/fmexch.cxx | 4 -
svx/source/form/fmobj.cxx | 8 +-
svx/source/form/fmobjfac.cxx | 6 +-
svx/source/form/fmpgeimp.cxx | 30 +++++-----
svx/source/form/fmservs.cxx | 4 -
svx/source/form/fmshell.cxx | 2
svx/source/form/fmshimp.cxx | 22 +++----
svx/source/form/fmtools.cxx | 4 -
svx/source/form/fmundo.cxx | 6 +-
svx/source/form/fmvwimp.cxx | 19 +++---
svx/source/form/formcontrolfactory.cxx | 27 ++++-----
svx/source/form/formcontroller.cxx | 12 ++--
svx/source/form/navigatortree.cxx | 8 +-
svx/source/form/navigatortreemodel.cxx | 6 +-
svx/source/form/tabwin.cxx | 2
svx/source/gallery2/galmisc.cxx | 4 -
svx/source/items/SmartTagItem.cxx | 16 ++---
svx/source/items/customshapeitem.cxx | 6 +-
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 2
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 2
svx/source/smarttags/SmartTagMgr.cxx | 6 +-
svx/source/styles/ColorSets.cxx | 4 -
svx/source/svdraw/charthelper.cxx | 4 -
svx/source/svdraw/svdmodel.cxx | 2
svx/source/svdraw/svdobj.cxx | 2
svx/source/svdraw/svdouno.cxx | 2
svx/source/tbxctrls/bulletsnumbering.cxx | 8 +-
svx/source/tbxctrls/colrctrl.cxx | 2
svx/source/tbxctrls/grafctrl.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 2
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 18 +++---
svx/source/tbxctrls/verttexttbxctrl.cxx | 2
svx/source/unodraw/UnoNamespaceMap.cxx | 2
svx/source/unodraw/gluepts.cxx | 4 -
svx/source/unodraw/unopage.cxx | 2
svx/source/unodraw/unoshap2.cxx | 2
svx/source/unodraw/unoshap4.cxx | 2
svx/source/unodraw/unoshcol.cxx | 2
svx/source/xml/xmleohlp.cxx | 2
svx/source/xml/xmlgrhlp.cxx | 2
svx/source/xml/xmlxtexp.cxx | 4 -
61 files changed, 243 insertions(+), 247 deletions(-)
New commits:
commit 1d2b6b709e81eec8600118b3402d82707aa113bc
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue May 3 17:01:57 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue May 3 21:48:15 2022 +0200
Just use Any ctor instead of makeAny in svx
Change-Id: I59b1b3f817a9028f132456ea5094f38f88674d00
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133768
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/svx/qa/unit/XTableImportExportTest.cxx
b/svx/qa/unit/XTableImportExportTest.cxx
index 1693d83d1a39..b97a7c50bc6b 100644
--- a/svx/qa/unit/XTableImportExportTest.cxx
+++ b/svx/qa/unit/XTableImportExportTest.cxx
@@ -51,7 +51,7 @@ CPPUNIT_TEST_FIXTURE(XTableImportExportTest, testImportExport)
Graphic aGraphic(aBitmapEx);
uno::Reference<awt::XBitmap> xBitmap(aGraphic.GetXGraphic(),
css::uno::UNO_QUERY);
- xNameContainer->insertByName("SomeBitmap", uno::makeAny(xBitmap));
+ xNameContainer->insertByName("SomeBitmap", uno::Any(xBitmap));
xBitmapList->Save();
aChecksum = aBitmap.GetChecksum();
diff --git a/svx/qa/unit/svdraw.cxx b/svx/qa/unit/svdraw.cxx
index a730bb3fc9b9..9ad02060d68e 100644
--- a/svx/qa/unit/svdraw.cxx
+++ b/svx/qa/unit/svdraw.cxx
@@ -119,9 +119,9 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testSemiTransparentText)
xShapeText->getText()->setString("hello");
uno::Reference<beans::XPropertySet> xShapeProperties(xShape,
uno::UNO_QUERY);
- xShapeProperties->setPropertyValue("CharColor", uno::makeAny(COL_RED));
+ xShapeProperties->setPropertyValue("CharColor", uno::Any(COL_RED));
sal_Int16 nTransparence = 75;
- xShapeProperties->setPropertyValue("CharTransparence",
uno::makeAny(nTransparence));
+ xShapeProperties->setPropertyValue("CharTransparence",
uno::Any(nTransparence));
// Generates drawinglayer primitives for the page.
auto pDrawPage = dynamic_cast<SvxDrawPage*>(xDrawPage.get());
@@ -153,9 +153,9 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testHandlePathObjScale)
xShape->setPosition(awt::Point(2512, 6062));
xShape->setSize(awt::Size(112, 112));
uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY);
- xShapeProps->setPropertyValue("FillStyle",
uno::makeAny(drawing::FillStyle_SOLID));
- xShapeProps->setPropertyValue("LineStyle",
uno::makeAny(drawing::LineStyle_SOLID));
- xShapeProps->setPropertyValue("FillColor",
uno::makeAny(static_cast<sal_Int32>(0)));
+ xShapeProps->setPropertyValue("FillStyle",
uno::Any(drawing::FillStyle_SOLID));
+ xShapeProps->setPropertyValue("LineStyle",
uno::Any(drawing::LineStyle_SOLID));
+ xShapeProps->setPropertyValue("FillColor",
uno::Any(static_cast<sal_Int32>(0)));
// Add it to the draw page.
uno::Reference<drawing::XDrawPagesSupplier>
xDrawPagesSupplier(getComponent(), uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage>
xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
@@ -197,7 +197,7 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testHandlePathObjScale)
drawing::PolygonFlags_NORMAL,
},
};
- xShapeProps->setPropertyValue("PolyPolygonBezier",
uno::makeAny(aPolyPolygonBezierCoords));
+ xShapeProps->setPropertyValue("PolyPolygonBezier",
uno::Any(aPolyPolygonBezierCoords));
drawing::HomogenMatrix3 aMatrix;
aMatrix.Line1.Column1 = 56;
aMatrix.Line2.Column1 = -97;
@@ -208,7 +208,7 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testHandlePathObjScale)
aMatrix.Line1.Column3 = 3317;
aMatrix.Line2.Column3 = 5583;
aMatrix.Line3.Column3 = 1;
- xShapeProps->setPropertyValue("Transformation", uno::makeAny(aMatrix));
+ xShapeProps->setPropertyValue("Transformation", uno::Any(aMatrix));
// Then make sure the scaling is only applied once:
// Without the accompanying fix in place, this test would have failed with:
@@ -246,7 +246,7 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testTextEditEmptyGrabBag)
comphelper::makePropertyValue("OOXLayout", true),
};
uno::Reference<beans::XPropertySet> xGroupProps(xGroup, uno::UNO_QUERY);
- xGroupProps->setPropertyValue("InteropGrabBag", uno::makeAny(aGrabBag));
+ xGroupProps->setPropertyValue("InteropGrabBag", uno::Any(aGrabBag));
// When editing the shape text of the 2nd rectangle (insert a char at the
start).
SfxViewShell* pViewShell = SfxViewShell::Current();
diff --git a/svx/qa/unit/unodraw.cxx b/svx/qa/unit/unodraw.cxx
index 5d2814e2c21a..d026e07bc076 100644
--- a/svx/qa/unit/unodraw.cxx
+++ b/svx/qa/unit/unodraw.cxx
@@ -143,9 +143,9 @@ CPPUNIT_TEST_FIXTURE(UnodrawTest, testTableShadowDirect)
uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY);
// Without the accompanying fix in place, this test would have failed with
throwing a
// beans.UnknownPropertyException, as shadow-as-direct-formatting on
tables were not possible.
- xShapeProps->setPropertyValue("Shadow", uno::makeAny(true));
+ xShapeProps->setPropertyValue("Shadow", uno::Any(true));
sal_Int32 nRed = 0xff0000;
- xShapeProps->setPropertyValue("ShadowColor", uno::makeAny(nRed));
+ xShapeProps->setPropertyValue("ShadowColor", uno::Any(nRed));
CPPUNIT_ASSERT(xShapeProps->getPropertyValue("ShadowColor") >>= nRed);
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0xff0000), nRed);
diff --git a/svx/qa/unit/xoutdev.cxx b/svx/qa/unit/xoutdev.cxx
index 78af484555de..41b46016451c 100644
--- a/svx/qa/unit/xoutdev.cxx
+++ b/svx/qa/unit/xoutdev.cxx
@@ -127,13 +127,13 @@ CPPUNIT_TEST_FIXTURE(XOutdevTest,
testFillColorThemeUnoApi)
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xShape(xPage->getByIndex(0),
uno::UNO_QUERY);
sal_Int16 nExpected = 4; // Accent 1
- xShape->setPropertyValue("FillColorTheme", uno::makeAny(nExpected));
+ xShape->setPropertyValue("FillColorTheme", uno::Any(nExpected));
// 80% lighter
sal_Int16 nExpectedLumMod = 2000;
- xShape->setPropertyValue("FillColorLumMod", uno::makeAny(nExpectedLumMod));
+ xShape->setPropertyValue("FillColorLumMod", uno::Any(nExpectedLumMod));
sal_Int16 nExpectedLumOff = 8000;
- xShape->setPropertyValue("FillColorLumOff", uno::makeAny(nExpectedLumOff));
+ xShape->setPropertyValue("FillColorLumOff", uno::Any(nExpectedLumOff));
// Then make sure the value we read back is the expected one:
sal_Int16 nActual = -1;
diff --git a/svx/source/accessibility/AccessibleShape.cxx
b/svx/source/accessibility/AccessibleShape.cxx
index d7792053cb89..03996fe7f67e 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -1165,7 +1165,7 @@ AccessibleShape::getGroupPosition( const uno::Any& )
Reference< XAccessibleGroupPosition > xGroupPosition(
xParent,uno::UNO_QUERY );
if ( xGroupPosition.is() )
{
- aRet = xGroupPosition->getGroupPosition( uno::makeAny(
getAccessibleContext() ) );
+ aRet = xGroupPosition->getGroupPosition( uno::Any(
getAccessibleContext() ) );
}
return aRet;
}
@@ -1230,7 +1230,7 @@ OUString AccessibleShape::getObjectLink( const uno::Any& )
Reference< XAccessibleGroupPosition > xGroupPosition(
maShapeTreeInfo.GetDocumentWindow(), uno::UNO_QUERY );
if (xGroupPosition.is())
{
- aRet = xGroupPosition->getObjectLink( uno::makeAny(
getAccessibleContext() ) );
+ aRet = xGroupPosition->getObjectLink( uno::Any(
getAccessibleContext() ) );
}
}
return aRet;
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx
b/svx/source/accessibility/AccessibleTextHelper.cxx
index 3331a88e552c..78915e4a8d62 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -406,7 +406,7 @@ namespace accessibility
{
AccessibleCell* pAccessibleCell = dynamic_cast<
AccessibleCell* > ( mxFrontEnd.get() );
if ( !pAccessibleCell )
- GotPropertyEvent(
uno::makeAny(AccessibleStateType::FOCUSED), AccessibleEventId::STATE_CHANGED );
+ GotPropertyEvent( uno::Any(AccessibleStateType::FOCUSED),
AccessibleEventId::STATE_CHANGED );
else // the focus event on cell should be fired on table
directly
{
AccessibleTableShape* pAccTable =
pAccessibleCell->GetParentTable();
@@ -424,7 +424,7 @@ namespace accessibility
{
AccessibleCell* pAccessibleCell = dynamic_cast<
AccessibleCell* > ( mxFrontEnd.get() );
if ( !pAccessibleCell )
- FireEvent( AccessibleEventId::STATE_CHANGED, uno::Any(),
uno::makeAny(AccessibleStateType::FOCUSED) );
+ FireEvent( AccessibleEventId::STATE_CHANGED, uno::Any(),
uno::Any(AccessibleStateType::FOCUSED) );
else
{
AccessibleTableShape* pAccTable =
pAccessibleCell->GetParentTable();
@@ -521,8 +521,8 @@ namespace accessibility
maParaManager.FireEvent( ::std::min(
maLastSelection.nEndPara, nMaxValidParaIndex ),
::std::min(
maLastSelection.nEndPara, nMaxValidParaIndex )+1,
AccessibleEventId::CARET_CHANGED,
-
uno::makeAny(static_cast<sal_Int32>(-1)),
-
uno::makeAny(maLastSelection.nEndPos) );
+
uno::Any(static_cast<sal_Int32>(-1)),
+
uno::Any(maLastSelection.nEndPos) );
}
ChangeChildFocus( aSelection.nEndPara );
@@ -556,7 +556,7 @@ namespace accessibility
maParaManager.FireEvent( aSelection.nEndPara,
aSelection.nEndPara+1,
AccessibleEventId::CARET_CHANGED,
-
uno::makeAny(aSelection.nEndPos),
+ uno::Any(aSelection.nEndPos),
aOldCursor );
}
@@ -767,7 +767,7 @@ namespace accessibility
// child not yet created?
if (!maParaManager.HasCreatedChild(nCurrPara))
{
- GotPropertyEvent( uno::makeAny(
maParaManager.CreateChild( nCurrPara - mnFirstVisibleChild,
+ GotPropertyEvent( uno::Any( maParaManager.CreateChild(
nCurrPara - mnFirstVisibleChild,
mxFrontEnd, GetEditSource(), nCurrPara ).first ),
AccessibleEventId::CHILD );
}
@@ -842,7 +842,7 @@ namespace accessibility
auto aHardRef( rPara.first.get() );
if( aHardRef.is() )
- mrImpl.FireEvent(AccessibleEventId::CHILD, uno::Any(),
uno::makeAny<css::uno::Reference<css::accessibility::XAccessible>>(aHardRef) );
+ mrImpl.FireEvent(AccessibleEventId::CHILD, uno::Any(),
uno::Any(css::uno::Reference<css::accessibility::XAccessible>(aHardRef)) );
}
private:
@@ -1053,7 +1053,7 @@ namespace accessibility
// #109864# Enforce creation of this paragraph
try
{
- GotPropertyEvent( uno::makeAny( getAccessibleChild(
aFunctor.GetParaIndex() -
+ GotPropertyEvent( uno::Any( getAccessibleChild(
aFunctor.GetParaIndex() -
mnFirstVisibleChild + GetStartIndex() ) ),
AccessibleEventId::CHILD );
}
@@ -1087,7 +1087,7 @@ namespace accessibility
// #i61812# notification for removed para
if (xPara.is())
- FireEvent(AccessibleEventId::CHILD, uno::Any(),
uno::makeAny( xPara) );
+ FireEvent(AccessibleEventId::CHILD, uno::Any(), uno::Any(
xPara) );
}
#ifdef DBG_UTIL
else
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx
b/svx/source/accessibility/ChildrenManagerImpl.cxx
index fa560abed6a0..b557e00a9000 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -399,7 +399,7 @@ void ChildrenManagerImpl::CreateAccessibilityObjects (
rChild.mbCreateEventPending = false;
mrContext.CommitChange (
AccessibleEventId::CHILD,
- uno::makeAny(rChild.mxAccessibleShape),
+ uno::Any(rChild.mxAccessibleShape),
uno::Any());
}
++nPos;
@@ -723,7 +723,7 @@ bool ChildrenManagerImpl::ReplaceChild (
mrContext.CommitChange (
AccessibleEventId::CHILD,
uno::Any(),
- uno::makeAny (I->mxAccessibleShape));
+ uno::Any (I->mxAccessibleShape));
// Replace with replacement and send an event about existence
// of the new child.
@@ -739,7 +739,7 @@ bool ChildrenManagerImpl::ReplaceChild (
I->mxAccessibleShape = pNewChild.get();
mrContext.CommitChange (
AccessibleEventId::CHILD,
- uno::makeAny (I->mxAccessibleShape),
+ uno::Any (I->mxAccessibleShape),
uno::Any());
return true;
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 60aebc19158a..531b75eb60cc 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -139,7 +139,7 @@ Reference< XAccessible >
SvxGraphCtrlAccessibleContext::getAccessible( const Sdr
mxShapes[pObj] = pAcc;
// Create event and inform listeners of the object creation.
- CommitChange( AccessibleEventId::CHILD, makeAny( xAccessibleShape
), makeAny( Reference<XAccessible>() ) );
+ CommitChange( AccessibleEventId::CHILD, Any( xAccessibleShape ),
Any( Reference<XAccessible>() ) );
}
}
@@ -713,10 +713,10 @@ void SvxGraphCtrlAccessibleContext::Notify(
SfxBroadcaster& /*rBC*/, const SfxHi
break;
case SdrHintKind::ObjectInserted:
- CommitChange( AccessibleEventId::CHILD, makeAny(
getAccessible( pSdrHint->GetObject() ) ) , uno::Any());
+ CommitChange( AccessibleEventId::CHILD, Any( getAccessible(
pSdrHint->GetObject() ) ) , uno::Any());
break;
case SdrHintKind::ObjectRemoved:
- CommitChange( AccessibleEventId::CHILD, uno::Any(), makeAny(
getAccessible( pSdrHint->GetObject() ) ) );
+ CommitChange( AccessibleEventId::CHILD, uno::Any(), Any(
getAccessible( pSdrHint->GetObject() ) ) );
break;
case SdrHintKind::ModelCleared:
dispose();
diff --git a/svx/source/dialog/ClassificationCommon.cxx
b/svx/source/dialog/ClassificationCommon.cxx
index 8ff87270e585..885dff644e9b 100644
--- a/svx/source/dialog/ClassificationCommon.cxx
+++ b/svx/source/dialog/ClassificationCommon.cxx
@@ -85,10 +85,10 @@ bool addOrInsertDocumentProperty(
try
{
if
(containsProperty(xPropertySet->getPropertySetInfo()->getProperties(), rsKey))
- xPropertySet->setPropertyValue(rsKey, uno::makeAny(rsValue));
+ xPropertySet->setPropertyValue(rsKey, uno::Any(rsValue));
else
rxPropertyContainer->addProperty(rsKey,
beans::PropertyAttribute::REMOVABLE,
- uno::makeAny(rsValue));
+ uno::Any(rsValue));
}
catch (const uno::Exception& /*rException*/)
{
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 6b618d51f73b..b806903ee184 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -752,9 +752,9 @@ void SvxShowCharSet::SelectIndex(int nNewIndex, bool bFocus)
svx::SvxShowCharSetItem* pItem = ImplGetItem(nSelectedIndex);
// Don't fire the focus event.
if ( bFocus )
- m_xAccessible->fireEvent(
AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, Any(),
makeAny(pItem->GetAccessible()) ); // this call assures that m_pItem is set
+ m_xAccessible->fireEvent(
AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, Any(),
Any(pItem->GetAccessible()) ); // this call assures that m_pItem is set
else
- m_xAccessible->fireEvent(
AccessibleEventId::ACTIVE_DESCENDANT_CHANGED_NOFOCUS, Any(),
makeAny(pItem->GetAccessible()) ); // this call assures that m_pItem is set
+ m_xAccessible->fireEvent(
AccessibleEventId::ACTIVE_DESCENDANT_CHANGED_NOFOCUS, Any(),
Any(pItem->GetAccessible()) ); // this call assures that m_pItem is set
assert(pItem->m_xItem.is() && "No accessible created!");
Any aOldAny, aNewAny;
diff --git a/svx/source/dialog/signaturelinehelper.cxx
b/svx/source/dialog/signaturelinehelper.cxx
index 2b1bb9555440..2c055e84db82 100644
--- a/svx/source/dialog/signaturelinehelper.cxx
+++ b/svx/source/dialog/signaturelinehelper.cxx
@@ -146,8 +146,7 @@ void setShapeCertificate(const SdrView* pView,
uno::Reference<beans::XPropertySet> xShapeProps(xShape, uno::UNO_QUERY);
comphelper::SequenceAsHashMap
aMap(xShapeProps->getPropertyValue("InteropGrabBag"));
aMap["SignatureCertificate"] <<= xCertificate;
- xShapeProps->setPropertyValue("InteropGrabBag",
-
uno::makeAny(aMap.getAsConstPropertyValueList()));
+ xShapeProps->setPropertyValue("InteropGrabBag",
uno::Any(aMap.getAsConstPropertyValueList()));
// Read svg and replace placeholder texts.
OUString
aSvgImage(svx::SignatureLineHelper::getSignatureImage("signature-line-draw.svg"));
diff --git a/svx/source/fmcomp/dbaexchange.cxx
b/svx/source/fmcomp/dbaexchange.cxx
index 65b5fb1006a8..904740e38877 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -223,7 +223,7 @@ namespace svx
default: break;
}
if (nFormatId == getDescriptorFormatId())
- return SetAny( makeAny(
m_aDescriptor.createPropertyValueSequence() ) );
+ return SetAny( Any( m_aDescriptor.createPropertyValueSequence() )
);
return false;
}
@@ -430,7 +430,7 @@ namespace svx
case SotClipboardFormatId::DBACCESS_TABLE:
case SotClipboardFormatId::DBACCESS_QUERY:
case SotClipboardFormatId::DBACCESS_COMMAND:
- return SetAny(
makeAny(m_aDescriptor.createPropertyValueSequence()) );
+ return SetAny(
Any(m_aDescriptor.createPropertyValueSequence()) );
case SotClipboardFormatId::SBA_DATAEXCHANGE:
return SetString(m_sCompatibleObjectDescription);
@@ -592,7 +592,7 @@ namespace svx
const SotClipboardFormatId nFormatId =
SotExchange::GetFormat(_rFlavor);
if (nFormatId == getDescriptorFormatId())
{
- return SetAny( makeAny( m_aDescriptors ) );
+ return SetAny( Any( m_aDescriptors ) );
}
return false;
diff --git a/svx/source/fmcomp/dbaobjectex.cxx
b/svx/source/fmcomp/dbaobjectex.cxx
index 58fbce666342..e3d22d2c35d1 100644
--- a/svx/source/fmcomp/dbaobjectex.cxx
+++ b/svx/source/fmcomp/dbaobjectex.cxx
@@ -92,7 +92,7 @@ namespace svx
{
const SotClipboardFormatId nFormatId =
SotExchange::GetFormat(_rFlavor);
if ( nFormatId == getDescriptorFormatId(true) || nFormatId ==
getDescriptorFormatId(false) )
- return SetAny( makeAny(
m_aDescriptor.createPropertyValueSequence() ) );
+ return SetAny( Any( m_aDescriptor.createPropertyValueSequence() )
);
return false;
}
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 762144002948..aacac128e566 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -136,7 +136,7 @@ void FmGridHeader::notifyColumnSelect(sal_uInt16 nColumnId)
{
Reference< XPropertySet > xColumn;
xColumns->getByIndex(nPos) >>= xColumn;
- xSelSupplier->select(makeAny(xColumn));
+ xSelSupplier->select(Any(xColumn));
}
}
}
@@ -307,7 +307,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent&
_rEvt )
// not interested in any results
Reference< XPropertySet > xStatProps(xStatement,UNO_QUERY);
- xStatProps->setPropertyValue("MaxRows",
makeAny(sal_Int32(0)));
+ xStatProps->setPropertyValue("MaxRows", Any(sal_Int32(0)));
xResultSet = xStatement->executeQuery();
Reference< XColumnsSupplier > xSupplyCols(xResultSet,
UNO_QUERY);
@@ -556,13 +556,13 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop, void*,
void )
if (bDateNTimeCol)
{
OUString sTimePostfix(SvxResId(RID_STR_POSTFIX_TIME));
- xCol->setPropertyValue(FM_PROP_LABEL, makeAny( OUString(
sFieldName + sTimePostfix ) ) );
+ xCol->setPropertyValue(FM_PROP_LABEL, Any( OUString( sFieldName +
sTimePostfix ) ) );
OUString sDatePostfix(SvxResId( RID_STR_POSTFIX_DATE));
- xSecondCol->setPropertyValue(FM_PROP_LABEL, makeAny( OUString(
sFieldName + sDatePostfix ) ) );
+ xSecondCol->setPropertyValue(FM_PROP_LABEL, Any( OUString(
sFieldName + sDatePostfix ) ) );
}
else
- xCol->setPropertyValue(FM_PROP_LABEL, makeAny(sFieldName));
+ xCol->setPropertyValue(FM_PROP_LABEL, Any(sFieldName));
// insert now
Any aElement;
@@ -574,9 +574,9 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop, void*,
void )
aControlFactory.initializeControlModel(
DocumentClassification::classifyHostDocument( xCols ), xCol );
FormControlFactory::initializeFieldDependentProperties( xField, xCol,
xNumberFormats );
- xCol->setPropertyValue(FM_PROP_CONTROLSOURCE, makeAny(sFieldName));
+ xCol->setPropertyValue(FM_PROP_CONTROLSOURCE, Any(sFieldName));
if ( xSecondCol.is() )
- xSecondCol->setPropertyValue(FM_PROP_CONTROLSOURCE,
makeAny(sFieldName));
+ xSecondCol->setPropertyValue(FM_PROP_CONTROLSOURCE,
Any(sFieldName));
if (bDateNTimeCol)
{
@@ -592,13 +592,13 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop, void*,
void )
sPurePostfix = comphelper::string::stripEnd(sPurePostfix, ')');
OUString sRealName = sFieldName + "_" + sPurePostfix;
if (i)
- xSecondCol->setPropertyValue(FM_PROP_NAME,
makeAny(sRealName));
+ xSecondCol->setPropertyValue(FM_PROP_NAME, Any(sRealName));
else
- xCol->setPropertyValue(FM_PROP_NAME, makeAny(sRealName));
+ xCol->setPropertyValue(FM_PROP_NAME, Any(sRealName));
}
}
else
- xCol->setPropertyValue(FM_PROP_NAME, makeAny(sFieldName));
+ xCol->setPropertyValue(FM_PROP_NAME, Any(sFieldName));
if (bDateNTimeCol)
{
@@ -614,14 +614,14 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop, void*,
void )
if
(::comphelper::getString(xForm->getPropertyValue(FM_PROP_DATASOURCE)).isEmpty())
{
if ( !sDatasource.isEmpty() )
- xForm->setPropertyValue(FM_PROP_DATASOURCE,
makeAny(sDatasource));
+ xForm->setPropertyValue(FM_PROP_DATASOURCE,
Any(sDatasource));
else
- xForm->setPropertyValue(FM_PROP_URL, makeAny(sURL));
+ xForm->setPropertyValue(FM_PROP_URL, Any(sURL));
}
if
(::comphelper::getString(xForm->getPropertyValue(FM_PROP_COMMAND)).isEmpty())
{
- xForm->setPropertyValue(FM_PROP_COMMAND, makeAny(sCommand));
+ xForm->setPropertyValue(FM_PROP_COMMAND, Any(sCommand));
Any aCommandType;
switch (nCommandType)
{
@@ -669,7 +669,7 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16
nColId, weld::Menu& rM
Reference< css::beans::XPropertySet> xColumn(
xColumns->getByIndex(nPos2), css::uno::UNO_QUERY);
Reference< css::view::XSelectionSupplier > xSelSupplier(xColumns,
UNO_QUERY);
if (xSelSupplier.is())
- xSelSupplier->select(makeAny(xColumn));
+ xSelSupplier->select(Any(xColumn));
}
// insert position, always before the current column
@@ -834,7 +834,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16
nColId, const weld::M
else if (rExecutionResult == "hide")
{
Reference< css::beans::XPropertySet > xCurCol(
xCols->getByIndex(nPos), css::uno::UNO_QUERY);
- xCurCol->setPropertyValue(FM_PROP_HIDDEN, makeAny(true));
+ xCurCol->setPropertyValue(FM_PROP_HIDDEN, Any(true));
}
else if (rExecutionResult == "column")
{
@@ -914,7 +914,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16
nColId, const weld::M
for (sal_Int32 i=0; i<xCols->getCount(); ++i)
{
xCurCol.set(xCols->getByIndex(i), css::uno::UNO_QUERY);
- xCurCol->setPropertyValue(FM_PROP_HIDDEN, makeAny(false));
+ xCurCol->setPropertyValue(FM_PROP_HIDDEN, Any(false));
}
// TODO : there must be a more clever way to do this...
// with the above the view is updated after every single model update
...
@@ -934,7 +934,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16
nColId, const weld::M
if (::comphelper::getBOOL(aHidden))
if (!--nExecutionResult)
{
- xCurCol->setPropertyValue(FM_PROP_HIDDEN,
makeAny(false));
+ xCurCol->setPropertyValue(FM_PROP_HIDDEN, Any(false));
break;
}
}
@@ -956,7 +956,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16
nColId, const weld::M
TransferFormComponentProperties(
xReplaced, xNewCol,
Application::GetSettings().GetUILanguageTag().getLocale() );
- xCols->replaceByIndex( nPos, makeAny( xNewCol ) );
+ xCols->replaceByIndex( nPos, Any( xNewCol ) );
::comphelper::disposeComponent( xReplaced );
eInspectorAction = eUpdateInspector;
@@ -967,12 +967,12 @@ void
FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::M
OUString sLabel =
FormControlFactory::getDefaultUniqueName_ByComponentType(
Reference< XNameAccess >( xCols, UNO_QUERY_THROW ),
xNewCol );
- xNewCol->setPropertyValue( FM_PROP_LABEL, makeAny( sLabel ) );
- xNewCol->setPropertyValue( FM_PROP_NAME, makeAny( sLabel ) );
+ xNewCol->setPropertyValue( FM_PROP_LABEL, Any( sLabel ) );
+ xNewCol->setPropertyValue( FM_PROP_NAME, Any( sLabel ) );
factory.initializeControlModel(
DocumentClassification::classifyHostDocument( xCols ), xNewCol );
- xCols->insertByIndex( nPos, makeAny( xNewCol ) );
+ xCols->insertByIndex( nPos, Any( xNewCol ) );
}
}
catch( const Exception& )
@@ -1509,7 +1509,7 @@ void FmGridControl::RowHeightChanged()
try
{
sal_Int32 nUnzoomedPixelHeight = CalcReverseZoom( GetDataRowHeight() );
- Any aProperty = makeAny( static_cast<sal_Int32>(PixelToLogic( Point(0,
nUnzoomedPixelHeight), MapMode(MapUnit::Map10thMM)).Y()) );
+ Any aProperty( static_cast<sal_Int32>(PixelToLogic( Point(0,
nUnzoomedPixelHeight), MapMode(MapUnit::Map10thMM)).Y()) );
xModel->setPropertyValue( FM_PROP_ROWHEIGHT, aProperty );
}
catch( const Exception& )
@@ -2030,7 +2030,7 @@ void FmGridControl::Select()
Reference< XPropertySet > xColumn(
xColumns->getByIndex(nSelectedColumn),
css::uno::UNO_QUERY);
- xSelSupplier->select(makeAny(xColumn));
+ xSelSupplier->select(Any(xColumn));
}
else
{
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index fb6067663a62..5ff7ddccae7d 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -2581,7 +2581,7 @@ Any SAL_CALL FmXGridPeer::getSelection( )
{
VclPtr< FmGridControl > pVclControl = GetAs< FmGridControl >();
Sequence< Any > aSelectionBookmarks = pVclControl->getSelectionBookmarks();
- return makeAny(aSelectionBookmarks);
+ return Any(aSelectionBookmarks);
}
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index cf907bbaed2e..74c14d42dbd1 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -245,7 +245,7 @@ void DbGridColumn::impl_toggleScriptManager_nothrow( bool
_bAttach )
Reference< XInterface > xCellInterface( *m_pCell, UNO_QUERY );
if ( _bAttach )
- xManager->attach( nIndexInParent, xCellInterface, makeAny(
xCellInterface ) );
+ xManager->attach( nIndexInParent, xCellInterface, Any(
xCellInterface ) );
else
xManager->detach( nIndexInParent, xCellInterface );
}
@@ -1199,7 +1199,7 @@ bool DbTextField::commitControl()
if ( sOldValue.getLength() > nMaxTextLen &&
sOldValue.compareTo(aText,nMaxTextLen) == 0 )
aText = sOldValue;
}
- m_rColumn.getModel()->setPropertyValue( FM_PROP_TEXT, makeAny( aText ) );
+ m_rColumn.getModel()->setPropertyValue( FM_PROP_TEXT, Any( aText ) );
return true;
}
@@ -1805,7 +1805,7 @@ void DbCheckBox::updateFromModel( Reference< XPropertySet
> _rxModel )
bool DbCheckBox::commitControl()
{
m_rColumn.getModel()->setPropertyValue( FM_PROP_STATE,
- makeAny( static_cast<sal_Int16>( static_cast<
CheckBoxControl* >( m_pWindow.get() )->GetState() ) ) );
+ Any( static_cast<sal_Int16>( static_cast< CheckBoxControl*
>( m_pWindow.get() )->GetState() ) ) );
return true;
}
@@ -1919,7 +1919,7 @@ void DbPatternField::updateFromModel( Reference<
XPropertySet > _rxModel )
bool DbPatternField::commitControl()
{
weld::Entry& rEntry =
static_cast<PatternControl*>(m_pWindow.get())->get_widget();
- m_rColumn.getModel()->setPropertyValue(FM_PROP_TEXT,
makeAny(rEntry.get_text()));
+ m_rColumn.getModel()->setPropertyValue(FM_PROP_TEXT,
Any(rEntry.get_text()));
return true;
}
@@ -2560,7 +2560,7 @@ bool DbComboBox::commitControl()
ComboBoxControl* pControl = static_cast<ComboBoxControl*>(m_pWindow.get());
weld::ComboBox& rComboBox = pControl->get_widget();
OUString aText(rComboBox.get_active_text());
- m_rColumn.getModel()->setPropertyValue(FM_PROP_TEXT, makeAny(aText));
+ m_rColumn.getModel()->setPropertyValue(FM_PROP_TEXT, Any(aText));
return true;
}
@@ -3107,7 +3107,7 @@ void DbFilterField::Update()
xStatement = xConnection->createStatement();
Reference< css::beans::XPropertySet > xStatementProps(xStatement,
UNO_QUERY);
- xStatementProps->setPropertyValue(FM_PROP_ESCAPE_PROCESSING,
makeAny(true));
+ xStatementProps->setPropertyValue(FM_PROP_ESCAPE_PROCESSING,
Any(true));
xListCursor =
xStatement->executeQuery(aStatement.makeStringAndClear());
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 7e21635d0a5a..8fda483e4798 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -393,7 +393,7 @@ namespace svxform
{
Reference< css::xforms::XSubmission > xNewSubmission =
aDlg.GetNewSubmission();
Reference< XSet > xSubmissions =
xModel->getSubmissions();
- xSubmissions->insert( makeAny( xNewSubmission ) );
+ xSubmissions->insert( Any( xNewSubmission ) );
AddEntry(xNewSubmission, m_xScratchIter.get());
m_xItemList->select(*m_xScratchIter);
bIsDocModified = true;
@@ -497,7 +497,7 @@ namespace svxform
pResId = RID_STR_DATANAV_ADD_BINDING;
xNewBinding = xModel->createBinding();
Reference< XSet > xBindings = xModel->getBindings();
- xBindings->insert( makeAny( xNewBinding ) );
+ xBindings->insert( Any( xNewBinding ) );
pNode.reset(new ItemNode( xNewBinding ));
eType = DITBinding;
}
@@ -550,7 +550,7 @@ namespace svxform
try
{
Reference< XSet > xBindings =
xModel->getBindings();
- xBindings->remove( makeAny( xNewBinding ) );
+ xBindings->remove( Any( xNewBinding ) );
}
catch ( Exception const & )
{
@@ -930,9 +930,9 @@ namespace svxform
try
{
if ( bSubmission )
- xModel->getSubmissions()->remove( makeAny(
pNode->m_xPropSet ) );
+ xModel->getSubmissions()->remove( Any(
pNode->m_xPropSet ) );
else // then Binding Page
- xModel->getBindings()->remove( makeAny(
pNode->m_xPropSet ) );
+ xModel->getBindings()->remove( Any(
pNode->m_xPropSet ) );
bRet = true;
}
catch ( Exception const & )
@@ -1398,7 +1398,7 @@ namespace svxform
xUIHelper->newModel( m_xFrameModel, sNewName
), UNO_SET_THROW );
Reference< XPropertySet > xModelProps( xNewModel,
UNO_QUERY_THROW );
- xModelProps->setPropertyValue("ExternalData",
makeAny( !bDocumentData ) );
+ xModelProps->setPropertyValue("ExternalData", Any(
!bDocumentData ) );
m_xModelsBox->append_text(sNewName);
m_xModelsBox->set_active(m_xModelsBox->get_count()
- 1);
@@ -1444,7 +1444,7 @@ namespace svxform
Reference< css::xforms::XFormsSupplier > xFormsSupp(
m_xFrameModel, UNO_QUERY_THROW );
Reference< XNameContainer > xXForms(
xFormsSupp->getXForms(), UNO_SET_THROW );
Reference< XPropertySet > xModelProps(
xXForms->getByName( sSelectedModel ), UNO_QUERY_THROW );
- xModelProps->setPropertyValue( "ExternalData",
makeAny( !bDocumentData ) );
+ xModelProps->setPropertyValue( "ExternalData", Any(
!bDocumentData ) );
bIsDocModified = true;
}
catch( const Exception& )
@@ -2096,7 +2096,7 @@ namespace svxform
{
Reference < XSet > xBindings = xModel->getBindings();
if ( xBindings.is() )
- xBindings->remove( makeAny( m_xTempBinding ) );
+ xBindings->remove( Any( m_xTempBinding ) );
}
catch (const Exception&)
{
@@ -2145,7 +2145,7 @@ namespace svxform
sTemp = TRUE_VALUE;
else if ( !bIsChecked && !sTemp.isEmpty() )
sTemp.clear();
- m_xTempBinding->setPropertyValue( sPropName, makeAny( sTemp ) );
+ m_xTempBinding->setPropertyValue( sPropName, Any( sTemp ) );
}
IMPL_LINK(AddDataItemDialog, ConditionHdl, weld::Button&, rBtn, void)
@@ -2187,7 +2187,7 @@ namespace svxform
{
m_xTempBinding->setPropertyValue(
- sPropName, makeAny( sNewCondition ) );
+ sPropName, Any( sNewCondition ) );
}
}
}
@@ -2243,7 +2243,7 @@ namespace svxform
}
OUString sDataType( m_xDataTypeLB->get_active_text() );
- m_xTempBinding->setPropertyValue( PN_BINDING_TYPE, makeAny( sDataType
) );
+ m_xTempBinding->setPropertyValue( PN_BINDING_TYPE, Any( sDataType ) );
if ( bIsHandleBinding )
{
@@ -2252,9 +2252,9 @@ namespace svxform
try
{
OUString sValue = m_xNameED->get_text();
- m_pItemNode->m_xPropSet->setPropertyValue( PN_BINDING_ID,
makeAny( sValue ) );
+ m_pItemNode->m_xPropSet->setPropertyValue( PN_BINDING_ID, Any(
sValue ) );
sValue = m_xDefaultED->get_text();
- m_pItemNode->m_xPropSet->setPropertyValue( PN_BINDING_EXPR,
makeAny( sValue ) );
+ m_pItemNode->m_xPropSet->setPropertyValue( PN_BINDING_EXPR,
Any( sValue ) );
}
catch ( Exception const & )
{
@@ -2349,7 +2349,7 @@ namespace svxform
m_xTempBinding = m_xUIHelper->cloneBindingAsGhost(
m_xBinding );
Reference < XSet > xBindings =
xModel->getBindings();
if ( xBindings.is() )
- xBindings->insert( makeAny( m_xTempBinding ) );
+ xBindings->insert( Any( m_xTempBinding ) );
}
}
@@ -2376,7 +2376,7 @@ namespace svxform
m_xTempBinding = m_xUIHelper->cloneBindingAsGhost(
m_pItemNode->m_xPropSet );
Reference < XSet > xBindings = xModel->getBindings();
if ( xBindings.is() )
- xBindings->insert( makeAny( m_xTempBinding ) );
+ xBindings->insert( Any( m_xTempBinding ) );
}
catch ( Exception const & )
{
@@ -2587,7 +2587,7 @@ namespace svxform
aDlg.run();
try
{
- m_xBinding->setPropertyValue( PN_BINDING_NAMESPACES, makeAny(
xNameContnr ) );
+ m_xBinding->setPropertyValue( PN_BINDING_NAMESPACES, Any(
xNameContnr ) );
}
catch ( Exception const & )
{
@@ -2725,9 +2725,9 @@ namespace svxform
OUString sURL(m_xNamespacesList->get_text(i, 1));
if ( m_rNamespaces->hasByName( sPrefix ) )
- m_rNamespaces->replaceByName( sPrefix, makeAny( sURL ) );
+ m_rNamespaces->replaceByName( sPrefix, Any( sURL ) );
else
- m_rNamespaces->insertByName( sPrefix, makeAny( sURL ) );
+ m_rNamespaces->insertByName( sPrefix, Any( sURL ) );
}
}
catch ( Exception const & )
@@ -2882,21 +2882,21 @@ namespace svxform
OUString sTemp = m_xNameED->get_text();
try
{
- m_xSubmission->setPropertyValue( PN_SUBMISSION_ID, makeAny(
sTemp ) );
+ m_xSubmission->setPropertyValue( PN_SUBMISSION_ID, Any( sTemp
) );
sTemp = m_xActionED->get_text();
- m_xSubmission->setPropertyValue( PN_SUBMISSION_ACTION,
makeAny( sTemp ) );
+ m_xSubmission->setPropertyValue( PN_SUBMISSION_ACTION, Any(
sTemp ) );
sTemp = m_aMethodString.toAPI( m_xMethodLB->get_active_text()
);
- m_xSubmission->setPropertyValue( PN_SUBMISSION_METHOD,
makeAny( sTemp ) );
+ m_xSubmission->setPropertyValue( PN_SUBMISSION_METHOD, Any(
sTemp ) );
sTemp = m_xRefED->get_text();
- m_xSubmission->setPropertyValue( PN_SUBMISSION_REF, makeAny(
sTemp ) );
+ m_xSubmission->setPropertyValue( PN_SUBMISSION_REF, Any( sTemp
) );
OUString sEntry = m_xBindLB->get_active_text();
sal_Int32 nColonIdx = sEntry.indexOf(':');
if (nColonIdx != -1)
sEntry = sEntry.copy(0, nColonIdx);
sTemp = sEntry;
- m_xSubmission->setPropertyValue( PN_SUBMISSION_BIND, makeAny(
sTemp ) );
+ m_xSubmission->setPropertyValue( PN_SUBMISSION_BIND, Any(
sTemp ) );
sTemp = m_aReplaceString.toAPI(
m_xReplaceLB->get_active_text() );
- m_xSubmission->setPropertyValue( PN_SUBMISSION_REPLACE,
makeAny( sTemp ) );
+ m_xSubmission->setPropertyValue( PN_SUBMISSION_REPLACE, Any(
sTemp ) );
}
catch ( Exception const & )
{
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 1f083fa49f88..1b24f9703393 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -373,7 +373,7 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag&
_rSelection )
xSingleSelection->getPropertyValue( FM_PROP_CLASSID ) >>= nClassID;
sTitle = SvxResId(RID_STR_PROPERTIES_CONTROL) +
- GetUIHeadlineName(nClassID, makeAny(xSingleSelection));
+ GetUIHeadlineName(nClassID, Any(xSingleSelection));
}
else if ( Reference< XForm >( xSingleSelection, UNO_QUERY ).is() )
sTitle = SvxResId(RID_STR_PROPERTIES_FORM);
@@ -449,10 +449,10 @@ void FmPropBrw::impl_createPropertyBrowser_throw(
FmFormShell* _pFormShell )
// a ComponentContext for the
::cppu::ContextEntry_Init aHandlerContextInfo[] =
{
- ::cppu::ContextEntry_Init( "ContextDocument", makeAny( xDocument ) ),
- ::cppu::ContextEntry_Init( "DialogParentWindow", makeAny(
xParentWindow ) ),
- ::cppu::ContextEntry_Init( "ControlContext", makeAny( xControlContext
) ),
- ::cppu::ContextEntry_Init( "ControlShapeAccess", makeAny( xControlMap
) )
+ ::cppu::ContextEntry_Init( "ContextDocument", Any( xDocument ) ),
+ ::cppu::ContextEntry_Init( "DialogParentWindow", Any( xParentWindow )
),
+ ::cppu::ContextEntry_Init( "ControlContext", Any( xControlContext ) ),
+ ::cppu::ContextEntry_Init( "ControlShapeAccess", Any( xControlMap ) )
};
m_xInspectorContext.set(
::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS(
aHandlerContextInfo ),
@@ -554,7 +554,7 @@ void FmPropBrw::StateChangedAtToolBoxControl(sal_uInt16
nSID, SfxItemState eStat
try
{
if ( m_xBrowserController.is() )
- m_xBrowserController->restoreViewData( makeAny(
m_sLastActivePage ) );
+ m_xBrowserController->restoreViewData( Any(
m_sLastActivePage ) );
}
catch( const Exception& )
{
diff --git a/svx/source/form/fmcontrolbordermanager.cxx
b/svx/source/form/fmcontrolbordermanager.cxx
index 5679f3354d96..b4673399589e 100644
--- a/svx/source/form/fmcontrolbordermanager.cxx
+++ b/svx/source/form/fmcontrolbordermanager.cxx
@@ -50,9 +50,9 @@ namespace svxform
FontDescriptor aFont;
OSL_VERIFY( _rxPeer->getProperty( FM_PROP_FONT ) >>= aFont );
aFont.Underline = _rUnderline.nUnderlineType;
- _rxPeer->setProperty( FM_PROP_FONT, makeAny( aFont ) );
+ _rxPeer->setProperty( FM_PROP_FONT, Any( aFont ) );
// the underline color is a separate property
- _rxPeer->setProperty( FM_PROP_TEXTLINECOLOR, makeAny(
_rUnderline.nUnderlineColor ) );
+ _rxPeer->setProperty( FM_PROP_TEXTLINECOLOR, Any(
_rUnderline.nUnderlineColor ) );
}
@@ -81,8 +81,8 @@ namespace svxform
{
OSL_ENSURE( _rxPeer.is(), "setBorder: invalid peer!" );
- _rxPeer->setProperty( FM_PROP_BORDER, makeAny( _rBorder.nBorderType )
);
- _rxPeer->setProperty( FM_PROP_BORDERCOLOR, makeAny(
_rBorder.nBorderColor ) );
+ _rxPeer->setProperty( FM_PROP_BORDER, Any( _rBorder.nBorderType ) );
+ _rxPeer->setProperty( FM_PROP_BORDERCOLOR, Any( _rBorder.nBorderColor
) );
}
ControlBorderManager::ControlBorderManager()
@@ -318,7 +318,7 @@ namespace svxform
if ( xPeer.is() )
{
updateBorderStyle( rControl.xControl, xPeer, rControl );
- xPeer->setProperty( FM_PROP_HELPTEXT, makeAny(
rControl.sOriginalHelpText ) );
+ xPeer->setProperty( FM_PROP_HELPTEXT, Any(
rControl.sOriginalHelpText ) );
setUnderline( xPeer, rControl );
}
}
@@ -377,7 +377,7 @@ namespace svxform
// restore all the things we used to indicate invalidity
if ( m_bDynamicBorderColors )
updateBorderStyle( _rxControl, xPeer, aOriginalLayout
);
- xPeer->setProperty( FM_PROP_HELPTEXT, makeAny(
aOriginalLayout.sOriginalHelpText ) );
+ xPeer->setProperty( FM_PROP_HELPTEXT, Any(
aOriginalLayout.sOriginalHelpText ) );
setUnderline( xPeer, aOriginalLayout );
}
return;
@@ -410,7 +410,7 @@ namespace svxform
Reference< XValidator > xValidator =
_rxValidatable->getValidator();
OSL_ENSURE( xValidator.is(),
"ControlBorderManager::validityChanged: invalid, but no validator?" );
OUString sExplainInvalidity = xValidator.is() ?
xValidator->explainInvalid( _rxValidatable->getCurrentValue() ) : OUString();
- xPeer->setProperty( FM_PROP_HELPTEXT, makeAny( sExplainInvalidity
) );
+ xPeer->setProperty( FM_PROP_HELPTEXT, Any( sExplainInvalidity ) );
}
catch( const Exception& )
{
diff --git a/svx/source/form/fmcontrollayout.cxx
b/svx/source/form/fmcontrollayout.cxx
index 5acd501a4fda..985fc6ef1bdb 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -56,7 +56,6 @@ namespace svxform
using ::com::sun::star::uno::Exception;
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::uno::Any;
- using ::com::sun::star::uno::makeAny;
using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::beans::XPropertySetInfo;
using ::com::sun::star::lang::Locale;
@@ -186,7 +185,7 @@ namespace svxform
// retrieve a default font for this locale, and set it at the
control
vcl::Font aFont = OutputDevice::GetDefaultFont(
DefaultFontType::SANS, LanguageTag::convertToLanguageType( aDocumentCharLocale
), GetDefaultFontFlags::OnlyOne );
FontDescriptor aFontDesc = VCLUnoHelper::CreateFontDescriptor(
aFont );
- _rxModel->setPropertyValue("FontDescriptor", makeAny(
aFontDesc )
+ _rxModel->setPropertyValue("FontDescriptor", Any( aFontDesc )
);
}
catch( const Exception& )
@@ -260,16 +259,16 @@ namespace svxform
&& ( nClassId != FormComponentType::SPINBUTTON )
)
{
- _rxControlModel->setPropertyValue( FM_PROP_BORDER,
makeAny( nVisualEffect ) );
+ _rxControlModel->setPropertyValue( FM_PROP_BORDER,
Any( nVisualEffect ) );
if ( ( nVisualEffect == VisualEffect::FLAT )
&& ( xPSI->hasPropertyByName( FM_PROP_BORDERCOLOR
) )
)
// light gray flat border
- _rxControlModel->setPropertyValue(
FM_PROP_BORDERCOLOR, makeAny( sal_Int32(0x00C0C0C0) ) );
+ _rxControlModel->setPropertyValue(
FM_PROP_BORDERCOLOR, Any( sal_Int32(0x00C0C0C0) ) );
}
}
if ( xPSI->hasPropertyByName( FM_PROP_VISUALEFFECT ) )
- _rxControlModel->setPropertyValue( FM_PROP_VISUALEFFECT,
makeAny( nVisualEffect ) );
+ _rxControlModel->setPropertyValue( FM_PROP_VISUALEFFECT,
Any( nVisualEffect ) );
}
// the font (only if we use the document's ref devices for
rendering control text, otherwise, the
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index 720c3720fe72..5a5429b109d0 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -255,12 +255,12 @@ namespace svxform
aCompleteInfo.getArray()[ 0 ] <<= m_xFormsRoot;
aCompleteInfo.getArray()[ 1 ] <<= m_aControlPaths;
- SetAny( makeAny( aCompleteInfo ) );
+ SetAny( Any( aCompleteInfo ) );
}
else if ( getHiddenControlModelsFormatId() == nFormatId )
{
// just need to transfer the models
- SetAny( makeAny( m_aHiddenControlModels ) );
+ SetAny( Any( m_aHiddenControlModels ) );
}
else
return OLocalExchange::GetData(_rFlavor, rDestDoc);
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index 1b331092e1e7..8ecd1a4c7de6 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -166,7 +166,7 @@ void FmFormObj::impl_checkRefDevice_nothrow( bool _force )
rtl::Reference<VCLXDevice> pUnoRefDevice = new VCLXDevice;
pUnoRefDevice->SetOutputDevice( m_pLastKnownRefDevice );
Reference< XDevice > xRefDevice( pUnoRefDevice );
- xModelProps->setPropertyValue( sRefDevicePropName, makeAny(
xRefDevice ) );
+ xModelProps->setPropertyValue( sRefDevicePropName, Any( xRefDevice
) );
}
}
catch( const Exception& )
@@ -315,7 +315,7 @@ void FmFormObj::handlePageChange(SdrPage* pOldPage,
SdrPage* pNewPage)
}
// and insert into the new container
- xNewParent->insertByIndex(xNewParent->getCount(),
makeAny(xMeAsFormComp));
+ xNewParent->insertByIndex(xNewParent->getCount(),
Any(xMeAsFormComp));
// transfer the events
if (aNewEvents.hasElements())
@@ -527,7 +527,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const
Reference< XInterface >
::comphelper::copyProperties( xCurrentSourceForm,
xCurrentDestForm );
DBG_ASSERT(nCurrentDestIndex ==
xDestContainer->getCount(), "FmFormObj::ensureModelEnv : something went wrong
with the numbers !");
- xDestContainer->insertByIndex(nCurrentDestIndex,
makeAny(xCurrentDestForm));
+ xDestContainer->insertByIndex(nCurrentDestIndex,
Any(xCurrentDestForm));
++nCurrentDestIndex;
// like nCurrentSourceIndex, nCurrentDestIndex now
points 'behind' the form it actually means
@@ -618,7 +618,7 @@ bool FmFormObj::EndCreate( SdrDragStat& rStat, SdrCreateCmd
eCmd )
FmFormPageImpl::setUniqueName( xContent, xParentForm );
if ( xFormToInsertInto.is() )
- xFormToInsertInto->insertByIndex(
xFormToInsertInto->getCount(), makeAny( xContent ) );
+ xFormToInsertInto->insertByIndex(
xFormToInsertInto->getCount(), Any( xContent ) );
}
catch( const Exception& )
{
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 7e6ffacc6229..7bdf2d4cc632 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -163,7 +163,7 @@ IMPL_STATIC_LINK(FmFormObjFactory, MakeObject,
SdrObjCreatorParams, aParams, Sdr
case SdrObjKind::FormTimeField:
sServiceSpecifier = FM_COMPONENT_TIMEFIELD;
- aInitialProperties.emplace_back( FM_PROP_TIMEMAX, makeAny(
tools::Time( 23, 59, 59, 999999999 ).GetUNOTime() ) );
+ aInitialProperties.emplace_back( FM_PROP_TIMEMAX, Any(
tools::Time( 23, 59, 59, 999999999 ).GetUNOTime() ) );
break;
case SdrObjKind::FormNumericField:
@@ -196,12 +196,12 @@ IMPL_STATIC_LINK(FmFormObjFactory, MakeObject,
SdrObjCreatorParams, aParams, Sdr
case SdrObjKind::FormScrollbar:
sServiceSpecifier = FM_SUN_COMPONENT_SCROLLBAR;
- aInitialProperties.emplace_back( FM_PROP_BORDER, makeAny(
sal_Int16(0) ) );
+ aInitialProperties.emplace_back( FM_PROP_BORDER, Any(
sal_Int16(0) ) );
break;
case SdrObjKind::FormSpinButton:
sServiceSpecifier = FM_SUN_COMPONENT_SPINBUTTON;
- aInitialProperties.emplace_back( FM_PROP_BORDER, makeAny(
sal_Int16(0) ) );
+ aInitialProperties.emplace_back( FM_PROP_BORDER, Any(
sal_Int16(0) ) );
break;
default:
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 449cc724f04f..5e8c2027d628 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -246,7 +246,7 @@ namespace
if ( !xControlShape.is() )
return;
- _map->put( makeAny( xControlModel ), makeAny( xControlShape ) );
+ _map->put( Any( xControlModel ), Any( xControlShape ) );
}
void lcl_removeFormObject_throw( const FmFormObj& _object, const
Reference< XMap >& _map )
@@ -259,9 +259,9 @@ namespace
return;
}
- Any aOldAssignment = _map->remove( makeAny( xControlModel ) );
+ Any aOldAssignment = _map->remove( Any( xControlModel ) );
OSL_ENSURE(
- aOldAssignment == makeAny( Reference< XControlShape >( const_cast<
FmFormObj& >( _object ).getUnoShape(), UNO_QUERY ) ),
+ aOldAssignment == Any( Reference< XControlShape >( const_cast<
FmFormObj& >( _object ).getUnoShape(), UNO_QUERY ) ),
"lcl_removeFormObject: map was inconsistent!" );
}
}
@@ -407,11 +407,11 @@ Reference< XForm > FmFormPageImpl::getDefaultForm()
// a form should always have the command type table as default
Reference< XPropertySet > xFormProps( xForm, UNO_QUERY_THROW );
- xFormProps->setPropertyValue( FM_PROP_COMMANDTYPE, makeAny(
sal_Int32( CommandType::TABLE ) ) );
+ xFormProps->setPropertyValue( FM_PROP_COMMANDTYPE, Any( sal_Int32(
CommandType::TABLE ) ) );
// and the "Standard" name
OUString sName = SvxResId(RID_STR_STDFORMNAME);
- xFormProps->setPropertyValue( FM_PROP_NAME, makeAny( sName ) );
+ xFormProps->setPropertyValue( FM_PROP_NAME, Any( sName ) );
if( rModel.IsUndoEnabled() )
{
@@ -423,7 +423,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm()
xForm,
xForms->getCount()));
}
- xForms->insertByName( sName, makeAny( xForm ) );
+ xForms->insertByName( sName, Any( xForm ) );
xCurrentForm = xForm;
}
catch( const Exception& )
@@ -486,11 +486,11 @@ Reference< css::form::XForm >
FmFormPageImpl::findPlaceInFormComponentHierarchy
xForm.set(::comphelper::getProcessServiceFactory()->createInstance(FM_SUN_COMPONENT_FORM),
UNO_QUERY);
// a form should always have the command type table as default
Reference< css::beans::XPropertySet > xFormProps(xForm, UNO_QUERY);
- try { xFormProps->setPropertyValue(FM_PROP_COMMANDTYPE,
makeAny(sal_Int32(CommandType::TABLE))); }
+ try { xFormProps->setPropertyValue(FM_PROP_COMMANDTYPE,
Any(sal_Int32(CommandType::TABLE))); }
catch(Exception&) { }
if (!rDBTitle.isEmpty())
-
xFormProps->setPropertyValue(FM_PROP_DATASOURCE,makeAny(rDBTitle));
+ xFormProps->setPropertyValue(FM_PROP_DATASOURCE,Any(rDBTitle));
else
{
Reference< css::beans::XPropertySet >
xDatabaseProps(rDatabase, UNO_QUERY);
@@ -498,8 +498,8 @@ Reference< css::form::XForm >
FmFormPageImpl::findPlaceInFormComponentHierarchy
xFormProps->setPropertyValue(FM_PROP_URL, aDatabaseUrl);
}
-
xFormProps->setPropertyValue(FM_PROP_COMMAND,makeAny(rCursorSource));
- xFormProps->setPropertyValue(FM_PROP_COMMANDTYPE,
makeAny(nCommandType));
+ xFormProps->setPropertyValue(FM_PROP_COMMAND,Any(rCursorSource));
+ xFormProps->setPropertyValue(FM_PROP_COMMANDTYPE,
Any(nCommandType));
Reference< css::container::XNameAccess > xNamedSet = getForms();
@@ -507,7 +507,7 @@ Reference< css::form::XForm >
FmFormPageImpl::findPlaceInFormComponentHierarchy
OUString sName = FormControlFactory::getUniqueName( xNamedSet,
bTableOrQuery ? rCursorSource : SvxResId(RID_STR_STDFORMNAME)
);
- xFormProps->setPropertyValue( FM_PROP_NAME, makeAny( sName ) );
+ xFormProps->setPropertyValue( FM_PROP_NAME, Any( sName ) );
if( bUndo )
{
@@ -521,7 +521,7 @@ Reference< css::form::XForm >
FmFormPageImpl::findPlaceInFormComponentHierarchy
xContainer->getCount()));
}
- getForms()->insertByName( sName, makeAny( xForm ) );
+ getForms()->insertByName( sName, Any( xForm ) );
if( bUndo )
rModel.EndUndo();
@@ -594,8 +594,8 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource(
// if no data source is set yet, it is done here
if (aCursorSource.isEmpty())
{
- xFormProps->setPropertyValue(FM_PROP_COMMAND,
makeAny(_rCursorSource));
- xFormProps->setPropertyValue(FM_PROP_COMMANDTYPE,
makeAny(nCommandType));
+ xFormProps->setPropertyValue(FM_PROP_COMMAND,
Any(_rCursorSource));
+ xFormProps->setPropertyValue(FM_PROP_COMMANDTYPE,
Any(nCommandType));
}
}
}
@@ -646,7 +646,7 @@ OUString FmFormPageImpl::setUniqueName(const Reference<
XFormComponent > & xForm
// do not overwrite the name of radio buttons that have it!
if (sName.isEmpty() || nClassId !=
css::form::FormComponentType::RADIOBUTTON)
{
- xSet->setPropertyValue(FM_PROP_NAME, makeAny(sDefaultName));
+ xSet->setPropertyValue(FM_PROP_NAME, Any(sDefaultName));
}
sName = sDefaultName;
diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx
index 86b6960ad1e4..a6c0daf5d1c3 100644
--- a/svx/source/form/fmservs.cxx
+++ b/svx/source/form/fmservs.cxx
@@ -32,7 +32,7 @@ using namespace com::sun::star;
OUString(), ImplName##_NewInstance_Impl, \
uno::Sequence< OUString>(&sString, 1)); \
if (xSingleFactory.is()) \
- xSet->insert(uno::makeAny(xSingleFactory));
+ xSet->insert(uno::Any(xSingleFactory));
namespace svxform
{
@@ -60,7 +60,7 @@ namespace svxform
OAddConditionDialog_GetSupportedServiceNames()
);
if ( xSingleFactory.is() )
- xSet->insert( uno::makeAny( xSingleFactory ) );
+ xSet->insert( uno::Any( xSingleFactory ) );
// DBGridControl
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 676a12763417..5ffa2991741c 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -715,7 +715,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
}
if ( nRecord != -1 )
- rController->execute( nSlot, "Position", makeAny( nRecord ) );
+ rController->execute( nSlot, "Position", Any( nRecord ) );
rReq.Done();
} break;
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 66f71165f67e..a16716ea143d 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -376,13 +376,13 @@ namespace
if (xModel.is())
{
- Any aModel(makeAny(xModel));
+ Any aModel(xModel);
aModelListeners =
xIntrospection->inspect(aModel)->getSupportedListeners();
}
if (xControl.is())
{
- Any aControl(makeAny(xControl));
+ Any aControl(xControl);
aControlListeners =
xIntrospection->inspect(aControl)->getSupportedListeners();
}
@@ -1132,7 +1132,7 @@ bool
FmXFormShell::executeControlConversionSlot_Lock(const Reference<XFormCompon
// the form container works with FormComponents
Reference< XFormComponent> xComponent(xNewModel,
UNO_QUERY);
DBG_ASSERT(xComponent.is(),
"FmXFormShell::executeControlConversionSlot: the new model is no form component
!");
- Any aNewModel(makeAny(xComponent));
+ Any aNewModel(xComponent);
try
{
@@ -1612,7 +1612,7 @@ void FmXFormShell::SetY2KState_Lock(sal_uInt16 n)
{
try
{
- xSet->setPropertyValue("TwoDigitDateStart",
makeAny<sal_uInt16>(n));
+ xSet->setPropertyValue("TwoDigitDateStart",
Any(sal_uInt16(n)));
}
catch(Exception&)
{
@@ -1651,7 +1651,7 @@ void FmXFormShell::SetY2KState_Lock(sal_uInt16 n)
{
try
{
- xSet->setPropertyValue("TwoDigitDateStart",
makeAny<sal_uInt16>(n));
+ xSet->setPropertyValue("TwoDigitDateStart",
Any(sal_uInt16(n)));
}
catch(Exception&)
{
@@ -2201,7 +2201,7 @@ IMPL_LINK(FmXFormShell, OnFoundData_Lock,
FmFoundRecordInformation&, rfriWhere,
if (m_xLastGridFound.is() && (m_xLastGridFound != xControlModel))
{
Reference< XPropertySet> xOldSet(m_xLastGridFound, UNO_QUERY);
- xOldSet->setPropertyValue(FM_PROP_ALWAYSSHOWCURSOR, makeAny( false ) );
+ xOldSet->setPropertyValue(FM_PROP_ALWAYSSHOWCURSOR, Any( false ) );
Reference< XPropertyState> xOldSetState(xOldSet, UNO_QUERY);
if (xOldSetState.is())
xOldSetState->setPropertyToDefault(FM_PROP_CURSORCOLOR);
@@ -2221,8 +2221,8 @@ IMPL_LINK(FmXFormShell, OnFoundData_Lock,
FmFoundRecordInformation&, rfriWhere,
// enable a permanent cursor for the grid so we can see the found text
Reference< XPropertySet> xModelSet(xControlModel, UNO_QUERY);
DBG_ASSERT(xModelSet.is(), "FmXFormShell::OnFoundData : invalid
control model (no property set) !");
- xModelSet->setPropertyValue( FM_PROP_ALWAYSSHOWCURSOR, makeAny( true )
);
- xModelSet->setPropertyValue( FM_PROP_CURSORCOLOR, makeAny(
COL_LIGHTRED ) );
+ xModelSet->setPropertyValue( FM_PROP_ALWAYSSHOWCURSOR, Any( true ) );
+ xModelSet->setPropertyValue( FM_PROP_CURSORCOLOR, Any( COL_LIGHTRED )
);
m_xLastGridFound = xControlModel;
if ( xGrid.is() )
@@ -2958,7 +2958,7 @@ static void saveFilter(const Reference<
runtime::XFormController >& _rxControlle
{
xFormAsSet->setPropertyValue(FM_PROP_FILTER,
xControllerAsSet->getPropertyValue(FM_PROP_FILTER));
- xFormAsSet->setPropertyValue(FM_PROP_APPLYFILTER, makeAny( true ) );
+ xFormAsSet->setPropertyValue(FM_PROP_APPLYFILTER, Any( true ) );
}
catch (const Exception& )
{
@@ -3051,8 +3051,8 @@ void FmXFormShell::stopFiltering_Lock(bool bSave)
bool bOriginalApplyFlag = aOriginalApplyFlags[ j -
rControllers.begin() ];
try
{
- xFormSet->setPropertyValue(FM_PROP_FILTER,
makeAny(sOriginalFilter));
- xFormSet->setPropertyValue(FM_PROP_APPLYFILTER,
makeAny(bOriginalApplyFlag));
+ xFormSet->setPropertyValue(FM_PROP_FILTER,
Any(sOriginalFilter));
+ xFormSet->setPropertyValue(FM_PROP_APPLYFILTER,
Any(bOriginalApplyFlag));
xReload->reload();
}
catch(const Exception&)
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 8239472f24a5..1089754d56ca 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -99,12 +99,12 @@ void displayException(const Any& _rExcept, const
css::uno::Reference<css::awt::X
void displayException(const css::sdbc::SQLException& _rExcept, const
css::uno::Reference<css::awt::XWindow>& rParent)
{
- displayException(makeAny(_rExcept), rParent);
+ displayException(Any(_rExcept), rParent);
}
void displayException(const css::sdb::SQLContext& _rExcept, const
css::uno::Reference<css::awt::XWindow>& rParent)
{
- displayException(makeAny(_rExcept), rParent);
+ displayException(Any(_rExcept), rParent);
}
void displayException(const css::sdb::SQLErrorEvent& _rEvent, const
css::uno::Reference<css::awt::XWindow>& rParent)
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index f5217122c93e..57593d36c52b 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -125,7 +125,7 @@ private:
// SfxObjectShellRef is good here since the model controls the
lifetime of the shell
SfxObjectShellRef const xObjectShell = m_rModel.GetObjectShell();
ENSURE_OR_THROW( xObjectShell.is(), "no object shell!" );
- xListenerProps->setPropertyValue("Model", makeAny(
xObjectShell->GetModel() ) );
+ xListenerProps->setPropertyValue("Model", Any(
xObjectShell->GetModel() ) );
m_vbaListener = xScriptListener;
}
@@ -427,7 +427,7 @@ void FmXUndoEnvironment::Inserted(FmFormObj* pObj)
}
FmFormPageImpl::setUniqueName( xContent, xForm );
- xNewParent->insertByIndex( nPos, makeAny( xContent ) );
+ xNewParent->insertByIndex( nPos, Any( xContent ) );
Reference< XEventAttacherManager > xManager( xNewParent,
UNO_QUERY_THROW );
xManager->registerScriptEvents( nPos, pObj->GetOriginalEvents() );
@@ -1240,7 +1240,7 @@ void FmUndoModelReplaceAction::Undo()
OUString sName;
xCurrentAsSet->getPropertyValue( FM_PROP_NAME ) >>= sName;
- xCurrentsParent->replaceByName( sName, makeAny( xComponent ) );
+ xCurrentsParent->replaceByName( sName, Any( xComponent ) );
m_pObject->SetUnoControlModel(m_xReplaced);
m_pObject->SetChanged();
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 80a87cdd61d0..c95c5d710977 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -97,7 +97,6 @@ using namespace ::dbtools;
using ::com::sun::star::uno::Type;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
- using ::com::sun::star::uno::makeAny;
using ::com::sun::star::uno::XComponentContext;
using ::com::sun::star::form::FormButtonType_SUBMIT;
using ::com::sun::star::form::binding::XValueBinding;
@@ -335,7 +334,7 @@ void FormViewPageWindowAdapter::setController(const
Reference< XForm > & xForm,
// attaching the events
Reference< XEventAttacherManager > xEventManager( xForm->getParent(),
UNO_QUERY );
- xEventManager->attach(m_aControllerList.size() - 1,
Reference<XInterface>( xController, UNO_QUERY ), makeAny(xController) );
+ xEventManager->attach(m_aControllerList.size() - 1,
Reference<XInterface>( xController, UNO_QUERY ), Any(xController) );
}
// now go through the subforms
@@ -1107,7 +1106,7 @@ namespace
FmFormPageImpl::setUniqueName( xFormComponent, xTargetForm );
Reference< XIndexContainer > xFormAsContainer( xTargetForm,
UNO_QUERY_THROW );
- xFormAsContainer->insertByIndex( xFormAsContainer->getCount(),
makeAny( xFormComponent ) );
+ xFormAsContainer->insertByIndex( xFormAsContainer->getCount(), Any(
xFormComponent ) );
}
}
@@ -1452,11 +1451,11 @@ SdrObjectUniquePtr
FmXFormView::implCreateXFormsControl( const svx::OXFormsDescr
// set the button label
Reference< XPropertySet >
xControlSet(pControl->GetUnoControlModel(), UNO_QUERY);
- xControlSet->setPropertyValue(FM_PROP_LABEL,
makeAny(_rDesc.szName));
+ xControlSet->setPropertyValue(FM_PROP_LABEL, Any(_rDesc.szName));
// connect the submission with the submission supplier (aka the
button)
xControlSet->setPropertyValue( FM_PROP_BUTTON_TYPE,
- makeAny( FormButtonType_SUBMIT ) );
+ Any( FormButtonType_SUBMIT ) );
Reference< css::form::submission::XSubmissionSupplier >
xSubmissionSupplier(pControl->GetUnoControlModel(), UNO_QUERY);
xSubmissionSupplier->setSubmission(xSubmission);
@@ -1583,9 +1582,9 @@ bool FmXFormView::createControlLabelPair( OutputDevice
const & _rOutDev, sal_Int
if ( sLabel.isEmpty() )
sLabel = sFieldName;
- xLabelModel->setPropertyValue( FM_PROP_LABEL, makeAny( sLabel +
_rFieldPostfix ) );
+ xLabelModel->setPropertyValue( FM_PROP_LABEL, Any( sLabel +
_rFieldPostfix ) );
OUString
sObjectLabel(SvxResId(RID_STR_OBJECT_LABEL).replaceAll("#object#", sFieldName));
- xLabelModel->setPropertyValue(FM_PROP_NAME, makeAny(sObjectLabel));
+ xLabelModel->setPropertyValue(FM_PROP_NAME, Any(sObjectLabel));
}
pLabel->SetLogicRect( ::tools::Rectangle(
@@ -1648,7 +1647,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice
const & _rOutDev, sal_Int
{
// no dedicated label control => use the label property
if ( xControlPropInfo->hasPropertyByName( FM_PROP_LABEL ) )
- xControlSet->setPropertyValue( FM_PROP_LABEL, makeAny(
sFieldName + _rFieldPostfix ) );
+ xControlSet->setPropertyValue( FM_PROP_LABEL, Any( sFieldName
+ _rFieldPostfix ) );
else
OSL_FAIL( "FmXFormView::createControlLabelPair: can't set a
label for the control!" );
}
@@ -1656,7 +1655,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice
const & _rOutDev, sal_Int
if ( (nDataType == DataType::LONGVARCHAR || nDataType == DataType::CLOB)
&& xControlPropInfo->hasPropertyByName( FM_PROP_MULTILINE ) )
{
- xControlSet->setPropertyValue( FM_PROP_MULTILINE, makeAny( true ) );
+ xControlSet->setPropertyValue( FM_PROP_MULTILINE, Any( true ) );
}
// announce the label to the control
@@ -1664,7 +1663,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice
const & _rOutDev, sal_Int
{
try
{
- xControlSet->setPropertyValue( FM_PROP_CONTROLLABEL, makeAny(
xLabelModel ) );
+ xControlSet->setPropertyValue( FM_PROP_CONTROLLABEL, Any(
xLabelModel ) );
}
catch (const Exception&)
{
diff --git a/svx/source/form/formcontrolfactory.cxx
b/svx/source/form/formcontrolfactory.cxx
index 513c0cc0d751..61a28b21aeeb 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -62,7 +62,6 @@ namespace svxform
using ::com::sun::star::uno::UNO_SET_THROW;
using ::com::sun::star::uno::Exception;
using ::com::sun::star::uno::Any;
- using ::com::sun::star::uno::makeAny;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::XComponentContext;
using ::com::sun::star::beans::XPropertySet;
@@ -390,14 +389,14 @@ namespace svxform
switch ( nClassId )
{
case FormComponentType::SCROLLBAR:
- _rxControlModel->setPropertyValue("LiveScroll", makeAny(
true ) );
+ _rxControlModel->setPropertyValue("LiveScroll", Any( true
) );
[[fallthrough]];
case FormComponentType::SPINBUTTON:
{
sal_Int32 eOrientation = ScrollBarOrientation::HORIZONTAL;
if ( !_rControlBoundRect.IsEmpty() && (
_rControlBoundRect.GetWidth() < _rControlBoundRect.GetHeight() ) )
eOrientation = ScrollBarOrientation::VERTICAL;
- _rxControlModel->setPropertyValue( FM_PROP_ORIENTATION,
makeAny( eOrientation ) );
+ _rxControlModel->setPropertyValue( FM_PROP_ORIENTATION,
Any( eOrientation ) );
}
break;
@@ -406,8 +405,8 @@ namespace svxform
{
bool bDropDown = !_rControlBoundRect.IsEmpty() && (
_rControlBoundRect.GetWidth() >= 3 * _rControlBoundRect.GetHeight() );
if ( xPSI->hasPropertyByName( FM_PROP_DROPDOWN ) )
- _rxControlModel->setPropertyValue( FM_PROP_DROPDOWN,
makeAny( bDropDown ) );
- _rxControlModel->setPropertyValue( FM_PROP_LINECOUNT,
makeAny( sal_Int16( 20 ) ) );
+ _rxControlModel->setPropertyValue( FM_PROP_DROPDOWN,
Any( bDropDown ) );
+ _rxControlModel->setPropertyValue( FM_PROP_LINECOUNT, Any(
sal_Int16( 20 ) ) );
}
break;
@@ -421,7 +420,7 @@ namespace svxform
)
{
if ( xPSI->hasPropertyByName( FM_PROP_MULTILINE ) )
- _rxControlModel->setPropertyValue(
FM_PROP_MULTILINE, makeAny( true ) );
+ _rxControlModel->setPropertyValue(
FM_PROP_MULTILINE, Any( true ) );
}
}
break;
@@ -432,7 +431,7 @@ namespace svxform
{
OUString sVertAlignPropertyName( "VerticalAlign" );
if ( xPSI->hasPropertyByName( sVertAlignPropertyName ) )
- _rxControlModel->setPropertyValue(
sVertAlignPropertyName, makeAny( VerticalAlignment_MIDDLE ) );
+ _rxControlModel->setPropertyValue(
sVertAlignPropertyName, Any( VerticalAlignment_MIDDLE ) );
}
break;
@@ -441,7 +440,7 @@ namespace svxform
{
static const OUStringLiteral sScaleModeProperty(
u"ScaleMode" );
if ( xPSI->hasPropertyByName( sScaleModeProperty ) )
- _rxControlModel->setPropertyValue( sScaleModeProperty,
makeAny( ImageScaleMode::ISOTROPIC ) );
+ _rxControlModel->setPropertyValue( sScaleModeProperty,
Any( ImageScaleMode::ISOTROPIC ) );
}
break;
}
@@ -471,7 +470,7 @@ namespace svxform
_rxControlModel->setPropertyValue(
FM_PROP_LABEL,
- makeAny( lcl_getUniqueLabel_nothrow( _rxControlModel,
sInitialLabel ) )
+ Any( lcl_getUniqueLabel_nothrow( _rxControlModel,
sInitialLabel ) )
);
}
}
@@ -479,17 +478,17 @@ namespace svxform
// strict format = yes is the default (i93467)
if ( xPSI->hasPropertyByName( FM_PROP_STRICTFORMAT ) )
{
- _rxControlModel->setPropertyValue( FM_PROP_STRICTFORMAT,
makeAny( true ) );
+ _rxControlModel->setPropertyValue( FM_PROP_STRICTFORMAT, Any(
true ) );
}
// mouse wheel: don't use it for scrolling by default (i110036)
if ( xPSI->hasPropertyByName( FM_PROP_MOUSE_WHEEL_BEHAVIOR ) )
{
- _rxControlModel->setPropertyValue(
FM_PROP_MOUSE_WHEEL_BEHAVIOR, makeAny( MouseWheelBehavior::SCROLL_DISABLED ) );
+ _rxControlModel->setPropertyValue(
FM_PROP_MOUSE_WHEEL_BEHAVIOR, Any( MouseWheelBehavior::SCROLL_DISABLED ) );
}
if ( xPSI->hasPropertyByName( FM_PROP_WRITING_MODE ) )
- _rxControlModel->setPropertyValue( FM_PROP_WRITING_MODE,
makeAny( WritingMode2::CONTEXT ) );
+ _rxControlModel->setPropertyValue( FM_PROP_WRITING_MODE, Any(
WritingMode2::CONTEXT ) );
}
catch( const Exception& )
{
@@ -521,7 +520,7 @@ namespace svxform
pInfo->Value >>= bDosLineEnds;
sal_Int16 nLineEndFormat = bDosLineEnds ?
LineEndFormat::CARRIAGE_RETURN_LINE_FEED : LineEndFormat::LINE_FEED;
- _rxModel->setPropertyValue( FM_PROP_LINEENDFORMAT, makeAny(
nLineEndFormat ) );
+ _rxModel->setPropertyValue( FM_PROP_LINEENDFORMAT, Any(
nLineEndFormat ) );
}
catch( const Exception& )
{
@@ -618,7 +617,7 @@ namespace svxform
{
sal_Int32 nNullable = ColumnValue::NULLABLE_UNKNOWN;
OSL_VERIFY( _rxDatabaseField->getPropertyValue(
FM_PROP_ISNULLABLE ) >>= nNullable );
- _rxControlModel->setPropertyValue( FM_PROP_TRISTATE, makeAny(
ColumnValue::NO_NULLS != nNullable ) );
+ _rxControlModel->setPropertyValue( FM_PROP_TRISTATE, Any(
ColumnValue::NO_NULLS != nNullable ) );
}
}
catch( const Exception& )
diff --git a/svx/source/form/formcontroller.cxx
b/svx/source/form/formcontroller.cxx
index fd66a5f0f9bb..c8c68180e605 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -1070,7 +1070,7 @@ Any SAL_CALL FormController::getByIndex(sal_Int32 Index)
Index >= static_cast<sal_Int32>(m_aChildren.size()))
throw IndexOutOfBoundsException();
- return makeAny( m_aChildren[ Index ] );
+ return Any( m_aChildren[ Index ] );
}
// EventListener
@@ -1302,7 +1302,7 @@ bool FormController::replaceControl( const Reference<
XControl >& _rxExistentCon
// carry over the model
_rxNewControl->setModel( _rxExistentControl->getModel() );
- xContainer->replaceByIdentifer( *pIdentifiers, makeAny(
_rxNewControl ) );
+ xContainer->replaceByIdentifer( *pIdentifiers, Any(
_rxNewControl ) );
bSuccess = true;
if ( bReplacedWasActive )
@@ -1915,7 +1915,7 @@ void FormController::addToEventAttacher(const Reference<
XControl > & xControl)
m_xModelAsIndex->getByIndex(--nPos) >>= xTemp;
if (xComp.get() == xTemp.get())
{
- m_xModelAsManager->attach( nPos, Reference<XInterface>( xControl,
UNO_QUERY ), makeAny(xControl) );
+ m_xModelAsManager->attach( nPos, Reference<XInterface>( xControl,
UNO_QUERY ), Any(xControl) );
break;
}
}
@@ -2923,7 +2923,7 @@ void SAL_CALL FormController::addChildController( const
Reference< XFormControll
m_xModelAsIndex->getByIndex(--nPos) >>= xTemp;
if ( xFormOfChild == xTemp )
{
- m_xModelAsManager->attach( nPos, Reference<XInterface>(
ChildController, UNO_QUERY ), makeAny( ChildController) );
+ m_xModelAsManager->attach( nPos, Reference<XInterface>(
ChildController, UNO_QUERY ), Any( ChildController) );
break;
}
}
@@ -3826,7 +3826,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const
DatabaseParameterEvent&
ParametersRequest aRequest;
aRequest.Parameters = aEvent.Parameters;
aRequest.Connection = getConnection(Reference< XRowSet
>(aEvent.Source, UNO_QUERY));
- rtl::Reference<OInteractionRequest> pParamRequest = new
OInteractionRequest(makeAny(aRequest));
+ rtl::Reference<OInteractionRequest> pParamRequest = new
OInteractionRequest(Any(aRequest));
// some knittings
pParamRequest->addContinuation(pParamValues);
pParamRequest->addContinuation(pAbort);
@@ -3934,7 +3934,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const
RowChangeEvent& aEvent)
aDetails.Message = SvxResId(RID_STR_DELETECONFIRM);
aWarning.NextException <<= aDetails;
- rtl::Reference<OInteractionRequest> pRequest = new
OInteractionRequest( makeAny( aWarning ) );
+ rtl::Reference<OInteractionRequest> pRequest = new
OInteractionRequest( Any( aWarning ) );
// some knittings
pRequest->addContinuation( pApprove );
diff --git a/svx/source/form/navigatortree.cxx
b/svx/source/form/navigatortree.cxx
index b717ffa3c5bf..9ac6e6a87469 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1073,12 +1073,12 @@ namespace svxform
{
// insert in a form needs a FormComponent
xContainer->insertByIndex( nIndex,
- makeAny( Reference< XFormComponent >( xCurrentChild,
UNO_QUERY ) ) );
+ Any( Reference< XFormComponent >( xCurrentChild, UNO_QUERY
) ) );
}
else
{
xContainer->insertByIndex( nIndex,
- makeAny( Reference< XForm >( xCurrentChild, UNO_QUERY ) )
);
+ Any( Reference< XForm >( xCurrentChild, UNO_QUERY ) ) );
}
if (aEvts.hasElements())
@@ -1292,9 +1292,9 @@ namespace svxform
try
{
- xPropertySet->setPropertyValue( FM_PROP_NAME, makeAny(aName) );
+ xPropertySet->setPropertyValue( FM_PROP_NAME, Any(aName) );
// a form should always have the command type table as default
- xPropertySet->setPropertyValue( FM_PROP_COMMANDTYPE,
makeAny(sal_Int32(CommandType::TABLE)));
+ xPropertySet->setPropertyValue( FM_PROP_COMMANDTYPE,
Any(sal_Int32(CommandType::TABLE)));
}
catch ( const Exception& )
{
diff --git a/svx/source/form/navigatortreemodel.cxx
b/svx/source/form/navigatortreemodel.cxx
index c8d5326cae1d..218e2ba4af89 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -299,14 +299,14 @@ namespace svxform
{
Reference< XForm > xElementAsForm(xElement, UNO_QUERY);
- xContainer->insertByIndex(nRelPos, makeAny(xElementAsForm));
+ xContainer->insertByIndex(nRelPos, Any(xElementAsForm));
}
else if (xContainer->getElementType() ==
cppu::UnoType<XFormComponent>::get())
{
Reference< XFormComponent > xElementAsComponent(xElement,
UNO_QUERY);
- xContainer->insertByIndex(nRelPos,
makeAny(xElementAsComponent));
+ xContainer->insertByIndex(nRelPos, Any(xElementAsComponent));
}
else
{
@@ -896,7 +896,7 @@ namespace svxform
// set name
- xSet->setPropertyValue( FM_PROP_NAME, makeAny(rNewText) );
+ xSet->setPropertyValue( FM_PROP_NAME, Any(rNewText) );
return true;
}
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 536a21227d81..4aa65b56e6fd 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -161,7 +161,7 @@ bool FmFieldWin::createSelectionControls()
aDescr[ DataAccessDescriptorProperty::ColumnName ] <<=
pSelected->sColumnName;
// transfer this to the SFX world
- SfxUnoAnyItem aDescriptorItem( SID_FM_DATACCESS_DESCRIPTOR, makeAny(
aDescr.createPropertyValueSequence() ) );
+ SfxUnoAnyItem aDescriptorItem( SID_FM_DATACCESS_DESCRIPTOR, Any(
aDescr.createPropertyValueSequence() ) );
const SfxPoolItem* pArgs[] =
{
&aDescriptorItem, nullptr
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 068a2f7e2af0..3422f5e2919c 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -267,7 +267,7 @@ bool CopyFile( const INetURLObject& rSrcURL, const
INetURLObject& rDstURL )
::ucbhelper::Content aDestPath( rDstURL.GetMainURL(
INetURLObject::DecodeMechanism::NONE ), uno::Reference<
ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
aDestPath.executeCommand( "transfer",
- uno::makeAny( ucb::TransferInfo( false,
rSrcURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ),
+ uno::Any( ucb::TransferInfo( false,
rSrcURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ),
rDstURL.GetLastName(),
ucb::NameClash::OVERWRITE ) ) );
bRet = true;
}
@@ -293,7 +293,7 @@ bool KillFile( const INetURLObject& rURL )
try
{
::ucbhelper::Content aCnt( rURL.GetMainURL(
INetURLObject::DecodeMechanism::NONE ), uno::Reference<
ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
- aCnt.executeCommand( "delete", uno::makeAny( true ) );
+ aCnt.executeCommand( "delete", uno::Any( true ) );
}
catch( const ucb::ContentCreationException& )
{
diff --git a/svx/source/items/SmartTagItem.cxx
b/svx/source/items/SmartTagItem.cxx
index 2208ee297d0e..fcec36315447 100644
--- a/svx/source/items/SmartTagItem.cxx
+++ b/svx/source/items/SmartTagItem.cxx
@@ -54,14 +54,14 @@ SvxSmartTagItem::SvxSmartTagItem( const
TypedWhichId<SvxSmartTagItem> nId,
bool SvxSmartTagItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
const
{
rVal <<= comphelper::InitPropertySequence( {
- { "ActionComponents", css::uno::makeAny( maActionComponentsSequence )
},
- { "ActionIndices", css::uno::makeAny( maActionIndicesSequence ) },
- { "StringKeyMaps", css::uno::makeAny( maStringKeyMaps ) },
- { "TextRange", css::uno::makeAny( mxRange ) },
- { "Controller", css::uno::makeAny( mxController ) },
- { "Locale", css::uno::makeAny( maLocale ) },
- { "ApplicationName", css::uno::makeAny( maApplicationName ) },
- { "RangeText", css::uno::makeAny( maRangeText ) },
+ { "ActionComponents", css::uno::Any( maActionComponentsSequence ) },
+ { "ActionIndices", css::uno::Any( maActionIndicesSequence ) },
+ { "StringKeyMaps", css::uno::Any( maStringKeyMaps ) },
+ { "TextRange", css::uno::Any( mxRange ) },
+ { "Controller", css::uno::Any( mxController ) },
+ { "Locale", css::uno::Any( maLocale ) },
+ { "ApplicationName", css::uno::Any( maApplicationName ) },
+ { "RangeText", css::uno::Any( maRangeText ) },
} );
return true;
}
diff --git a/svx/source/items/customshapeitem.cxx
b/svx/source/items/customshapeitem.cxx
index 3ba698a3c158..3caa270de999 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -253,15 +253,15 @@ bool SdrCustomShapeGeometryItem::operator<( const
SfxPoolItem& rCmp ) const
if( aHashState == HashState::Valid )
return aHash < other.aHash;
- return comphelper::anyLess( css::uno::makeAny( aPropSeq ),
- css::uno::makeAny( other.aPropSeq ));
+ return comphelper::anyLess( css::uno::Any( aPropSeq ),
+ css::uno::Any( other.aPropSeq ));
}
void SdrCustomShapeGeometryItem::UpdateHash() const
{
if( aHashState != HashState::Unknown )
return;
- std::optional< size_t > hash = comphelper::anyToHash( css::uno::makeAny(
aPropSeq ));
+ std::optional< size_t > hash = comphelper::anyToHash( css::uno::Any(
aPropSeq ));
if( hash.has_value())
{
aHash = *hash;
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 833113b1293b..da9e067b2f01 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -435,7 +435,7 @@ IMPL_LINK_NOARG( PosSizePropertyPanel, ClickAutoHdl,
weld::Toggleable&, void )
// mxCbxScale must synchronized with that on Position and Size tabpage on
Shape Properties dialog
SvtViewOptions aPageOpt(EViewType::TabPage,
"cui/ui/possizetabpage/PositionAndSize");
- aPageOpt.SetUserItem( USERITEM_NAME, css::uno::makeAny( OUString::number(
int(mxCbxScale->get_active()) ) ) );
+ aPageOpt.SetUserItem( USERITEM_NAME, css::uno::Any( OUString::number(
int(mxCbxScale->get_active()) ) ) );
}
IMPL_LINK_NOARG( PosSizePropertyPanel, RotationHdl, DialControl&, void )
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 0826434b79fb..b2b2f87a4b08 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -99,7 +99,7 @@ TextCharacterSpacingControl::~TextCharacterSpacingControl()
{
SvtViewOptions aWinOpt(EViewType::Window,
SIDEBAR_SPACING_GLOBAL_VALUE);
css::uno::Sequence<css::beans::NamedValue> aSeq
- { { "Spacing", css::uno::makeAny(OUString::number(mnCustomKern)) }
};
+ { { "Spacing", css::uno::Any(OUString::number(mnCustomKern)) } };
aWinOpt.SetUserData(aSeq);
}
}
diff --git a/svx/source/smarttags/SmartTagMgr.cxx
b/svx/source/smarttags/SmartTagMgr.cxx
index 913590833217..875d4557db4b 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -209,7 +209,7 @@ void SmartTagMgr::WriteConfiguration( const bool*
pIsLabelTextWithSmartTags,
if ( pIsLabelTextWithSmartTags )
{
- const Any aEnabled = makeAny( *pIsLabelTextWithSmartTags );
+ const Any aEnabled( *pIsLabelTextWithSmartTags );
try
{
@@ -225,7 +225,7 @@ void SmartTagMgr::WriteConfiguration( const bool*
pIsLabelTextWithSmartTags,
{
Sequence< OUString > aTypes =
comphelper::containerToSequence(*pDisabledTypes);
- const Any aNewTypes = makeAny( aTypes );
+ const Any aNewTypes( aTypes );
try
{
@@ -374,7 +374,7 @@ void SmartTagMgr::LoadLibraries()
void SmartTagMgr::PrepareConfiguration( std::u16string_view
rConfigurationGroupName )
{
- Any aAny = makeAny(
+ Any aAny(
OUString::Concat("/org.openoffice.Office.Common/SmartTags/") +
rConfigurationGroupName );
beans::PropertyValue aPathArgument;
aPathArgument.Name = "nodepath";
diff --git a/svx/source/styles/ColorSets.cxx b/svx/source/styles/ColorSets.cxx
index 9edfdc2f3d2a..6b2db4831a22 100644
--- a/svx/source/styles/ColorSets.cxx
+++ b/svx/source/styles/ColorSets.cxx
@@ -60,7 +60,7 @@ void UpdateTextPortionColorSet(const
uno::Reference<beans::XPropertySet>& xPorti
}
xPortion->setPropertyValue(UNO_NAME_EDIT_CHAR_COLOR,
- uno::makeAny(static_cast<sal_Int32>(aColor)));
+ uno::Any(static_cast<sal_Int32>(aColor)));
}
void UpdateFillColorSet(const uno::Reference<beans::XPropertySet>& xShape,
const svx::ColorSet& rColorSet)
@@ -87,7 +87,7 @@ void UpdateFillColorSet(const
uno::Reference<beans::XPropertySet>& xShape, const
aColor.ApplyLumModOff(nFillColorLumMod, nFillColorLumOff);
}
- xShape->setPropertyValue(UNO_NAME_FILLCOLOR,
uno::makeAny(static_cast<sal_Int32>(aColor)));
+ xShape->setPropertyValue(UNO_NAME_FILLCOLOR,
uno::Any(static_cast<sal_Int32>(aColor)));
}
void UpdateSdrObject(svx::Theme* pTheme, SdrObject* pObject)
diff --git a/svx/source/svdraw/charthelper.cxx
b/svx/source/svdraw/charthelper.cxx
index f73d3b0dab25..cae747228ca4 100644
--- a/svx/source/svdraw/charthelper.cxx
+++ b/svx/source/svdraw/charthelper.cxx
@@ -121,9 +121,9 @@ void ChartHelper::AdaptDefaultsForChart(
if (uno::Reference< beans::XPropertySet > xPageProp =
xChartDoc->getPageBackground())
{
// set background to transparent (none)
- xPageProp->setPropertyValue("FillStyle",
uno::makeAny(drawing::FillStyle_NONE));
+ xPageProp->setPropertyValue("FillStyle",
uno::Any(drawing::FillStyle_NONE));
// set no border
- xPageProp->setPropertyValue("LineStyle",
uno::makeAny(drawing::LineStyle_NONE));
+ xPageProp->setPropertyValue("LineStyle",
uno::Any(drawing::LineStyle_NONE));
}
}
catch( const uno::Exception & )
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index ad5279e4917d..bb28a23a558e 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1777,7 +1777,7 @@ void SdrModel::ReadUserDataSequenceValue(const
css::beans::PropertyValue* pValue
template <typename T>
static void addPair(std::vector< std::pair< OUString, Any > >& aUserData,
const OUString& name, const T val)
{
- aUserData.push_back(std::pair< OUString, Any >(name,
css::uno::makeAny(val)));
+ aUserData.push_back(std::pair< OUString, Any >(name, css::uno::Any(val)));
}
void SdrModel::WriteUserDataSequence(css::uno::Sequence <
css::beans::PropertyValue >& rValues)
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index f8e597b8e1d2..000c79937739 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1820,7 +1820,7 @@ void
SdrObject::SetOutlinerParaObject(std::optional<OutlinerParaObject> pTextObj
{
// A shape was modified, which is in a group shape. Empty the group
shape's grab-bag,
// which potentially contains the old text of the shapes in case of
diagrams.
-
pTopGroupObj->SetGrabBagItem(uno::makeAny(uno::Sequence<beans::PropertyValue>()));
+
pTopGroupObj->SetGrabBagItem(uno::Any(uno::Sequence<beans::PropertyValue>()));
}
}
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 07763e9d945c..4f706672619c 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -256,7 +256,7 @@ void SdrUnoObj::SetContextWritingMode( const sal_Int16
_nContextWritingMode )
try
{
uno::Reference< beans::XPropertySet > xModelProperties(
GetUnoControlModel(), uno::UNO_QUERY_THROW );
- xModelProperties->setPropertyValue( "ContextWritingMode",
uno::makeAny( _nContextWritingMode ) );
+ xModelProperties->setPropertyValue( "ContextWritingMode", uno::Any(
_nContextWritingMode ) );
}
catch( const uno::Exception& )
{
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx
b/svx/source/tbxctrls/bulletsnumbering.cxx
index b9820b84e2c6..8bf8327612ba 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -146,17 +146,17 @@ IMPL_LINK_NOARG(NumberingPopup, VSSelectValueSetHdl,
ValueSet*, void)
sal_uInt16 nSelItem = mxValueSet->GetSelectedItemId();
if ( mePageType == NumberingPageType::BULLET )
{
- auto aArgs( comphelper::InitPropertySequence( { { "SetBullet",
css::uno::makeAny( nSelItem ) } } ) );
+ auto aArgs( comphelper::InitPropertySequence( { { "SetBullet",
css::uno::Any( nSelItem ) } } ) );
mrController.dispatchCommand( ".uno:SetBullet", aArgs );
}
else if ( mePageType == NumberingPageType::SINGLENUM )
{
- auto aArgs( comphelper::InitPropertySequence( { { "SetNumber",
css::uno::makeAny( nSelItem ) } } ) );
+ auto aArgs( comphelper::InitPropertySequence( { { "SetNumber",
css::uno::Any( nSelItem ) } } ) );
mrController.dispatchCommand( ".uno:SetNumber", aArgs );
}
else
{
- auto aArgs( comphelper::InitPropertySequence( { { "SetOutline",
css::uno::makeAny( nSelItem ) } } ) );
+ auto aArgs( comphelper::InitPropertySequence( { { "SetOutline",
css::uno::Any( nSelItem ) } } ) );
mrController.dispatchCommand( ".uno:SetOutline", aArgs );
}
mrController.EndPopupMode();
@@ -169,7 +169,7 @@ void NumberingPopup::GrabFocus()
IMPL_LINK_NOARG(NumberingPopup, VSButtonClickSetHdl, weld::Button&, void)
{
- auto aArgs( comphelper::InitPropertySequence( { { "Page",
css::uno::makeAny( OUString("customize") ) } } ) );
+ auto aArgs( comphelper::InitPropertySequence( { { "Page", css::uno::Any(
OUString("customize") ) } } ) );
mrController.dispatchCommand( ".uno:OutlineBullet", aArgs );
mrController.EndPopupMode();
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 521b6fb73888..d3bc9ae24310 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -79,7 +79,7 @@ bool SvxColorValueSetData::GetData( const
css::datatransfer::DataFlavor& rFlavor
if( SotExchange::GetFormat( rFlavor ) == SotClipboardFormatId::XFA )
{
- SetAny(uno::makeAny(m_Data));
+ SetAny(uno::Any(m_Data));
bRet = true;
}
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index bf224a693be5..088b0a492c25 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -656,7 +656,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq,
SdrView& rView )
::CreateTabPage fnCreatePage =
pFact->GetTabPageCreatorFunc( RID_SVXPAGE_GRFCROP );
std::unique_ptr<SfxTabPage> xTabPage =
(*fnCreatePage)(aCropDialog.get_content_area(), &aCropDialog, &aCropDlgAttr);
sal_Int32 nPreferredDPI =
rView.getSdrModelFromSdrView().getImagePreferredDPI();
-
xTabPage->getAdditionalProperties().emplace("PreferredDPI",
css::uno::makeAny(nPreferredDPI));
+
xTabPage->getAdditionalProperties().emplace("PreferredDPI",
css::uno::Any(nPreferredDPI));
xTabPage->SetPageTitle(aCropStr);
aCropDialog.SetTabPage(std::move(xTabPage));
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 70b14ee14bba..f19f683d71b0 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3499,7 +3499,7 @@ void SvxColorToolBoxControl::execute(sal_Int16
/*nSelectModifier*/)
}
auto aArgs( comphelper::InitPropertySequence( {
- { m_aCommandURL.copy(5), css::uno::makeAny(aColor) }
+ { m_aCommandURL.copy(5), css::uno::Any(aColor) }
} ) );
dispatchCommand( aCommand, aArgs );
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index b168462baf2d..4871682857e9 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -168,16 +168,16 @@ void impl_executeSearch( const css::uno::Reference<
css::uno::XComponentContext
| TransliterationFlags::IGNORE_KASHIDA_CTL;
auto aArgs( comphelper::InitPropertySequence( {
- { "SearchItem.SearchString", css::uno::makeAny( sFindText ) },
+ { "SearchItem.SearchString", css::uno::Any( sFindText ) },
// Related tdf#102506: make Find Bar Ctrl+F searching by value by
default
... etc. - the rest is truncated
