Cheers, Wol
>From 80e48ddcd8d78241849f5e3bdb767477c7c6c9b3 Mon Sep 17 00:00:00 2001 From: Wol <anth...@youngman.org.uk> Date: Sun, 28 Nov 2010 21:16:29 +0000 Subject: [PATCH 6/6] More dead code deleted
--- .../source/ui/inspection/DataProviderHandler.cxx | 14 +++----------- .../source/ui/inspection/GeometryHandler.cxx | 4 ++-- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index d1756b1..b8475fb 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -169,13 +169,6 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface m_xMasterDetails = new OPropertyMediator( m_xDataProvider.get(), m_xReportComponent.get(), aPropertyMediation,sal_True ); } - - //const ::rtl::OUString sRowSet(RTL_CONSTASCII_USTRINGPARAM("RowSet")); - //if ( xNameCont->hasByName(sRowSet) ) - //{ - // uno::Reference<beans::XPropertySet> xProp(m_xFormComponentHandler,uno::UNO_QUERY); - // xProp->setPropertyValue(sRowSet,xNameCont->getByName(sRowSet)); - //} } catch(uno::Exception) { @@ -271,7 +264,7 @@ void DataProviderHandler::impl_updateChartTitle_throw(const uno::Any& _aValue) aArgs[0] = xFormatted; xTitle->setText(aArgs); } - } // if ( xTitled.is() ) + } } beans::PropertyState SAL_CALL DataProviderHandler::getPropertyState(const ::rtl::OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException) @@ -396,7 +389,6 @@ uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedPrope ,PROPERTY_MASTERFIELDS ,PROPERTY_DETAILFIELDS ,PROPERTY_PREVIEW_COUNT - //,PROPERTY_TITLE }; for (size_t nPos = 0; nPos < SAL_N_ELEMENTS(s_pProperties) ;++nPos ) @@ -480,9 +472,9 @@ void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const ::rtl::OUStrin xReceiver->setArguments( aArgs.getPropertyValues() ); if ( !bModified ) xReport->setModified(sal_False); - } // if ( NewValue != OldValue ) + } m_xFormComponentHandler->actuatingPropertyChanged(ActuatingPropertyName, NewValue, OldValue, InspectorUI, FirstTimeInit); - } // if ( ActuatingPropertyName == PROPERTY_COMMAND ) + } else if ( ActuatingPropertyName == PROPERTY_TITLE ) { if ( NewValue != OldValue ) diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 8b293a7..1d76432 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -133,11 +133,11 @@ struct PropertyCompare : public ::std::binary_function< beans::Property, ::rtl:: { bool operator() (const beans::Property& x, const ::rtl::OUString& y) const { - return x.Name.equals(y);// ? true : false; + return x.Name.equals(y); } bool operator() (const ::rtl::OUString& x,const beans::Property& y) const { - return x.equals(y.Name);// ? true : false; + return x.equals(y.Name);/ } }; -- 1.7.2.2
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice