reportdesign/source/core/api/ReportDefinition.cxx | 64 +++++++++++-----------
1 file changed, 32 insertions(+), 32 deletions(-)
New commits:
commit 7347a8ed38fb1494fde6f0bfc5a61bbc7135c790
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sun May 11 11:42:01 2014 +0200
Fix previous commit (reportdesign part)
Change-Id: I490326abccac237bd70209d2a3dd623ebd5c59a2
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx
b/reportdesign/source/core/api/ReportDefinition.cxx
index 4d3bc94..2eaff03 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -304,85 +304,85 @@ OStyle::OStyle()
sal_Int32 i = 0;
registerPropertyNoMember( PROPERTY_NAME, ++i,nBound,::getCppuType(
static_cast< OUString *>(NULL) ), &sName );
- registerPropertyNoMember(PROPERTY_BACKCOLOR,
++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nTransparent);
+ registerPropertyNoMember(PROPERTY_BACKCOLOR,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nTransparent);
registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION,
++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
registerPropertyNoMember(PROPERTY_BACKTRANSPARENT,
++i,nBound,::getBooleanCppuType() ,&bTrue);
- registerPropertyNoMember(SC_UNO_PAGE_BORDERDIST,
++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_BORDERDIST,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
registerPropertyNoMember(SC_UNO_PAGE_BOTTBORDER,
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_BOTTBRDDIST,
++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
- registerPropertyNoMember(PROPERTY_BOTTOMMARGIN,
++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nMargin);
+ registerPropertyNoMember(SC_UNO_PAGE_BOTTBRDDIST,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(PROPERTY_BOTTOMMARGIN,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nMargin);
registerPropertyNoMember("DisplayName",
++i,nBound,::getCppuType((OUString*)0) ,&sEmpty);
- registerPropertyNoMember(SC_UNO_PAGE_FTRBACKCOL,
++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nTransparent);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRBACKCOL,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nTransparent);
registerPropertyNoMember(SC_UNO_PAGE_FTRGRFFILT,
++i,nBound,::getCppuType((const OUString*)0) ,&sEmpty);
registerPropertyNoMember(SC_UNO_PAGE_FTRGRFLOC,
++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
registerPropertyNoMember(SC_UNO_PAGE_FTRGRFURL,
++i,nBound,::getCppuType((const OUString*)0) ,&sEmpty);
registerPropertyNoMember(SC_UNO_PAGE_FTRBACKTRAN,
++i,nBound,::getBooleanCppuType() ,&bTrue);
- registerPropertyNoMember(SC_UNO_PAGE_FTRBODYDIST,
++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
- registerPropertyNoMember(SC_UNO_PAGE_FTRBRDDIST,
++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRBODYDIST,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRBRDDIST,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBOR,
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBDIS,
++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
- registerPropertyNoMember(SC_UNO_PAGE_FTRHEIGHT,
++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBDIS,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRHEIGHT,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
registerPropertyNoMember(SC_UNO_PAGE_FTRDYNAMIC,
++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(SC_UNO_PAGE_FTRON,
++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(SC_UNO_PAGE_FTRSHARED,
++i,nBound,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBOR,
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBDIS,
++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
- registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTMAR,
++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBDIS,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTMAR,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBOR,
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
-
registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBDIS,++i,nBound,::cppu::UnoType<sal_Int32>::get()0)
,&nZero);
- registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTMAR,
++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
+
registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBDIS,++i,nBound,::cppu::UnoType<sal_Int32>::get(),
&nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTMAR,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
registerPropertyNoMember(SC_UNO_PAGE_FTRSHADOW,
++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat);
registerPropertyNoMember(SC_UNO_PAGE_FTRTOPBOR,
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_FTRTOPBDIS,
++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_FTRTOPBDIS,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerPropertyNoMember(SC_UNO_PAGE_HDRBACKCOL,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nTransparent);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRBACKCOL,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nTransparent);
registerPropertyNoMember(SC_UNO_PAGE_HDRGRFFILT,
++i,nBound|nMayBeVoid,::getCppuType((const OUString*)0) ,&sEmpty);
registerPropertyNoMember(SC_UNO_PAGE_HDRGRFLOC,
++i,nBound|nMayBeVoid,::getCppuType((const style::GraphicLocation*)0)
,&eGraphicLocation);
registerPropertyNoMember(SC_UNO_PAGE_HDRGRFURL,
++i,nBound|nMayBeVoid,::getCppuType((const OUString*)0) ,&sEmpty);
registerPropertyNoMember(SC_UNO_PAGE_HDRBACKTRAN,
++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bTrue);
- registerPropertyNoMember(SC_UNO_PAGE_HDRBODYDIST,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
- registerPropertyNoMember(SC_UNO_PAGE_HDRBRDDIST,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRBODYDIST,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRBRDDIST,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nZero);
registerPropertyNoMember(SC_UNO_PAGE_HDRBOTTBOR,
++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine2*)0)
,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_HDRBOTTBDIS,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
- registerPropertyNoMember(SC_UNO_PAGE_HDRHEIGHT,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRBOTTBDIS,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRHEIGHT,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nZero);
registerPropertyNoMember(SC_UNO_PAGE_HDRDYNAMIC,
++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(SC_UNO_PAGE_HDRON,
++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(SC_UNO_PAGE_HDRSHARED,
++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTBOR,
++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine2*)0)
,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTBDIS,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
- registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTMAR,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTBDIS,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRLEFTMAR,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nZero);
registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTBOR,
++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine2*)0)
,&eBorderLine);
-
registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTBDIS,++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0)
,&nZero);
- registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTMAR,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
+
registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTBDIS,++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(),
&nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRRIGHTMAR,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nZero);
registerPropertyNoMember(SC_UNO_PAGE_HDRSHADOW,
++i,nBound|nMayBeVoid,::getCppuType((const table::ShadowFormat*)0)
,&eShadowFormat);
registerPropertyNoMember(SC_UNO_PAGE_HDRTOPBOR,
++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine2*)0)
,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_HDRTOPBDIS,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
+ registerPropertyNoMember(SC_UNO_PAGE_HDRTOPBDIS,
++i,nBound|nMayBeVoid,::cppu::UnoType<sal_Int32>::get(), &nZero);
- registerProperty(PROPERTY_HEIGHT, ++i,nBound,&m_aSize.Height,
::cppu::UnoType<sal_Int32>::get()0) );
+ registerProperty(PROPERTY_HEIGHT, ++i,nBound,&m_aSize.Height,
::cppu::UnoType<sal_Int32>::get() );
registerPropertyNoMember(PROPERTY_ISLANDSCAPE,
++i,nBound, ::getBooleanCppuType() ,&bFalse);
registerPropertyNoMember(SC_UNO_PAGE_LEFTBORDER, ++i,nBound,
::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_LEFTBRDDIST, ++i,nBound,
::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
- registerPropertyNoMember(PROPERTY_LEFTMARGIN,
++i,beans::PropertyAttribute::BOUND, ::cppu::UnoType<sal_Int32>::get()0)
,&nMargin);
+ registerPropertyNoMember(SC_UNO_PAGE_LEFTBRDDIST, ++i,nBound,
::cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(PROPERTY_LEFTMARGIN,
++i,beans::PropertyAttribute::BOUND, ::cppu::UnoType<sal_Int32>::get(),
&nMargin);
registerPropertyNoMember(PROPERTY_NUMBERINGTYPE,
++i,nBound,::getCppuType((const sal_Int16*)0) ,&nNummeringType);
registerPropertyNoMember(SC_UNO_PAGE_SCALEVAL,
++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT,
++i,nBound,::getCppuType((const style::PageStyleLayout*)0) ,&ePageStyleLayout);
const OUString sPaperTray("[From printer settings]");
registerPropertyNoMember(SC_UNO_PAGE_PAPERTRAY,
++i,nBound,::getCppuType((const OUString*)0) ,&sPaperTray);
registerPropertyNoMember(SC_UNO_PAGE_RIGHTBORDER,
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
-
registerPropertyNoMember(SC_UNO_PAGE_RIGHTBRDDIST,++i,nBound,::cppu::UnoType<sal_Int32>::get()0)
,&nZero);
- registerPropertyNoMember(PROPERTY_RIGHTMARGIN,
++i,beans::PropertyAttribute::BOUND,::cppu::UnoType<sal_Int32>::get()0)
,&nMargin);
+
registerPropertyNoMember(SC_UNO_PAGE_RIGHTBRDDIST,++i,nBound,::cppu::UnoType<sal_Int32>::get(),
&nZero);
+ registerPropertyNoMember(PROPERTY_RIGHTMARGIN,
++i,beans::PropertyAttribute::BOUND,::cppu::UnoType<sal_Int32>::get(),
&nMargin);
registerPropertyNoMember(SC_UNO_PAGE_SCALETOPAG,
++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
registerPropertyNoMember(SC_UNO_PAGE_SCALETOX,
++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
registerPropertyNoMember(SC_UNO_PAGE_SCALETOY,
++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero);
registerPropertyNoMember(SC_UNO_PAGE_SHADOWFORM,
++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat);
registerProperty(PROPERTY_PAPERSIZE,
++i,beans::PropertyAttribute::BOUND,&m_aSize,::getCppuType((const awt::Size*)0)
);
registerPropertyNoMember(SC_UNO_PAGE_TOPBORDER,
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
- registerPropertyNoMember(SC_UNO_PAGE_TOPBRDDIST,
++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nZero);
- registerPropertyNoMember(PROPERTY_TOPMARGIN,
++i,nBound,::cppu::UnoType<sal_Int32>::get()0) ,&nMargin);
+ registerPropertyNoMember(SC_UNO_PAGE_TOPBRDDIST,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nZero);
+ registerPropertyNoMember(PROPERTY_TOPMARGIN,
++i,nBound,::cppu::UnoType<sal_Int32>::get(), &nMargin);
uno::Reference< container::XNameContainer> xAttribs =
::comphelper::NameContainer_createInstance(::getCppuType(static_cast<
xml::AttributeData* >(NULL)));
registerPropertyNoMember("UserDefinedAttributes",
++i,nBound,::getCppuType((uno::Reference<container::XNameContainer>*)0)
,&xAttribs);
- registerProperty(PROPERTY_WIDTH,
++i,nBound,&m_aSize.Width,::cppu::UnoType<sal_Int32>::get()0) );
+ registerProperty(PROPERTY_WIDTH,
++i,nBound,&m_aSize.Width,::cppu::UnoType<sal_Int32>::get() );
registerPropertyNoMember("PrinterName",
++i,nBound,::getCppuType((const OUString*)0),&sEmpty);
uno::Sequence<sal_Int8> aSe;
registerPropertyNoMember("PrinterSetup",
++i,nBound,::getCppuType((const uno::Sequence<sal_Int8>*)0),&aSe);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
