Tag: cws_src680_oj14 User: oj Date: 2007-05-15 09:37:43+0000 Modified: dba/reportdesign/source/core/api/ReportDefinition.cxx dba/reportdesign/source/core/sdr/UndoActions.cxx dba/reportdesign/source/ui/report/ReportController.cxx
Log: #i77293# change property attributes to bound File Changes: Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: ReportDefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/ReportDefinition.cxx?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +187 -131 ----------------------- --- ReportDefinition.cxx 2007-05-15 07:46:26+0000 1.1.2.2 +++ ReportDefinition.cxx 2007-05-15 09:37:40+0000 1.1.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: ReportDefinition.cxx,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: oj $ $Date: 2007/05/15 07:46:26 $ + * last change: $Author: oj $ $Date: 2007/05/15 09:37:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -426,113 +426,115 @@ const table::BorderLine eBorderLine(0,0,0,0); const table::ShadowFormat eShadowFormat(table::ShadowLocation_NONE,0,0,0); const style::PageStyleLayout ePageStyleLayout = style::PageStyleLayout_ALL; + const sal_Int32 nBound = beans::PropertyAttribute::BOUND; + const sal_Int32 nMayBeVoid = beans::PropertyAttribute::MAYBEVOID; sal_Int32 i = 0; - registerPropertyNoMember( PROPERTY_NAME, ++i, beans::PropertyAttribute::BOUND,::getCppuType( static_cast< ::rtl::OUString *>(NULL) ), &sName ); + registerPropertyNoMember( PROPERTY_NAME, ++i,nBound,::getCppuType( static_cast< ::rtl::OUString *>(NULL) ), &sName ); - registerPropertyNoMember(PROPERTY_BACKCOLOR, ++i,0,::getCppuType((const sal_Int32*)0) ,&nTransparent); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ++i,0,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + 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_BACKGRAPHICLOCATION, ++i,0,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); - //registerPropertyNoMember(PROPERTY_BACKGRAPHICURL, ++i,0,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - registerPropertyNoMember(PROPERTY_BACKTRANSPARENT, ++i,0,::getBooleanCppuType() ,&bTrue); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR), ++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST), ++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER), ++i,0,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST), ++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, ++i,0,::getCppuType((const sal_Int32*)0) ,&nMargin); - registerPropertyNoMember(MAP_CHAR_LEN("DisplayName"), ++i,0,::getCppuType((rtl::OUString*)0) ,&sEmpty); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FIRSTPAGE), ++i,0,::getCppuType((const sal_Int16*)0) ,&n16Zero); + registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION, ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); + //registerPropertyNoMember(PROPERTY_BACKGRAPHICURL, ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); + 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,0,::getCppuType((const sal_Int32*)0) ,&nTransparent); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ++i,0,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), ++i,0,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ++i,0,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ++i,0,::getBooleanCppuType() ,&bTrue); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), ++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST), ++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR), ++i,0,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), ++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC), ++i,0,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT), ++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC), ++i,0,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRON), ++i,0,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED), ++i,0,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR), ++i,0,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), ++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR), ++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON), ++i,0,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), ++i,0,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), ++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW), ++i,0,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED), ++i,0,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR), ++i,0,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), ++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); + 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); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); + 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,beans::PropertyAttribute::MAYBEVOID,::getCppuType((const sal_Int32*)0) ,&nTransparent); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFFILT), ++i,beans::PropertyAttribute::MAYBEVOID,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), ++i,beans::PropertyAttribute::MAYBEVOID,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ++i,beans::PropertyAttribute::MAYBEVOID,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ++i,beans::PropertyAttribute::MAYBEVOID,::getBooleanCppuType() ,&bTrue); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), ++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ++i,beans::PropertyAttribute::MAYBEVOID,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST), ++i,beans::PropertyAttribute::MAYBEVOID,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR), ++i,beans::PropertyAttribute::MAYBEVOID,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), ++i,beans::PropertyAttribute::MAYBEVOID,::getCppuType((const sal_Int32*)0) ,&nZero); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC), ++i,0,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT), ++i,beans::PropertyAttribute::MAYBEVOID,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC), ++i,beans::PropertyAttribute::MAYBEVOID,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRON), ++i,beans::PropertyAttribute::MAYBEVOID,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHARED), ++i,beans::PropertyAttribute::MAYBEVOID,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR), ++i,beans::PropertyAttribute::MAYBEVOID,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), ++i,beans::PropertyAttribute::MAYBEVOID,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR), ++i,beans::PropertyAttribute::MAYBEVOID,::getCppuType((const sal_Int32*)0) ,&nZero); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON), ++i,0,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), ++i,beans::PropertyAttribute::MAYBEVOID,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),++i,beans::PropertyAttribute::MAYBEVOID,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), ++i,beans::PropertyAttribute::MAYBEVOID,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW), ++i,beans::PropertyAttribute::MAYBEVOID,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED), ++i,0,::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR), ++i,beans::PropertyAttribute::MAYBEVOID,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS), ++i,beans::PropertyAttribute::MAYBEVOID,::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); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHARED), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); + 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,0,&m_aSize.Height, ::getCppuType((const sal_Int32*)0) ); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKTRANS), ++i,0, ::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(PROPERTY_ISLANDSCAPE, ++i,0, ::getBooleanCppuType() ,&bFalse); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBORDER), ++i,0, ::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBRDDIST), ++i,0, ::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,0,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTHDRCONT), ++i,0,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); - registerPropertyNoMember(PROPERTY_NUMBERINGTYPE, ++i,0,::getCppuType((const sal_Int16*)0) ,&nNummeringType); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL), ++i,0,::getCppuType((const sal_Int16*)0) ,&n16Zero); - registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT, ++i,0,::getCppuType((const style::PageStyleLayout*)0) ,&ePageStyleLayout); + //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); const ::rtl::OUString sPaperTray(RTL_CONSTASCII_USTRINGPARAM("[From printer settings]")); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ++i,0,::getCppuType((const ::rtl::OUString*)0) ,&sPaperTray); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ++i,0,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); + registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_PAPERTRAY), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sPaperTray); + 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,0,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTHDRCON), ++i,0,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOPAG), ++i,0,::getCppuType((const sal_Int16*)0) ,&n16Zero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOX), ++i,0,::getCppuType((const sal_Int16*)0) ,&n16Zero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOY), ++i,0,::getCppuType((const sal_Int16*)0) ,&n16Zero); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SHADOWFORM), ++i,0,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); + //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); + registerPropertyNoMember(MAP_CHAR_LEN(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(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBORDER), ++i,0,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); - registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBRDDIST), ++i,0,::getCppuType((const sal_Int32*)0) ,&nZero); - registerPropertyNoMember(PROPERTY_TOPMARGIN, ++i,0,::getCppuType((const sal_Int32*)0) ,&nMargin); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),++i,0,::getBooleanCppuType() ,&bFalse); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),++i,0,::getBooleanCppuType() ,&bFalse); + 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,0,::getCppuType((uno::Reference<container::XNameContainer>*)0) ,&xAttribs); - registerProperty(PROPERTY_WIDTH, ++i,0,&m_aSize.Width,::getCppuType((const sal_Int32*)0) ); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNONAME_WRITING), ++i,0,:.getCppuType((sal_Int16*)0) ,&n16Zero); - registerPropertyNoMember(MAP_CHAR_LEN("PrinterName"), ++i,0,::getCppuType((const ::rtl::OUString*)0),&sEmpty); + 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,0,::getCppuType((const uno::Sequence<sal_Int8>*)0),&aSe); + registerPropertyNoMember(MAP_CHAR_LEN("PrinterSetup"), ++i,nBound,::getCppuType((const uno::Sequence<sal_Int8>*)0),&aSe); } @@ -2257,19 +2259,29 @@ return ::rtl::OUString(); } // ----------------------------------------------------------------------------- -typedef ::cppu::WeakImplHelper2< container::XNameAccess, +typedef ::cppu::WeakImplHelper2< container::XNameContainer, container::XIndexAccess > TStylesBASE; -class OStylesHelper : public TStylesBASE +class OStylesHelper : public ::cppu::BaseMutex, public TStylesBASE { - typedef ::std::map< ::rtl::OUString, uno::Reference< container::XNameContainer> , ::comphelper::UStringMixLess> TStyleElements; + typedef ::std::map< ::rtl::OUString, uno::Any , ::comphelper::UStringMixLess> TStyleElements; TStyleElements m_aElements; ::std::vector<TStyleElements::iterator> m_aElementsPos; - uno::Reference< lang::XMultiServiceFactory > m_xFactory; + uno::Type m_aType; + + OStylesHelper(const OStylesHelper&); + void operator =(const OStylesHelper&); protected: - ~OStylesHelper(){} + virtual ~OStylesHelper(){} public: - OStylesHelper(const uno::Reference< lang::XMultiServiceFactory > & _xFactory); + OStylesHelper(const uno::Type _aType = ::getCppuType(static_cast< uno::Reference< container::XElementAccess >* >(NULL))); + + // XNameContainer + virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException,lang::WrappedTargetException, uno::RuntimeException); + virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw(container::NoSuchElementException, lang::WrappedTargetException,uno::RuntimeException); + + // XNameReplace + virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException,lang::WrappedTargetException, uno::RuntimeException); // container::XElementAccess uno::Type SAL_CALL getElementType( ) throw(uno::RuntimeException); @@ -2284,44 +2296,34 @@ sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(uno::RuntimeException); }; -OStylesHelper::OStylesHelper(const uno::Reference< lang::XMultiServiceFactory > & _xFactory) -:m_xFactory(_xFactory) +OStylesHelper::OStylesHelper(const uno::Type _aType) +: cppu::BaseMutex() +,m_aType(_aType) { - uno::Reference< container::XNameContainer> xPageStyles = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL))); - m_aElementsPos.push_back(m_aElements.insert(TStyleElements::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageStyles")),xPageStyles)).first); - uno::Reference< style::XStyle> xPageStyle(m_xFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.PageStyle"))),uno::UNO_QUERY); - xPageStyles->insertByName(xPageStyle->getName(),uno::makeAny(xPageStyle)); - - uno::Reference< container::XNameContainer> xFrameStyles = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL))); - m_aElementsPos.push_back(m_aElements.insert(TStyleElements::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameStyles")),xFrameStyles)).first); - uno::Reference< style::XStyle> xFrameStyle(m_xFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.FrameStyle"))),uno::UNO_QUERY); - xFrameStyles->insertByName(xFrameStyle->getName(),uno::makeAny(xFrameStyle)); - - uno::Reference< container::XNameContainer> xGraphicStyles = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL))); - m_aElementsPos.push_back(m_aElements.insert(TStyleElements::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("graphics")),xGraphicStyles)).first); - uno::Reference< style::XStyle> xGraphicStyle(m_xFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.GraphicStyle"))),uno::UNO_QUERY); - xGraphicStyles->insertByName(xGraphicStyle->getName(),uno::makeAny(xGraphicStyle)); } // -----------------------------------------------------------------------------; // container::XElementAccess uno::Type SAL_CALL OStylesHelper::getElementType( ) throw(uno::RuntimeException) { - return ::getCppuType(static_cast< uno::Reference< container::XElementAccess >* >(NULL)); + return m_aType; } // ----------------------------------------------------------------------------- sal_Bool SAL_CALL OStylesHelper::hasElements( ) throw(uno::RuntimeException) { + ::osl::MutexGuard aGuard(m_aMutex); return !m_aElementsPos.empty(); } // ----------------------------------------------------------------------------- // container::XIndexAccess sal_Int32 SAL_CALL OStylesHelper::getCount( ) throw(uno::RuntimeException) { + ::osl::MutexGuard aGuard(m_aMutex); return m_aElementsPos.size(); } // ----------------------------------------------------------------------------- uno::Any SAL_CALL OStylesHelper::getByIndex( sal_Int32 Index ) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { + ::osl::MutexGuard aGuard(m_aMutex); if ( Index < 0 || Index >= static_cast<sal_Int32>(m_aElementsPos.size()) ) throw lang::IndexOutOfBoundsException(); return uno::makeAny(m_aElementsPos[Index]->second); @@ -2330,6 +2332,7 @@ // container::XNameAccess uno::Any SAL_CALL OStylesHelper::getByName( const ::rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { + ::osl::MutexGuard aGuard(m_aMutex); TStyleElements::iterator aFind = m_aElements.find(aName); if ( aFind == m_aElements.end() ) throw container::NoSuchElementException(); @@ -2338,29 +2341,82 @@ // ----------------------------------------------------------------------------- uno::Sequence< ::rtl::OUString > SAL_CALL OStylesHelper::getElementNames( ) throw(uno::RuntimeException) { - static uno::Sequence< ::rtl::OUString > s_sNames; - if ( !s_sNames.getLength() ) - { - s_sNames.realloc(3); - s_sNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageStyles")); - s_sNames[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameStyles")); - s_sNames[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("graphics")); - } - return s_sNames; + ::osl::MutexGuard aGuard(m_aMutex); + uno::Sequence< ::rtl::OUString > aNameList(m_aElementsPos.size()); + + ::rtl::OUString* pStringArray = aNameList.getArray(); + ::std::vector<TStyleElements::iterator>::const_iterator aEnd = m_aElementsPos.end(); + for(::std::vector<TStyleElements::iterator>::const_iterator aIter = m_aElementsPos.begin(); aIter != aEnd;++aIter,++pStringArray) + *pStringArray = (*aIter)->first; + + return aNameList; } // ----------------------------------------------------------------------------- sal_Bool SAL_CALL OStylesHelper::hasByName( const ::rtl::OUString& aName ) throw(uno::RuntimeException) { + ::osl::MutexGuard aGuard(m_aMutex); return m_aElements.find(aName) != m_aElements.end(); } // ----------------------------------------------------------------------------- +// XNameContainer +void SAL_CALL OStylesHelper::insertByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException,lang::WrappedTargetException, uno::RuntimeException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + if ( m_aElements.find(aName) != m_aElements.end() ) + throw container::ElementExistException(); + + if ( !aElement.isExtractableTo(m_aType) ) + throw lang::IllegalArgumentException(); + + m_aElementsPos.push_back(m_aElements.insert(TStyleElements::value_type(aName,aElement)).first); +} +// ----------------------------------------------------------------------------- +void SAL_CALL OStylesHelper::removeByName( const ::rtl::OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException,uno::RuntimeException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + TStyleElements::iterator aFind = m_aElements.find(aName); + if ( aFind != m_aElements.end() ) + throw container::NoSuchElementException(); + m_aElementsPos.erase(::std::find(m_aElementsPos.begin(),m_aElementsPos.end(),aFind)); + m_aElements.erase(aFind); +} +// ----------------------------------------------------------------------------- +// XNameReplace +void SAL_CALL OStylesHelper::replaceByName( const ::rtl::OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException,lang::WrappedTargetException, uno::RuntimeException) +{ + ::osl::MutexGuard aGuard(m_aMutex); + TStyleElements::iterator aFind = m_aElements.find(aName); + if ( aFind != m_aElements.end() ) + throw container::NoSuchElementException(); + if ( !aElement.isExtractableTo(m_aType) ) + throw lang::IllegalArgumentException(); + aFind->second = aElement; +} // ----------------------------------------------------------------------------- uno::Reference< container::XNameAccess > SAL_CALL OReportDefinition::getStyleFamilies( ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); if ( !m_pImpl->m_xStyles.is() ) - m_pImpl->m_xStyles = new OStylesHelper(this); + { + m_pImpl->m_xStyles = new OStylesHelper(); + uno::Reference< container::XNameContainer> xStyles(m_pImpl->m_xStyles,uno::UNO_QUERY); + + uno::Reference< container::XNameContainer> xPageStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL))); + xStyles->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageStyles")),uno::makeAny(xPageStyles)); + uno::Reference< style::XStyle> xPageStyle(createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.PageStyle"))),uno::UNO_QUERY); + xPageStyles->insertByName(xPageStyle->getName(),uno::makeAny(xPageStyle)); + + uno::Reference< container::XNameContainer> xFrameStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL))); + xStyles->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameStyles")),uno::makeAny(xFrameStyles)); + uno::Reference< style::XStyle> xFrameStyle(createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.FrameStyle"))),uno::UNO_QUERY); + xFrameStyles->insertByName(xFrameStyle->getName(),uno::makeAny(xFrameStyle)); + + uno::Reference< container::XNameContainer> xGraphicStyles = new OStylesHelper(::getCppuType(static_cast< uno::Reference<style::XStyle>* >(NULL))); + xStyles->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("graphics")),uno::makeAny(xGraphicStyles)); + uno::Reference< style::XStyle> xGraphicStyle(createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.GraphicStyle"))),uno::UNO_QUERY); + xGraphicStyles->insertByName(xGraphicStyle->getName(),uno::makeAny(xGraphicStyle)); + } return m_pImpl->m_xStyles; } // ----------------------------------------------------------------------------- Directory: /dba/reportdesign/source/core/sdr/ ============================================= File [changed]: UndoActions.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/sdr/UndoActions.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +3 -3 ------------------- --- UndoActions.cxx 2007-05-09 13:50:36+0000 1.1.2.1 +++ UndoActions.cxx 2007-05-15 09:37:41+0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: UndoActions.cxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2007/05/09 13:50:36 $ + * last change: $Author: oj $ $Date: 2007/05/15 09:37:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -863,7 +863,7 @@ // be notified of any changes in the container elements Reference< XContainer > xSimpleContainer( _rxContainer, UNO_QUERY ); - OSL_ENSURE( xSimpleContainer.is(), "OXUndoEnvironment::switchListening: how are we expected to be notified of changes in the container?" ); + // OSL_ENSURE( xSimpleContainer.is(), "OXUndoEnvironment::switchListening: how are we expected to be notified of changes in the container?" ); if ( xSimpleContainer.is() ) if ( _bStartListening ) xSimpleContainer->addContainerListener( this ); Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: ReportController.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportController.cxx?r1=1.1.2.6&r2=1.1.2.7 Delta lines: +5 -2 ------------------- --- ReportController.cxx 2007-05-15 07:46:26+0000 1.1.2.6 +++ ReportController.cxx 2007-05-15 09:37:41+0000 1.1.2.7 @@ -4,9 +4,9 @@ * * $RCSfile: ReportController.cxx,v $ * - * $Revision: 1.1.2.6 $ + * $Revision: 1.1.2.7 $ * - * last change: $Author: oj $ $Date: 2007/05/15 07:46:26 $ + * last change: $Author: oj $ $Date: 2007/05/15 09:37:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -3440,6 +3440,9 @@ _bAdd ? m_xReportDefinition->addPropertyChangeListener(pIter->Name,xUndo) : m_xReportDefinition->removePropertyChangeListener(pIter->Name,xUndo); } + + _bAdd ? rUndoEnv.AddElement(m_xReportDefinition->getStyleFamilies()) : rUndoEnv.RemoveElement(m_xReportDefinition->getStyleFamilies()); + _bAdd ? rUndoEnv.AddElement(m_xReportDefinition->getFunctions()) : rUndoEnv.RemoveElement(m_xReportDefinition->getFunctions()); if ( m_xReportDefinition->getReportHeaderOn() && _bAdd ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
