diff options
5 files changed, 7 insertions, 7 deletions
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 53855c424d49..db5eb0bc3b00 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -218,7 +218,7 @@ void lcl_extractAndStartStatusIndicator( const utl::MediaDescriptor& _rDescripto { try { - _rxStatusIndicator = _rDescriptor.getUnpackedValueOrDefault( _rDescriptor.PROP_STATUSINDICATOR(), _rxStatusIndicator ); + _rxStatusIndicator = _rDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_STATUSINDICATOR(), _rxStatusIndicator ); if ( _rxStatusIndicator.is() ) { _rxStatusIndicator->start( OUString(), (sal_Int32)1000000 ); @@ -519,7 +519,7 @@ namespace ::comphelper::MimeConfigurationHelper aHelper(m_xContext); SvtModuleOptions aModuleOptions; uno::Reference< frame::XModel > xModel(xFrameLoad->loadComponentFromURL( - aModuleOptions.GetFactoryEmptyDocumentURL( aModuleOptions.ClassifyFactoryByServiceName( aHelper.GetDocServiceNameFromMediaType(m_sMimeType) )), + aModuleOptions.GetFactoryEmptyDocumentURL( SvtModuleOptions::ClassifyFactoryByServiceName( aHelper.GetDocServiceNameFromMediaType(m_sMimeType) )), OUString(), // empty frame name 0, aArgs @@ -1477,7 +1477,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS xInfoSet->setPropertyValue("UsePrettyPrinting", uno::makeAny(aSaveOpt.IsPrettyPrinting())); if ( aSaveOpt.IsSaveRelFSys() ) { - const OUString sVal( aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),OUString()) ); + const OUString sVal( aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTBASEURL(),OUString()) ); xInfoSet->setPropertyValue("BaseURI", uno::makeAny(sVal)); } const OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault("HierarchicalDocumentName",OUString()) ); diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index d56b6367d799..d40a480caacc 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -517,7 +517,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) }; utl::MediaDescriptor aDescriptor(rDescriptor); uno::Reference<beans::XPropertySet> xProp = comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap)); - const OUString sVal( aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),OUString()) ); + const OUString sVal( aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTBASEURL(),OUString()) ); xProp->setPropertyValue("BaseURI", uno::makeAny(sVal)); const OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault("HierarchicalDocumentName",OUString()) ); xProp->setPropertyValue("StreamRelPath", uno::makeAny(sHierarchicalDocumentName)); diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 9e613505a253..3affd783bf35 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -365,7 +365,7 @@ uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedPrope ::std::vector< beans::Property > aNewProps; if( m_xChartModel.is() ) { - m_pInfoService->getExcludeProperties( aNewProps, m_xFormComponentHandler ); + rptui::OPropertyInfoService::getExcludeProperties( aNewProps, m_xFormComponentHandler ); beans::Property aValue; static const OUString s_pProperties[] = { diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index be85489bf41e..519ccfbcb1cf 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -1268,7 +1268,7 @@ uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedPropertie { ::std::vector< beans::Property > aNewProps; aNewProps.reserve(20); // only a guess - m_pInfoService->getExcludeProperties( aNewProps, m_xFormComponentHandler ); + rptui::OPropertyInfoService::getExcludeProperties( aNewProps, m_xFormComponentHandler ); const OUString pIncludeProperties[] = { diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index 987d38386aa3..d9e9a69d6577 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -173,7 +173,7 @@ void SAL_CALL ReportComponentHandler::removePropertyChangeListener(const uno::Re uno::Sequence< beans::Property > SAL_CALL ReportComponentHandler::getSupportedProperties() throw (uno::RuntimeException, std::exception) { ::std::vector< beans::Property > aNewProps; - m_pInfoService->getExcludeProperties( aNewProps, m_xFormComponentHandler ); + rptui::OPropertyInfoService::getExcludeProperties( aNewProps, m_xFormComponentHandler ); return aNewProps.empty() ? uno::Sequence< beans::Property > () : uno::Sequence< beans::Property > (&(*aNewProps.begin()),aNewProps.size()); } |