reportdesign/inc/ReportDefinition.hxx | 4
reportdesign/source/core/api/FormattedField.cxx | 2
reportdesign/source/core/api/Functions.cxx | 8
reportdesign/source/core/api/Group.cxx | 2
reportdesign/source/core/api/Groups.cxx | 8
reportdesign/source/core/api/ReportControlModel.cxx | 6
reportdesign/source/core/api/ReportDefinition.cxx | 98 ++++++------
reportdesign/source/core/api/ReportEngineJFree.cxx | 6
reportdesign/source/core/api/Section.cxx | 4
reportdesign/source/core/api/Shape.cxx | 10 -
reportdesign/source/core/inc/FixedLine.hxx | 2
reportdesign/source/core/inc/FixedText.hxx | 6
reportdesign/source/core/inc/FormatCondition.hxx | 6
reportdesign/source/core/inc/FormattedField.hxx | 6
reportdesign/source/core/inc/Function.hxx | 4
reportdesign/source/core/inc/Group.hxx | 4
reportdesign/source/core/inc/ImageControl.hxx | 4
reportdesign/source/core/inc/ReportEngineJFree.hxx | 2
reportdesign/source/core/inc/ReportHelperImpl.hxx | 6
reportdesign/source/core/inc/Section.hxx | 4
reportdesign/source/core/inc/Shape.hxx | 6
reportdesign/source/core/sdr/ReportDrawPage.cxx | 2
reportdesign/source/core/sdr/RptModel.cxx | 2
reportdesign/source/core/sdr/RptObject.cxx | 16 -
reportdesign/source/core/sdr/UndoActions.cxx | 2
reportdesign/source/core/sdr/UndoEnv.cxx | 2
reportdesign/source/filter/xml/xmlCondPrtExpr.cxx | 4
reportdesign/source/filter/xml/xmlExport.cxx | 4
reportdesign/source/filter/xml/xmlFunction.cxx | 2
reportdesign/source/filter/xml/xmlGroup.cxx | 2
reportdesign/source/filter/xml/xmlHelper.cxx | 2
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 8
reportdesign/source/filter/xml/xmlReport.cxx | 2
reportdesign/source/filter/xml/xmlReportElement.cxx | 2
reportdesign/source/filter/xml/xmlStyleImport.cxx | 2
reportdesign/source/filter/xml/xmlSubDocument.cxx | 2
reportdesign/source/filter/xml/xmlfilter.cxx | 18 +-
reportdesign/source/ui/dlg/CondFormat.cxx | 4
reportdesign/source/ui/dlg/GroupExchange.cxx | 2
reportdesign/source/ui/dlg/GroupsSorting.cxx | 2
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 8
reportdesign/source/ui/inspection/GeometryHandler.cxx | 22 +-
reportdesign/source/ui/misc/RptUndo.cxx | 2
reportdesign/source/ui/misc/UITools.cxx | 44 ++---
reportdesign/source/ui/report/FixedTextColor.cxx | 2
reportdesign/source/ui/report/FormattedFieldBeautifier.cxx | 6
reportdesign/source/ui/report/ReportController.cxx | 54 +++---
reportdesign/source/ui/report/ReportSection.cxx | 6
reportdesign/source/ui/report/SectionView.cxx | 2
reportdesign/source/ui/report/dlgedfac.cxx | 2
reportdesign/source/ui/report/dlgedfunc.cxx | 2
reportdesign/source/ui/report/propbrw.cxx | 16 -
52 files changed, 222 insertions(+), 222 deletions(-)
New commits:
commit 422bf47201c7a18f7f61a2e39eb384fe540d90c9
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed May 4 07:01:00 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed May 4 09:27:43 2022 +0200
Just use Any ctor instead of makeAny in reportdesign
Change-Id: If8b6f8f7facf36f740b2e1773e923e28d8c85552
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133792
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/reportdesign/inc/ReportDefinition.hxx
b/reportdesign/inc/ReportDefinition.hxx
index 33d7cd2d8dee..f58a3add90fe 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -105,7 +105,7 @@ namespace reportdesign
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
l.notify();
@@ -118,7 +118,7 @@ namespace reportdesign
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
l.notify();
diff --git a/reportdesign/source/core/api/FormattedField.cxx
b/reportdesign/source/core/api/FormattedField.cxx
index 25ddb41156d7..c8bcad859e2c 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -215,7 +215,7 @@ uno::Reference< util::XCloneable > SAL_CALL
OFormattedField::createClone( )
{
uno::Reference< report::XFormatCondition > xCond =
xSet->createFormatCondition();
::comphelper::copyProperties(rxFormatCondition, xCond);
- xSet->insertByIndex(i,uno::makeAny(xCond));
+ xSet->insertByIndex(i,uno::Any(xCond));
++i;
}
return xSet;
diff --git a/reportdesign/source/core/api/Functions.cxx
b/reportdesign/source/core/api/Functions.cxx
index c7a92f6b6f42..31928d8b34ec 100644
--- a/reportdesign/source/core/api/Functions.cxx
+++ b/reportdesign/source/core/api/Functions.cxx
@@ -89,7 +89,7 @@ void SAL_CALL OFunctions::insertByIndex( ::sal_Int32 Index,
const uno::Any& aEle
xFunction->setParent(*this);
}
// notify our container listeners
- container::ContainerEvent
aEvent(static_cast<container::XContainer*>(this), uno::makeAny(Index),
aElement, uno::Any());
+ container::ContainerEvent
aEvent(static_cast<container::XContainer*>(this), uno::Any(Index), aElement,
uno::Any());
m_aContainerListeners.notifyEach(&container::XContainerListener::elementInserted,aEvent);
}
@@ -106,7 +106,7 @@ void SAL_CALL OFunctions::removeByIndex( ::sal_Int32 Index )
m_aFunctions.erase(aPos);
xFunction->setParent(nullptr);
}
- container::ContainerEvent
aEvent(static_cast<container::XContainer*>(this), uno::makeAny(Index),
uno::makeAny(xFunction), uno::Any());
+ container::ContainerEvent
aEvent(static_cast<container::XContainer*>(this), uno::Any(Index),
uno::Any(xFunction), uno::Any());
m_aContainerListeners.notifyEach(&container::XContainerListener::elementRemoved,aEvent);
}
@@ -126,7 +126,7 @@ void SAL_CALL OFunctions::replaceByIndex( ::sal_Int32
Index, const uno::Any& Ele
*aPos = xFunction;
}
- container::ContainerEvent
aEvent(static_cast<container::XContainer*>(this), uno::makeAny(Index), Element,
aOldElement);
+ container::ContainerEvent
aEvent(static_cast<container::XContainer*>(this), uno::Any(Index), Element,
aOldElement);
m_aContainerListeners.notifyEach(&container::XContainerListener::elementReplaced,aEvent);
}
@@ -143,7 +143,7 @@ uno::Any SAL_CALL OFunctions::getByIndex( ::sal_Int32 Index
)
checkIndex(Index);
TFunctions::const_iterator aPos = m_aFunctions.begin();
::std::advance(aPos,Index);
- return uno::makeAny(*aPos);
+ return uno::Any(*aPos);
}
// XElementAccess
diff --git a/reportdesign/source/core/api/Group.cxx
b/reportdesign/source/core/api/Group.cxx
index 165214513bbe..b78e433cb4ae 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -296,7 +296,7 @@ void OGroup::setSection( const OUString& _sProperty
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, uno::makeAny(_member), uno::makeAny(_bOn), &l);
+ prepareSet(_sProperty, uno::Any(_member), uno::Any(_bOn), &l);
// create section if needed
if ( _bOn && !_member.is() )
diff --git a/reportdesign/source/core/api/Groups.cxx
b/reportdesign/source/core/api/Groups.cxx
index 9cc410760a3f..6310813134a9 100644
--- a/reportdesign/source/core/api/Groups.cxx
+++ b/reportdesign/source/core/api/Groups.cxx
@@ -92,7 +92,7 @@ void SAL_CALL OGroups::insertByIndex( ::sal_Int32 Index,
const uno::Any& aElemen
}
}
// notify our container listeners
- container::ContainerEvent
aEvent(static_cast<container::XContainer*>(this), uno::makeAny(Index),
aElement, uno::Any());
+ container::ContainerEvent
aEvent(static_cast<container::XContainer*>(this), uno::Any(Index), aElement,
uno::Any());
m_aContainerListeners.notifyEach(&container::XContainerListener::elementInserted,aEvent);
}
@@ -108,7 +108,7 @@ void SAL_CALL OGroups::removeByIndex( ::sal_Int32 Index )
xGroup = *aPos;
m_aGroups.erase(aPos);
}
- container::ContainerEvent
aEvent(static_cast<container::XContainer*>(this), uno::makeAny(Index),
uno::makeAny(xGroup), uno::Any());
+ container::ContainerEvent
aEvent(static_cast<container::XContainer*>(this), uno::Any(Index),
uno::Any(xGroup), uno::Any());
m_aContainerListeners.notifyEach(&container::XContainerListener::elementRemoved,aEvent);
}
@@ -128,7 +128,7 @@ void SAL_CALL OGroups::replaceByIndex( ::sal_Int32 Index,
const uno::Any& Elemen
*aPos = xGroup;
}
- container::ContainerEvent
aEvent(static_cast<container::XContainer*>(this), uno::makeAny(Index), Element,
aOldElement);
+ container::ContainerEvent
aEvent(static_cast<container::XContainer*>(this), uno::Any(Index), Element,
aOldElement);
m_aContainerListeners.notifyEach(&container::XContainerListener::elementReplaced,aEvent);
}
@@ -145,7 +145,7 @@ uno::Any SAL_CALL OGroups::getByIndex( ::sal_Int32 Index )
checkIndex(Index);
TGroups::const_iterator aPos = m_aGroups.begin();
::std::advance(aPos,Index);
- return uno::makeAny(*aPos);
+ return uno::Any(*aPos);
}
// XElementAccess
diff --git a/reportdesign/source/core/api/ReportControlModel.cxx
b/reportdesign/source/core/api/ReportControlModel.cxx
index 480f21377e6b..f1a00af093a0 100644
--- a/reportdesign/source/core/api/ReportControlModel.cxx
+++ b/reportdesign/source/core/api/ReportControlModel.cxx
@@ -62,7 +62,7 @@ void OReportControlModel::insertByIndex(::sal_Int32 Index,
const uno::Any& Eleme
}
// notify our container listeners
- container::ContainerEvent aEvent(xBroadcaster, uno::makeAny(Index),
Element, uno::Any());
+ container::ContainerEvent aEvent(xBroadcaster, uno::Any(Index), Element,
uno::Any());
aContainerListeners.notifyEach(&container::XContainerListener::elementInserted,
aEvent);
}
@@ -77,7 +77,7 @@ void OReportControlModel::removeByIndex(::sal_Int32 Index)
Element <<= m_aFormatConditions[Index];
m_aFormatConditions.erase(m_aFormatConditions.begin() + Index);
}
- container::ContainerEvent aEvent(xBroadcaster, uno::makeAny(Index),
Element, uno::Any());
+ container::ContainerEvent aEvent(xBroadcaster, uno::Any(Index), Element,
uno::Any());
aContainerListeners.notifyEach(&container::XContainerListener::elementRemoved,
aEvent);
}
@@ -94,7 +94,7 @@ void OReportControlModel::replaceByIndex(::sal_Int32 Index,
const uno::Any& Elem
checkIndex(Index);
m_aFormatConditions[Index] = xElement;
}
- container::ContainerEvent aEvent(xBroadcaster, uno::makeAny(Index),
Element, uno::Any());
+ container::ContainerEvent aEvent(xBroadcaster, uno::Any(Index), Element,
uno::Any());
aContainerListeners.notifyEach(&container::XContainerListener::elementReplaced,
aEvent);
}
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx
b/reportdesign/source/core/api/ReportDefinition.cxx
index b74ded0d9b32..638b7a87a631 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -289,82 +289,82 @@ OStyle::OStyle()
sal_Int32 i = 0;
registerPropertyNoMember( PROPERTY_NAME, ++i, nBound,
cppu::UnoType<OUString>::get(), css::uno::Any(OUString("Default")) );
- registerPropertyNoMember(PROPERTY_BACKCOLOR,
++i,nBound, cppu::UnoType<sal_Int32>::get(),
css::uno::makeAny(COL_TRANSPARENT));
+ registerPropertyNoMember(PROPERTY_BACKCOLOR,
++i,nBound, cppu::UnoType<sal_Int32>::get(), css::uno::Any(COL_TRANSPARENT));
registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION, ++i,nBound,
cppu::UnoType<style::GraphicLocation>::get(),
css::uno::Any(style::GraphicLocation_NONE));
registerPropertyNoMember(PROPERTY_BACKTRANSPARENT,
++i,nBound,cppu::UnoType<bool>::get(), css::uno::Any(true));
- registerPropertyNoMember(SC_UNO_PAGE_BORDERDIST, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
+ registerPropertyNoMember(SC_UNO_PAGE_BORDERDIST, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
registerPropertyNoMember(SC_UNO_PAGE_BOTTBORDER, ++i,nBound,
cppu::UnoType<table::BorderLine2>::get(), css::uno::Any(table::BorderLine2()));
- registerPropertyNoMember(SC_UNO_PAGE_BOTTBRDDIST, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
+ registerPropertyNoMember(SC_UNO_PAGE_BOTTBRDDIST, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(nMargin));
registerPropertyNoMember("DisplayName", ++i,nBound,
cppu::UnoType<OUString>::get(), css::uno::Any(OUString()));
- registerPropertyNoMember(SC_UNO_PAGE_FTRBACKCOL, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny(COL_TRANSPARENT));
+ registerPropertyNoMember(SC_UNO_PAGE_FTRBACKCOL, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(COL_TRANSPARENT));
registerPropertyNoMember(SC_UNO_PAGE_FTRGRFFILT, ++i,nBound,
cppu::UnoType<OUString>::get(), css::uno::Any(OUString()));
registerPropertyNoMember(SC_UNO_PAGE_FTRGRFLOC, ++i,nBound,
cppu::UnoType<style::GraphicLocation>::get(),
css::uno::Any(style::GraphicLocation_NONE));
registerPropertyNoMember(SC_UNO_PAGE_FTRGRF, ++i,nBound|nMayBeVoid,
cppu::UnoType<graphic::XGraphic>::get(),
css::uno::Any(uno::Reference<graphic::XGraphic>()));
registerPropertyNoMember(SC_UNO_PAGE_FTRBACKTRAN,
++i,nBound,cppu::UnoType<bool>::get(), css::uno::Any(true));
- registerPropertyNoMember(SC_UNO_PAGE_FTRBODYDIST, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
- registerPropertyNoMember(SC_UNO_PAGE_FTRBRDDIST, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
+ registerPropertyNoMember(SC_UNO_PAGE_FTRBODYDIST, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
+ registerPropertyNoMember(SC_UNO_PAGE_FTRBRDDIST, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBOR, ++i,nBound,
cppu::UnoType<table::BorderLine2>::get(), css::uno::Any(table::BorderLine2()));
- registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBDIS, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
- registerPropertyNoMember(SC_UNO_PAGE_FTRHEIGHT, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
+ registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBDIS, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
+ registerPropertyNoMember(SC_UNO_PAGE_FTRHEIGHT, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
registerPropertyNoMember(SC_UNO_PAGE_FTRDYNAMIC,
++i,nBound,cppu::UnoType<bool>::get(), css::uno::Any(false));
registerPropertyNoMember(SC_UNO_PAGE_FTRON,
++i,nBound,cppu::UnoType<bool>::get(), css::uno::Any(false));
registerPropertyNoMember(SC_UNO_PAGE_FTRSHARED,
++i,nBound,cppu::UnoType<bool>::get(), css::uno::Any(false));
registerPropertyNoMember(SC_UNO_PAGE_FIRSTFTRSHARED,
++i,nBound,cppu::UnoType<bool>::get(), css::uno::Any(false));
registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBOR, ++i,nBound,
cppu::UnoType<table::BorderLine2>::get(), css::uno::Any(table::BorderLine2()));
- registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBDIS, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
- registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTMAR, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
+ registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBDIS, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
+ registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTMAR, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBOR, ++i,nBound,
cppu::UnoType<table::BorderLine2>::get(), css::uno::Any(table::BorderLine2()));
- registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBDIS,++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
- registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTMAR, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
+ registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBDIS,++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
+ registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTMAR, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
registerPropertyNoMember(SC_UNO_PAGE_FTRSHADOW, ++i,nBound,
cppu::UnoType<table::ShadowFormat>::get(),
css::uno::Any(table::ShadowFormat()));
registerPropertyNoMember(SC_UNO_PAGE_FTRTOPBOR, ++i,nBound,
cppu::UnoType<table::BorderLine2>::get(), css::uno::Any(table::BorderLine2()));
- registerPropertyNoMember(SC_UNO_PAGE_FTRTOPBDIS, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
+ registerPropertyNoMember(SC_UNO_PAGE_FTRTOPBDIS, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
- registerPropertyNoMember(SC_UNO_PAGE_HDRBACKCOL, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny(COL_TRANSPARENT));
+ registerPropertyNoMember(SC_UNO_PAGE_HDRBACKCOL, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(COL_TRANSPARENT));
registerPropertyNoMember(SC_UNO_PAGE_HDRGRFFILT, ++i,nBound|nMayBeVoid,
cppu::UnoType<OUString>::get(), css::uno::Any(OUString()));
registerPropertyNoMember(SC_UNO_PAGE_HDRGRFLOC, ++i,nBound|nMayBeVoid,
cppu::UnoType<style::GraphicLocation>::get(),
css::uno::Any(style::GraphicLocation_NONE));
registerPropertyNoMember(SC_UNO_PAGE_HDRGRF, ++i,nBound|nMayBeVoid,
cppu::UnoType<graphic::XGraphic>::get(),
css::uno::Any(uno::Reference<graphic::XGraphic>()));
registerPropertyNoMember(SC_UNO_PAGE_HDRBACKTRAN,
++i,nBound|nMayBeVoid,cppu::UnoType<bool>::get(), css::uno::Any(true));
- registerPropertyNoMember(SC_UNO_PAGE_HDRBODYDIST, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
- registerPropertyNoMember(SC_UNO_PAGE_HDRBRDDIST, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
+ registerPropertyNoMember(SC_UNO_PAGE_HDRBODYDIST, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
+ registerPropertyNoMember(SC_UNO_PAGE_HDRBRDDIST, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
registerPropertyNoMember(SC_UNO_PAGE_HDRBOTTBOR, ++i,nBound|nMayBeVoid,
cppu::UnoType<table::BorderLine2>::get(), css::uno::Any(table::BorderLine2()));
- registerPropertyNoMember(SC_UNO_PAGE_HDRBOTTBDIS, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
- registerPropertyNoMember(SC_UNO_PAGE_HDRHEIGHT, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
+ registerPropertyNoMember(SC_UNO_PAGE_HDRBOTTBDIS, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
+ registerPropertyNoMember(SC_UNO_PAGE_HDRHEIGHT, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
registerPropertyNoMember(SC_UNO_PAGE_HDRDYNAMIC,
++i,nBound|nMayBeVoid,cppu::UnoType<bool>::get(), css::uno::Any(false));
registerPropertyNoMember(SC_UNO_PAGE_HDRON,
++i,nBound|nMayBeVoid,cppu::UnoType<bool>::get(), css::uno::Any(false));
registerPropertyNoMember(SC_UNO_PAGE_HDRSHARED,
++i,nBound|nMayBeVoid,cppu::UnoType<bool>::get(), css::uno::Any(false));
registerPropertyNoMember(SC_UNO_PAGE_FIRSTHDRSHARED,
++i,nBound|nMayBeVoid,cppu::UnoType<bool>::get(), css::uno::Any(false));
registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTBOR, ++i,nBound|nMayBeVoid,
cppu::UnoType<table::BorderLine2>::get(), css::uno::Any(table::BorderLine2()));
- registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTBDIS, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
- registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTMAR, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
+ registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTBDIS, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
+ registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTMAR, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTBOR, ++i,nBound|nMayBeVoid,
cppu::UnoType<table::BorderLine2>::get(), css::uno::Any(table::BorderLine2()));
- registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTBDIS,++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
- registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTMAR, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
+ registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTBDIS,++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
+ registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTMAR, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
registerPropertyNoMember(SC_UNO_PAGE_HDRSHADOW, ++i,nBound|nMayBeVoid,
cppu::UnoType<table::ShadowFormat>::get(),
css::uno::Any(table::ShadowFormat()));
registerPropertyNoMember(SC_UNO_PAGE_HDRTOPBOR, ++i,nBound|nMayBeVoid,
cppu::UnoType<table::BorderLine2>::get(), css::uno::Any(table::BorderLine2()));
- registerPropertyNoMember(SC_UNO_PAGE_HDRTOPBDIS, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
+ registerPropertyNoMember(SC_UNO_PAGE_HDRTOPBDIS, ++i,nBound|nMayBeVoid,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
registerProperty(PROPERTY_HEIGHT, ++i,nBound,&m_aSize.Height,
::cppu::UnoType<sal_Int32>::get() );
registerPropertyNoMember(PROPERTY_ISLANDSCAPE,
++i,nBound, cppu::UnoType<bool>::get(), css::uno::Any(false));
registerPropertyNoMember(SC_UNO_PAGE_LEFTBORDER, ++i,nBound,
cppu::UnoType<table::BorderLine2>::get(), css::uno::Any(table::BorderLine2()));
- registerPropertyNoMember(SC_UNO_PAGE_LEFTBRDDIST, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
+ registerPropertyNoMember(SC_UNO_PAGE_LEFTBRDDIST, ++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
registerPropertyNoMember(PROPERTY_LEFTMARGIN,
++i,beans::PropertyAttribute::BOUND, ::cppu::UnoType<sal_Int32>::get(),
css::uno::Any(nMargin));
registerPropertyNoMember(PROPERTY_NUMBERINGTYPE,
++i,nBound, cppu::UnoType<sal_Int16>::get(),
css::uno::Any(style::NumberingType::ARABIC));
- registerPropertyNoMember(SC_UNO_PAGE_SCALEVAL, ++i,nBound,
cppu::UnoType<sal_Int16>::get(), css::uno::makeAny<sal_Int16>(0));
+ registerPropertyNoMember(SC_UNO_PAGE_SCALEVAL, ++i,nBound,
cppu::UnoType<sal_Int16>::get(), css::uno::Any(sal_Int16(0)));
registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT,
++i,nBound, cppu::UnoType<style::PageStyleLayout>::get(),
css::uno::Any(style::PageStyleLayout_ALL));
registerPropertyNoMember(SC_UNO_PAGE_PAPERTRAY, ++i,nBound,
cppu::UnoType<OUString>::get(), css::uno::Any(OUString("[From printer
settings]")));
registerPropertyNoMember(SC_UNO_PAGE_RIGHTBORDER, ++i,nBound,
cppu::UnoType<table::BorderLine2>::get(), css::uno::Any(table::BorderLine2()));
- registerPropertyNoMember(SC_UNO_PAGE_RIGHTBRDDIST,++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
+ registerPropertyNoMember(SC_UNO_PAGE_RIGHTBRDDIST,++i,nBound,
cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
registerPropertyNoMember(PROPERTY_RIGHTMARGIN,
++i,beans::PropertyAttribute::BOUND,::cppu::UnoType<sal_Int32>::get(),
css::uno::Any(nMargin));
- registerPropertyNoMember(SC_UNO_PAGE_SCALETOPAG, ++i,nBound,
cppu::UnoType<sal_Int16>::get(), css::uno::makeAny<sal_Int16>(0));
- registerPropertyNoMember(SC_UNO_PAGE_SCALETOX, ++i,nBound,
cppu::UnoType<sal_Int16>::get(), css::uno::makeAny<sal_Int16>(0));
- registerPropertyNoMember(SC_UNO_PAGE_SCALETOY, ++i,nBound,
cppu::UnoType<sal_Int16>::get(), css::uno::makeAny<sal_Int16>(0));
+ registerPropertyNoMember(SC_UNO_PAGE_SCALETOPAG, ++i,nBound,
cppu::UnoType<sal_Int16>::get(), css::uno::Any(sal_Int16(0)));
+ registerPropertyNoMember(SC_UNO_PAGE_SCALETOX, ++i,nBound,
cppu::UnoType<sal_Int16>::get(), css::uno::Any(sal_Int16(0)));
+ registerPropertyNoMember(SC_UNO_PAGE_SCALETOY, ++i,nBound,
cppu::UnoType<sal_Int16>::get(), css::uno::Any(sal_Int16(0)));
registerPropertyNoMember(SC_UNO_PAGE_SHADOWFORM, ++i,nBound,
cppu::UnoType<table::ShadowFormat>::get(),
css::uno::Any(table::ShadowFormat()));
registerProperty(PROPERTY_PAPERSIZE,
++i,beans::PropertyAttribute::BOUND,&m_aSize, cppu::UnoType<awt::Size>::get() );
registerPropertyNoMember(SC_UNO_PAGE_TOPBORDER, ++i,nBound,
cppu::UnoType<table::BorderLine2>::get(), css::uno::Any(table::BorderLine2()));
- registerPropertyNoMember(SC_UNO_PAGE_TOPBRDDIST,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0));
+ registerPropertyNoMember(SC_UNO_PAGE_TOPBRDDIST,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)));
registerPropertyNoMember(PROPERTY_TOPMARGIN,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), css::uno::Any(nMargin));
registerPropertyNoMember("UserDefinedAttributes", ++i,nBound,
cppu::UnoType<container::XNameContainer>::get(),
css::uno::Any(comphelper::NameContainer_createInstance(cppu::UnoType<xml::AttributeData>::get())));
registerProperty(PROPERTY_WIDTH, ++i,nBound,&m_aSize.Width,
cppu::UnoType<sal_Int32>::get() );
@@ -427,7 +427,7 @@ OUString SAL_CALL OStyle::getName( )
void SAL_CALL OStyle::setName( const OUString& aName )
{
- setPropertyValue(PROPERTY_NAME,uno::makeAny(aName));
+ setPropertyValue(PROPERTY_NAME,uno::Any(aName));
}
void SAL_CALL OStyle::setAllPropertiesToDefault( )
@@ -605,7 +605,7 @@ void OReportDefinition::init()
OUString sMediaType;
xStorProps->getPropertyValue("MediaType") >>= sMediaType;
if ( sMediaType.isEmpty() )
-
xStorProps->setPropertyValue("MediaType",uno::makeAny<OUString>(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII));
+
xStorProps->setPropertyValue("MediaType",uno::Any(OUString(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII)));
}
m_pImpl->m_pObjectContainer =
std::make_shared<comphelper::EmbeddedObjectContainer>(m_pImpl->m_xStorage ,
static_cast<cppu::OWeakObject*>(this) );
}
@@ -1031,7 +1031,7 @@ void OReportDefinition::setSection( const OUString&
_sProperty
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, uno::makeAny(_member), uno::makeAny(_bOn), &l);
+ prepareSet(_sProperty, uno::Any(_member), uno::Any(_bOn), &l);
// create section if needed
if ( _bOn && !_member.is() )
@@ -1232,7 +1232,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw(
const uno::Reference<
utl::MediaDescriptor aDescriptor( _aMediaDescriptor );
fillArgs(aDescriptor);
-
aDescriptor.createItemIfMissing("Storage",uno::makeAny(_xStorageToLoadFrom));
+ aDescriptor.createItemIfMissing("Storage",uno::Any(_xStorageToLoadFrom));
uno::Sequence< uno::Any >
aDelegatorArguments(_aMediaDescriptor.getLength());
uno::Any* pIter = aDelegatorArguments.getArray();
@@ -1303,7 +1303,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const
uno::Reference< embed::XS
OUString sOldMediaType;
xProp->getPropertyValue(sPropName) >>= sOldMediaType;
if ( !xProp->getPropertyValue(sPropName).hasValue() ||
sOldMediaType.isEmpty() || MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII !=
sOldMediaType )
- xProp->setPropertyValue( sPropName,
uno::makeAny<OUString>(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII) );
+ xProp->setPropertyValue( sPropName,
uno::Any(OUString(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII)) );
}
/** property map for export info set */
@@ -1317,14 +1317,14 @@ void SAL_CALL OReportDefinition::storeToStorage( const
uno::Reference< embed::XS
};
uno::Reference< beans::XPropertySet > xInfoSet(
comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo(
aExportInfoMap ) ) );
- xInfoSet->setPropertyValue("UsePrettyPrinting",
uno::makeAny(officecfg::Office::Common::Save::Document::PrettyPrinting::get()));
+ xInfoSet->setPropertyValue("UsePrettyPrinting",
uno::Any(officecfg::Office::Common::Save::Document::PrettyPrinting::get()));
if ( officecfg::Office::Common::Save::URL::FileSystem::get() )
{
const OUString sVal(
aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTBASEURL,
OUString()) );
- xInfoSet->setPropertyValue("BaseURI", uno::makeAny(sVal));
+ xInfoSet->setPropertyValue("BaseURI", uno::Any(sVal));
}
const OUString sHierarchicalDocumentName(
aDescriptor.getUnpackedValueOrDefault("HierarchicalDocumentName",OUString()) );
- xInfoSet->setPropertyValue("StreamRelPath",
uno::makeAny(sHierarchicalDocumentName));
+ xInfoSet->setPropertyValue("StreamRelPath",
uno::Any(sHierarchicalDocumentName));
sal_Int32 nArgsLen = aDelegatorArguments.getLength();
@@ -1345,19 +1345,19 @@ void SAL_CALL OReportDefinition::storeToStorage( const
uno::Reference< embed::XS
uno::Reference<XComponent>
xCom(static_cast<OWeakObject*>(this),uno::UNO_QUERY);
// Try to write to settings.xml, meta.xml, and styles.xml; only really
care about success of
// write to content.xml (keeping logic of commit
94ccba3eebc83b58e74e18f0e028c6a995ce6aa6)
- xInfoSet->setPropertyValue("StreamName",
uno::makeAny(OUString("settings.xml")));
+ xInfoSet->setPropertyValue("StreamName",
uno::Any(OUString("settings.xml")));
WriteThroughComponent(xCom, "settings.xml",
"com.sun.star.comp.report.XMLSettingsExporter",
aDelegatorArguments, aProps, _xStorageToSaveTo);
- xInfoSet->setPropertyValue("StreamName",
uno::makeAny(OUString("meta.xml")));
+ xInfoSet->setPropertyValue("StreamName", uno::Any(OUString("meta.xml")));
WriteThroughComponent(xCom, "meta.xml",
"com.sun.star.comp.report.XMLMetaExporter",
aDelegatorArguments, aProps, _xStorageToSaveTo);
- xInfoSet->setPropertyValue("StreamName",
uno::makeAny(OUString("styles.xml")));
+ xInfoSet->setPropertyValue("StreamName", uno::Any(OUString("styles.xml")));
WriteThroughComponent(xCom, "styles.xml",
"com.sun.star.comp.report.XMLStylesExporter",
aDelegatorArguments, aProps, _xStorageToSaveTo);
- xInfoSet->setPropertyValue("StreamName",
uno::makeAny(OUString("content.xml")));
+ xInfoSet->setPropertyValue("StreamName",
uno::Any(OUString("content.xml")));
bool bOk = WriteThroughComponent(xCom, "content.xml",
"com.sun.star.comp.report.ExportFilter",
aDelegatorArguments, aProps,
_xStorageToSaveTo);
@@ -1480,7 +1480,7 @@ bool OReportDefinition::WriteThroughComponent(
// encrypt all streams
xStreamProp->setPropertyValue( "UseCommonStoragePasswordEncryption",
- uno::makeAny( true ) );
+ uno::Any( true ) );
// set buffer and create outputstream
@@ -2362,19 +2362,19 @@ uno::Reference< container::XNameAccess > SAL_CALL
OReportDefinition::getStyleFam
uno::Reference< container::XNameContainer>
xStyles(m_pImpl->m_xStyles,uno::UNO_QUERY);
uno::Reference< container::XNameContainer> xPageStyles = new
OStylesHelper(cppu::UnoType<style::XStyle>::get());
- xStyles->insertByName("PageStyles",uno::makeAny(xPageStyles));
+ xStyles->insertByName("PageStyles",uno::Any(xPageStyles));
uno::Reference< style::XStyle>
xPageStyle(createInstance("com.sun.star.style.PageStyle"),uno::UNO_QUERY);
-
xPageStyles->insertByName(xPageStyle->getName(),uno::makeAny(xPageStyle));
+ xPageStyles->insertByName(xPageStyle->getName(),uno::Any(xPageStyle));
uno::Reference< container::XNameContainer> xFrameStyles = new
OStylesHelper(cppu::UnoType<style::XStyle>::get());
- xStyles->insertByName("FrameStyles",uno::makeAny(xFrameStyles));
+ xStyles->insertByName("FrameStyles",uno::Any(xFrameStyles));
uno::Reference< style::XStyle>
xFrameStyle(createInstance("com.sun.star.style.FrameStyle"),uno::UNO_QUERY);
-
xFrameStyles->insertByName(xFrameStyle->getName(),uno::makeAny(xFrameStyle));
+
xFrameStyles->insertByName(xFrameStyle->getName(),uno::Any(xFrameStyle));
uno::Reference< container::XNameContainer> xGraphicStyles = new
OStylesHelper(cppu::UnoType<style::XStyle>::get());
- xStyles->insertByName("graphics",uno::makeAny(xGraphicStyles));
+ xStyles->insertByName("graphics",uno::Any(xGraphicStyles));
uno::Reference< style::XStyle>
xGraphicStyle(createInstance("com.sun.star.style.GraphicStyle"),uno::UNO_QUERY);
-
xGraphicStyles->insertByName(xGraphicStyle->getName(),uno::makeAny(xGraphicStyle));
+
xGraphicStyles->insertByName(xGraphicStyle->getName(),uno::Any(xGraphicStyle));
}
return m_pImpl->m_xStyles;
}
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx
b/reportdesign/source/core/api/ReportEngineJFree.cxx
index 182294c7be4a..30a51d7b9a25 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -123,7 +123,7 @@ void SAL_CALL OReportEngineJFree::setReportDefinition(
const uno::Reference< rep
::osl::MutexGuard aGuard(m_aMutex);
if ( m_xReport != _report )
{
- prepareSet(PROPERTY_REPORTDEFINITION, uno::makeAny(m_xReport),
uno::makeAny(_report), &l);
+ prepareSet(PROPERTY_REPORTDEFINITION, uno::Any(m_xReport),
uno::Any(_report), &l);
m_xReport = _report;
}
}
@@ -163,7 +163,7 @@ OUString OReportEngineJFree::getNewOutputName()
uno::Reference< beans::XPropertySet> xStorageProp(xTemp,uno::UNO_QUERY);
if ( xStorageProp.is() )
{
- xStorageProp->setPropertyValue( s_sMediaType, uno::makeAny(sMimeType));
+ xStorageProp->setPropertyValue( s_sMediaType, uno::Any(sMimeType));
}
m_xReport->storeToStorage(xTemp,aEmpty); // store to temp file because it
may contain information which isn't in the database yet.
@@ -188,7 +188,7 @@ OUString OReportEngineJFree::getNewOutputName()
xStorageProp.set(xOut,uno::UNO_QUERY);
if ( xStorageProp.is() )
{
- xStorageProp->setPropertyValue( s_sMediaType, uno::makeAny(sMimeType));
+ xStorageProp->setPropertyValue( s_sMediaType, uno::Any(sMimeType));
}
// some meta data
diff --git a/reportdesign/source/core/api/Section.cxx
b/reportdesign/source/core/api/Section.cxx
index d0e40aff411b..e7a8e7561b64 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -580,7 +580,7 @@ void OSection::notifyElementAdded(const uno::Reference<
drawing::XShape >& xShap
{
if ( !m_bInInsertNotify )
{
- container::ContainerEvent
aEvent(static_cast<container::XContainer*>(this), uno::Any(),
uno::makeAny(xShape), uno::Any());
+ container::ContainerEvent
aEvent(static_cast<container::XContainer*>(this), uno::Any(), uno::Any(xShape),
uno::Any());
m_aContainerListeners.notifyEach(&container::XContainerListener::elementInserted,aEvent);
}
}
@@ -590,7 +590,7 @@ void OSection::notifyElementRemoved(const uno::Reference<
drawing::XShape >& xSh
if ( !m_bInRemoveNotify )
{
// notify our container listeners
- container::ContainerEvent
aEvent(static_cast<container::XContainer*>(this), uno::Any(),
uno::makeAny(xShape), uno::Any());
+ container::ContainerEvent
aEvent(static_cast<container::XContainer*>(this), uno::Any(), uno::Any(xShape),
uno::Any());
m_aContainerListeners.notifyEach(&container::XContainerListener::elementRemoved,aEvent);
}
}
diff --git a/reportdesign/source/core/api/Shape.cxx
b/reportdesign/source/core/api/Shape.cxx
index cdeb8f221436..413f02e1b765 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -418,7 +418,7 @@ OUString SAL_CALL OShape::getShapeType( )
void SAL_CALL OShape::setZOrder( ::sal_Int32 _zorder )
{
::osl::MutexGuard aGuard(m_aMutex);
-
m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_ZORDER,uno::makeAny(_zorder));
+
m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_ZORDER,uno::Any(_zorder));
set(PROPERTY_ZORDER,_zorder,m_nZOrder);
}
@@ -443,7 +443,7 @@ drawing::HomogenMatrix3 SAL_CALL OShape::getTransformation()
void SAL_CALL OShape::setTransformation( const drawing::HomogenMatrix3&
_transformation )
{
-
m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_TRANSFORMATION,uno::makeAny(_transformation));
+
m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_TRANSFORMATION,uno::Any(_transformation));
set(PROPERTY_TRANSFORMATION,_transformation,m_Transformation);
}
@@ -457,7 +457,7 @@ OUString SAL_CALL OShape::getCustomShapeEngine()
void SAL_CALL OShape::setCustomShapeEngine( const OUString& _customshapeengine
)
{
-
m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEENGINE,uno::makeAny(_customshapeengine));
+
m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEENGINE,uno::Any(_customshapeengine));
set(PROPERTY_CUSTOMSHAPEENGINE,_customshapeengine,m_CustomShapeEngine);
}
@@ -470,7 +470,7 @@ OUString SAL_CALL OShape::getCustomShapeData()
void SAL_CALL OShape::setCustomShapeData( const OUString& _customshapedata )
{
-
m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEDATA,uno::makeAny(_customshapedata));
+
m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEDATA,uno::Any(_customshapedata));
set(PROPERTY_CUSTOMSHAPEDATA,_customshapedata,m_CustomShapeData);
}
@@ -483,7 +483,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL
OShape::getCustomShapeGeometry()
void SAL_CALL OShape::setCustomShapeGeometry( const uno::Sequence<
beans::PropertyValue >& _customshapegeometry )
{
-
m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEGEOMETRY,uno::makeAny(_customshapegeometry));
+
m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEGEOMETRY,uno::Any(_customshapegeometry));
set(PROPERTY_CUSTOMSHAPEGEOMETRY,_customshapegeometry,m_CustomShapeGeometry);
}
diff --git a/reportdesign/source/core/inc/FixedLine.hxx
b/reportdesign/source/core/inc/FixedLine.hxx
index 4b1c44d71722..7014ef1538f1 100644
--- a/reportdesign/source/core/inc/FixedLine.hxx
+++ b/reportdesign/source/core/inc/FixedLine.hxx
@@ -63,7 +63,7 @@ namespace reportdesign
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
l.notify();
diff --git a/reportdesign/source/core/inc/FixedText.hxx
b/reportdesign/source/core/inc/FixedText.hxx
index 815bc56390b1..6cc63bfeb6cf 100644
--- a/reportdesign/source/core/inc/FixedText.hxx
+++ b/reportdesign/source/core/inc/FixedText.hxx
@@ -61,7 +61,7 @@ namespace reportdesign
::osl::MutexGuard aGuard(m_aMutex);
if ( static_cast<sal_Int16>(_member) != Value )
{
- prepareSet(_sProperty,
css::uno::makeAny(static_cast<sal_Int16>(_member)), css::uno::makeAny(Value),
&l);
+ prepareSet(_sProperty,
css::uno::Any(static_cast<sal_Int16>(_member)), css::uno::Any(Value), &l);
_member = static_cast<css::style::ParagraphAdjust>(Value);
}
}
@@ -76,7 +76,7 @@ namespace reportdesign
::osl::MutexGuard aGuard(m_aMutex);
if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
}
@@ -91,7 +91,7 @@ namespace reportdesign
::osl::MutexGuard aGuard(m_aMutex);
if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
}
diff --git a/reportdesign/source/core/inc/FormatCondition.hxx
b/reportdesign/source/core/inc/FormatCondition.hxx
index dcff84d48b20..07b2db006e22 100644
--- a/reportdesign/source/core/inc/FormatCondition.hxx
+++ b/reportdesign/source/core/inc/FormatCondition.hxx
@@ -59,7 +59,7 @@ namespace reportdesign
::osl::MutexGuard aGuard(m_aMutex);
if ( static_cast<sal_Int16>(_member) != Value )
{
- prepareSet(_sProperty,
css::uno::makeAny(static_cast<sal_Int16>(_member)), css::uno::makeAny(Value),
&l);
+ prepareSet(_sProperty,
css::uno::Any(static_cast<sal_Int16>(_member)), css::uno::Any(Value), &l);
_member = static_cast<css::style::ParagraphAdjust>(Value);
}
}
@@ -74,7 +74,7 @@ namespace reportdesign
::osl::MutexGuard aGuard(m_aMutex);
if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
}
@@ -89,7 +89,7 @@ namespace reportdesign
::osl::MutexGuard aGuard(m_aMutex);
if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
}
diff --git a/reportdesign/source/core/inc/FormattedField.hxx
b/reportdesign/source/core/inc/FormattedField.hxx
index 9a6378dca6e6..e777f7b5e0c0 100644
--- a/reportdesign/source/core/inc/FormattedField.hxx
+++ b/reportdesign/source/core/inc/FormattedField.hxx
@@ -64,7 +64,7 @@ namespace reportdesign
::osl::MutexGuard aGuard(m_aMutex);
if ( static_cast<sal_Int16>(_member) != Value )
{
- prepareSet(_sProperty,
css::uno::makeAny(static_cast<sal_Int16>(_member)), css::uno::makeAny(Value),
&l);
+ prepareSet(_sProperty,
css::uno::Any(static_cast<sal_Int16>(_member)), css::uno::Any(Value), &l);
_member = static_cast<css::style::ParagraphAdjust>(Value);
}
}
@@ -79,7 +79,7 @@ namespace reportdesign
::osl::MutexGuard aGuard(m_aMutex);
if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
}
@@ -94,7 +94,7 @@ namespace reportdesign
::osl::MutexGuard aGuard(m_aMutex);
if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
}
diff --git a/reportdesign/source/core/inc/Function.hxx
b/reportdesign/source/core/inc/Function.hxx
index bf067c8068be..891b5427d0ef 100644
--- a/reportdesign/source/core/inc/Function.hxx
+++ b/reportdesign/source/core/inc/Function.hxx
@@ -58,7 +58,7 @@ namespace reportdesign
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
l.notify();
@@ -70,7 +70,7 @@ namespace reportdesign
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
l.notify();
diff --git a/reportdesign/source/core/inc/Group.hxx
b/reportdesign/source/core/inc/Group.hxx
index 80f54a9270eb..a30debf41d49 100644
--- a/reportdesign/source/core/inc/Group.hxx
+++ b/reportdesign/source/core/inc/Group.hxx
@@ -62,7 +62,7 @@ namespace reportdesign
::osl::MutexGuard aGuard(m_aMutex);
if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
}
@@ -77,7 +77,7 @@ namespace reportdesign
::osl::MutexGuard aGuard(m_aMutex);
if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
}
diff --git a/reportdesign/source/core/inc/ImageControl.hxx
b/reportdesign/source/core/inc/ImageControl.hxx
index 63ed5468efc6..748659913321 100644
--- a/reportdesign/source/core/inc/ImageControl.hxx
+++ b/reportdesign/source/core/inc/ImageControl.hxx
@@ -58,7 +58,7 @@ namespace reportdesign
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
l.notify();
@@ -70,7 +70,7 @@ namespace reportdesign
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
l.notify();
diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx
b/reportdesign/source/core/inc/ReportEngineJFree.hxx
index 951dc93ce168..e0ab1d60b34b 100644
--- a/reportdesign/source/core/inc/ReportEngineJFree.hxx
+++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx
@@ -54,7 +54,7 @@ namespace reportdesign
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
l.notify();
diff --git a/reportdesign/source/core/inc/ReportHelperImpl.hxx
b/reportdesign/source/core/inc/ReportHelperImpl.hxx
index b6352de35715..4d5a1f41e6a0 100644
--- a/reportdesign/source/core/inc/ReportHelperImpl.hxx
+++ b/reportdesign/source/core/inc/ReportHelperImpl.hxx
@@ -478,7 +478,7 @@ void SAL_CALL clazz::setCharLocale(const lang::Locale &
the_value) \
|| varName.aCharLocale.Country != the_value.Country \
|| varName.aCharLocale.Variant != the_value.Variant ) \
{ \
- prepareSet(PROPERTY_CHARLOCALE,
css::uno::makeAny(varName.aCharLocale), css::uno::makeAny(the_value), &l); \
+ prepareSet(PROPERTY_CHARLOCALE,
css::uno::Any(varName.aCharLocale), css::uno::Any(the_value), &l); \
varName.aCharLocale = the_value; \
} \
} \
@@ -696,7 +696,7 @@ void SAL_CALL clazz::setCharLocaleAsian( const
css::lang::Locale& the_value )\
|| varName.aCharLocaleAsian.Country != the_value.Country \
|| varName.aCharLocaleAsian.Variant != the_value.Variant ) \
{ \
- prepareSet(PROPERTY_CHARLOCALEASIAN,
css::uno::makeAny(varName.aCharLocaleAsian), css::uno::makeAny(the_value), &l);
\
+ prepareSet(PROPERTY_CHARLOCALEASIAN,
css::uno::Any(varName.aCharLocaleAsian), css::uno::Any(the_value), &l); \
varName.aCharLocaleAsian = the_value; \
} \
} \
@@ -788,7 +788,7 @@ void SAL_CALL clazz::setCharLocaleComplex( const
css::lang::Locale& the_value )\
|| varName.aCharLocaleComplex.Country != the_value.Country \
|| varName.aCharLocaleComplex.Variant != the_value.Variant ) \
{ \
- prepareSet(PROPERTY_CHARLOCALECOMPLEX,
css::uno::makeAny(varName.aCharLocaleComplex), css::uno::makeAny(the_value),
&l); \
+ prepareSet(PROPERTY_CHARLOCALECOMPLEX,
css::uno::Any(varName.aCharLocaleComplex), css::uno::Any(the_value), &l); \
varName.aCharLocaleComplex = the_value; \
} \
} \
diff --git a/reportdesign/source/core/inc/Section.hxx
b/reportdesign/source/core/inc/Section.hxx
index 7afbf9e91d0f..5417af2a9a1e 100644
--- a/reportdesign/source/core/inc/Section.hxx
+++ b/reportdesign/source/core/inc/Section.hxx
@@ -84,7 +84,7 @@ namespace reportdesign
::osl::MutexGuard aGuard(m_aMutex);
if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
}
@@ -99,7 +99,7 @@ namespace reportdesign
::osl::MutexGuard aGuard(m_aMutex);
if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
}
diff --git a/reportdesign/source/core/inc/Shape.hxx
b/reportdesign/source/core/inc/Shape.hxx
index b7c9e6d882f9..73f6c63f685f 100644
--- a/reportdesign/source/core/inc/Shape.hxx
+++ b/reportdesign/source/core/inc/Shape.hxx
@@ -69,7 +69,7 @@ namespace reportdesign
::osl::MutexGuard aGuard(m_aMutex);
if ( static_cast<sal_Int16>(_member) != Value )
{
- prepareSet(_sProperty,
css::uno::makeAny(static_cast<sal_Int16>(_member)), css::uno::makeAny(Value),
&l);
+ prepareSet(_sProperty,
css::uno::Any(static_cast<sal_Int16>(_member)), css::uno::Any(Value), &l);
_member = static_cast<css::style::ParagraphAdjust>(Value);
}
}
@@ -84,7 +84,7 @@ namespace reportdesign
::osl::MutexGuard aGuard(m_aMutex);
if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
}
@@ -99,7 +99,7 @@ namespace reportdesign
::osl::MutexGuard aGuard(m_aMutex);
if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
}
diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx
b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index 2689f1b437f9..b89c3dac284b 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -80,7 +80,7 @@ uno::Reference< drawing::XShape >
OReportDrawPage::CreateShape( SdrObject *pObj
{
uno::Reference<beans::XPropertySet>
xControlModel(rUnoObj.GetUnoControlModel(),uno::UNO_QUERY);
if ( xControlModel.is() )
- xControlModel->setPropertyValue(
PROPERTY_MULTILINE,uno::makeAny(true));
+ xControlModel->setPropertyValue(
PROPERTY_MULTILINE,uno::Any(true));
}
else
bChangeOrientation = rUnoObj.GetObjIdentifier() ==
SdrObjKind::ReportDesignHorizontalFixedLine;
diff --git a/reportdesign/source/core/sdr/RptModel.cxx
b/reportdesign/source/core/sdr/RptModel.cxx
index 3ac79aa42beb..e7fa935f8612 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -146,7 +146,7 @@ uno::Reference< uno::XInterface >
OReportModel::createShape(const OUString& aSer
xRet = xProp;
if ( _rShape.is() )
throw uno::Exception("no shape", nullptr);
- xProp->setPropertyValue( PROPERTY_FORMATSSUPPLIER,
uno::makeAny(uno::Reference< util::XNumberFormatsSupplier
>(*m_pReportDefinition,uno::UNO_QUERY)) );
+ xProp->setPropertyValue( PROPERTY_FORMATSSUPPLIER,
uno::Any(uno::Reference< util::XNumberFormatsSupplier
>(*m_pReportDefinition,uno::UNO_QUERY)) );
}
else if ( aServiceSpecifier == SERVICE_FIXEDTEXT)
{
diff --git a/reportdesign/source/core/sdr/RptObject.cxx
b/reportdesign/source/core/sdr/RptObject.cxx
index dd83ccef4ba6..1972e892eb27 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -104,7 +104,7 @@ SdrObject* OObjectBase::createObject(
uno::Reference<beans::XPropertySet>
xControlModel(pUnoObj->GetUnoControlModel(),uno::UNO_QUERY);
if ( xControlModel.is() )
- xControlModel->setPropertyValue(
PROPERTY_MULTILINE,uno::makeAny(true));
+ xControlModel->setPropertyValue(
PROPERTY_MULTILINE,uno::Any(true));
}
break;
case SdrObjKind::ReportDesignImageControl:
@@ -630,7 +630,7 @@ void OUnoObject::impl_initializeModel_nothrow()
if ( xFormatted.is() )
{
const Reference< XPropertySet > xModelProps( GetUnoControlModel(),
UNO_QUERY_THROW );
- xModelProps->setPropertyValue( "TreatAsNumber", makeAny( false ) );
+ xModelProps->setPropertyValue( "TreatAsNumber", Any( false ) );
xModelProps->setPropertyValue(
PROPERTY_VERTICALALIGN,m_xReportComponent->getPropertyValue(PROPERTY_VERTICALALIGN));
}
}
@@ -856,7 +856,7 @@ void OUnoObject::CreateMediator(bool _bReverse)
{
m_xReportComponent->setPropertyValue(
PROPERTY_LABEL,
- uno::makeAny(GetDefaultName(this)));
+ uno::Any(GetDefaultName(this)));
}
}
catch(const uno::Exception&)
@@ -1156,7 +1156,7 @@ void OOle2Obj::initializeOle()
uno::Reference< beans::XPropertySet > xChartProps(
xCompSupp->getComponent(), uno::UNO_QUERY );
if ( xChartProps.is() )
xChartProps->setPropertyValue("NullDate",
- uno::makeAny(util::DateTime(0,0,0,0,30,12,1899,false)));
+ uno::Any(util::DateTime(0,0,0,0,30,12,1899,false)));
}
}
@@ -1183,10 +1183,10 @@ void OOle2Obj::initializeChart( const uno::Reference<
frame::XModel>& _xModel)
rRptModel.GetUndoEnv().AddElement(lcl_getDataProvider(xObj));
::comphelper::NamedValueCollection aArgs;
- aArgs.put( "CellRangeRepresentation", uno::makeAny( OUString( "all" ) ) );
- aArgs.put( "HasCategories", uno::makeAny( true ) );
- aArgs.put( "FirstCellAsLabel", uno::makeAny( true ) );
- aArgs.put( "DataRowSource", uno::makeAny(
chart::ChartDataRowSource_COLUMNS ) );
+ aArgs.put( "CellRangeRepresentation", uno::Any( OUString( "all" ) ) );
+ aArgs.put( "HasCategories", uno::Any( true ) );
+ aArgs.put( "FirstCellAsLabel", uno::Any( true ) );
+ aArgs.put( "DataRowSource", uno::Any( chart::ChartDataRowSource_COLUMNS )
);
xReceiver->setArguments( aArgs.getPropertyValues() );
if( xChartModel.is() )
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx
b/reportdesign/source/core/sdr/UndoActions.cxx
index 5086bc1f92c1..78d59e5410f8 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -140,7 +140,7 @@ void OUndoContainerAction::implReInsert( )
if ( m_xContainer.is() )
{
// insert the element
- m_xContainer->insertByIndex(
m_xContainer->getCount(),uno::makeAny(m_xElement) );
+ m_xContainer->insertByIndex(
m_xContainer->getCount(),uno::Any(m_xElement) );
}
// we don't own the object anymore
m_xOwnElement = nullptr;
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx
b/reportdesign/source/core/sdr/UndoEnv.cxx
index 45aa4119255d..2585d4a20cb9 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -263,7 +263,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const
PropertyChangeEvent& _rEv
m_pImpl->m_xIntrospection = theIntrospection::get(
m_pImpl->m_rModel.getController()->getORB() );
}
Reference< XIntrospectionAccess > xIntrospection(
- m_pImpl->m_xIntrospection->inspect( makeAny(
_rEvent.Source ) ),
+ m_pImpl->m_xIntrospection->inspect( Any(
_rEvent.Source ) ),
UNO_SET_THROW
);
rObjectInfo.xPropertyIntrospection.set(
xIntrospection->queryAdapter( cppu::UnoType<XPropertySet>::get() ),
UNO_QUERY_THROW );
diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
index 0521fb895702..369d1f564b03 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
@@ -45,7 +45,7 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport
switch( aIter.getToken() )
{
case XML_ELEMENT(REPORT, XML_FORMULA):
-
m_xComponent->setPropertyValue(PROPERTY_CONDITIONALPRINTEXPRESSION,uno::makeAny(ORptFilter::convertFormula(aIter.toString())));
+
m_xComponent->setPropertyValue(PROPERTY_CONDITIONALPRINTEXPRESSION,uno::Any(ORptFilter::convertFormula(aIter.toString())));
break;
default:
XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
@@ -74,7 +74,7 @@ void OXMLCondPrtExpr::characters( const OUString& rChars )
void OXMLCondPrtExpr::endFastElement( sal_Int32 )
{
if (m_aCharBuffer.getLength())
-
m_xComponent->setPropertyValue(PROPERTY_CONDITIONALPRINTEXPRESSION,makeAny(m_aCharBuffer.makeStringAndClear()));
+
m_xComponent->setPropertyValue(PROPERTY_CONDITIONALPRINTEXPRESSION,Any(m_aCharBuffer.makeStringAndClear()));
}
} // namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx
b/reportdesign/source/filter/xml/xmlExport.cxx
index 222bb423e79e..a2216564cf55 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -1165,7 +1165,7 @@ void ORptExport::exportAutoStyle(XPropertySet*
_xProp,const Reference<XFormatted
aProps.emplace_back(PROPERTY_BORDERLEFT);
}
- xBorderProp->setPropertyValue(sBorderProp,uno::makeAny(aValue));
+ xBorderProp->setPropertyValue(sBorderProp,uno::Any(aValue));
aValue.Color = aValue.OuterLineWidth = aValue.LineWidth = 0;
aValue.LineStyle = table::BorderLineStyle::NONE;
@@ -1192,7 +1192,7 @@ void ORptExport::exportAutoStyle(XPropertySet*
_xProp,const Reference<XFormatted
{
sal_Int32 nStyleMapIndex =
m_xCellStylesExportPropertySetMapper->getPropertySetMapper()->FindEntryIndex(
CTF_RPT_NUMBERFORMAT );
addDataStyle(nNumberFormat);
- XMLPropertyState aNumberStyleState( nStyleMapIndex,
uno::makeAny( getDataStyleName(nNumberFormat) ) );
+ XMLPropertyState aNumberStyleState( nStyleMapIndex, uno::Any(
getDataStyleName(nNumberFormat) ) );
auto const iter(::std::find_if(
aPropertyStates.begin(), aPropertyStates.end(),
[nStyleMapIndex] (XMLPropertyState const& rItem)
diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx
b/reportdesign/source/filter/xml/xmlFunction.cxx
index 1e052bcb4bff..31df344be9c2 100644
--- a/reportdesign/source/filter/xml/xmlFunction.cxx
+++ b/reportdesign/source/filter/xml/xmlFunction.cxx
@@ -99,7 +99,7 @@ void OXMLFunction::endFastElement(sal_Int32 )
{
try
{
-
m_xFunctions->insertByIndex(m_xFunctions->getCount(),uno::makeAny(m_xFunction));
+
m_xFunctions->insertByIndex(m_xFunctions->getCount(),uno::Any(m_xFunction));
m_xFunction.clear();
}catch(uno::Exception&)
{
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx
b/reportdesign/source/filter/xml/xmlGroup.cxx
index a0f2e6bf7bd4..edb50cff04dd 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -231,7 +231,7 @@ void OXMLGroup::endFastElement(sal_Int32 )
try
{
// the group elements end in the reverse order
- m_xGroups->insertByIndex(0,uno::makeAny(m_xGroup));
+ m_xGroups->insertByIndex(0,uno::Any(m_xGroup));
}catch(uno::Exception&)
{
TOOLS_WARN_EXCEPTION( "reportdesign", "");
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx
b/reportdesign/source/filter/xml/xmlHelper.cxx
index a7e0c2ca45db..0f439d7dcb08 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -277,7 +277,7 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const
OUString& _sStyleName,
{
pAutoStyle->FillPropertySet(_xProp);
if ( _bOld &&
_xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_CHARHIDDEN) )
- _xProp->setPropertyValue(PROPERTY_CHARHIDDEN,uno::makeAny(false));
+ _xProp->setPropertyValue(PROPERTY_CHARHIDDEN,uno::Any(false));
uno::Reference<beans::XPropertySet> xProp =
comphelper::GenericPropertySet_CreateInstance(new
comphelper::PropertySetInfo(pMap));
pAutoStyle->FillPropertySet(xProp);
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index fa0f29037320..edb4dcaaaad2 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -105,8 +105,8 @@ void SAL_CALL ImportDocumentHandler::endDocument()
// this fills the chart again
::comphelper::NamedValueCollection aArgs;
aArgs.put( "CellRangeRepresentation", OUString("all") );
- aArgs.put( "FirstCellAsLabel", uno::makeAny( true ) );
- aArgs.put( "DataRowSource", uno::makeAny(
chart::ChartDataRowSource_COLUMNS ) );
+ aArgs.put( "FirstCellAsLabel", uno::Any( true ) );
+ aArgs.put( "DataRowSource", uno::Any( chart::ChartDataRowSource_COLUMNS )
);
bool bHasCategories = false;
@@ -131,13 +131,13 @@ void SAL_CALL ImportDocumentHandler::endDocument()
}
}
}
- aArgs.put( "HasCategories", uno::makeAny( bHasCategories ) );
+ aArgs.put( "HasCategories", uno::Any( bHasCategories ) );
uno::Reference< chart::XComplexDescriptionAccess >
xDataProvider(m_xModel->getDataProvider(),uno::UNO_QUERY);
if ( xDataProvider.is() )
{
const uno::Sequence< OUString > aColumnNames =
xDataProvider->getColumnDescriptions();
- aArgs.put( "ColumnDescriptions", uno::makeAny( aColumnNames ) );
+ aArgs.put( "ColumnDescriptions", uno::Any( aColumnNames ) );
}
xReceiver->attachDataProvider( m_xDatabaseDataProvider );
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx
b/reportdesign/source/filter/xml/xmlReport.cxx
index 148b56b02e87..29f7315febca 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -188,7 +188,7 @@ void OXMLReport::endFastElement(sal_Int32)
Reference< XFunctions > xFunctions = m_xReportDefinition->getFunctions();
const ORptFilter::TGroupFunctionMap& aFunctions = m_rImport.getFunctions();
for (const auto& rEntry : aFunctions)
-
xFunctions->insertByIndex(xFunctions->getCount(),uno::makeAny(rEntry.second));
+
xFunctions->insertByIndex(xFunctions->getCount(),uno::Any(rEntry.second));
if ( !m_aMasterFields.empty() )
m_xReportDefinition->setMasterFields(Sequence<
OUString>(&*m_aMasterFields.begin(),m_aMasterFields.size()));
diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx
b/reportdesign/source/filter/xml/xmlReportElement.cxx
index 7e4e89221651..89025ae229ad 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.cxx
@@ -93,7 +93,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler >
OXMLReportElement::cre
case XML_ELEMENT(REPORT, XML_FORMAT_CONDITION):
{
uno::Reference< report::XFormatCondition > xNewCond =
m_xComponent->createFormatCondition();
-
m_xComponent->insertByIndex(m_xComponent->getCount(),uno::makeAny(xNewCond));
+
m_xComponent->insertByIndex(m_xComponent->getCount(),uno::Any(xNewCond));
rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
xContext = new OXMLFormatCondition(
rImport,xAttrList,xNewCond);
}
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx
b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 221645ac097d..595bd5506dca 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -106,7 +106,7 @@ void OControlStyleContext::FillPropertySet(const Reference<
XPropertySet > & rPr
if ( pStyle )
{
m_nNumberFormat = pStyle->GetKey();
- AddProperty(CTF_RPT_NUMBERFORMAT,
uno::makeAny(m_nNumberFormat));
+ AddProperty(CTF_RPT_NUMBERFORMAT,
uno::Any(m_nNumberFormat));
}
}
}
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx
b/reportdesign/source/filter/xml/xmlSubDocument.cxx
index ab99212f9697..4a5f9fd5c1ca 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.cxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx
@@ -129,7 +129,7 @@ void OXMLSubDocument::endFastElement(sal_Int32 )
uno::Reference< report::XFormatCondition >
xCond(xFakeModel->getByIndex(i),uno::UNO_QUERY);
uno::Reference< report::XFormatCondition > xNewCond =
xComponentModel->createFormatCondition();
::comphelper::copyProperties(xCond, xNewCond);
-
xComponentModel->insertByIndex(xComponentModel->getCount(),uno::makeAny(xNewCond));
+
xComponentModel->insertByIndex(xComponentModel->getCount(),uno::Any(xNewCond));
}
}
catch(uno::Exception&)
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx
b/reportdesign/source/filter/xml/xmlfilter.cxx
index 49bba943ffa8..371f0647a1ae 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -412,7 +412,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue
>& rDescriptor )
uno::UNO_QUERY);
uno::Reference< lang::XMultiServiceFactory > xReportServiceFactory(
m_xReportDefinition, uno::UNO_QUERY);
- aArgs.getArray()[0] <<= beans::NamedValue("Storage",
uno::makeAny(xStorage));
+ aArgs.getArray()[0] <<= beans::NamedValue("Storage",
uno::Any(xStorage));
xEmbeddedObjectResolver.set(
xReportServiceFactory->createInstanceWithArguments("com.sun.star.document.ImportEmbeddedObjectResolver",aArgs)
, uno::UNO_QUERY);
static constexpr OUStringLiteral s_sOld = u"OldFormat";
@@ -429,14 +429,14 @@ bool ORptFilter::implImport( const Sequence<
PropertyValue >& rDescriptor )
uno::Reference<beans::XPropertySet> xProp =
comphelper::GenericPropertySet_CreateInstance(new
comphelper::PropertySetInfo(pMap));
const OUString sVal(
aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTBASEURL,
OUString()) );
assert(!sVal.isEmpty()); // needed for relative URLs
- xProp->setPropertyValue("BaseURI", uno::makeAny(sVal));
+ xProp->setPropertyValue("BaseURI", uno::Any(sVal));
const OUString sHierarchicalDocumentName(
aDescriptor.getUnpackedValueOrDefault("HierarchicalDocumentName",OUString()) );
- xProp->setPropertyValue("StreamRelPath",
uno::makeAny(sHierarchicalDocumentName));
+ xProp->setPropertyValue("StreamRelPath",
uno::Any(sHierarchicalDocumentName));
uno::Reference<XComponent> xModel = GetModel();
static constexpr OUStringLiteral s_sMeta = u"meta.xml";
static constexpr OUStringLiteral s_sStreamName = u"StreamName";
- xProp->setPropertyValue(s_sStreamName,
uno::makeAny(OUString(s_sMeta)));
+ xProp->setPropertyValue(s_sStreamName, uno::Any(OUString(s_sMeta)));
ErrCode nRet = ReadThroughComponent( xStorage
,xModel
,"meta.xml"
@@ -450,16 +450,16 @@ bool ORptFilter::implImport( const Sequence<
PropertyValue >& rDescriptor )
try
{
-
xProp->setPropertyValue(s_sOld,uno::makeAny(!(xStorage->hasByName(s_sMeta) ||
xStorage->isStreamElement( s_sMeta ))));
+
xProp->setPropertyValue(s_sOld,uno::Any(!(xStorage->hasByName(s_sMeta) ||
xStorage->isStreamElement( s_sMeta ))));
}
catch (const uno::Exception&)
{
- xProp->setPropertyValue(s_sOld,uno::makeAny(true));
+ xProp->setPropertyValue(s_sOld,uno::Any(true));
}
if ( nRet == ERRCODE_NONE )
{
- xProp->setPropertyValue(s_sStreamName,
uno::makeAny(OUString("settings.xml")));
+ xProp->setPropertyValue(s_sStreamName,
uno::Any(OUString("settings.xml")));
nRet = ReadThroughComponent( xStorage
,xModel
,"settings.xml"
@@ -472,7 +472,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue
>& rDescriptor )
}
if ( nRet == ERRCODE_NONE )
{
- xProp->setPropertyValue(s_sStreamName,
uno::makeAny(OUString("styles.xml")));
+ xProp->setPropertyValue(s_sStreamName,
uno::Any(OUString("styles.xml")));
nRet = ReadThroughComponent(xStorage
,xModel
,"styles.xml"
@@ -485,7 +485,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue
>& rDescriptor )
if ( nRet == ERRCODE_NONE )
{
- xProp->setPropertyValue(s_sStreamName,
uno::makeAny(OUString("content.xml")));
+ xProp->setPropertyValue(s_sStreamName,
uno::Any(OUString("content.xml")));
nRet = ReadThroughComponent( xStorage
,xModel
,"content.xml"
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx
b/reportdesign/source/ui/dlg/CondFormat.cxx
index e9677cf3fa35..5c593c3a0502 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -145,7 +145,7 @@ namespace rptui
Reference< XFormatCondition > xCond =
m_xCopy->createFormatCondition();
::comphelper::copyProperties(m_xCopy, xCond);
- m_xCopy->insertByIndex( _nNewCondIndex, makeAny( xCond ) );
+ m_xCopy->insertByIndex( _nNewCondIndex, Any( xCond ) );
auto xCon =
std::make_unique<Condition>(m_xConditionPlayground.get(), m_xDialog.get(),
*this, m_rController);
xCon->setCondition(xCond);
m_xConditionPlayground->reorder_child(xCon->get_widget(),
_nNewCondIndex);
@@ -378,7 +378,7 @@ namespace rptui
if ( bAppend )
{
xNewCond =
m_xFormatConditions->createFormatCondition();
- m_xFormatConditions->insertByIndex( i, makeAny(
xNewCond ) );
+ m_xFormatConditions->insertByIndex( i, Any( xNewCond )
);
}
else
xNewCond.set( m_xFormatConditions->getByIndex(j),
UNO_QUERY );
diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx
b/reportdesign/source/ui/dlg/GroupExchange.cxx
index 44e9fa0a354d..7b749c3f4b4a 100644
--- a/reportdesign/source/ui/dlg/GroupExchange.cxx
+++ b/reportdesign/source/ui/dlg/GroupExchange.cxx
@@ -53,7 +53,7 @@ namespace rptui
SotClipboardFormatId nFormat = SotExchange::GetFormat(rFlavor);
if(nFormat == OGroupExchange::getReportGroupId() )
{
- return SetAny(uno::makeAny(m_aGroupRow));
+ return SetAny(uno::Any(m_aGroupRow));
}
return false;
}
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx
b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 38036939adda..e0599d83a525 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -235,7 +235,7 @@ uno::Sequence<uno::Any>
OFieldExpressionControl::fillSelectedGroups()
uno::Reference< report::XGroup>
xOrgGroup(xGroups->getByIndex(m_aGroupPositions[nIndex]),uno::UNO_QUERY);
/*uno::Reference< report::XGroup> xCopy =
xGroups->createGroup();
::comphelper::copyProperties(xOrgGroup.get(),xCopy.get());*/
- vClipboardList.push_back( uno::makeAny(xOrgGroup) );
+ vClipboardList.push_back( uno::Any(xOrgGroup) );
}
}
catch(uno::Exception&)
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 389074a903c5..9e789db4c5da 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -426,10 +426,10 @@ void SAL_CALL
DataProviderHandler::actuatingPropertyChanged(const OUString & Act
bool bModified = xReport->isModified();
// this fills the chart again
::comphelper::NamedValueCollection aArgs;
- aArgs.put( "CellRangeRepresentation", uno::makeAny( OUString(
"all" ) ) );
- aArgs.put( "HasCategories", uno::makeAny( true ) );
- aArgs.put( "FirstCellAsLabel", uno::makeAny( true ) );
- aArgs.put( "DataRowSource", uno::makeAny(
chart::ChartDataRowSource_COLUMNS ) );
+ aArgs.put( "CellRangeRepresentation", uno::Any( OUString( "all" )
) );
+ aArgs.put( "HasCategories", uno::Any( true ) );
+ aArgs.put( "FirstCellAsLabel", uno::Any( true ) );
+ aArgs.put( "DataRowSource", uno::Any(
chart::ChartDataRowSource_COLUMNS ) );
uno::Reference< chart2::data::XDataReceiver >
xReceiver(m_xChartModel,uno::UNO_QUERY_THROW);
xReceiver->setArguments( aArgs.getPropertyValues() );
if ( !bModified )
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 4dd7ac4df9c7..66852237b270 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -464,7 +464,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const
OUString & PropertyName, c
removeFunction();
m_xFunction.clear();
OBlocker aBlocker(m_bIn);
-
m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::makeAny(OUString()));
+
m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::Any(OUString()));
}
resetOwnProperties(aGuard,sOldFunctionName,sOldScope,m_nDataFieldType);
}
@@ -493,7 +493,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const
OUString & PropertyName, c
else if ( m_nDataFieldType == USER_DEF_FUNCTION )
{
OBlocker aBlocker(m_bIn);
-
m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::makeAny(OUString()));
+
m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::Any(OUString()));
}
}
else if ( m_nDataFieldType == USER_DEF_FUNCTION )
@@ -518,11 +518,11 @@ void SAL_CALL GeometryHandler::setPropertyValue(const
OUString & PropertyName, c
}
const sal_uInt32 nOldDataFieldType = m_nDataFieldType;
m_nDataFieldType = nNewDataType;
-
m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::makeAny(impl_convertToFormula(
uno::makeAny(sFunction))));
+
m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::Any(impl_convertToFormula(
uno::Any(sFunction))));
resetOwnProperties(aGuard,sOldFunctionName,sOldScope,nOldDataFieldType);
}
else
-
m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::makeAny(impl_convertToFormula(
uno::makeAny(sFunction))));
+
m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::Any(impl_convertToFormula(
uno::Any(sFunction))));
}
else if ( m_nDataFieldType == FUNCTION )
{
@@ -905,7 +905,7 @@ uno::Any GeometryHandler::getConstantValue(bool
_bToControlValue,const Translate
uno::Reference< inspection::XStringRepresentation > xConversionHelper =
inspection::StringRepresentation::createConstant(
m_xContext,m_xTypeConverter,_sConstantName,aSeq);
if ( _bToControlValue )
{
- return uno::makeAny( xConversionHelper->convertToControlValue( _aValue
) );
+ return uno::Any( xConversionHelper->convertToControlValue( _aValue ) );
}
else
{
@@ -998,7 +998,7 @@ uno::Any SAL_CALL
GeometryHandler::convertToPropertyValue(const OUString & Prope
case PROPERTY_ID_CONDITIONALPRINTEXPRESSION:
case PROPERTY_ID_INITIALFORMULA:
case PROPERTY_ID_FORMULA:
- return uno::makeAny( impl_convertToFormula( _rControlValue ) );
+ return uno::Any( impl_convertToFormula( _rControlValue ) );
case PROPERTY_ID_DATAFIELD:
{
OUString sDataField;
@@ -1006,7 +1006,7 @@ uno::Any SAL_CALL
GeometryHandler::convertToPropertyValue(const OUString & Prope
if ( isDefaultFunction(sDataField,sDataField) )
{
OSL_ENSURE(m_xFunction.is(),"No function set!");
- aPropertyValue <<= impl_convertToFormula(
uno::makeAny(lcl_getQuotedFunctionName(m_xFunction)) );
+ aPropertyValue <<= impl_convertToFormula(
uno::Any(lcl_getQuotedFunctionName(m_xFunction)) );
}
else
aPropertyValue <<= impl_convertToFormula( _rControlValue );
@@ -1561,7 +1561,7 @@ bool GeometryHandler::impl_dialogFilter_nothrow(
OUString& _out_rSelectedClause,
{
m_xRowSet.set(xFactory->createInstanceWithContext("com.sun.star.sdb.RowSet",m_xContext),uno::UNO_QUERY);
xRowSetProp.set(m_xRowSet,uno::UNO_QUERY);
-
xRowSetProp->setPropertyValue(PROPERTY_ACTIVECONNECTION,uno::makeAny(xCon));
+
xRowSetProp->setPropertyValue(PROPERTY_ACTIVECONNECTION,uno::Any(xCon));
::comphelper::copyProperties(m_xReportComponent,xRowSetProp);
}
@@ -1951,7 +1951,7 @@ void
GeometryHandler::createDefaultFunction(::osl::ResettableMutexGuard& _aGuard
impl_createFunction(sFunctionName,_sDataField,*aIter);
OBlocker aBlocker(m_bIn);
-
m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::makeAny(
impl_convertToFormula( uno::makeAny(sQuotedFunctionName) )));
+ m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::Any(
impl_convertToFormula( uno::Any(sQuotedFunctionName) )));
aEvent.NewValue <<= m_sScope;
_aGuard.clear();
m_aPropertyListeners.notifyEach(
&beans::XPropertyChangeListener::propertyChange, aEvent );
@@ -2114,7 +2114,7 @@ void GeometryHandler::impl_createFunction(const OUString&
_sFunctionName,std::u1
OUString sNamePostfix;
const uno::Reference< report::XFunctionsSupplier> xFunctionsSupplier =
fillScope_throw(sNamePostfix);
const uno::Reference< container::XIndexContainer>
xFunctions(xFunctionsSupplier->getFunctions(),uno::UNO_QUERY_THROW);
-
xFunctions->insertByIndex(xFunctions->getCount(),uno::makeAny(m_xFunction));
+ xFunctions->insertByIndex(xFunctions->getCount(),uno::Any(m_xFunction));
m_aFunctionNames.emplace(sQuotedFunctionName,TFunctionPair(m_xFunction,xFunctionsSupplier));
m_bNewFunction = true;
}
@@ -2130,7 +2130,7 @@ void GeometryHandler::impl_setCounterFunction_throw()
impl_createFunction(sFunctionName,{},m_aCounterFunction);
OBlocker aBlocker(m_bIn);
-
m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::makeAny(impl_convertToFormula(
uno::makeAny(sQuotedFunctionName))));
+
m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::Any(impl_convertToFormula(
uno::Any(sQuotedFunctionName))));
}
sal_uInt32 GeometryHandler::impl_getDataFieldType_throw(const OUString&
_sDataField) const
diff --git a/reportdesign/source/ui/misc/RptUndo.cxx
b/reportdesign/source/ui/misc/RptUndo.cxx
index e0c7df4dcb25..60d0927d640f 100644
--- a/reportdesign/source/ui/misc/RptUndo.cxx
+++ b/reportdesign/source/ui/misc/RptUndo.cxx
@@ -329,7 +329,7 @@ void OGroupUndo::implReInsert( )
{
try
{
-
m_xReportDefinition->getGroups()->insertByIndex(m_nLastPosition,uno::makeAny(m_xGroup));
+
m_xReportDefinition->getGroups()->insertByIndex(m_nLastPosition,uno::Any(m_xGroup));
}
catch(uno::Exception&)
{
diff --git a/reportdesign/source/ui/misc/UITools.cxx
b/reportdesign/source/ui/misc/UITools.cxx
index 3566c684289a..e0560bc1163d 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -246,7 +246,7 @@ namespace
const vcl::Font aFont( lcl_getReportControlFont(
_rxReportControlFormat, aControlFont,_nWhich ) );
SvxFontItem aFontItem(_nFont);
- aFontItem.PutValue( uno::makeAny( aControlFont ), 0 );
+ aFontItem.PutValue( uno::Any( aControlFont ), 0 );
_rItemSet.Put(aFontItem);
_rItemSet.Put(SvxFontHeightItem(o3tl::convert(aFont.GetFontHeight(),
o3tl::Length::pt, o3tl::Length::twip), 100, _nFontHeight));
@@ -435,19 +435,19 @@ namespace
// create an AWT font
awt::FontDescriptor aAwtFont;
lcl_initAwtFont( _rOriginalControlFont, _rItemSet,
aAwtFont,ITEMID_FONT,ITEMID_FONTHEIGHT,ITEMID_POSTURE, ITEMID_WEIGHT);
- lcl_pushBack( _out_rProperties, "Font", uno::makeAny( aAwtFont ) );
+ lcl_pushBack( _out_rProperties, "Font", uno::Any( aAwtFont ) );
lcl_initAwtFont( _rOriginalControlFontAsian, _rItemSet,
aAwtFont,ITEMID_FONT_ASIAN,ITEMID_FONTHEIGHT_ASIAN,ITEMID_POSTURE_ASIAN,
ITEMID_WEIGHT_ASIAN);
- lcl_pushBack( _out_rProperties, "FontAsian", uno::makeAny( aAwtFont )
);
+ lcl_pushBack( _out_rProperties, "FontAsian", uno::Any( aAwtFont ) );
lcl_initAwtFont( _rOriginalControlFontComplex, _rItemSet,
aAwtFont,ITEMID_FONT_COMPLEX,ITEMID_FONTHEIGHT_COMPLEX,ITEMID_POSTURE_COMPLEX,
ITEMID_WEIGHT_COMPLEX);
- lcl_pushBack( _out_rProperties, "FontComplex", uno::makeAny( aAwtFont
) );
+ lcl_pushBack( _out_rProperties, "FontComplex", uno::Any( aAwtFont ) );
// properties which cannot be represented in an AWT font need to be
preserved directly
if ( const SvxShadowedItem* pShadowedItem = _rItemSet.GetItemIfSet(
ITEMID_SHADOWED) )
- lcl_pushBack( _out_rProperties, PROPERTY_CHARSHADOWED,
uno::makeAny( pShadowedItem->GetValue() ) );
+ lcl_pushBack( _out_rProperties, PROPERTY_CHARSHADOWED, uno::Any(
pShadowedItem->GetValue() ) );
if ( const SvxContourItem* pContourItem = _rItemSet.GetItemIfSet(
ITEMID_CONTOUR ) )
- lcl_pushBack( _out_rProperties, PROPERTY_CHARCONTOURED,
uno::makeAny( pContourItem->GetValue() ) );
+ lcl_pushBack( _out_rProperties, PROPERTY_CHARCONTOURED, uno::Any(
pContourItem->GetValue() ) );
if ( const SvxUnderlineItem* pUnderlineItem = _rItemSet.GetItemIfSet(
ITEMID_UNDERLINE ) )
- lcl_pushBack( _out_rProperties, PROPERTY_CHARUNDERLINECOLOR,
uno::makeAny( pUnderlineItem->GetColor() ) );
+ lcl_pushBack( _out_rProperties, PROPERTY_CHARUNDERLINECOLOR,
uno::Any( pUnderlineItem->GetColor() ) );
if ( const SvxHorJustifyItem* pJustifyItem = _rItemSet.GetItemIfSet(
ITEMID_HORJUSTIFY ) )
{
uno::Any aValue;
@@ -461,29 +461,29 @@ namespace
lcl_pushBack( _out_rProperties, PROPERTY_VERTICALALIGN, aValue );
}
if ( const SvxCharReliefItem* pReliefItem = _rItemSet.GetItemIfSet(
ITEMID_CHARRELIEF ) )
- lcl_pushBack( _out_rProperties, PROPERTY_CHARRELIEF, uno::makeAny(
static_cast< sal_Int16 >( pReliefItem->GetEnumValue() ) ) );
+ lcl_pushBack( _out_rProperties, PROPERTY_CHARRELIEF, uno::Any(
static_cast< sal_Int16 >( pReliefItem->GetEnumValue() ) ) );
if ( const SvxCharHiddenItem* pHiddenItem = _rItemSet.GetItemIfSet(
ITEMID_CHARHIDDEN ) )
- lcl_pushBack( _out_rProperties, PROPERTY_CHARHIDDEN, uno::makeAny(
pHiddenItem->GetValue() ) );
+ lcl_pushBack( _out_rProperties, PROPERTY_CHARHIDDEN, uno::Any(
pHiddenItem->GetValue() ) );
if ( const SvxAutoKernItem* pKernItem = _rItemSet.GetItemIfSet(
ITEMID_AUTOKERN ) )
- lcl_pushBack( _out_rProperties, PROPERTY_CHARAUTOKERNING,
uno::makeAny( pKernItem->GetValue() ) );
+ lcl_pushBack( _out_rProperties, PROPERTY_CHARAUTOKERNING,
uno::Any( pKernItem->GetValue() ) );
if ( const SvxBrushItem* pBrushItem = _rItemSet.GetItemIfSet(
ITEMID_BRUSH ) )
- lcl_pushBack( _out_rProperties, PROPERTY_CONTROLBACKGROUND,
uno::makeAny( pBrushItem->GetColor() ) );
+ lcl_pushBack( _out_rProperties, PROPERTY_CONTROLBACKGROUND,
uno::Any( pBrushItem->GetColor() ) );
if ( const SvxBlinkItem* pBlinkItem = _rItemSet.GetItemIfSet(
ITEMID_BLINK ) )
- lcl_pushBack( _out_rProperties, PROPERTY_CHARFLASH, uno::makeAny(
pBlinkItem->GetValue() ) );
+ lcl_pushBack( _out_rProperties, PROPERTY_CHARFLASH, uno::Any(
pBlinkItem->GetValue() ) );
if ( const SvxEmphasisMarkItem* pMarkItem = _rItemSet.GetItemIfSet(
ITEMID_EMPHASISMARK ) )
- lcl_pushBack( _out_rProperties, PROPERTY_CHAREMPHASIS,
uno::makeAny( static_cast< sal_Int16 >( pMarkItem->GetEmphasisMark() ) ) );
+ lcl_pushBack( _out_rProperties, PROPERTY_CHAREMPHASIS, uno::Any(
static_cast< sal_Int16 >( pMarkItem->GetEmphasisMark() ) ) );
if ( const SvxTwoLinesItem* pLinesItem = _rItemSet.GetItemIfSet(
ITEMID_TWOLINES ) )
{
- lcl_pushBack( _out_rProperties, PROPERTY_CHARCOMBINEISON,
uno::makeAny( pLinesItem->GetValue() ) );
- lcl_pushBack( _out_rProperties, PROPERTY_CHARCOMBINEPREFIX,
uno::makeAny( OUString( pLinesItem->GetStartBracket() ) ) );
- lcl_pushBack( _out_rProperties, PROPERTY_CHARCOMBINESUFFIX,
uno::makeAny( OUString( pLinesItem->GetEndBracket() ) ) );
+ lcl_pushBack( _out_rProperties, PROPERTY_CHARCOMBINEISON,
uno::Any( pLinesItem->GetValue() ) );
+ lcl_pushBack( _out_rProperties, PROPERTY_CHARCOMBINEPREFIX,
uno::Any( OUString( pLinesItem->GetStartBracket() ) ) );
+ lcl_pushBack( _out_rProperties, PROPERTY_CHARCOMBINESUFFIX,
uno::Any( OUString( pLinesItem->GetEndBracket() ) ) );
}
if ( const SvxColorItem* pColorItem = _rItemSet.GetItemIfSet(
ITEMID_COLOR ) )
- lcl_pushBack( _out_rProperties, PROPERTY_CHARCOLOR, uno::makeAny(
pColorItem->GetValue() ) );
+ lcl_pushBack( _out_rProperties, PROPERTY_CHARCOLOR, uno::Any(
pColorItem->GetValue() ) );
if ( const SvxKerningItem* pKernItem = _rItemSet.GetItemIfSet(
ITEMID_KERNING ) )
- lcl_pushBack( _out_rProperties, PROPERTY_CHARKERNING,
uno::makeAny( pKernItem->GetValue() ) );
+ lcl_pushBack( _out_rProperties, PROPERTY_CHARKERNING, uno::Any(
pKernItem->GetValue() ) );
if ( const SvxCaseMapItem* pCaseMapItem = _rItemSet.GetItemIfSet(
ITEMID_CASEMAP ) )
- lcl_pushBack( _out_rProperties, PROPERTY_CHARCASEMAP,
uno::makeAny( pCaseMapItem->GetEnumValue() ) );
+ lcl_pushBack( _out_rProperties, PROPERTY_CHARCASEMAP, uno::Any(
pCaseMapItem->GetEnumValue() ) );
struct Items {
TypedWhichId<SvxLanguageItem> nWhich;
OUString sPropertyName;
@@ -497,13 +497,13 @@ namespace
if ( const SvxLanguageItem* pLanguageItem =
_rItemSet.GetItemIfSet( k.nWhich ) )
{
lang::Locale aCharLocale( LanguageTag(
pLanguageItem->GetLanguage()).getLocale());
- lcl_pushBack( _out_rProperties, k.sPropertyName, uno::makeAny(
aCharLocale ) );
+ lcl_pushBack( _out_rProperties, k.sPropertyName, uno::Any(
aCharLocale ) );
}
}
if ( const SvxEscapementItem* pEscapementItem =
_rItemSet.GetItemIfSet( ITEMID_ESCAPEMENT ) )
{
- lcl_pushBack( _out_rProperties, PROPERTY_CHARESCAPEMENT,
uno::makeAny( pEscapementItem->GetEsc() ) );
- lcl_pushBack( _out_rProperties, PROPERTY_CHARESCAPEMENTHEIGHT,
uno::makeAny(static_cast<sal_Int8>(pEscapementItem->GetProportionalHeight())) );
+ lcl_pushBack( _out_rProperties, PROPERTY_CHARESCAPEMENT, uno::Any(
pEscapementItem->GetEsc() ) );
+ lcl_pushBack( _out_rProperties, PROPERTY_CHARESCAPEMENTHEIGHT,
uno::Any(static_cast<sal_Int8>(pEscapementItem->GetProportionalHeight())) );
}
}
diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx
b/reportdesign/source/ui/report/FixedTextColor.cxx
index 17f8ce20d1b7..b0dd3c4960f4 100644
--- a/reportdesign/source/ui/report/FixedTextColor.cxx
+++ b/reportdesign/source/ui/report/FixedTextColor.cxx
@@ -75,7 +75,7 @@ namespace rptui
void FixedTextColor::setPropertyTextColor(const uno::Reference<
awt::XVclWindowPeer >& _xVclWindowPeer, Color _nTextColor)
{
- _xVclWindowPeer->setProperty(PROPERTY_TEXTCOLOR,
uno::makeAny(_nTextColor));
+ _xVclWindowPeer->setProperty(PROPERTY_TEXTCOLOR,
uno::Any(_nTextColor));
}
diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
index b4af3352c21b..d4fec971ee04 100644
--- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
+++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
@@ -108,15 +108,15 @@ namespace rptui
throw uno::RuntimeException();
// the actual text
- _xVclWindowPeer->setProperty(PROPERTY_TEXT, uno::makeAny(_rText));
+ _xVclWindowPeer->setProperty(PROPERTY_TEXT, uno::Any(_rText));
// the text color
- _xVclWindowPeer->setProperty(PROPERTY_TEXTCOLOR,
uno::makeAny(getTextColor()));
+ _xVclWindowPeer->setProperty(PROPERTY_TEXTCOLOR,
uno::Any(getTextColor()));
// font->italic
uno::Any aFontDescriptor =
_xVclWindowPeer->getProperty(PROPERTY_FONTDESCRIPTOR);
awt::FontDescriptor aFontDescriptorStructure;
aFontDescriptor >>= aFontDescriptorStructure;
aFontDescriptorStructure.Slant = css::awt::FontSlant_ITALIC;
- _xVclWindowPeer->setProperty(PROPERTY_FONTDESCRIPTOR,
uno::makeAny(aFontDescriptorStructure));
+ _xVclWindowPeer->setProperty(PROPERTY_FONTDESCRIPTOR,
uno::Any(aFontDescriptorStructure));
}
diff --git a/reportdesign/source/ui/report/ReportController.cxx
b/reportdesign/source/ui/report/ReportController.cxx
index 5840e72a485e..4935ac250074 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1135,7 +1135,7 @@ void OReportController::Execute(sal_uInt16 _nId, const
Sequence< PropertyValue >
select(aArgs[0].Value);
break;
case SID_SELECT_REPORT:
- select(uno::makeAny(m_xReportDefinition));
+ select(uno::Any(m_xReportDefinition));
break;
case SID_EXECUTE_REPORT:
getView()->PostUserEvent(LINK(this,
OReportController,OnExecuteReport));
@@ -1167,7 +1167,7 @@ void OReportController::Execute(sal_uInt16 _nId, const
Sequence< PropertyValue >
const OUString sUndoAction =
RptResId(RID_STR_UNDO_REMOVE_FUNCTION);
UndoContext aUndoContext( getUndoManager(), sUndoAction );
xFunctions->removeByIndex(nIndex);
- select(uno::makeAny(xFunctions->getParent()));
+ select(uno::Any(xFunctions->getParent()));
InvalidateFeature( SID_UNDO );
}
}
@@ -1432,7 +1432,7 @@ void OReportController::Execute(sal_uInt16 _nId, const
Sequence< PropertyValue >
case SID_BACKGROUND_COLOR:
{
const util::Color aColor( lcl_extractBackgroundColor( aArgs )
);
- if (
!impl_setPropertyAtControls_throw(RID_STR_UNDO_CHANGEFONT,PROPERTY_CONTROLBACKGROUND,uno::makeAny(aColor),aArgs)
)
+ if (
!impl_setPropertyAtControls_throw(RID_STR_UNDO_CHANGEFONT,PROPERTY_CONTROLBACKGROUND,uno::Any(aColor),aArgs)
)
{
uno::Reference< report::XSection > xSection =
getDesignView()->getCurrentSection();
if ( xSection.is() )
@@ -1467,7 +1467,7 @@ void OReportController::Execute(sal_uInt16 _nId, const
Sequence< PropertyValue >
{
const SequenceAsHashMap aMap(aArgs);
const util::Color aColor =
aMap.getUnpackedValueOrDefault(PROPERTY_FONTCOLOR,util::Color());
-
impl_setPropertyAtControls_throw(RID_STR_UNDO_CHANGEFONT,PROPERTY_CHARCOLOR,uno::makeAny(aColor),aArgs);
+
impl_setPropertyAtControls_throw(RID_STR_UNDO_CHANGEFONT,PROPERTY_CHARCOLOR,uno::Any(aColor),aArgs);
bForceBroadcast = true;
}
break;
@@ -1477,7 +1477,7 @@ void OReportController::Execute(sal_uInt16 _nId, const
Sequence< PropertyValue >
awt::FontDescriptor aFont;
if ( aArgs[0].Value >>= aFont )
{
-
impl_setPropertyAtControls_throw(RID_STR_UNDO_CHANGEFONT,PROPERTY_CHARFONTNAME,uno::makeAny(aFont.Name),aArgs);
+
impl_setPropertyAtControls_throw(RID_STR_UNDO_CHANGEFONT,PROPERTY_CHARFONTNAME,uno::Any(aFont.Name),aArgs);
}
}
break;
@@ -1510,7 +1510,7 @@ void OReportController::Execute(sal_uInt16 _nId, const
Sequence< PropertyValue >
eParagraphAdjust = style::ParagraphAdjust_BLOCK;
break;
}
-
impl_setPropertyAtControls_throw(RID_STR_UNDO_ALIGNMENT,PROPERTY_PARAADJUST,uno::makeAny(static_cast<sal_Int16>(eParagraphAdjust)),aArgs);
+
impl_setPropertyAtControls_throw(RID_STR_UNDO_ALIGNMENT,PROPERTY_PARAADJUST,uno::Any(static_cast<sal_Int16>(eParagraphAdjust)),aArgs);
InvalidateFeature(SID_ATTR_PARA_ADJUST_LEFT);
InvalidateFeature(SID_ATTR_PARA_ADJUST_CENTER);
@@ -2481,13 +2481,13 @@ void OReportController::openPageDialog(const
uno::Reference<report::XSection>& _
}
if ( const SvxULSpaceItem* pSpaceItem =
pSet->GetItemIfSet( RPTUI_ID_ULSPACE ))
{
-
xProp->setPropertyValue(PROPERTY_TOPMARGIN,uno::makeAny(pSpaceItem->GetUpper()));
-
xProp->setPropertyValue(PROPERTY_BOTTOMMARGIN,uno::makeAny(pSpaceItem->GetLower()));
+
xProp->setPropertyValue(PROPERTY_TOPMARGIN,uno::Any(pSpaceItem->GetUpper()));
+
xProp->setPropertyValue(PROPERTY_BOTTOMMARGIN,uno::Any(pSpaceItem->GetLower()));
}
if ( const SvxPageItem* pPageItem = pSet->GetItemIfSet(
RPTUI_ID_PAGE ))
{
-
xProp->setPropertyValue(PROPERTY_ISLANDSCAPE,uno::makeAny(pPageItem->IsLandscape()));
-
xProp->setPropertyValue(PROPERTY_NUMBERINGTYPE,uno::makeAny(static_cast<sal_Int16>(pPageItem->GetNumType())));
+
xProp->setPropertyValue(PROPERTY_ISLANDSCAPE,uno::Any(pPageItem->IsLandscape()));
+
xProp->setPropertyValue(PROPERTY_NUMBERINGTYPE,uno::Any(static_cast<sal_Int16>(pPageItem->GetNumType())));
uno::Any aValue;
pPageItem->QueryValue(aValue,MID_PAGE_LAYOUT);
xProp->setPropertyValue(PROPERTY_PAGESTYLELAYOUT,aValue);
@@ -2496,8 +2496,8 @@ void OReportController::openPageDialog(const
uno::Reference<report::XSection>& _
if ( const SvxBrushItem* pBrushItem = pSet->GetItemIfSet(
RPTUI_ID_BRUSH ))
{
::Color aBackColor = pBrushItem->GetColor();
-
xProp->setPropertyValue(PROPERTY_BACKTRANSPARENT,uno::makeAny(aBackColor ==
COL_TRANSPARENT));
-
xProp->setPropertyValue(PROPERTY_BACKCOLOR,uno::makeAny(aBackColor));
+
xProp->setPropertyValue(PROPERTY_BACKTRANSPARENT,uno::Any(aBackColor ==
COL_TRANSPARENT));
+
xProp->setPropertyValue(PROPERTY_BACKCOLOR,uno::Any(aBackColor));
}
}
}
@@ -2751,7 +2751,7 @@ uno::Any SAL_CALL OReportController::getViewData()
}
aViewData.put( "ZoomFactor", m_nZoomValue );
- return uno::makeAny( aViewData.getPropertyValues() );
+ return uno::Any( aViewData.getPropertyValues() );
}
void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data)
@@ -2957,8 +2957,8 @@ uno::Reference< sdbc::XRowSet > const &
OReportController::getRowSet()
uno::UNO_QUERY );
uno::Reference< beans::XPropertySet> xRowSetProp( xRowSet,
uno::UNO_QUERY_THROW );
- xRowSetProp->setPropertyValue( PROPERTY_ACTIVECONNECTION,
uno::makeAny( getConnection() ) );
- xRowSetProp->setPropertyValue( PROPERTY_APPLYFILTER, uno::makeAny(
true ) );
+ xRowSetProp->setPropertyValue( PROPERTY_ACTIVECONNECTION, uno::Any(
getConnection() ) );
+ xRowSetProp->setPropertyValue( PROPERTY_APPLYFILTER, uno::Any( true )
);
auto aNoConverter = std::make_shared<AnyConverter>();
TPropertyNamePair aPropertyMediation;
@@ -3080,7 +3080,7 @@ void OReportController::createNewFunction(const uno::Any&
_aValue)
uno::Reference< report::XFunction>
xFunction(report::Function::create(m_xContext));
xFunction->setName(sNewName);
// the call below will also create an undo action -> listener
- xFunctions->insertByIndex(xFunctions->getCount(),uno::makeAny(xFunction));
+ xFunctions->insertByIndex(xFunctions->getCount(),uno::Any(xFunction));
}
IMPL_LINK_NOARG( OReportController, OnExecuteReport, void*, void )
@@ -3192,21 +3192,21 @@ void OReportController::createControl(const Sequence<
PropertyValue >& _aArgs,co
if ( xInfo->hasPropertyByName(PROPERTY_DATAFIELD) &&
!_sFunction.isEmpty() )
{
ReportFormula aFunctionFormula( ReportFormula::Expression,
_sFunction );
- xUnoProp->setPropertyValue( PROPERTY_DATAFIELD, uno::makeAny(
aFunctionFormula.getCompleteFormula() ) );
... etc. - the rest is truncated
