Tag: cws_dev300_rptchart02 User: oj Date: 2008-05-15 12:32:13+0000 Modified: dba/reportdesign/inc/ReportHelperDefines.hxx dba/reportdesign/source/core/api/FixedLine.cxx dba/reportdesign/source/core/api/ImageControl.cxx dba/reportdesign/source/core/inc/ReportHelperImpl.hxx
Log: #i87135# allow to enable e.g. bold for controls as other checks File Changes: Directory: /dba/reportdesign/inc/ ================================= File [changed]: ReportHelperDefines.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/inc/ReportHelperDefines.hxx?r1=1.4&r2=1.4.2.1 Delta lines: +4 -4 ------------------- --- ReportHelperDefines.hxx 2008-04-10 17:03:16+0000 1.4 +++ ReportHelperDefines.hxx 2008-05-15 12:32:10+0000 1.4.2.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportHelperDefines.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.2.1 $ * * This file is part of OpenOffice.org. * @@ -73,8 +73,8 @@ virtual void SAL_CALL setControlBackground(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \ virtual ::sal_Bool SAL_CALL getControlBackgroundTransparent() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \ virtual void SAL_CALL setControlBackgroundTransparent(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \ - virtual ::sal_Int16 SAL_CALL getParaAdjust() throw (::com::sun::star::uno::RuntimeException); \ - virtual void SAL_CALL setParaAdjust(::sal_Int16 the_value) throw (::com::sun::star::uno::RuntimeException); \ + virtual ::sal_Int16 SAL_CALL getParaAdjust() throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \ + virtual void SAL_CALL setParaAdjust( ::sal_Int16 _paraadjust ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); \ virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getFontDescriptor() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \ virtual void SAL_CALL setFontDescriptor(const ::com::sun::star::awt::FontDescriptor & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \ virtual ::sal_Int16 SAL_CALL getControlTextEmphasis() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException); \ Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: FixedLine.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/FixedLine.cxx?r1=1.6&r2=1.6.2.1 Delta lines: +3 -13 -------------------- --- FixedLine.cxx 2008-04-10 18:08:35+0000 1.6 +++ FixedLine.cxx 2008-05-15 12:32:10+0000 1.6.2.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: FixedLine.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.2.1 $ * * This file is part of OpenOffice.org. * @@ -105,6 +105,7 @@ ,PROPERTY_PRINTWHENGROUPCHANGE ,PROPERTY_MASTERFIELDS ,PROPERTY_DETAILFIELDS + ,PROPERTY_PARAADJUST }; return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); } @@ -295,17 +296,6 @@ throw beans::UnknownPropertyException(); } // ----------------------------------------------------------------------------- -::sal_Int16 SAL_CALL OFixedLine::getParaAdjust() throw (uno::RuntimeException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_aProps.aFormatProperties.nAlign; -} -// ----------------------------------------------------------------------------- -void SAL_CALL OFixedLine::setParaAdjust( ::sal_Int16 _align ) throw (uno::RuntimeException) -{ - set(PROPERTY_PARAADJUST,_align,m_aProps.aFormatProperties.nAlign); -} -// ----------------------------------------------------------------------------- ::sal_Int32 SAL_CALL OFixedLine::getControlBackground() throw (beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); File [changed]: ImageControl.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/ImageControl.cxx?r1=1.5.2.1&r2=1.5.2.2 Delta lines: +2 -11 -------------------- --- ImageControl.cxx 2008-05-07 06:57:01+0000 1.5.2.1 +++ ImageControl.cxx 2008-05-15 12:32:10+0000 1.5.2.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ImageControl.cxx,v $ - * $Revision: 1.5.2.1 $ + * $Revision: 1.5.2.2 $ * * This file is part of OpenOffice.org. * @@ -89,6 +89,7 @@ ,PROPERTY_CHARKERNING ,PROPERTY_MASTERFIELDS ,PROPERTY_DETAILFIELDS + ,PROPERTY_PARAADJUST }; return uno::Sequence< ::rtl::OUString >(pProps,sizeof(pProps)/sizeof(pProps[0])); } @@ -226,16 +227,6 @@ } // ----------------------------------------------------------------------------- -::sal_Int16 SAL_CALL OImageControl::getParaAdjust() throw (uno::RuntimeException) -{ - ::osl::MutexGuard aGuard(m_aMutex); - return m_aProps.aFormatProperties.nAlign; -} -// ----------------------------------------------------------------------------- -void SAL_CALL OImageControl::setParaAdjust( ::sal_Int16 _align ) throw (uno::RuntimeException) -{ - set(PROPERTY_PARAADJUST,_align,m_aProps.aFormatProperties.nAlign); -} ::sal_Int32 SAL_CALL OImageControl::getControlBackground() throw (::com::sun::star::beans::UnknownPropertyException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); Directory: /dba/reportdesign/source/core/inc/ ============================================= File [changed]: ReportHelperImpl.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/inc/ReportHelperImpl.hxx?r1=1.5&r2=1.5.2.1 Delta lines: +12 -4 -------------------- --- ReportHelperImpl.hxx 2008-04-10 18:20:30+0000 1.5 +++ ReportHelperImpl.hxx 2008-05-15 12:32:10+0000 1.5.2.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportHelperImpl.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.2.1 $ * * This file is part of OpenOffice.org. * @@ -234,13 +234,13 @@ float newValue = the_value; \ set(PROPERTY_CHARSCALEWIDTH,newValue,varName.aFontDescriptor.CharacterWidth); \ } \ -::sal_Int16 SAL_CALL clazz::getParaAdjust() throw (uno::RuntimeException) \ +::sal_Int16 SAL_CALL clazz::getParaAdjust() throw (beans::UnknownPropertyException,uno::RuntimeException) \ { \ ::osl::MutexGuard aGuard(m_aMutex); \ return varName.nAlign; \ } \ \ -void SAL_CALL clazz::setParaAdjust( ::sal_Int16 _align ) throw (uno::RuntimeException) \ +void SAL_CALL clazz::setParaAdjust( ::sal_Int16 _align ) throw (beans::UnknownPropertyException,uno::RuntimeException) \ { \ set(PROPERTY_PARAADJUST,_align,varName.nAlign); \ } \ @@ -596,6 +596,14 @@ } #define NO_REPORTCONTROLFORMAT_IMPL(clazz) \ +::sal_Int16 SAL_CALL clazz::getParaAdjust() throw (uno::RuntimeException, beans::UnknownPropertyException)\ +{\ + throw beans::UnknownPropertyException();\ +}\ +void SAL_CALL clazz::setParaAdjust(::sal_Int16 /*the_value*/) throw (uno::RuntimeException, beans::UnknownPropertyException)\ +{\ + throw beans::UnknownPropertyException();\ +}\ ::sal_Int16 SAL_CALL clazz::getCharStrikeout() throw (uno::RuntimeException, beans::UnknownPropertyException)\ {\ throw beans::UnknownPropertyException();\ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
