[Libreoffice-commits] core.git: basctl/source basic/qa basic/source binaryurp/source chart2/qa chart2/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Feb 3 08:51:28 UTC 2017
basctl/source/basicide/basicbox.cxx | 2
basctl/source/basicide/basicrenderable.cxx | 2
basctl/source/basicide/baside3.cxx | 2
basctl/source/basicide/basides1.cxx | 2
basctl/source/basicide/moduldl2.cxx | 8
basctl/source/basicide/moduldlg.cxx | 2
basctl/source/basicide/scriptdocument.cxx | 18 -
basctl/source/dlged/dlged.cxx | 6
basctl/source/dlged/dlgedobj.cxx | 2
basctl/source/dlged/propbrw.cxx | 6
basic/qa/cppunit/test_vba.cxx | 4
basic/source/basmgr/basicmanagerrepository.cxx | 4
basic/source/basmgr/basmgr.cxx | 4
basic/source/classes/errobject.cxx | 6
basic/source/classes/eventatt.cxx | 4
basic/source/classes/sb.cxx | 2
basic/source/classes/sbxmod.cxx | 4
basic/source/runtime/methods1.cxx | 20 +-
basic/source/uno/namecont.cxx | 16 -
basic/source/uno/scriptcont.cxx | 4
binaryurp/source/bridge.cxx | 4
chart2/qa/extras/charttest.hxx | 2
chart2/qa/unit/common_functor_test.cxx | 14 -
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 12 -
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 12 -
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 18 -
chart2/source/controller/chartapiwrapper/GridWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx | 14 -
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx | 6
chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx | 8
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx | 4
chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx | 4
chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx | 5
chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx | 20 +-
chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx | 4
chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx | 12 -
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx | 44 ++--
chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx | 4
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 28 +-
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 14 -
chart2/source/controller/dialogs/DataBrowser.cxx | 6
chart2/source/controller/dialogs/DataBrowserModel.cxx | 6
chart2/source/controller/dialogs/DialogModel.cxx | 6
chart2/source/controller/dialogs/RangeSelectionHelper.cxx | 8
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 6
chart2/source/controller/dialogs/res_LegendPosition.cxx | 6
chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx | 2
chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx | 4
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 8
chart2/source/controller/dialogs/tp_DataSource.cxx | 4
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 4
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | 34 +--
chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx | 34 +--
chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx | 14 -
chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx | 6
chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx | 10 -
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx | 18 -
chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx | 34 +--
chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx | 2
chart2/source/controller/main/ChartController.cxx | 14 -
chart2/source/controller/main/ChartController_Insert.cxx | 12 -
chart2/source/controller/main/ChartController_TextEdit.cxx | 4
chart2/source/controller/main/ChartController_Tools.cxx | 36 +--
chart2/source/controller/main/ChartController_Window.cxx | 22 +-
chart2/source/controller/main/ControllerCommandDispatch.cxx | 10 -
chart2/source/controller/main/DragMethod_PieSegment.cxx | 2
chart2/source/controller/main/PositionAndSizeHelper.cxx | 16 -
chart2/source/controller/sidebar/Chart2PanelFactory.cxx | 2
chart2/source/controller/sidebar/ChartAreaPanel.cxx | 24 +-
chart2/source/controller/sidebar/ChartAxisPanel.cxx | 6
chart2/source/controller/sidebar/ChartColorWrapper.cxx | 2
chart2/source/controller/sidebar/ChartElementsPanel.cxx | 4
chart2/source/controller/sidebar/ChartErrorBarPanel.cxx | 8
chart2/source/controller/sidebar/ChartLinePanel.cxx | 10 -
chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 4
chart2/source/inc/PropertyHelper.hxx | 4
chart2/source/model/filter/XMLFilter.cxx | 20 +-
chart2/source/model/main/Axis.cxx | 2
chart2/source/model/main/BaseCoordinateSystem.cxx | 4
chart2/source/model/main/ChartModel.cxx | 14 -
chart2/source/model/main/ChartModel_Persistence.cxx | 36 +--
chart2/source/model/main/Diagram.cxx | 6
chart2/source/model/main/StockBar.cxx | 4
chart2/source/model/template/AreaChartTypeTemplate.cxx | 6
chart2/source/model/template/BarChartTypeTemplate.cxx | 6
chart2/source/model/template/BubbleChartTypeTemplate.cxx | 2
chart2/source/model/template/CandleStickChartType.cxx | 4
chart2/source/model/template/ChartTypeTemplate.cxx | 12 -
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 6
chart2/source/model/template/DataInterpreter.cxx | 2
chart2/source/model/template/GL3DBarChartTypeTemplate.cxx | 2
chart2/source/model/template/PieChartTypeTemplate.cxx | 16 -
chart2/source/model/template/ScatterChartType.cxx | 6
chart2/source/model/template/ScatterChartTypeTemplate.cxx | 2
chart2/source/model/template/StockChartTypeTemplate.cxx | 20 +-
chart2/source/tools/AxisHelper.cxx | 14 -
chart2/source/tools/ChartModelHelper.cxx | 2
chart2/source/tools/DataSeriesHelper.cxx | 18 -
chart2/source/tools/DataSourceHelper.cxx | 10 -
chart2/source/tools/DiagramHelper.cxx | 18 -
chart2/source/tools/ErrorBar.cxx | 2
chart2/source/tools/InternalData.cxx | 2
chart2/source/tools/InternalDataProvider.cxx | 18 -
chart2/source/tools/LegendHelper.cxx | 8
chart2/source/tools/LinePropertiesHelper.cxx | 8
chart2/source/tools/OPropertySet.cxx | 4
chart2/source/tools/ObjectIdentifier.cxx | 4
chart2/source/tools/ReferenceSizeProvider.cxx | 2
chart2/source/tools/RegressionCurveHelper.cxx | 8
chart2/source/tools/RegressionCurveModel.cxx | 2
chart2/source/tools/RelativeSizeHelper.cxx | 4
chart2/source/tools/SceneProperties.cxx | 2
chart2/source/tools/StatisticsHelper.cxx | 10 -
chart2/source/tools/ThreeDHelper.cxx | 50 ++---
chart2/source/tools/TitleHelper.cxx | 10 -
chart2/source/tools/UncachedDataSequence.cxx | 2
chart2/source/tools/WrappedIgnoreProperty.cxx | 56 ++---
chart2/source/tools/WrappedPropertySet.cxx | 4
chart2/source/view/axes/VCartesianAxis.cxx | 8
chart2/source/view/axes/VCartesianGrid.cxx | 4
chart2/source/view/axes/VPolarAngleAxis.cxx | 2
chart2/source/view/charttypes/AreaChart.cxx | 2
chart2/source/view/charttypes/BarChart.cxx | 2
chart2/source/view/charttypes/BubbleChart.cxx | 4
chart2/source/view/charttypes/NetChart.cxx | 2
chart2/source/view/charttypes/PieChart.cxx | 8
chart2/source/view/charttypes/VSeriesPlotter.cxx | 8
chart2/source/view/diagram/VDiagram.cxx | 10 -
chart2/source/view/main/AbstractShapeFactory.cxx | 8
chart2/source/view/main/ChartView.cxx | 16 -
chart2/source/view/main/DummyXShape.cxx | 6
chart2/source/view/main/LabelPositionHelper.cxx | 6
chart2/source/view/main/OpenglShapeFactory.cxx | 12 -
chart2/source/view/main/PropertyMapper.cxx | 32 +--
chart2/source/view/main/ShapeFactory.cxx | 94 +++++-----
chart2/source/view/main/VLegend.cxx | 24 +-
chart2/source/view/main/VLegendSymbolFactory.cxx | 2
chart2/source/view/main/VLineProperties.cxx | 10 -
chart2/source/view/main/VTitle.cxx | 2
147 files changed, 722 insertions(+), 727 deletions(-)
New commits:
commit 83721f4365d234b62f9e3517345c8d3fda19f2c6
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Feb 3 08:54:47 2017 +0200
makeAny->Any in basctl..chart2
Change-Id: Ief1cdffbfc59ab4e35ac945d020772ff84c50d61
Reviewed-on: https://gerrit.libreoffice.org/33867
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 36c5b95..53ff103 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -305,7 +305,7 @@ void LibBox::NotifyIDE()
if (LibEntry* pEntry = static_cast<LibEntry*>(GetEntryData(nSelPos)))
{
ScriptDocument aDocument( pEntry->GetDocument() );
- SfxUsrAnyItem aDocumentItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, uno::makeAny( aDocument.getDocumentOrNull() ) );
+ SfxUsrAnyItem aDocumentItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, uno::Any( aDocument.getDocumentOrNull() ) );
OUString aLibName = pEntry->GetLibName();
SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
if (SfxDispatcher* pDispatcher = GetDispatcher())
diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx
index 3af2ee9..4951762 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -134,7 +134,7 @@ Sequence<beans::PropertyValue> SAL_CALL Renderable::getRenderer (
aSize.Width = aPageSize.Width();
aSize.Height = aPageSize.Height();
aVals = ::comphelper::InitPropertySequence({
- { "PageSize", makeAny(aSize) }
+ { "PageSize", Any(aSize) }
});
}
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 2d65873..821c341 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1280,7 +1280,7 @@ void DialogWindow::StoreData()
Reference< XComponentContext > xContext(
comphelper::getProcessComponentContext() );
Reference< XInputStreamProvider > xISP = ::xmlscript::exportDialogModel( xDialogModel, xContext, GetDocument().isDocument() ? GetDocument().getDocument() : Reference< frame::XModel >() );
- xLib->replaceByName( GetName(), makeAny( xISP ) );
+ xLib->replaceByName( GetName(), Any( xISP ) );
}
}
}
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 1fe82da..43d4078 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -239,7 +239,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
}
if ( xStatusIndicator.is() )
- rReq.AppendItem( SfxUnoAnyItem( SID_PROGRESS_STATUSBAR_CONTROL, uno::makeAny( xStatusIndicator ) ) );
+ rReq.AppendItem( SfxUnoAnyItem( SID_PROGRESS_STATUSBAR_CONTROL, uno::Any( xStatusIndicator ) ) );
}
aDocument.saveDocument( xStatusIndicator );
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 0a2f421..200d845 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -619,7 +619,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton, void )
SfxRequest aRequest( SID_BASICIDE_APPEAR, SfxCallMode::SYNCHRON, aArgs );
SfxGetpApp()->ExecuteSlot( aRequest );
- SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, makeAny( m_aCurDocument.getDocumentOrNull() ) );
+ SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, Any( m_aCurDocument.getDocumentOrNull() ) );
SvTreeListEntry* pCurEntry = m_pLibBox->GetCurEntry();
DBG_ASSERT( pCurEntry, "Entry?!" );
OUString aLibName( SvTabListBox::GetEntryText( pCurEntry, 0 ) );
@@ -1258,8 +1258,8 @@ void LibPage::ExportAsPackage( const OUString& aLibName )
OUString fullPath = aLibName
+ "/" ;
auto attribs(::comphelper::InitPropertySequence({
- { strFullPath, makeAny(fullPath) },
- { strMediaType, makeAny(strBasicMediaType) }
+ { strFullPath, Any(fullPath) },
+ { strMediaType, Any(strBasicMediaType) }
}));
manifest.push_back( attribs );
@@ -1334,7 +1334,7 @@ void LibPage::DeleteCurrent()
if ( QueryDelLib( aLibName, bIsLibraryLink, this ) )
{
// inform BasicIDE
- SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, makeAny( m_aCurDocument.getDocumentOrNull() ) );
+ SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, Any( m_aCurDocument.getDocumentOrNull() ) );
SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
if (SfxDispatcher* pDispatcher = GetDispatcher())
pDispatcher->ExecuteList(SID_BASICIDE_LIBREMOVED,
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index fa53485..c76e716 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -715,7 +715,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton, void )
if (pDocumentEntry)
aDocument = pDocumentEntry->GetDocument();
}
- SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, makeAny( aDocument.getDocumentOrNull() ) );
+ SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, Any( aDocument.getDocumentOrNull() ) );
OUString aLibName( m_pBasicBox->GetEntryText( pCurEntry ) );
SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
if ( pDispatcher )
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 135ea2b..c5966a4 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -75,7 +75,7 @@ namespace basctl
using ::com::sun::star::container::NoSuchElementException;
using ::com::sun::star::uno::UNO_QUERY;
using ::com::sun::star::task::XStatusIndicator;
- using ::com::sun::star::uno::makeAny;
+ using ::com::sun::star::uno::Any;
using ::com::sun::star::script::XLibraryContainer2;
using ::com::sun::star::uri::UriReferenceFactory;
using ::com::sun::star::uri::XUriReferenceFactory;
@@ -628,7 +628,7 @@ namespace basctl
// set new name as property
Reference< XPropertySet > xDlgPSet( xDialogModel, UNO_QUERY_THROW );
- xDlgPSet->setPropertyValue( DLGED_PROP_NAME, makeAny( _rNewName ) );
+ xDlgPSet->setPropertyValue( DLGED_PROP_NAME, Any( _rNewName ) );
// export dialog model
xISP = ::xmlscript::exportDialogModel( xDialogModel, aContext, isDocument() ? getDocument() : Reference< XModel >() );
@@ -680,7 +680,7 @@ namespace basctl
}
// insert module into library
- xLib->insertByName( _rModName, makeAny( _out_rNewModuleCode ) );
+ xLib->insertByName( _rModName, Any( _out_rNewModuleCode ) );
}
catch( const Exception& )
{
@@ -718,7 +718,7 @@ namespace basctl
Reference< XNameContainer > xLib( getOrCreateLibrary( E_SCRIPTS, _rLibName ), UNO_QUERY_THROW );
if ( !xLib->hasByName( _rModName ) )
return false;
- xLib->replaceByName( _rModName, makeAny( _rModuleCode ) );
+ xLib->replaceByName( _rModName, Any( _rModuleCode ) );
return true;
}
catch( const Exception& )
@@ -750,13 +750,13 @@ namespace basctl
// set name property
Reference< XPropertySet > xDlgPSet( xDialogModel, UNO_QUERY_THROW );
- xDlgPSet->setPropertyValue( DLGED_PROP_NAME, makeAny( _rDialogName ) );
+ xDlgPSet->setPropertyValue( DLGED_PROP_NAME, Any( _rDialogName ) );
// export dialog model
_out_rDialogProvider = ::xmlscript::exportDialogModel( xDialogModel, aContext, isDocument() ? getDocument() : Reference< XModel >() );
// insert dialog into library
- xLib->insertByName( _rDialogName, makeAny( _out_rDialogProvider ) );
+ xLib->insertByName( _rDialogName, Any( _out_rDialogProvider ) );
}
catch( const Exception& )
{
@@ -813,7 +813,7 @@ namespace basctl
if ( _rxStatusIndicator.is() )
{
aArgs = ::comphelper::InitPropertySequence({
- { "StatusIndicator", makeAny(_rxStatusIndicator) }
+ { "StatusIndicator", Any(_rxStatusIndicator) }
});
}
@@ -1376,7 +1376,7 @@ namespace basctl
bool ScriptDocument::insertModule( const OUString& _rLibName, const OUString& _rModName, const OUString& _rModuleCode ) const
{
- return m_pImpl->insertModuleOrDialog( E_SCRIPTS, _rLibName, _rModName, makeAny( _rModuleCode ) );
+ return m_pImpl->insertModuleOrDialog( E_SCRIPTS, _rLibName, _rModName, Any( _rModuleCode ) );
}
@@ -1426,7 +1426,7 @@ namespace basctl
bool ScriptDocument::insertDialog( const OUString& _rLibName, const OUString& _rDialogName, const Reference< XInputStreamProvider >& _rxDialogProvider ) const
{
- return m_pImpl->insertModuleOrDialog( E_DIALOGS, _rLibName, _rDialogName, makeAny( _rxDialogProvider ) );
+ return m_pImpl->insertModuleOrDialog( E_DIALOGS, _rLibName, _rDialogName, Any( _rxDialogProvider ) );
}
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 052506d..ecdbdf5 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -122,8 +122,8 @@ void DlgEditor::ShowDialog()
aDecorationAny >>= bDecoration;
if( !bDecoration )
{
- xNewDlgModPropSet->setPropertyValue( aDecorationPropName, makeAny( true ) );
- xNewDlgModPropSet->setPropertyValue( "Title", makeAny( OUString() ) );
+ xNewDlgModPropSet->setPropertyValue( aDecorationPropName, Any( true ) );
+ xNewDlgModPropSet->setPropertyValue( "Title", Any( OUString() ) );
}
}
catch(const UnknownPropertyException& )
@@ -792,7 +792,7 @@ void DlgEditor::Copy()
memcpy( pCombinedData + 4, DialogModelBytes.getConstArray(), nDialogDataLen );
memcpy( pCombinedData + nResOffset, aResData.getConstArray(), nResDataLen );
- aSeqData[1] = Any(aCombinedData);
+ aSeqData[1] <<= aCombinedData;
pTrans = new DlgEdTransferableImpl( m_ClipboardDataFlavorsResource, aSeqData );
}
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 7b839c3..a2ac765 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -1133,7 +1133,7 @@ void SAL_CALL DlgEdObj::_propertyChange( const css::beans::PropertyChangeEvent&
catch (container::NoSuchElementException const& e)
{
throw lang::WrappedTargetRuntimeException("", nullptr,
- uno::makeAny(e));
+ uno::Any(e));
}
}
}
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index fea4b05..c4b5d3d 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -122,8 +122,8 @@ void PropBrw::ImplReCreateController()
// a ComponentContext for the
::cppu::ContextEntry_Init aHandlerContextInfo[] =
{
- ::cppu::ContextEntry_Init( "DialogParentWindow", makeAny( VCLUnoHelper::GetInterface ( this ) ) ),
- ::cppu::ContextEntry_Init( "ContextDocument", makeAny( m_xContextDocument ) )
+ ::cppu::ContextEntry_Init( "DialogParentWindow", Any( VCLUnoHelper::GetInterface ( this ) ) ),
+ ::cppu::ContextEntry_Init( "ContextDocument", Any( m_xContextDocument ) )
};
Reference< XComponentContext > xInspectorContext(
::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), xOwnContext ) );
@@ -296,7 +296,7 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject )
if ( m_xBrowserController.is() )
{
m_xBrowserController->setPropertyValue( "IntrospectedObject",
- makeAny( _rxObject )
+ Any( _rxObject )
);
// set the new title according to the selected object
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index a0f3f32..e493c20 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -142,8 +142,8 @@ void VBATest::testMiscOLEStuff()
OUString sPath = m_directories.getPathFromSrc("/basic/qa/vba_tests/data/ADODBdata.xls");
sPath = sPath.replaceAll( "/", "\\" );
- aArgs[ 0 ] = uno::makeAny( sPath );
- aArgs[ 1 ] = uno::makeAny( OUString(pODBCDriverName) );
+ aArgs[ 0 ] <<= sPath;
+ aArgs[ 1 ] <<= OUString(pODBCDriverName);
for ( sal_uInt32 i=0; i<SAL_N_ELEMENTS( macroSource ); ++i )
{
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index 03d7309..f7bff18 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -309,7 +309,7 @@ namespace basic
// StarDesktop
Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
- pBasicManager->SetGlobalUNOConstant( "StarDesktop", makeAny( Desktop::create(xContext)));
+ pBasicManager->SetGlobalUNOConstant( "StarDesktop", css::uno::Any( Desktop::create(xContext)));
// (BasicLibraries and DialogLibraries have automatically been added in SetLibraryContainerInfo)
@@ -474,7 +474,7 @@ namespace basic
_out_rpBasicManager->GetLib(0)->SetParent( pAppBasic );
// global properties in the document's Basic
- _out_rpBasicManager->SetGlobalUNOConstant( "ThisComponent", makeAny( _rxDocumentModel ) );
+ _out_rpBasicManager->SetGlobalUNOConstant( "ThisComponent", css::uno::Any( _rxDocumentModel ) );
// notify
impl_notifyCreationListeners( _rxDocumentModel, *_out_rpBasicManager );
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index de63810..9b0c92a 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -608,8 +608,8 @@ void BasicManager::SetLibraryContainerInfo( const LibraryContainerInfo& rInfo )
}
}
- SetGlobalUNOConstant( "BasicLibraries", makeAny( mpImpl->maContainerInfo.mxScriptCont ) );
- SetGlobalUNOConstant( "DialogLibraries", makeAny( mpImpl->maContainerInfo.mxDialogCont ) );
+ SetGlobalUNOConstant( "BasicLibraries", uno::Any( mpImpl->maContainerInfo.mxScriptCont ) );
+ SetGlobalUNOConstant( "DialogLibraries", uno::Any( mpImpl->maContainerInfo.mxDialogCont ) );
}
BasicManager::BasicManager( StarBASIC* pSLib, OUString* pLibPath, bool bDocMgr ) : mbDocMgr( bDocMgr )
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index baad838..d6fb2cc 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -78,7 +78,7 @@ ErrObject::setNumber( ::sal_Int32 _number )
{
GetSbData()->pInst->setErrorVB( _number, OUString() );
OUString _description = GetSbData()->pInst->GetErrorMsg();
- setData( uno::makeAny( _number ), uno::Any(), uno::makeAny( _description ), uno::Any(), uno::Any() );
+ setData( uno::Any( _number ), uno::Any(), uno::Any( _description ), uno::Any(), uno::Any() );
}
::sal_Int32 SAL_CALL
@@ -192,7 +192,7 @@ SbxErrObject::getUnoErrObject()
SbxVariableRef const &
SbxErrObject::getErrObject()
{
- static SbxVariableRef pGlobErr = new SbxErrObject( "Err", uno::makeAny( uno::Reference< vba::XErrObject >( new ErrObject() ) ) );
+ static SbxVariableRef pGlobErr = new SbxErrObject( "Err", uno::Any( uno::Reference< vba::XErrObject >( new ErrObject() ) ) );
return pGlobErr;
}
@@ -200,7 +200,7 @@ void SbxErrObject::setNumberAndDescription( ::sal_Int32 _number, const OUString&
{
if( m_pErrObject != nullptr )
{
- m_pErrObject->setData( uno::makeAny( _number ), uno::Any(), uno::makeAny( _description ), uno::Any(), uno::Any() );
+ m_pErrObject->setData( uno::Any( _number ), uno::Any(), uno::Any( _description ), uno::Any(), uno::Any() );
}
}
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 49a0163..05df798 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -471,8 +471,8 @@ void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, bool bWrite )
aDecorationAny >>= bDecoration;
if( !bDecoration )
{
- xDlgModPropSet->setPropertyValue( aDecorationPropName, makeAny( true ) );
- xDlgModPropSet->setPropertyValue( "Title", makeAny( OUString() ) );
+ xDlgModPropSet->setPropertyValue( aDecorationPropName, Any( true ) );
+ xDlgModPropSet->setPropertyValue( "Title", Any( OUString() ) );
}
}
catch(const UnknownPropertyException& )
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index fa5019e..60d71c7 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -454,7 +454,7 @@ SbxObject* SbiFactory::CreateObject( const OUString& rClass )
Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory(), UNO_SET_THROW );
OUString aServiceName("ooo.vba.FileSystemObject");
Reference< XInterface > xInterface( xFactory->createInstance( aServiceName ), UNO_SET_THROW );
- return new SbUnoObject( aServiceName, uno::makeAny( xInterface ) );
+ return new SbUnoObject( aServiceName, uno::Any( xInterface ) );
}
catch(const Exception& )
{
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index f964ef2..c9c7b73 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -2165,7 +2165,7 @@ SbObjModule::SbObjModule( const OUString& rName, const css::script::ModuleInfo&
}
else if ( mInfo.ModuleObject.is() )
{
- SetUnoObject( uno::makeAny( mInfo.ModuleObject ) );
+ SetUnoObject( uno::Any( mInfo.ModuleObject ) );
}
}
@@ -2654,7 +2654,7 @@ void SbUserFormModule::InitObject()
aArgs[ 1 ] <<= m_xDialog;
aArgs[ 2 ] <<= m_xModel;
aArgs[ 3 ] <<= OUString( GetParent()->GetName() );
- pDocObject = new SbUnoObject( GetName(), uno::makeAny( xVBAFactory->createInstanceWithArguments( "ooo.vba.msforms.UserForm", aArgs ) ) );
+ pDocObject = new SbUnoObject( GetName(), uno::Any( xVBAFactory->createInstanceWithArguments( "ooo.vba.msforms.UserForm", aArgs ) ) );
uno::Reference< lang::XComponent > xComponent( m_xDialog, uno::UNO_QUERY_THROW );
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index eee8de4..f24e426 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -2694,10 +2694,10 @@ RTLFUNC(SYD)
// retrieve non-optional params
Sequence< Any > aParams( 4 );
- aParams[ 0 ] = makeAny( rPar.Get(1)->GetDouble() );
- aParams[ 1 ] = makeAny( rPar.Get(2)->GetDouble() );
- aParams[ 2 ] = makeAny( rPar.Get(3)->GetDouble() );
- aParams[ 3 ] = makeAny( rPar.Get(4)->GetDouble() );
+ aParams[ 0 ] <<= rPar.Get(1)->GetDouble();
+ aParams[ 1 ] <<= rPar.Get(2)->GetDouble();
+ aParams[ 2 ] <<= rPar.Get(3)->GetDouble();
+ aParams[ 3 ] <<= rPar.Get(4)->GetDouble();
CallFunctionAccessFunction( aParams, "SYD", rPar.Get( 0 ) );
}
@@ -2718,9 +2718,9 @@ RTLFUNC(SLN)
// retrieve non-optional params
Sequence< Any > aParams( 3 );
- aParams[ 0 ] = makeAny( rPar.Get(1)->GetDouble() );
- aParams[ 1 ] = makeAny( rPar.Get(2)->GetDouble() );
- aParams[ 2 ] = makeAny( rPar.Get(3)->GetDouble() );
+ aParams[ 0 ] <<= rPar.Get(1)->GetDouble();
+ aParams[ 1 ] <<= rPar.Get(2)->GetDouble();
+ aParams[ 2 ] <<= rPar.Get(3)->GetDouble();
CallFunctionAccessFunction( aParams, "SLN", rPar.Get( 0 ) );
}
@@ -2876,7 +2876,7 @@ RTLFUNC(NPV)
}
Sequence< Any > aParams( 2 );
- aParams[ 0 ] = makeAny( rPar.Get(1)->GetDouble() );
+ aParams[ 0 ] <<= rPar.Get(1)->GetDouble();
Any aValues = sbxToUnoValue( rPar.Get(2),
cppu::UnoType<Sequence<double>>::get() );
@@ -2960,8 +2960,8 @@ RTLFUNC(MIRR)
aValues <<= sValues;
aParams[ 0 ] = aValues;
- aParams[ 1 ] = makeAny( rPar.Get(2)->GetDouble() );
- aParams[ 2 ] = makeAny( rPar.Get(3)->GetDouble() );
+ aParams[ 1 ] <<= rPar.Get(2)->GetDouble();
+ aParams[ 2 ] <<= rPar.Get(3)->GetDouble();
CallFunctionAccessFunction( aParams, "MIRR", rPar.Get( 0 ) );
}
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index ae57954..189eb64 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -530,7 +530,7 @@ void SAL_CALL SfxLibraryContainer::removeModifyListener( const Reference< XModif
Any SAL_CALL SfxLibraryContainer::getRootLocation()
{
LibraryContainerMethodGuard aGuard( *this );
- return makeAny( getRootStorage() );
+ return Any( getRootStorage() );
}
OUString SAL_CALL SfxLibraryContainer::getContainerLocationName()
@@ -1426,10 +1426,10 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
if ( xProps.is() )
{
- xProps->setPropertyValue("MediaType", uno::makeAny( aMime ) );
+ xProps->setPropertyValue("MediaType", uno::Any( aMime ) );
// #87671 Allow encryption
- xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::makeAny( true ) );
+ xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::Any( true ) );
Reference< XOutputStream > xOutput = xElementStream->getOutputStream();
Reference< XNameContainer > xLib( pLib );
@@ -1565,10 +1565,10 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib,
if ( xProps.is() )
{
OUString aMime("text/xml");
- xProps->setPropertyValue("MediaType", uno::makeAny( aMime ) );
+ xProps->setPropertyValue("MediaType", uno::Any( aMime ) );
// #87671 Allow encryption
- xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::makeAny( true ) );
+ xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::Any( true ) );
xOut = xInfoStream->getOutputStream();
}
@@ -2087,10 +2087,10 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
throw uno::RuntimeException();
}
OUString aMime( "text/xml" );
- xProps->setPropertyValue("MediaType", uno::makeAny( aMime ) );
+ xProps->setPropertyValue("MediaType", uno::Any( aMime ) );
// #87671 Allow encryption
- xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::makeAny( true ) );
+ xProps->setPropertyValue("UseCommonStoragePasswordEncryption", uno::Any( true ) );
xOut = xInfoStream->getOutputStream();
}
@@ -3075,7 +3075,7 @@ void SfxLibrary::impl_checkLoaded()
throw WrappedTargetException(
OUString(),
*this,
- makeAny( LibraryNotLoadedException(
+ Any( LibraryNotLoadedException(
OUString(),
*this
) )
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 07f8935..d78242d 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -673,7 +673,7 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons
throw uno::RuntimeException();
}
OUString aMime( "text/xml" );
- xProps->setPropertyValue("MediaType", uno::makeAny( aMime ) );
+ xProps->setPropertyValue("MediaType", uno::Any( aMime ) );
// Set encryption key
setStreamKey( xSourceStream, pLib->maPassword );
@@ -818,7 +818,7 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons
throw uno::RuntimeException();
}
OUString aMime( "text/xml" );
- xProps->setPropertyValue("MediaType", uno::makeAny( aMime ) );
+ xProps->setPropertyValue("MediaType", uno::Any( aMime ) );
Reference< XOutputStream > xOut = xSourceStream->getOutputStream();
Reference< XNameContainer > xLib( pLib );
diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index a47fbaa..1a05bc2 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -779,7 +779,7 @@ void Bridge::handleCommitChangeRequest(
bCcMode = false;
bExc = true;
ret = mapCppToBinaryAny(
- css::uno::makeAny(
+ css::uno::Any(
css::bridge::InvalidProtocolChangeException(
"InvalidProtocolChangeException",
css::uno::Reference< css::uno::XInterface >(), s[i],
@@ -941,7 +941,7 @@ void Bridge::sendCommitChangeRequest() {
css::uno::Sequence< css::bridge::ProtocolProperty > s(1);
s[0].Name = "CurrentContext";
std::vector< BinaryAny > a;
- a.push_back(mapCppToBinaryAny(css::uno::makeAny(s)));
+ a.push_back(mapCppToBinaryAny(css::uno::Any(s)));
sendProtPropRequest(OutgoingRequest::KIND_COMMIT_CHANGE, a);
}
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index aaa46cb..17ab82d 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -122,7 +122,7 @@ std::shared_ptr<utl::TempFile> ChartTest::save(const OUString& rFilterName)
{
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
auto aArgs(::comphelper::InitPropertySequence({
- { "FilterName", makeAny(rFilterName) }
+ { "FilterName", Any(rFilterName) }
}));
std::shared_ptr<utl::TempFile> pTempFile = std::make_shared<utl::TempFile>();
pTempFile->EnableKillingFile();
diff --git a/chart2/qa/unit/common_functor_test.cxx b/chart2/qa/unit/common_functor_test.cxx
index ecc4f48..c630455 100644
--- a/chart2/qa/unit/common_functor_test.cxx
+++ b/chart2/qa/unit/common_functor_test.cxx
@@ -38,13 +38,13 @@ private:
void CommonFunctorsTest::testAnyToString()
{
std::vector<css::uno::Any> aInput;
- aInput.push_back(css::uno::makeAny(2.0));
- aInput.push_back(css::uno::makeAny(10.0));
- aInput.push_back(css::uno::makeAny(12.0));
- aInput.push_back(css::uno::makeAny(15.0));
- aInput.push_back(css::uno::makeAny(25.234));
- aInput.push_back(css::uno::makeAny(123.456));
- aInput.push_back(css::uno::makeAny(0.123450));
+ aInput.push_back(css::uno::Any(2.0));
+ aInput.push_back(css::uno::Any(10.0));
+ aInput.push_back(css::uno::Any(12.0));
+ aInput.push_back(css::uno::Any(15.0));
+ aInput.push_back(css::uno::Any(25.234));
+ aInput.push_back(css::uno::Any(123.456));
+ aInput.push_back(css::uno::Any(0.123450));
std::vector<OUString> aOutput;
std::transform(aInput.begin(), aInput.end(),
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index a7b0880..c5a993e 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -585,7 +585,7 @@ void AxisWrapper::updateReferenceSize()
if( xProp.is() )
{
if( xProp->getPropertyValue("ReferencePageSize").hasValue() )
- xProp->setPropertyValue("ReferencePageSize", uno::makeAny(
+ xProp->setPropertyValue("ReferencePageSize", uno::Any(
m_spChart2ModelContact->GetPageSize() ));
}
}
@@ -618,7 +618,7 @@ Reference< chart2::XAxis > AxisWrapper::getAxis()
xAxis = AxisHelper::createAxis( nDimensionIndex, bMainAxis, xDiagram, m_spChart2ModelContact->m_xContext );
Reference< beans::XPropertySet > xProp( xAxis, uno::UNO_QUERY );
if( xProp.is() )
- xProp->setPropertyValue("Show", uno::makeAny( false ) );
+ xProp->setPropertyValue("Show", uno::Any( false ) );
}
}
catch( const uno::Exception & ex )
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index f98a743..2a912ff 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -479,7 +479,7 @@ void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const R
Any aAOld = xLegendProp->getPropertyValue("Show");
aAOld >>= bOldValue;
if( bOldValue != bNewValue )
- xLegendProp->setPropertyValue("Show", uno::makeAny( bNewValue ));
+ xLegendProp->setPropertyValue("Show", uno::Any( bNewValue ));
}
}
catch (const uno::Exception& ex)
@@ -1277,10 +1277,8 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
m_xChartView = xViewInit;
Sequence< Any > aArguments(2);
- Reference<frame::XModel> xModel(this);
- aArguments[0]=uno::makeAny(xModel);
- bool bRefreshAddIn = true;
- aArguments[1]=uno::makeAny(bRefreshAddIn);
+ aArguments[0] <<= Reference<frame::XModel>(this);
+ aArguments[1] <<= true; // bRefreshAddIn
xViewInit->initialize(aArguments);
}
catch (const uno::Exception& ex)
@@ -1446,8 +1444,8 @@ const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedPropert
aWrappedProperties.push_back( new WrappedAdditionalShapesProperty( *this ) );
aWrappedProperties.push_back( new WrappedRefreshAddInAllowedProperty( *this ) );
aWrappedProperties.push_back( new WrappedIgnoreProperty("NullDate",Any() ) ); // i99104
- aWrappedProperties.push_back( new WrappedIgnoreProperty("EnableComplexChartTypes", uno::makeAny(true) ) );
- aWrappedProperties.push_back( new WrappedIgnoreProperty("EnableDataTableDialog", uno::makeAny(true) ) );
+ aWrappedProperties.push_back( new WrappedIgnoreProperty("EnableComplexChartTypes", uno::Any(true) ) );
+ aWrappedProperties.push_back( new WrappedIgnoreProperty("EnableDataTableDialog", uno::Any(true) ) );
return aWrappedProperties;
}
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index f83bc35..a376933 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -374,7 +374,7 @@ WrappedLineColorProperty::WrappedLineColorProperty(
DataSeriesPointWrapper* pDataSeriesPointWrapper )
: WrappedSeriesAreaOrLineProperty("LineColor","BorderColor","Color", pDataSeriesPointWrapper )
, m_pDataSeriesPointWrapper( pDataSeriesPointWrapper )
- , m_aDefaultValue(uno::makeAny(sal_Int32( 0x0099ccff ))) // blue 8
+ , m_aDefaultValue(uno::Any(sal_Int32( 0x0099ccff ))) // blue 8
, m_aOuterValue(m_aDefaultValue)
{
}
@@ -422,7 +422,7 @@ WrappedLineStyleProperty::WrappedLineStyleProperty(
DataSeriesPointWrapper* pDataSeriesPointWrapper )
: WrappedSeriesAreaOrLineProperty("LineStyle","BorderStyle", "LineStyle", pDataSeriesPointWrapper )
, m_pDataSeriesPointWrapper( pDataSeriesPointWrapper )
- , m_aDefaultValue(uno::makeAny(drawing::LineStyle_SOLID))
+ , m_aDefaultValue(uno::Any(drawing::LineStyle_SOLID))
, m_aOuterValue(m_aDefaultValue)
{
}
@@ -433,7 +433,7 @@ void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const R
if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() )
{
m_aOuterValue = rOuterValue;
- aNewValue = uno::makeAny(drawing::LineStyle_NONE);
+ aNewValue = uno::Any(drawing::LineStyle_NONE);
}
WrappedSeriesAreaOrLineProperty::setPropertyValue( aNewValue, xInnerPropertySet );
}
@@ -581,7 +581,7 @@ void DataSeriesPointWrapper::updateReferenceSize()
if( xProp.is() )
{
if( xProp->getPropertyValue("ReferencePageSize").hasValue() )
- xProp->setPropertyValue("ReferencePageSize", uno::makeAny(
+ xProp->setPropertyValue("ReferencePageSize", uno::Any(
m_spChart2ModelContact->GetPageSize() ));
}
}
@@ -747,7 +747,7 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope
aWrappedProperties.push_back( new WrappedProperty("FillStyle","FillStyle" ) );
aWrappedProperties.push_back( new WrappedProperty("FillTransparence","Transparency") );
- aWrappedProperties.push_back( new WrappedIgnoreProperty("LineJoint", uno::makeAny( drawing::LineJoint_ROUND ) ) );
+ aWrappedProperties.push_back( new WrappedIgnoreProperty("LineJoint", uno::Any( drawing::LineJoint_ROUND ) ) );
aWrappedProperties.push_back( new WrappedProperty("FillTransparenceGradientName","TransparencyGradientName") );
aWrappedProperties.push_back( new WrappedProperty("FillGradientName","GradientName") );
aWrappedProperties.push_back( new WrappedProperty("FillGradientStepCount","GradientStepCount") );
@@ -854,7 +854,7 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rProperty
{
Reference< chart2::XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme() );
if( xColorScheme.is() )
- return uno::makeAny( xColorScheme->getColorByIndex( m_nPointIndex ) );
+ return uno::Any( xColorScheme->getColorByIndex( m_nPointIndex ) );
}
}
}
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index ffb4fd9..74952ee 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -746,8 +746,8 @@ void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition )
xProp->setPropertyValue( "RelativePosition", aEmpty );
return;
}
- xProp->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) );
- xProp->setPropertyValue( "PosSizeExcludeAxes", uno::makeAny(false) );
+ xProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) );
+ xProp->setPropertyValue( "PosSizeExcludeAxes", uno::Any(false) );
}
}
@@ -777,8 +777,8 @@ void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize )
return;
}
- xProp->setPropertyValue( "RelativeSize", uno::makeAny(aRelativeSize) );
- xProp->setPropertyValue( "PosSizeExcludeAxes", uno::makeAny(false) );
+ xProp->setPropertyValue( "RelativeSize", uno::Any(aRelativeSize) );
+ xProp->setPropertyValue( "PosSizeExcludeAxes", uno::Any(false) );
}
}
@@ -818,7 +818,7 @@ void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectan
DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect );
uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY );
if( xDiaProps.is() )
- xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::makeAny(true) );
+ xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::Any(true) );
}
sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning()
{
@@ -846,7 +846,7 @@ void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectan
DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect );
uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY );
if( xDiaProps.is() )
- xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::makeAny(false) );
+ xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::Any(false) );
}
awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxes( )
{
@@ -1525,7 +1525,7 @@ bool WrappedNumberOfLinesProperty::detectInnerValue( uno::Any& rInnerValue ) con
}
}
if(bHasDetectableInnerValue)
- rInnerValue = uno::makeAny(nNumberOfLines);
+ rInnerValue = uno::Any(nNumberOfLines);
return bHasDetectableInnerValue;
}
@@ -1584,7 +1584,7 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con
// locked controllers
ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
uno::Reference< beans::XPropertySet > xProp( xTemplate, uno::UNO_QUERY );
- xProp->setPropertyValue( "NumberOfLines", uno::makeAny(nNewValue) );
+ xProp->setPropertyValue( "NumberOfLines", uno::Any(nNewValue) );
xTemplate->changeDiagram( xDiagram );
}
catch( const uno::Exception & ex )
@@ -1773,7 +1773,7 @@ Any WrappedSolidTypeProperty::getPropertyValue( const Reference< beans::XPropert
Any WrappedSolidTypeProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
{
- return uno::makeAny( css::chart::ChartSolidType::RECTANGULAR_SOLID );
+ return uno::Any( css::chart::ChartSolidType::RECTANGULAR_SOLID );
}
class WrappedAutomaticSizeProperty : public WrappedProperty
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index fb2fb8d..e95a0c8 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -161,7 +161,7 @@ const std::vector< WrappedProperty* > GridWrapper::createWrappedProperties()
{
::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
- aWrappedProperties.push_back( new WrappedDefaultProperty( "LineColor", "LineColor", uno::makeAny( sal_Int32( 0x000000) ) ) ); // black
+ aWrappedProperties.push_back( new WrappedDefaultProperty( "LineColor", "LineColor", uno::Any( sal_Int32( 0x000000) ) ) ); // black
return aWrappedProperties;
}
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index caa5bf8..4d699c4 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -79,7 +79,7 @@ Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XP
xInnerPropertySet->getPropertyValue( "Show" ) >>= bShowLegend;
if(!bShowLegend)
{
- aRet = uno::makeAny( css::chart::ChartLegendPosition_NONE );
+ aRet = uno::Any( css::chart::ChartLegendPosition_NONE );
}
else
{
@@ -104,7 +104,7 @@ void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, c
}
if(bNewShowLegend!=bOldShowLegend)
{
- xInnerPropertySet->setPropertyValue( "Show", uno::makeAny(bNewShowLegend) );
+ xInnerPropertySet->setPropertyValue( "Show", uno::Any(bNewShowLegend) );
}
if(!bNewShowLegend)
return;
@@ -128,7 +128,7 @@ void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, c
xInnerPropertySet->getPropertyValue( "Expansion" ) >>= eOldExpansion );
if( !bExpansionWasSet || (eOldExpansion != eNewExpansion))
- xInnerPropertySet->setPropertyValue( "Expansion", uno::makeAny( eNewExpansion ));
+ xInnerPropertySet->setPropertyValue( "Expansion", uno::Any( eNewExpansion ));
}
//correct RelativePosition
@@ -167,7 +167,7 @@ Any WrappedLegendAlignmentProperty::convertInnerToOuterValue( const Any& rInnerV
break;
}
}
- return uno::makeAny( ePos );
+ return uno::Any( ePos );
}
Any WrappedLegendAlignmentProperty::convertOuterToInnerValue( const Any& rOuterValue ) const
{
@@ -195,7 +195,7 @@ Any WrappedLegendAlignmentProperty::convertOuterToInnerValue( const Any& rOuterV
}
}
- return uno::makeAny( eNewPos );
+ return uno::Any( eNewPos );
}
}
@@ -291,7 +291,7 @@ void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition )
aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT;
aRelativePosition.Primary = aPageSize.Width == 0 ? 0 : double(aPosition.X)/double(aPageSize.Width);
aRelativePosition.Secondary = aPageSize.Height == 0 ? 0 : double(aPosition.Y)/double(aPageSize.Height);
- xProp->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) );
+ xProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) );
}
}
@@ -351,7 +351,7 @@ void LegendWrapper::updateReferenceSize()
if( xProp.is() )
{
if( xProp->getPropertyValue( "ReferencePageSize" ).hasValue() )
- xProp->setPropertyValue( "ReferencePageSize", uno::makeAny(
+ xProp->setPropertyValue( "ReferencePageSize", uno::Any(
m_spChart2ModelContact->GetPageSize() ));
}
}
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 282fcdf..4b9a84d 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -120,7 +120,7 @@ namespace wrapper
MinMaxLineWrapper::MinMaxLineWrapper(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
: m_spChart2ModelContact( spChart2ModelContact )
, m_aEventListenerContainer( m_aMutex )
- , m_aWrappedLineJointProperty( "LineJoint", uno::makeAny( drawing::LineJoint_NONE ))
+ , m_aWrappedLineJointProperty( "LineJoint", uno::Any( drawing::LineJoint_NONE ))
{
}
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 3cbef7f..e56f203 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -94,7 +94,7 @@ Any WrappedTitleStringProperty::getPropertyValue( const Reference< beans::XPrope
}
Any WrappedTitleStringProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
{
- return uno::makeAny( OUString() );//default title is a empty String
+ return uno::Any( OUString() );//default title is a empty String
}
class WrappedStackedTextProperty : public WrappedProperty
@@ -214,7 +214,7 @@ void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition )
aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT;
aRelativePosition.Primary = double(aPosition.X)/double(aPageSize.Width);
aRelativePosition.Secondary = double(aPosition.Y)/double(aPageSize.Height);
- xPropertySet->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) );
+ xPropertySet->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) );
}
}
@@ -430,7 +430,7 @@ void TitleWrapper::updateReferenceSize()
if( xProp.is() )
{
if( xProp->getPropertyValue( "ReferencePageSize" ).hasValue() )
- xProp->setPropertyValue( "ReferencePageSize", uno::makeAny(
+ xProp->setPropertyValue( "ReferencePageSize", uno::Any(
m_spChart2ModelContact->GetPageSize() ));
}
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
index ffd6baa..b55662a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
@@ -49,7 +49,7 @@ void WrappedAddInProperty::setPropertyValue( const Any& rOuterValue, const Refer
Any WrappedAddInProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
{
- return uno::makeAny( m_rChartDocumentWrapper.getAddIn() );
+ return uno::Any( m_rChartDocumentWrapper.getAddIn() );
}
WrappedBaseDiagramProperty::WrappedBaseDiagramProperty( ChartDocumentWrapper& rChartDocumentWrapper )
@@ -72,7 +72,7 @@ void WrappedBaseDiagramProperty::setPropertyValue( const Any& rOuterValue, const
Any WrappedBaseDiagramProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
{
- return uno::makeAny( m_rChartDocumentWrapper.getBaseDiagram() );
+ return uno::Any( m_rChartDocumentWrapper.getBaseDiagram() );
}
WrappedAdditionalShapesProperty::WrappedAdditionalShapesProperty( ChartDocumentWrapper& rChartDocumentWrapper )
@@ -91,7 +91,7 @@ void WrappedAdditionalShapesProperty::setPropertyValue( const Any& /*rOuterValue
Any WrappedAdditionalShapesProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
{
- return uno::makeAny( m_rChartDocumentWrapper.getAdditionalShapes() );
+ return uno::Any( m_rChartDocumentWrapper.getAdditionalShapes() );
}
WrappedRefreshAddInAllowedProperty::WrappedRefreshAddInAllowedProperty( ChartDocumentWrapper& rChartDocumentWrapper )
@@ -114,7 +114,7 @@ void WrappedRefreshAddInAllowedProperty::setPropertyValue( const Any& rOuterValu
Any WrappedRefreshAddInAllowedProperty::getPropertyValue( const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const
{
- return uno::makeAny( m_rChartDocumentWrapper.getUpdateAddIn() );
+ return uno::Any( m_rChartDocumentWrapper.getUpdateAddIn() );
}
} //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index bd80bbd..8654699 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -360,7 +360,7 @@ void WrappedAxisLabelExistenceProperty::setPropertyValue( const Any& rOuterValue
//create axis if needed
xProp.set( AxisHelper::createAxis( m_nDimensionIndex, m_bMain, xDiagram, m_spChart2ModelContact->m_xContext ), uno::UNO_QUERY );
if( xProp.is() )
- xProp->setPropertyValue( "Show", uno::makeAny( false ) );
+ xProp->setPropertyValue( "Show", uno::Any( false ) );
}
if( xProp.is() )
xProp->setPropertyValue( "DisplayLabels", rOuterValue );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
index ad19a61..f49014b 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
@@ -124,7 +124,7 @@ WrappedDataCaptionProperty::WrappedDataCaptionProperty(
const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact
, tSeriesOrDiagramPropertyType ePropertyType )
: WrappedSeriesOrDiagramProperty< sal_Int32 >( "DataCaption"
- , uno::makeAny( sal_Int32(0) ), spChart2ModelContact, ePropertyType )
+ , uno::Any( sal_Int32(0) ), spChart2ModelContact, ePropertyType )
{
}
@@ -144,7 +144,7 @@ void WrappedDataCaptionProperty::setValueToSeries( const Reference< beans::XProp
return;
chart2::DataPointLabel aLabel = lcl_CaptionToLabel( nCaption );
- xSeriesPropertySet->setPropertyValue( CHART_UNONAME_LABEL, uno::makeAny( aLabel ) );
+ xSeriesPropertySet->setPropertyValue( CHART_UNONAME_LABEL, uno::Any( aLabel ) );
}
} //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
index 93bbda4..c4ca7e7 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
@@ -130,7 +130,7 @@ void WrappedGL3DProperties::addWrappedProperties(
{
rList.push_back(
new WrappedGL3DProperty(
- CHART_UNONAME_ROUNDED_EDGE, CHART_UNONAME_ROUNDED_EDGE, uno::makeAny(false), pChart2ModelContact));
+ CHART_UNONAME_ROUNDED_EDGE, CHART_UNONAME_ROUNDED_EDGE, uno::Any(false), pChart2ModelContact));
}
}}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
index 57fa2a3..3f016f5 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
@@ -39,7 +39,7 @@ WrappedBarPositionProperty_Base::WrappedBarPositionProperty_Base(
, const OUString& rInnerSequencePropertyName
, sal_Int32 nDefaultValue
, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact )
- : WrappedDefaultProperty( rOuterName, OUString(), uno::makeAny( nDefaultValue ) )
+ : WrappedDefaultProperty( rOuterName, OUString(), uno::Any( nDefaultValue ) )
, m_nDimensionIndex(0)
, m_nAxisIndex(0)
, m_spChart2ModelContact( spChart2ModelContact )
@@ -94,7 +94,7 @@ void WrappedBarPositionProperty_Base::setPropertyValue( const Any& rOuterValue,
}
aBarPositionSequence[m_nAxisIndex] = nNewValue;
- xProp->setPropertyValue( m_InnerSequencePropertyName, uno::makeAny( aBarPositionSequence ) );
+ xProp->setPropertyValue( m_InnerSequencePropertyName, uno::Any( aBarPositionSequence ) );
}
}
catch( uno::Exception& e )
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
index 0b41f89..2c34d58 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
@@ -77,7 +77,7 @@ Any WrappedNumberFormatProperty::getPropertyValue( const Reference< beans::XProp
Any WrappedNumberFormatProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
{
- return uno::makeAny( sal_Int32( 0 ) );
+ return uno::Any( sal_Int32( 0 ) );
}
WrappedLinkNumberFormatProperty::WrappedLinkNumberFormatProperty() :
@@ -113,8 +113,7 @@ Any WrappedLinkNumberFormatProperty::getPropertyValue( const Reference< beans::X
Any WrappedLinkNumberFormatProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
{
- bool bLink = true;
- return uno::makeAny( bLink );
+ return uno::Any( true ); // bLink
}
} //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index bd04260..63f8860 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -404,7 +404,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
{
sal_Int32 nIntervalCount = 0;
rSubIncrements[ 0 ].IntervalCount >>= nIntervalCount;
- aRet = uno::makeAny( double(nIntervalCount) );
+ aRet = uno::Any( double(nIntervalCount) );
bNeedToCalculateExplicitValues = false;
}
}
@@ -442,7 +442,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
if( rSubIncrements.getLength() > 0 )
{
sal_Int32 nIntervalCount = aExplicitIncrement.SubIncrements[ 0 ].IntervalCount;
- aRet = uno::makeAny( double(nIntervalCount) );
+ aRet = uno::Any( double(nIntervalCount) );
}
}
else
@@ -476,7 +476,7 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
if( !aExplicitIncrement.SubIncrements.empty() )
nIntervalCount = aExplicitIncrement.SubIncrements[ 0 ].IntervalCount;
}
- aRet = uno::makeAny( nIntervalCount );
+ aRet = uno::Any( nIntervalCount );
break;
}
case SCALE_PROP_AUTO_MAX:
@@ -531,13 +531,13 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
if( !aScaleData.AutoDateAxis )
nType = css::chart::ChartAxisType::CATEGORY;
}
- aRet = uno::makeAny( nType );
+ aRet = uno::Any( nType );
break;
}
case SCALE_PROP_DATE_INCREMENT:
{
if( aScaleData.AxisType == AxisType::DATE || aScaleData.AutoDateAxis )
- aRet = uno::makeAny( aScaleData.TimeIncrement );
+ aRet = uno::Any( aScaleData.TimeIncrement );
break;
}
case SCALE_PROP_EXPLICIT_DATE_INCREMENT:
@@ -548,15 +548,15 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
if( aExplicitScale.AxisType == AxisType::DATE )
{
TimeIncrement aTimeIncrement;
- aTimeIncrement.MajorTimeInterval = uno::makeAny( aExplicitIncrement.MajorTimeInterval );
- aTimeIncrement.MinorTimeInterval = uno::makeAny( aExplicitIncrement.MinorTimeInterval );
- aTimeIncrement.TimeResolution = uno::makeAny( aExplicitScale.TimeResolution );
- aRet = uno::makeAny(aTimeIncrement);
+ aTimeIncrement.MajorTimeInterval = uno::Any( aExplicitIncrement.MajorTimeInterval );
+ aTimeIncrement.MinorTimeInterval = uno::Any( aExplicitIncrement.MinorTimeInterval );
+ aTimeIncrement.TimeResolution = uno::Any( aExplicitScale.TimeResolution );
+ aRet = uno::Any(aTimeIncrement);
}
}
if( aScaleData.AxisType == AxisType::DATE || aScaleData.AutoDateAxis )
- aRet = uno::makeAny( aScaleData.TimeIncrement );
+ aRet = uno::Any( aScaleData.TimeIncrement );
break;
}
case SCALE_PROP_LOGARITHMIC:
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 5bdd140..9f7cc28 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -70,7 +70,7 @@ void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const R
if( bNewValue )
{
awt::Size aRefSize( m_spChart2ModelContact->GetPageSize() );
- xInnerPropertySet->setPropertyValue( aRefSizeName, uno::makeAny( aRefSize ) );
+ xInnerPropertySet->setPropertyValue( aRefSizeName, uno::Any( aRefSize ) );
}
else
xInnerPropertySet->setPropertyValue( aRefSizeName, Any() );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
index 0de7f6d..f0d9e2a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
@@ -66,7 +66,7 @@ void WrappedD3DTransformMatrixProperty::setPropertyValue( const Any& rOuterValue
aHM = BaseGFXHelper::B3DHomMatrixToHomogenMatrix(aNewMatrix);
- WrappedProperty::setPropertyValue( uno::makeAny(aHM), xInnerPropertySet );
+ WrappedProperty::setPropertyValue( uno::Any(aHM), xInnerPropertySet );
return;
}
}
@@ -92,7 +92,7 @@ Any WrappedD3DTransformMatrixProperty::getPropertyValue( const Reference< beans:
aHM = BaseGFXHelper::B3DHomMatrixToHomogenMatrix(aNewMatrix);
- return uno::makeAny(aHM);
+ return uno::Any(aHM);
}
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index 9b1d869..2537b9a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -116,7 +116,7 @@ public:
css::uno::Reference< css::beans::XPropertySet > xChartTypePropertySet( aChartTypes[nN], css::uno::UNO_QUERY );
if( xChartTypePropertySet.is() )
{
- xChartTypePropertySet->setPropertyValue(m_aOwnInnerName,this->convertOuterToInnerValue(uno::makeAny(aNewValue)));
+ xChartTypePropertySet->setPropertyValue(m_aOwnInnerName,this->convertOuterToInnerValue(uno::Any(aNewValue)));
}
}
catch( uno::Exception & ex )
@@ -207,15 +207,15 @@ void WrappedSplineProperties::addWrappedProperties( std::vector< WrappedProperty
rList.push_back(
new WrappedSplineProperty<sal_Int32>(
CHART_UNONAME_SPLINE_ORDER, CHART_UNONAME_SPLINE_ORDER,
- uno::makeAny(sal_Int32(3)), spChart2ModelContact));
+ uno::Any(sal_Int32(3)), spChart2ModelContact));
rList.push_back(
new WrappedSplineProperty<sal_Int32>(
CHART_UNONAME_SPLINE_RESOLUTION, CHART_UNONAME_CURVE_RESOLUTION,
- uno::makeAny(sal_Int32(20)), spChart2ModelContact));
+ uno::Any(sal_Int32(20)), spChart2ModelContact));
}
WrappedSplineTypeProperty::WrappedSplineTypeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
- : WrappedSplineProperty<sal_Int32>(CHART_UNONAME_SPLINE_TYPE, CHART_UNONAME_CURVE_STYLE, uno::makeAny(sal_Int32(0)), spChart2ModelContact )
+ : WrappedSplineProperty<sal_Int32>(CHART_UNONAME_SPLINE_TYPE, CHART_UNONAME_CURVE_STYLE, uno::Any(sal_Int32(0)), spChart2ModelContact )
{
}
@@ -249,7 +249,7 @@ Any WrappedSplineTypeProperty::convertInnerToOuterValue( const Any& rInnerValue
nOuterValue = 0;
}
- return uno::makeAny(nOuterValue);
+ return uno::Any(nOuterValue);
}
Any WrappedSplineTypeProperty::convertOuterToInnerValue( const Any& rOuterValue ) const
{
@@ -283,7 +283,7 @@ Any WrappedSplineTypeProperty::convertOuterToInnerValue( const Any& rOuterValue
aInnerValue = chart2::CurveStyle_LINES;
}
- return uno::makeAny(aInnerValue);
+ return uno::Any(aInnerValue);
}
} //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 31e51a8..012ee39 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -188,10 +188,10 @@ protected:
{
xErrorBarProperties = new ::chart::ErrorBar;
//default in new and old api are different
- xErrorBarProperties->setPropertyValue( "ShowPositiveError" , uno::makeAny(false) );
- xErrorBarProperties->setPropertyValue( "ShowNegativeError" , uno::makeAny(false) );
- xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::makeAny(css::chart::ErrorBarStyle::NONE) );
- xSeriesPropertySet->setPropertyValue( CHART_UNONAME_ERRORBAR_Y , uno::makeAny( xErrorBarProperties ) );
+ xErrorBarProperties->setPropertyValue( "ShowPositiveError" , uno::Any(false) );
+ xErrorBarProperties->setPropertyValue( "ShowNegativeError" , uno::Any(false) );
+ xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::Any(css::chart::ErrorBarStyle::NONE) );
+ xSeriesPropertySet->setPropertyValue( CHART_UNONAME_ERRORBAR_Y , uno::Any( xErrorBarProperties ) );
}
return xErrorBarProperties;
}
@@ -216,7 +216,7 @@ WrappedConstantErrorLowProperty::WrappedConstantErrorLowProperty(
::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< double >( "ConstantErrorLow"
- , uno::makeAny( double(0.0) ), spChart2ModelContact, ePropertyType )
+ , uno::Any( double(0.0) ), spChart2ModelContact, ePropertyType )
{
}
@@ -240,7 +240,7 @@ void WrappedConstantErrorLowProperty::setValueToSeries( const Reference< beans::
uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
if( xErrorBarProperties.is() )
{
- m_aOuterValue = uno::makeAny( aNewValue );
+ m_aOuterValue = uno::Any( aNewValue );
if( css::chart::ErrorBarStyle::ABSOLUTE == lcl_getErrorBarStyle( xErrorBarProperties ) )
{
xErrorBarProperties->setPropertyValue( "NegativeError", m_aOuterValue );
@@ -266,7 +266,7 @@ WrappedConstantErrorHighProperty::WrappedConstantErrorHighProperty(
::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< double >( "ConstantErrorHigh"
- , uno::makeAny( double(0.0) ), spChart2ModelContact, ePropertyType )
+ , uno::Any( double(0.0) ), spChart2ModelContact, ePropertyType )
{
}
@@ -290,7 +290,7 @@ void WrappedConstantErrorHighProperty::setValueToSeries( const Reference< beans:
uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
if( xErrorBarProperties.is() )
{
- m_aOuterValue = uno::makeAny( aNewValue );
+ m_aOuterValue = uno::Any( aNewValue );
if( css::chart::ErrorBarStyle::ABSOLUTE == lcl_getErrorBarStyle( xErrorBarProperties ) )
{
xErrorBarProperties->setPropertyValue( "PositiveError" , m_aOuterValue );
@@ -312,7 +312,7 @@ public:
WrappedMeanValueProperty::WrappedMeanValueProperty(
::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
- : WrappedStatisticProperty< bool >( "MeanValue", uno::makeAny( false ), spChart2ModelContact, ePropertyType )
+ : WrappedStatisticProperty< bool >( "MeanValue", uno::Any( false ), spChart2ModelContact, ePropertyType )
{
}
@@ -353,7 +353,7 @@ WrappedErrorCategoryProperty::WrappedErrorCategoryProperty(
::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< css::chart::ChartErrorCategory >( "ErrorCategory"
- , uno::makeAny( css::chart::ChartErrorCategory_NONE ), spChart2ModelContact, ePropertyType )
+ , uno::Any( css::chart::ChartErrorCategory_NONE ), spChart2ModelContact, ePropertyType )
{
}
@@ -428,7 +428,7 @@ void WrappedErrorCategoryProperty::setValueToSeries( const Reference< beans::XPr
default:
break;
}
- xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::makeAny(nNewStyle) );
+ xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::Any(nNewStyle) );
}
}
@@ -450,7 +450,7 @@ WrappedPercentageErrorProperty::WrappedPercentageErrorProperty(
::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< double >( "PercentageError"
- , uno::makeAny( double(0.0) ), spChart2ModelContact, ePropertyType )
+ , uno::Any( double(0.0) ), spChart2ModelContact, ePropertyType )
{
}
@@ -473,7 +473,7 @@ void WrappedPercentageErrorProperty::setValueToSeries( const Reference< beans::X
uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
if( xErrorBarProperties.is() )
{
- m_aOuterValue = uno::makeAny( aNewValue );
+ m_aOuterValue = uno::Any( aNewValue );
if( css::chart::ErrorBarStyle::RELATIVE == lcl_getErrorBarStyle( xErrorBarProperties ) )
{
xErrorBarProperties->setPropertyValue( "PositiveError" , m_aOuterValue );
@@ -500,7 +500,7 @@ WrappedErrorMarginProperty::WrappedErrorMarginProperty(
::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< double >( "ErrorMargin"
- , uno::makeAny( double(0.0) ), spChart2ModelContact, ePropertyType )
+ , uno::Any( double(0.0) ), spChart2ModelContact, ePropertyType )
{
}
@@ -523,7 +523,7 @@ void WrappedErrorMarginProperty::setValueToSeries( const Reference< beans::XProp
uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
if( xErrorBarProperties.is() )
{
- m_aOuterValue = uno::makeAny( aNewValue );
+ m_aOuterValue = uno::Any( aNewValue );
if( css::chart::ErrorBarStyle::ERROR_MARGIN == lcl_getErrorBarStyle( xErrorBarProperties ) )
{
xErrorBarProperties->setPropertyValue( "PositiveError" , m_aOuterValue );
@@ -547,7 +547,7 @@ WrappedErrorIndicatorProperty::WrappedErrorIndicatorProperty(
::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< css::chart::ChartErrorIndicatorType >( "ErrorIndicator"
- , uno::makeAny( css::chart::ChartErrorIndicatorType_NONE ), spChart2ModelContact, ePropertyType )
+ , uno::Any( css::chart::ChartErrorIndicatorType_NONE ), spChart2ModelContact, ePropertyType )
{
}
@@ -595,8 +595,8 @@ void WrappedErrorIndicatorProperty::setValueToSeries( const Reference< beans::XP
break;
}
- xErrorBarProperties->setPropertyValue( "ShowPositiveError" , uno::makeAny(bPositive) );
- xErrorBarProperties->setPropertyValue( "ShowNegativeError" , uno::makeAny(bNegative) );
+ xErrorBarProperties->setPropertyValue( "ShowPositiveError" , uno::Any(bPositive) );
+ xErrorBarProperties->setPropertyValue( "ShowNegativeError" , uno::Any(bNegative) );
}
}
@@ -616,7 +616,7 @@ WrappedErrorBarStyleProperty::WrappedErrorBarStyleProperty(
::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< sal_Int32 >( "ErrorBarStyle"
- , uno::makeAny( css::chart::ErrorBarStyle::NONE ), spChart2ModelContact, ePropertyType )
+ , uno::Any( css::chart::ErrorBarStyle::NONE ), spChart2ModelContact, ePropertyType )
{
}
@@ -639,7 +639,7 @@ void WrappedErrorBarStyleProperty::setValueToSeries( const Reference< beans::XPr
uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
if( xErrorBarProperties.is() )
{
- xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::makeAny( nNewValue ));
+ xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::Any( nNewValue ));
}
}
@@ -661,7 +661,7 @@ WrappedErrorBarRangePositiveProperty::WrappedErrorBarRangePositiveProperty(
::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< OUString >( "ErrorBarRangePositive"
- , uno::makeAny( OUString() ), spChart2ModelContact, ePropertyType )
+ , uno::Any( OUString() ), spChart2ModelContact, ePropertyType )
{
}
@@ -724,7 +724,7 @@ WrappedErrorBarRangeNegativeProperty::WrappedErrorBarRangeNegativeProperty(
::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< OUString >( "ErrorBarRangeNegative"
- , uno::makeAny( OUString() ), spChart2ModelContact, ePropertyType )
+ , uno::Any( OUString() ), spChart2ModelContact, ePropertyType )
{
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index c7f16fe..852fd09 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -116,7 +116,7 @@ public:
};
WrappedVolumeProperty::WrappedVolumeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
- : WrappedStockProperty( "Volume", uno::makeAny(false) , spChart2ModelContact )
+ : WrappedStockProperty( "Volume", uno::Any(false) , spChart2ModelContact )
{
}
@@ -181,7 +181,7 @@ public:
};
WrappedUpDownProperty::WrappedUpDownProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
- : WrappedStockProperty( "UpDown", uno::makeAny(false) , spChart2ModelContact )
+ : WrappedStockProperty( "UpDown", uno::Any(false) , spChart2ModelContact )
{
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index ba107ea..830fbb6 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -209,7 +209,7 @@ WrappedSymbolTypeProperty::WrappedSymbolTypeProperty(
const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedSeriesOrDiagramProperty< sal_Int32 >( "SymbolType"
- , uno::makeAny( css::chart::ChartSymbolType::NONE )
+ , uno::Any( css::chart::ChartSymbolType::NONE )
, spChart2ModelContact
, ePropertyType )
{
@@ -234,7 +234,7 @@ void WrappedSymbolTypeProperty::setValueToSeries( const Reference< beans::XPrope
xSeriesPropertySet->getPropertyValue("Symbol") >>= aSymbol;
lcl_setSymbolTypeToSymbol( nSymbolType, aSymbol );
- xSeriesPropertySet->setPropertyValue( "Symbol", uno::makeAny( aSymbol ) );
+ xSeriesPropertySet->setPropertyValue( "Symbol", uno::Any( aSymbol ) );
}
Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
@@ -248,14 +248,14 @@ Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XProper
{
if(bHasAmbiguousValue)
{
- m_aOuterValue = uno::makeAny( css::chart::ChartSymbolType::AUTO );
+ m_aOuterValue = uno::Any( css::chart::ChartSymbolType::AUTO );
}
else
{
if( css::chart::ChartSymbolType::NONE == aValue )
- m_aOuterValue = uno::makeAny( css::chart::ChartSymbolType::NONE );
+ m_aOuterValue = uno::Any( css::chart::ChartSymbolType::NONE );
else
- m_aOuterValue = uno::makeAny( css::chart::ChartSymbolType::AUTO );
+ m_aOuterValue = uno::Any( css::chart::ChartSymbolType::AUTO );
}
}
return m_aOuterValue;
@@ -290,7 +290,7 @@ WrappedSymbolBitmapURLProperty::WrappedSymbolBitmapURLProperty(
const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedSeriesOrDiagramProperty< OUString >( "SymbolBitmapURL"
- , uno::makeAny( OUString() ), spChart2ModelContact, ePropertyType )
+ , uno::Any( OUString() ), spChart2ModelContact, ePropertyType )
{
}
@@ -326,7 +326,7 @@ void WrappedSymbolBitmapURLProperty::setValueToSeries(
GraphicObject aGrObj = GraphicObject(
OUStringToOString(aNewGraphicURL.copy( RTL_CONSTASCII_LENGTH(UNO_NAME_GRAPHOBJ_URLPREFIX) ), RTL_TEXTENCODING_ASCII_US));
aSymbol.Graphic.set( aGrObj.GetGraphic().GetXGraphic());
- xSeriesPropertySet->setPropertyValue( "Symbol", uno::makeAny( aSymbol ) );
+ xSeriesPropertySet->setPropertyValue( "Symbol", uno::Any( aSymbol ) );
}
else
{
@@ -336,11 +336,11 @@ void WrappedSymbolBitmapURLProperty::setValueToSeries(
Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
Reference< graphic::XGraphicProvider > xGraphProv( graphic::GraphicProvider::create(xContext) );
Sequence< beans::PropertyValue > aArgs(1);
- aArgs[0] = beans::PropertyValue( "URL", -1, uno::makeAny( aNewGraphicURL ),
+ aArgs[0] = beans::PropertyValue( "URL", -1, uno::Any( aNewGraphicURL ),
beans::PropertyState_DIRECT_VALUE );
aSymbol.Graphic.set( xGraphProv->queryGraphic( aArgs ));
OSL_ENSURE( aSymbol.Graphic.is(), "Invalid URL for Symbol Bitmap" );
- xSeriesPropertySet->setPropertyValue( "Symbol", uno::makeAny( aSymbol ) );
+ xSeriesPropertySet->setPropertyValue( "Symbol", uno::Any( aSymbol ) );
}
catch( const uno::Exception & ex )
{
@@ -414,7 +414,7 @@ WrappedSymbolSizeProperty::WrappedSymbolSizeProperty(
const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedSeriesOrDiagramProperty< awt::Size >( "SymbolSize"
- , uno::makeAny( awt::Size(250,250) ), spChart2ModelContact, ePropertyType )
+ , uno::Any( awt::Size(250,250) ), spChart2ModelContact, ePropertyType )
{
}
@@ -440,7 +440,7 @@ void WrappedSymbolSizeProperty::setValueToSeries(
{
aSymbol.Size = aNewSize;
lcl_correctSymbolSizeForBitmaps(aSymbol);
- xSeriesPropertySet->setPropertyValue( "Symbol", uno::makeAny( aSymbol ) );
+ xSeriesPropertySet->setPropertyValue( "Symbol", uno::Any( aSymbol ) );
}
}
@@ -471,7 +471,7 @@ WrappedSymbolAndLinesProperty::WrappedSymbolAndLinesProperty(
const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedSeriesOrDiagramProperty< bool >( "Lines"
- , uno::makeAny( true ), spChart2ModelContact, ePropertyType )
+ , uno::Any( true ), spChart2ModelContact, ePropertyType )
{
}
@@ -494,12 +494,12 @@ void WrappedSymbolAndLinesProperty::setValueToSeries(
{
//#i114298# don't overwrite dashed lines with solid lines here
if( eOldLineStyle == drawing::LineStyle_NONE )
- xSeriesPropertySet->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) );
+ xSeriesPropertySet->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_SOLID ) );
}
else
{
if( eOldLineStyle != drawing::LineStyle_NONE )
- xSeriesPropertySet->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ) );
+ xSeriesPropertySet->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE ) );
}
}
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 1d434d4..6acfc91 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -288,9 +288,9 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla
{
try
{
- xTemplateProps->setPropertyValue( CHART_UNONAME_CURVE_STYLE , uno::makeAny(rParameter.eCurveStyle) );
- xTemplateProps->setPropertyValue( CHART_UNONAME_CURVE_RESOLUTION , uno::makeAny(rParameter.nCurveResolution) );
- xTemplateProps->setPropertyValue( CHART_UNONAME_SPLINE_ORDER , uno::makeAny(rParameter.nSplineOrder) );
+ xTemplateProps->setPropertyValue( CHART_UNONAME_CURVE_STYLE , uno::Any(rParameter.eCurveStyle) );
+ xTemplateProps->setPropertyValue( CHART_UNONAME_CURVE_RESOLUTION , uno::Any(rParameter.nCurveResolution) );
+ xTemplateProps->setPropertyValue( CHART_UNONAME_SPLINE_ORDER , uno::Any(rParameter.nSplineOrder) );
}
catch( uno::Exception & ex )
{
@@ -299,7 +299,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla
}
try
{
- xTemplateProps->setPropertyValue( "Geometry3D" , uno::makeAny(rParameter.nGeometry3D) );
+ xTemplateProps->setPropertyValue( "Geometry3D" , uno::Any(rParameter.nGeometry3D) );
}
catch( uno::Exception & ex )
{
@@ -309,7 +309,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla
try
{
- xTemplateProps->setPropertyValue(CHART_UNONAME_ROUNDED_EDGE, uno::makeAny(rParameter.mbRoundedEdge));
+ xTemplateProps->setPropertyValue(CHART_UNONAME_ROUNDED_EDGE, uno::Any(rParameter.mbRoundedEdge));
}
catch ( const uno::Exception& )
{
@@ -354,7 +354,7 @@ void ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame
uno::Reference<beans::XPropertySet> xDiaProp(xDiagram, uno::UNO_QUERY);
if (xDiaProp.is())
{
- xDiaProp->setPropertyValue(CHART_UNONAME_SORT_BY_XVALUES, uno::makeAny(rParameter.bSortByXValues));
+ xDiaProp->setPropertyValue(CHART_UNONAME_SORT_BY_XVALUES, uno::Any(rParameter.bSortByXValues));
}
}
}
@@ -1229,7 +1229,7 @@ void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Ref
if( xTemplateProps.is() )
{
sal_Int32 nNumLines = static_cast< sal_Int32 >( m_pMF_NumberOfLines->GetValue());
- xTemplateProps->setPropertyValue( "NumberOfLines" , uno::makeAny(nNumLines) );
+ xTemplateProps->setPropertyValue( "NumberOfLines" , uno::Any(nNumLines) );
}
}
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 345ae06..b2ae9b2 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -1195,9 +1195,9 @@ bool DataBrowser::SaveModified()
double fValue = 0.0;
bChangeValid = false;
if( isDateTimeString( aText, fValue ) )
- bChangeValid = m_apDataBrowserModel->setCellAny( nCol, nRow, uno::makeAny( fValue ) );
+ bChangeValid = m_apDataBrowserModel->setCellAny( nCol, nRow, uno::Any( fValue ) );
if(!bChangeValid)
- bChangeValid = m_apDataBrowserModel->setCellAny( nCol, nRow, uno::makeAny( aText ) );
+ bChangeValid = m_apDataBrowserModel->setCellAny( nCol, nRow, uno::Any( aText ) );
}
break;
case DataBrowserModel::TEXT:
@@ -1379,7 +1379,7 @@ IMPL_LINK( DataBrowser, SeriesHeaderChanged, impl::SeriesHeaderEdit*, pEdit, voi
Reference< container::XIndexReplace > xIndexReplace( xLabeledSeq->getLabel(), uno::UNO_QUERY );
if( xIndexReplace.is())
xIndexReplace->replaceByIndex(
- 0, uno::makeAny( OUString( pEdit->GetText())));
+ 0, uno::Any( OUString( pEdit->GetText())));
}
}
}
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index e90d36a..83064a1 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -390,7 +390,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
//give the new series the same number format as the former series especially for bubble charts thus the bubble size values can be edited with same format immediately
Reference< beans::XPropertySet > xNewSeriesProps( xNewSeries, uno::UNO_QUERY );
if( xNewSeriesProps.is() )
- xNewSeriesProps->setPropertyValue(CHART_UNONAME_NUMFMT , uno::makeAny(nSeriesNumberFormat));
+ xNewSeriesProps->setPropertyValue(CHART_UNONAME_NUMFMT , uno::Any(nSeriesNumberFormat));
}
updateFromModel();
@@ -698,13 +698,13 @@ bool DataBrowserModel::setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow, const
bool DataBrowserModel::setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, double fValue )
{
return (getCellType( nAtColumn, nAtRow ) == NUMBER) &&
- setCellAny( nAtColumn, nAtRow, uno::makeAny( fValue ));
+ setCellAny( nAtColumn, nAtRow, uno::Any( fValue ));
}
bool DataBrowserModel::setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const OUString & rText )
{
return (getCellType( nAtColumn, nAtRow ) == TEXT) &&
- setCellAny( nAtColumn, nAtRow, uno::makeAny( rText ));
+ setCellAny( nAtColumn, nAtRow, uno::Any( rText ));
}
sal_Int32 DataBrowserModel::getColumnCount() const
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 08f391d..e6cdc92 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -262,7 +262,7 @@ void lcl_SetSequenceRole(
{
Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY );
if( xProp.is())
- xProp->setPropertyValue( "Role" , uno::makeAny( rRole ));
+ xProp->setPropertyValue( "Role" , uno::Any( rRole ));
}
Reference< XDataSeries > lcl_CreateNewSeries(
@@ -288,7 +288,7 @@ Reference< XDataSeries > lcl_CreateNewSeries(
// without setting it as hard attribute
Reference< XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme());
if( xColorScheme.is())
- xResultProp->setPropertyValue( "Color" , uno::makeAny( xColorScheme->getColorByIndex( nNewSeriesIndex )));
+ xResultProp->setPropertyValue( "Color" , uno::Any( xColorScheme->getColorByIndex( nNewSeriesIndex )));
}
sal_Int32 nGroupIndex=0;
if( xChartType.is())
@@ -816,7 +816,7 @@ void DialogModel::applyInterpretedData(
Reference< XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme());
if( xColorScheme.is())
xSeriesProp->setPropertyValue( "Color" ,
- uno::makeAny( xColorScheme->getColorByIndex( nSeriesCounter )));
+ uno::Any( xColorScheme->getColorByIndex( nSeriesCounter )));
}
m_xTemplate->applyStyle( aSeries[nSeries], nGroup, nNewSeriesIndex++, nSeriesInGroup );
}
diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
index 013c625..addc52a 100644
--- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
@@ -120,17 +120,17 @@ bool RangeSelectionHelper::chooseRange(
{
Sequence< beans::PropertyValue > aArgs( 4 );
aArgs[0] = beans::PropertyValue(
- "InitialValue", -1, uno::makeAny( aCurrentRange ),
+ "InitialValue", -1, uno::Any( aCurrentRange ),
beans::PropertyState_DIRECT_VALUE );
aArgs[1] = beans::PropertyValue(
"Title", -1,
- uno::makeAny( aUIString ),
+ uno::Any( aUIString ),
beans::PropertyState_DIRECT_VALUE );
aArgs[2] = beans::PropertyValue(
- "CloseOnMouseRelease", -1, uno::makeAny( true ),
+ "CloseOnMouseRelease", -1, uno::Any( true ),
beans::PropertyState_DIRECT_VALUE );
aArgs[3] = beans::PropertyValue(
- "MultiSelectionMode", -1, uno::makeAny( true ),
+ "MultiSelectionMode", -1, uno::Any( true ),
beans::PropertyState_DIRECT_VALUE );
if( m_xRangeSelectionListener.is() )
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 096fecf..c4c00cd 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -313,7 +313,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPrope
{
Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
awt::Point aPoint(aRect.Left(),aRect.Top());
- aRet = uno::makeAny( aPoint );
+ aRet = uno::Any( aPoint );
}
}
else if( rPropertyName == "Size" )
@@ -326,12 +326,12 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPrope
{
Rectangle aRect( m_pDialog->GetWindowExtentsRelative( nullptr ) );
awt::Size aSize(aRect.GetWidth(),aRect.GetHeight());
- aRet = uno::makeAny( aSize );
+ aRet = uno::Any( aSize );
}
}
else if( rPropertyName == "UnlockControllersOnExecute" )
{
- aRet = uno::makeAny( m_bUnlockControllersOnExecute );
+ aRet = uno::Any( m_bUnlockControllersOnExecute );
}
else
throw beans::UnknownPropertyException( "unknown property was tried to get from chart wizard" , nullptr );
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 6b268f9..23b89af 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -131,7 +131,7 @@ void LegendPositionResources::writeToModel( const css::uno::Reference< frame::XM
if( xProp.is() )
{
//show
- xProp->setPropertyValue( "Show" , uno::makeAny( bShowLegend ));
+ xProp->setPropertyValue( "Show" , uno::Any( bShowLegend ));
//position
chart2::LegendPosition eNewPos;
@@ -154,8 +154,8 @@ void LegendPositionResources::writeToModel( const css::uno::Reference< frame::XM
eExp = css::chart::ChartLegendExpansion_WIDE;
}
- xProp->setPropertyValue( "AnchorPosition" , uno::makeAny( eNewPos ));
- xProp->setPropertyValue( "Expansion" , uno::makeAny( eExp ));
+ xProp->setPropertyValue( "AnchorPosition" , uno::Any( eNewPos ));
+ xProp->setPropertyValue( "Expansion" , uno::Any( eExp ));
xProp->setPropertyValue( "RelativePosition" , uno::Any());
}
}
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 602afff..8fa0259 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -68,7 +68,7 @@ void lcl_setShadeModeAtModel( uno::Reference< frame::XModel > & xModel, drawing:
{
uno::Reference< beans::XPropertySet > xDiaProp(
::chart::ChartModelHelper::findDiagram( xModel ), uno::UNO_QUERY_THROW );
- xDiaProp->setPropertyValue( "D3DSceneShadeMode" , uno::makeAny( aShadeMode ));
+ xDiaProp->setPropertyValue( "D3DSceneShadeMode" , uno::Any( aShadeMode ));
}
catch( const uno::Exception & ex )
{
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index f07864ff..77e0d0c 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -218,8 +218,8 @@ void ThreeD_SceneGeometry_TabPage::applyPerspectiveToModel()
try
{
- m_xSceneProperties->setPropertyValue( "D3DScenePerspective" , uno::makeAny( aMode ));
- m_xSceneProperties->setPropertyValue( "Perspective" , uno::makeAny( (sal_Int32)m_pMFPerspective->GetValue() ));
+ m_xSceneProperties->setPropertyValue( "D3DScenePerspective" , uno::Any( aMode ));
+ m_xSceneProperties->setPropertyValue( "Perspective" , uno::Any( (sal_Int32)m_pMFPerspective->GetValue() ));
}
catch( const uno::Exception & ex )
{
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index a877896..59e6108 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -160,11 +160,11 @@ namespace
try
{
xSceneProperties->setPropertyValue( "D3DSceneLightColor" + aIndex,
- uno::makeAny( rLightSource.nDiffuseColor ));
+ uno::Any( rLightSource.nDiffuseColor ));
xSceneProperties->setPropertyValue( "D3DSceneLightDirection" + aIndex,
- uno::makeAny( rLightSource.aDirection ));
+ uno::Any( rLightSource.aDirection ));
xSceneProperties->setPropertyValue( "D3DSceneLightOn" + aIndex,
- uno::makeAny( rLightSource.bIsEnabled ));
+ uno::Any( rLightSource.bIsEnabled ));
}
catch( const uno::Exception & ex )
{
@@ -199,7 +199,7 @@ namespace
try
{
xSceneProperties->setPropertyValue("D3DSceneAmbientColor",
- uno::makeAny( rColor.GetColor()));
+ uno::Any( rColor.GetColor()));
}
catch( const uno::Exception & ex )
{
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index df92cc0..183073c 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -913,7 +913,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
// "$Sheet1.$A$1"
aRange = xNewSeq->getSourceRangeRepresentation();
Reference< beans::XPropertySet > xProp( xNewSeq, uno::UNO_QUERY_THROW );
- xProp->setPropertyValue( "Role" , uno::makeAny( lcl_aLabelRole ));
+ xProp->setPropertyValue( "Role" , uno::Any( lcl_aLabelRole ));
xLabeledSeq->setLabel( xNewSeq );
}
}
@@ -945,7 +945,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
aRange = xNewSeq->getSourceRangeRepresentation();
Reference< beans::XPropertySet > xProp( xNewSeq, uno::UNO_QUERY_THROW );
- xProp->setPropertyValue( "Role" , uno::makeAny( aSelectedRole ));
+ xProp->setPropertyValue( "Role" , uno::Any( aSelectedRole ));
if( !xLabeledSeq.is())
{
if( aSelectedRole == aSequenceNameForLabel )
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 62ce33a..deac1fd 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -253,7 +253,7 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
{
aArguments.realloc( aArguments.getLength() + 1 );
aArguments[aArguments.getLength() - 1] =
- beans::PropertyValue( "TimeBased", -1, uno::makeAny(bTimeBased),
+ beans::PropertyValue( "TimeBased", -1, uno::Any(bTimeBased),
beans::PropertyState_DIRECT_VALUE );
}
@@ -264,7 +264,7 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
aArguments.realloc( aArguments.getLength() + 1 );
aArguments[aArguments.getLength() - 1] =
beans::PropertyValue( "CellRangeRepresentation" , -1,
- uno::makeAny( m_aLastValidRangeString ),
+ uno::Any( m_aLastValidRangeString ),
beans::PropertyState_DIRECT_VALUE );
m_rDialogModel.setData( aArguments );
m_bIsDirty = false;
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index fbb79d0..192fd3d 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -582,7 +582,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
TimeInterval aTimeInterval;
aScale.TimeIncrement.MajorTimeInterval >>= aTimeInterval;
aValue >>= aTimeInterval.TimeUnit;
- aScale.TimeIncrement.MajorTimeInterval = uno::makeAny( aTimeInterval );
+ aScale.TimeIncrement.MajorTimeInterval <<= aTimeInterval;
bSetScale = true;
}
}
@@ -601,7 +601,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
TimeInterval aTimeInterval;
aScale.TimeIncrement.MajorTimeInterval >>= aTimeInterval;
aTimeInterval.Number = static_cast<sal_Int32>(fValue);
- aScale.TimeIncrement.MajorTimeInterval = uno::makeAny( aTimeInterval );
+ aScale.TimeIncrement.MajorTimeInterval <<= aTimeInterval;
bSetScale = true;
}
}
@@ -640,7 +640,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
TimeInterval aTimeInterval;
aScale.TimeIncrement.MinorTimeInterval >>= aTimeInterval;
aValue >>= aTimeInterval.TimeUnit;
- aScale.TimeIncrement.MinorTimeInterval = uno::makeAny( aTimeInterval );
+ aScale.TimeIncrement.MinorTimeInterval <<= aTimeInterval;
bSetScale = true;
}
}
@@ -656,7 +656,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
TimeInterval aTimeInterval;
aScale.TimeIncrement.MinorTimeInterval >>= aTimeInterval;
aValue >>= aTimeInterval.Number;
- aScale.TimeIncrement.MinorTimeInterval = uno::makeAny(aTimeInterval);
+ aScale.TimeIncrement.MinorTimeInterval <<= aTimeInterval;
bSetScale = true;
}
else if( aScale.IncrementData.SubIncrements.getLength() > 0 )
@@ -733,11 +733,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
double fValue = 0.0;
if( aValue >>= fValue )
{
- xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( css::chart::ChartAxisPosition_VALUE ));
- xCrossingMainAxis->setPropertyValue( "CrossoverValue" , uno::makeAny( fValue ));
+ xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::Any( css::chart::ChartAxisPosition_VALUE ));
+ xCrossingMainAxis->setPropertyValue( "CrossoverValue" , uno::Any( fValue ));
}
else
- xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::makeAny( css::chart::ChartAxisPosition_START ));
+ xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::Any( css::chart::ChartAxisPosition_START ));
}
}
}
@@ -757,7 +757,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet
if( !bPropExisted || ( eOldAxisPos != eAxisPos ))
{
- GetPropertySet()->setPropertyValue( "CrossoverPosition" , uno::makeAny( eAxisPos ));
+ GetPropertySet()->setPropertyValue( "CrossoverPosition" , uno::Any( eAxisPos ));
bChangedOtherwise = true;
//move the parallel axes to the other side if necessary
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list