Cheers,
Wol
>From a894597c0e3814677d83db3dc64588953a6dadd3 Mon Sep 17 00:00:00 2001
From: Wol <anth...@youngman.org.uk>
Date: Sun, 28 Nov 2010 15:52:28 +0000
Subject: [PATCH 5/5] Remove dead code
---
reportdesign/source/core/api/FixedLine.cxx | 1 -
reportdesign/source/core/api/FixedText.cxx | 4 +-
reportdesign/source/core/api/FormattedField.cxx | 1 -
reportdesign/source/core/api/Functions.cxx | 2 +-
reportdesign/source/core/api/Group.cxx | 11 +---
reportdesign/source/core/api/Groups.cxx | 4 +-
reportdesign/source/core/api/ImageControl.cxx | 1 -
reportdesign/source/core/api/ReportComponent.cxx | 1 -
.../source/core/api/ReportControlModel.cxx | 1 -
reportdesign/source/core/api/ReportDefinition.cxx | 70 ++++----------------
reportdesign/source/core/api/ReportEngineJFree.cxx | 4 +-
reportdesign/source/core/api/Section.cxx | 28 +-------
reportdesign/source/core/api/Shape.cxx | 9 +--
13 files changed, 24 insertions(+), 113 deletions(-)
diff --git a/reportdesign/source/core/api/FixedLine.cxx
b/reportdesign/source/core/api/FixedLine.cxx
index 3085c27..522e3c3 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -198,7 +198,6 @@ OFixedLine::~OFixedLine()
DBG_DTOR(rpt_OFixedLine,NULL);
}
//
-----------------------------------------------------------------------------
-//IMPLEMENT_FORWARD_XINTERFACE2(OFixedLine,FixedLineBase,FixedLinePropertySet)
IMPLEMENT_FORWARD_REFCOUNT( OFixedLine, FixedLineBase )
//
--------------------------------------------------------------------------------
uno::Any SAL_CALL OFixedLine::queryInterface( const uno::Type& _rType ) throw
(uno::RuntimeException)
diff --git a/reportdesign/source/core/api/FixedText.cxx
b/reportdesign/source/core/api/FixedText.cxx
index fbc6dce..42dedcc 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -97,7 +97,6 @@ uno::Any SAL_CALL OFixedText::queryInterface( const
uno::Type& _rType ) throw (u
return aReturn.hasValue() ? aReturn : (m_aProps.aComponent.m_xProxy.is() ?
m_aProps.aComponent.m_xProxy->queryAggregation(_rType) : aReturn);
}
-//IMPLEMENT_FORWARD_XINTERFACE2(OFixedText,FixedTextBase,FixedTextPropertySet)
//
-----------------------------------------------------------------------------
void SAL_CALL OFixedText::dispose() throw(uno::RuntimeException)
{
@@ -119,9 +118,8 @@ void SAL_CALL OFixedText::dispose()
throw(uno::RuntimeException)
//--------------------------------------------------------------------------
uno::Sequence< ::rtl::OUString > OFixedText::getSupportedServiceNames_Static(
) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aServices(1);//2);
+ uno::Sequence< ::rtl::OUString > aServices(1);
aServices.getArray()[0] = SERVICE_FIXEDTEXT;
- //aServices.getArray()[1] =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText"));
return aServices;
}
diff --git a/reportdesign/source/core/api/FormattedField.cxx
b/reportdesign/source/core/api/FormattedField.cxx
index b8096ca..69c8517 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -91,7 +91,6 @@ OFormattedField::~OFormattedField()
DBG_DTOR( rpt_OFormattedField,NULL);
}
//
-----------------------------------------------------------------------------
-//IMPLEMENT_FORWARD_XINTERFACE2(OFormattedField,FormattedFieldBase,FormattedFieldPropertySet)
IMPLEMENT_FORWARD_REFCOUNT( OFormattedField, FormattedFieldBase )
//
--------------------------------------------------------------------------------
uno::Any SAL_CALL OFormattedField::queryInterface( const uno::Type& _rType )
throw (uno::RuntimeException)
diff --git a/reportdesign/source/core/api/Functions.cxx
b/reportdesign/source/core/api/Functions.cxx
index bce09bf..4386db6 100644
--- a/reportdesign/source/core/api/Functions.cxx
+++ b/reportdesign/source/core/api/Functions.cxx
@@ -111,7 +111,7 @@ void SAL_CALL OFunctions::removeByIndex( ::sal_Int32 Index
) throw (lang::IndexO
{
uno::Reference< report::XFunction > xFunction;
{
- ::osl::MutexGuard aGuard(m_aMutex);
+ ::osl::MutexGuard aGuard(m_aMutex);
checkIndex(Index);
TFunctions::iterator aPos = m_aFunctions.begin();
::std::advance(aPos,Index);
diff --git a/reportdesign/source/core/api/Group.cxx
b/reportdesign/source/core/api/Group.cxx
index f572484..0cdf87c 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -76,13 +76,13 @@ void OGroup::copyGroup(const uno::Reference< report::XGroup
>& _xSource)
{
setHeaderOn(sal_True);
OSection::lcl_copySection(_xSource->getHeader(),m_xHeader);
- } // if ( _xSource->getHeaderOn() )
+ }
if ( _xSource->getFooterOn() )
{
setFooterOn(sal_True);
OSection::lcl_copySection(_xSource->getFooter(),m_xFooter);
- } // if ( _xSource->getFooterOn() )
+ }
}
//--------------------------------------------------------------------------
IMPLEMENT_FORWARD_XINTERFACE2(OGroup,GroupBase,GroupPropertySet)
@@ -121,8 +121,6 @@ void SAL_CALL OGroup::disposing()
{
m_xHeader.clear();
m_xFooter.clear();
- //::comphelper::disposeComponent(m_xHeader);
- //::comphelper::disposeComponent(m_xFooter);
::comphelper::disposeComponent(m_xFunctions);
m_xContext.clear();
}
@@ -150,8 +148,6 @@ void SAL_CALL OGroup::setHeaderOn( ::sal_Bool _headeron )
throw (uno::RuntimeExc
if ( _headeron != m_xHeader.is() )
{
::rtl::OUString
sName(RPT_RESSTRING(RID_STR_GROUP_HEADER,m_xContext->getServiceManager()));
- /*const ::rtl::OUString
sPlaceHolder(RTL_CONSTASCII_USTRINGPARAM("%1"));
- sName =
sName.replaceAt(sName.indexOf(sPlaceHolder),sPlaceHolder.getLength(),m_aProps.m_sExpression);*/
setSection(PROPERTY_HEADERON,_headeron,sName,m_xHeader);
}
}
@@ -167,8 +163,6 @@ void SAL_CALL OGroup::setFooterOn( ::sal_Bool _footeron )
throw (uno::RuntimeExc
if ( _footeron != m_xFooter.is() )
{
::rtl::OUString
sName(RPT_RESSTRING(RID_STR_GROUP_FOOTER,m_xContext->getServiceManager()));
- /*const ::rtl::OUString
sPlaceHolder(RTL_CONSTASCII_USTRINGPARAM("%1"));
- sName =
sName.replaceAt(sName.indexOf(sPlaceHolder),sPlaceHolder.getLength(),m_aProps.m_sExpression);*/
setSection(PROPERTY_FOOTERON,_footeron,sName,m_xFooter);
}
}
@@ -294,7 +288,6 @@ void SAL_CALL OGroup::setParent( const uno::Reference<
uno::XInterface >& /*Pare
//
-----------------------------------------------------------------------------
uno::Reference< beans::XPropertySetInfo > SAL_CALL OGroup::getPropertySetInfo(
) throw(uno::RuntimeException)
{
- // return uno::Reference< beans::XPropertySetInfo >();
return GroupPropertySet::getPropertySetInfo();
}
//
-----------------------------------------------------------------------------
diff --git a/reportdesign/source/core/api/Groups.cxx
b/reportdesign/source/core/api/Groups.cxx
index 073894f..f0c4f75 100644
--- a/reportdesign/source/core/api/Groups.cxx
+++ b/reportdesign/source/core/api/Groups.cxx
@@ -59,12 +59,12 @@ void OGroups::copyGroups(const uno::Reference<
report::XGroups >& _xSource)
{
sal_Int32 nCount = _xSource->getCount();
for (sal_Int32 i = 0; i != nCount; ++i)
- {
+ {
OGroup* pGroup = new OGroup(this,m_xContext);
m_aGroups.push_back(pGroup);
uno::Reference<report::XGroup>
xGroup(_xSource->getByIndex(i),uno::UNO_QUERY);
pGroup->copyGroup(xGroup);
- }
+ }
}
//
-----------------------------------------------------------------------------
void SAL_CALL OGroups::dispose() throw(uno::RuntimeException)
diff --git a/reportdesign/source/core/api/ImageControl.cxx
b/reportdesign/source/core/api/ImageControl.cxx
index d7132b8..a3930c2 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -218,7 +218,6 @@ sal_Bool SAL_CALL OImageControl::supportsService(const
::rtl::OUString& ServiceN
REPORTCOMPONENT_IMPL(OImageControl,m_aProps.aComponent)
REPORTCOMPONENT_IMPL2(OImageControl,m_aProps.aComponent)
REPORTCOMPONENT_NOMASTERDETAIL(OImageControl)
-//REPORTCONTROLFORMAT_IMPL(OImageControl,m_aProps.aFormatProperties)
NO_REPORTCONTROLFORMAT_IMPL(OImageControl)
::rtl::OUString SAL_CALL OImageControl::getHyperLinkURL() throw
(uno::RuntimeException, beans::UnknownPropertyException)
{
diff --git a/reportdesign/source/core/api/ReportComponent.cxx
b/reportdesign/source/core/api/ReportComponent.cxx
index d43c903..f9bcd00 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -115,7 +115,6 @@ OFormatProperties::OFormatProperties()
}
aFontDescriptor.Weight = awt::FontWeight::NORMAL;
aFontDescriptor.CharacterWidth = awt::FontWidth::NORMAL;
- // aCharLocale = SvtSysLocale().GetLocaleData().getLocale();
}
//
-----------------------------------------------------------------------------
void OReportComponentProperties::setShape(uno::Reference< drawing::XShape >&
_xShape,const uno::Reference< report::XReportComponent>&
_xTunnel,oslInterlockedCount& _rRefCount)
diff --git a/reportdesign/source/core/api/ReportControlModel.cxx
b/reportdesign/source/core/api/ReportControlModel.cxx
index 31f5d81..46b7f1f 100644
--- a/reportdesign/source/core/api/ReportControlModel.cxx
+++ b/reportdesign/source/core/api/ReportControlModel.cxx
@@ -85,7 +85,6 @@ void OReportControlModel::insertByIndex( ::sal_Int32 Index,
const uno::Any& Elem
if ( Index > static_cast<sal_Int32>(m_aFormatConditions.size()) )
throw lang::IndexOutOfBoundsException();
- //m_aFormatConditions.resize(m_aFormatConditions.size() + 1);
m_aFormatConditions.insert(m_aFormatConditions.begin() +
Index,xElement);
}
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx
b/reportdesign/source/core/api/ReportDefinition.cxx
index 1cbe0ef..f27474e 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -239,7 +239,6 @@ void lcl_extractAndStartStatusIndicator( const
::comphelper::MediaDescriptor& _r
catch( const uno::Exception& )
{
OSL_ENSURE( sal_False, "lcl_extractAndStartStatusIndicator: caught an
exception!" );
-// DBG_UNHANDLED_EXCEPTION();
}
}
//
-----------------------------------------------------------------------------
@@ -317,31 +316,24 @@ OStyle::OStyle()
sal_Int32 i = 0;
registerPropertyNoMember( PROPERTY_NAME, ++i,nBound,::getCppuType(
static_cast< ::rtl::OUString *>(NULL) ), &sName );
- registerPropertyNoMember(PROPERTY_BACKCOLOR,
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent);
- //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT),
++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
+ registerPropertyNoMember(PROPERTY_BACKCOLOR,
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent);
- registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION,
++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
- //registerPropertyNoMember(PROPERTY_BACKGRAPHICURL,
++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
+ registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION,
++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
registerPropertyNoMember(PROPERTY_BACKTRANSPARENT,
++i,nBound,::getBooleanCppuType() ,&bTrue);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER),
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(PROPERTY_BOTTOMMARGIN,
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin);
registerPropertyNoMember(MAP_CHAR_LEN("DisplayName"),
++i,nBound,::getCppuType((rtl::OUString*)0) ,&sEmpty);
- //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FIRSTPAGE),
++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
- //
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT),
++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC),
++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL),
++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN),
++i,nBound,::getBooleanCppuType() ,&bTrue);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR),
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC),
++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC),
++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRON),
++i,nBound,::getBooleanCppuType() ,&bFalse);
@@ -349,26 +341,21 @@ OStyle::OStyle()
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR),
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON),
++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR),
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),++i,nBound,::getCppuType((const
sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW),
++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED),
++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR),
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
- //
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKCOL),
++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nTransparent);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT),
++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC),
++i,nBound|nMayBeVoid,::getCppuType((const style::GraphicLocation*)0)
,&eGraphicLocation);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL),
++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN),
++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bTrue);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST),
++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST),
++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR),
++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS),
++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC),
++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT),
++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC),
++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRON),
++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse);
@@ -376,23 +363,17 @@ OStyle::OStyle()
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR),
++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS),
++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR),
++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON),
++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR),
++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),++i,nBound|nMayBeVoid,::getCppuType((const
sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR),
++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW),
++i,nBound|nMayBeVoid,::getCppuType((const table::ShadowFormat*)0)
,&eShadowFormat);
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED),
++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR),
++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS),
++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero);
- //
registerProperty(PROPERTY_HEIGHT, ++i,nBound,&m_aSize.Height,
::getCppuType((const sal_Int32*)0) );
- //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKTRANS),
++i,nBound, ::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(PROPERTY_ISLANDSCAPE,
++i,nBound, ::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBORDER),
++i,nBound, ::getCppuType((const table::BorderLine*)0)
,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBRDDIST),
++i,nBound, ::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(PROPERTY_LEFTMARGIN,
++i,beans::PropertyAttribute::BOUND, ::getCppuType((const
sal_Int32*)0) ,&nMargin);
- //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTFTRCONT),
++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent
>*)0) ,NULL);
- //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTHDRCONT),
++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent
>*)0) ,NULL);
registerPropertyNoMember(PROPERTY_NUMBERINGTYPE,
++i,nBound,::getCppuType((const sal_Int16*)0) ,&nNummeringType);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL),
++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT,
++i,nBound,::getCppuType((const style::PageStyleLayout*)0) ,&ePageStyleLayout);
@@ -401,8 +382,6 @@ OStyle::OStyle()
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER),
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),++i,nBound,::getCppuType((const
sal_Int32*)0) ,&nZero);
registerPropertyNoMember(PROPERTY_RIGHTMARGIN,
++i,beans::PropertyAttribute::BOUND,::getCppuType((const sal_Int32*)0)
,&nMargin);
- //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTFTRCON),
++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent
>*)0) ,NULL);
- //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTHDRCON),
++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent
>*)0) ,NULL);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOPAG),
++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOX),
++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOY),
++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
@@ -411,12 +390,9 @@ OStyle::OStyle()
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBORDER),
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBRDDIST),
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
registerPropertyNoMember(PROPERTY_TOPMARGIN,
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin);
-
//registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),++i,nBound,::getBooleanCppuType()
,&bFalse);
-
//registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),++i,nBound,::getBooleanCppuType()
,&bFalse);
uno::Reference< container::XNameContainer> xAttribs =
::comphelper::NameContainer_createInstance(::getCppuType(static_cast<
xml::AttributeData* >(NULL)));
registerPropertyNoMember(MAP_CHAR_LEN("UserDefinedAttributes"),
++i,nBound,::getCppuType((uno::Reference<container::XNameContainer>*)0)
,&xAttribs);
registerProperty(PROPERTY_WIDTH,
++i,nBound,&m_aSize.Width,::getCppuType((const sal_Int32*)0) );
- //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNONAME_WRITING),
++i,nBound,:.getCppuType((sal_Int16*)0) ,&n16Zero);
registerPropertyNoMember(MAP_CHAR_LEN("PrinterName"),
++i,nBound,::getCppuType((const ::rtl::OUString*)0),&sEmpty);
uno::Sequence<sal_Int8> aSe;
registerPropertyNoMember(MAP_CHAR_LEN("PrinterSetup"),
++i,nBound,::getCppuType((const uno::Sequence<sal_Int8>*)0),&aSe);
@@ -747,7 +723,6 @@ OReportDefinition::~OReportDefinition()
}
//
-----------------------------------------------------------------------------
IMPLEMENT_FORWARD_REFCOUNT( OReportDefinition, ReportDefinitionBase )
-//IMPLEMENT_FORWARD_XINTERFACE2(OReportDefinition,ReportDefinitionBase,ReportDefinitionPropertySet)
void OReportDefinition::init()
{
try
@@ -765,7 +740,7 @@ void OReportDefinition::init()
pCreatorThread->createSuspended();
pCreatorThread->setPriority(osl_Thread_PriorityBelowNormal);
pCreatorThread->resume();
- } // for ( ; pIter != pEnd; ++pIter )
+ }
}
m_pImpl->m_pReportModel.reset(new OReportModel(this));
@@ -826,11 +801,6 @@ void SAL_CALL OReportDefinition::disposing()
m_pImpl->m_xPageHeader.clear();
m_pImpl->m_xPageFooter.clear();
m_pImpl->m_xDetail.clear();
- //::comphelper::disposeComponent(m_pImpl->m_xReportHeader);
- //::comphelper::disposeComponent(m_pImpl->m_xReportFooter);
- //::comphelper::disposeComponent(m_pImpl->m_xPageHeader);
- //::comphelper::disposeComponent(m_pImpl->m_xPageFooter);
- //::comphelper::disposeComponent(m_pImpl->m_xDetail);
::comphelper::disposeComponent(m_pImpl->m_xFunctions);
//::comphelper::disposeComponent(m_pImpl->m_xStorage);
@@ -1409,10 +1379,6 @@ uno::Reference< uno::XInterface > SAL_CALL
OReportDefinition::getCurrentSelectio
void OReportDefinition::impl_loadFromStorage_nolck_throw( const
uno::Reference< embed::XStorage >& _xStorageToLoadFrom,
const uno::Sequence< beans::PropertyValue >& _aMediaDescriptor )
{
-// ::osl::MutexGuard aGuard(m_aMutex);
-// ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
-//
-
m_pImpl->m_xStorage = _xStorageToLoadFrom;
::comphelper::MediaDescriptor aDescriptor( _aMediaDescriptor );
@@ -1512,7 +1478,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const
uno::Reference< embed::XS
{
const ::rtl::OUString sVal(
aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),::rtl::OUString())
);
xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI")),
uno::makeAny(sVal));
- } // if ( aSaveOpt.IsSaveRelFSys() )
+ }
const ::rtl::OUString sHierarchicalDocumentName(
aDescriptor.getUnpackedValueOrDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HierarchicalDocumentName")),::rtl::OUString())
);
xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")),
uno::makeAny(sHierarchicalDocumentName));
@@ -1565,7 +1531,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const
uno::Reference< embed::XS
sWarnFile =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("meta.xml"));
}
}
- } // if( !bErr )
+ }
if( !bErr )
{
@@ -1594,7 +1560,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const
uno::Reference< embed::XS
bErr = sal_True;
sErrFile =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml"));
}
- } // if ( !bErr )
+ }
uno::Any aImage;
uno::Reference< embed::XVisualObject >
xCurrentController(getCurrentController(),uno::UNO_QUERY);
@@ -1909,15 +1875,14 @@ void SAL_CALL OReportDefinition::setVisualAreaSize(
::sal_Int64 _nAspect, const
{
::osl::MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
- //if( nAspect == embed::Aspects::MSOLE_CONTENT )
- {
- bool bChanged =
+
+ bool bChanged =
(m_pImpl->m_aVisualAreaSize.Width != _aSize.Width ||
m_pImpl->m_aVisualAreaSize.Height != _aSize.Height);
- m_pImpl->m_aVisualAreaSize = _aSize;
- if( bChanged )
- setModified( sal_True );
- }
+ m_pImpl->m_aVisualAreaSize = _aSize;
+ if( bChanged )
+ setModified( sal_True );
+
m_pImpl->m_nAspect = _nAspect;
}
//
-----------------------------------------------------------------------------
@@ -2081,8 +2046,6 @@ uno::Reference< container::XIndexAccess > SAL_CALL
OReportDefinition::getViewDat
{
m_pImpl->m_xViewData.set(m_aProps->m_xContext->getServiceManager()->createInstanceWithContext(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.IndexedPropertyValues")),m_aProps->m_xContext
),uno::UNO_QUERY);
- //uno::Sequence< beans::PropertyValue > aProps;
-
//m_pImpl->m_xViewData->insertByIndex(m_pImpl->m_xViewData->getCount(),uno::makeAny(aProps));
uno::Reference< container::XIndexContainer >
xContainer(m_pImpl->m_xViewData,uno::UNO_QUERY);
::std::vector< uno::Reference< frame::XController> >::iterator aIter =
m_pImpl->m_aControllers.begin();
::std::vector< uno::Reference< frame::XController> >::iterator aEnd =
m_pImpl->m_aControllers.end();
@@ -2097,7 +2060,7 @@ uno::Reference< container::XIndexAccess > SAL_CALL
OReportDefinition::getViewDat
catch(uno::Exception&)
{
}
- } // if ( aIter->is() )
+ }
}
}
@@ -2271,7 +2234,7 @@ uno::Reference< uno::XInterface > SAL_CALL
OReportDefinition::createInstanceWith
*pIter >>= aValue;
if( aValue.Name.equalsAscii( "Storage" ) )
aValue.Value >>= xStorage;
- } // for(;pIter != pEnd ;++pIter)
+ }
m_pImpl->m_pObjectContainer->SwitchPersistence(xStorage);
xRet = static_cast< ::cppu::OWeakObject*
>(SvXMLEmbeddedObjectHelper::Create( xStorage,*this,
EMBEDDEDOBJECTHELPER_MODE_READ ));
}
@@ -2327,35 +2290,30 @@ uno::Reference< uno::XInterface > SAL_CALL
OReportDefinition::createInstance( co
{
if ( !m_pImpl->m_xGradientTable.is() )
m_pImpl->m_xGradientTable.set(SvxUnoGradientTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY);
- //comphelper::NameContainer_createInstance( ::getCppuType( (const
awt::Gradient*) 0 ) ).get();
return m_pImpl->m_xGradientTable;
}
else if ( aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.HatchTable") ) == 0 )
{
if ( !m_pImpl->m_xHatchTable.is() )
m_pImpl->m_xHatchTable.set(SvxUnoHatchTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY);
- //comphelper::NameContainer_createInstance( ::getCppuType( (const
drawing::Hatch*) 0 ) ).get();
return m_pImpl->m_xHatchTable;
}
else if ( aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.BitmapTable") ) == 0 )
{
if ( !m_pImpl->m_xBitmapTable.is() )
m_pImpl->m_xBitmapTable.set(SvxUnoBitmapTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY);
- //comphelper::NameContainer_createInstance( ::getCppuType( (const
::rtl::OUString*) 0 ) ).get();
return m_pImpl->m_xBitmapTable;
}
else if ( aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.TransparencyGradientTable") )
== 0 )
{
if ( !m_pImpl->m_xTransparencyGradientTable.is() )
m_pImpl->m_xTransparencyGradientTable.set(SvxUnoTransGradientTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY);
- //comphelper::NameContainer_createInstance( ::getCppuType( (const
awt::Gradient*) 0 ) ).get();
return m_pImpl->m_xTransparencyGradientTable;
}
else if ( aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DashTable") ) == 0 )
{
if ( !m_pImpl->m_xDashTable.is() )
m_pImpl->m_xDashTable.set(SvxUnoDashTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY);
- //comphelper::NameContainer_createInstance( ::getCppuType( (const
drawing::LineDash*) 0 ) ).get();
return m_pImpl->m_xDashTable;
}
else if( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MarkerTable") ) )
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx
b/reportdesign/source/core/api/ReportEngineJFree.cxx
index e5af3f2..5dc0563 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -198,7 +198,7 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const
uno::Reference< task
{
xStorageProp->setPropertyValue( s_sMediaType,
uno::makeAny(sMimeType));
}
- m_xReport->storeToStorage(xTemp,aEmpty); // store to temp file
because it may contain information which aren't in the database yet.
+ m_xReport->storeToStorage(xTemp,aEmpty); // store to temp file
because it may contain information which isn't in the database yet.
uno::Sequence< beans::NamedValue > aConvertedProperties(8);
sal_Int32 nPos = 0;
@@ -262,7 +262,6 @@ void SAL_CALL OReportEngineJFree::setStatusIndicator( const
uno::Reference< task
xJob->execute(aConvertedProperties);
if ( xStorageProp.is() )
{
-
//xStorageProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")))
>>= sOutputName;
sOutputName = sFileURL;
}
}
@@ -333,7 +332,6 @@ uno::Reference< frame::XModel > SAL_CALL
OReportEngineJFree::createDocumentAlive
}
uno::Reference< lang::XMultiServiceFactory >
xFac(m_xContext->getServiceManager(),uno::UNO_QUERY);
- /*::comphelper::MimeConfigurationHelper aHelper(xFac);*/
xModel.set( xFrameLoad->loadComponentFromURL(
sOutputName,
::rtl::OUString(), // empty frame name
diff --git a/reportdesign/source/core/api/Section.cxx
b/reportdesign/source/core/api/Section.cxx
index 1935670..be43fe7 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -136,7 +136,6 @@ OSection::OSection(const uno::Reference<
report::XReportDefinition >& _xParent
{
DBG_CTOR( rpt_OSection,NULL);
init();
- //.getSdrModel()->createNewPage(m_xSection);
}
//--------------------------------------------------------------------------
// TODO: VirtualFunctionFinder: This is virtual function!
@@ -179,28 +178,6 @@ void SAL_CALL OSection::disposing()
lang::EventObject aDisposeEvent( static_cast< ::cppu::OWeakObject* >( this
) );
m_aContainerListeners.disposeAndClear( aDisposeEvent );
m_xContext.clear();
- //m_xDrawPage.clear();
-
- /*uno::Reference< report::XReportDefinition> xReport =
getReportDefinition();
- ::boost::shared_ptr<rptui::OReportModel> pModel =
OReportDefinition::getSdrModel(xReport);
- osl_incrementInterlockedCount( &m_refCount );
- while( m_xDrawPage.is() && m_xDrawPage->hasElements() )
- {
- try
- {
- uno::Reference< drawing::XShape>
xShape(m_xDrawPage->getByIndex(0),uno::UNO_QUERY);
- m_xDrawPage->remove(xShape);
- ::comphelper::disposeComponent(xShape);
- }
- catch(const uno::Exception&)
- {}
- }
- if ( pModel )
- {
- uno::Reference< report::XSection> xSection = this;
- pModel->DeletePage(pModel->getPage(xSection)->GetPageNum());
- }
- osl_decrementInterlockedCount( &m_refCount );*/
}
//--------------------------------------------------------------------------
::rtl::OUString SAL_CALL OSection::getImplementationName( )
throw(uno::RuntimeException)
@@ -471,7 +448,7 @@ const ::std::vector< ::rtl::OUString >&
lcl_getControlModelMap()
s_sControlModels.push_back(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageControl")) );
s_sControlModels.push_back(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormattedField")) );
s_sControlModels.push_back(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Shape")) );
- } // if ( s_sMap.empty() )
+ }
return s_sControlModels;
}
@@ -504,9 +481,8 @@ uno::Reference< report::XReportComponent > SAL_CALL
OSection::createReportCompon
xRet.set(xFac->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape"))),uno::UNO_QUERY);
break;
default:
- //xRet = new OShape(m_xContext);
break;
- } // switch( aRet.begin() - aFind )
+ }
return xRet;
}
//
-----------------------------------------------------------------------------
diff --git a/reportdesign/source/core/api/Shape.cxx
b/reportdesign/source/core/api/Shape.cxx
index c6327ba..606893c 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -322,11 +322,9 @@ uno::Reference< util::XCloneable > SAL_CALL
OShape::createClone( ) throw (uno::
if ( pClone )
{
xSet.set(pClone->getUnoShape(),uno::UNO_QUERY_THROW );
-
- // ::comphelper::copyProperties(xSource.get(),xSet.get());
}
}
- } // if ( pShape )
+ }
}
catch(const uno::Exception&)
{
@@ -345,11 +343,6 @@ void SAL_CALL OShape::setParent( const uno::Reference<
uno::XInterface >& Parent
{
::osl::MutexGuard aGuard(m_aMutex);
m_aProps.aComponent.m_xParent = uno::Reference< container::XChild
>(Parent,uno::UNO_QUERY);
- // not supported by the shape
- //uno::Reference< container::XChild > xChild;
- //comphelper::query_aggregation(m_aProps.aComponent.m_xProxy,xChild);
- //if ( xChild.is() )
- // xChild->setParent(Parent);
}
uno::Reference< report::XFormatCondition > SAL_CALL
OShape::createFormatCondition( ) throw (uno::Exception, uno::RuntimeException)
{
--
1.7.2.2
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
